Resolve merge conflicts

2025-12-12 04:00:42 +00:00 · 2025-10-16 17:41:28 -04:00 · 2025-10-16 17:41:28 -04:00 · 70217cc032
commit 70217cc032
parent f4556f14c7
1 changed files with 1 additions and 1 deletions
--- a/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py
+++ b/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py
@ -110,9 +110,9 @@ class StreamingResponseOrchestrator:
        text: OpenAIResponseText,
        max_infer_iters: int,
        tool_executor,  # Will be the tool execution logic from the main class
+        instructions: str,
        safety_api,
        guardrail_ids: list[str] | None = None,
-        instructions: str,
    ):
        self.inference_api = inference_api
        self.ctx = ctx