Merge 93d5894a5e into ce77c27ff8

2025-10-03 19:57:35 +00:00 · 2025-10-03 17:56:55 +02:00 · 2025-10-03 17:56:55 +02:00 · 8486f861bb
commit 8486f861bb
parent ce77c27ff8 93d5894a5e
8 changed files with 10 additions and 64 deletions
--- a/docs/static/deprecated-llama-stack-spec.html
+++ b/docs/static/deprecated-llama-stack-spec.html
@ -8759,25 +8759,13 @@
            "OpenAIResponseInput": {
                "oneOf": [
                    {
-                        "$ref": "#/components/schemas/OpenAIResponseOutputMessageWebSearchToolCall"
-                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseOutputMessageFileSearchToolCall"
-                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseOutputMessageFunctionToolCall"
+                        "$ref": "#/components/schemas/OpenAIResponseOutput"
                    },
                    {
                        "$ref": "#/components/schemas/OpenAIResponseInputFunctionToolCallOutput"
                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseMCPApprovalRequest"
-                    },
                    {
                        "$ref": "#/components/schemas/OpenAIResponseMCPApprovalResponse"
-                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseMessage"
                    }
                ]
            },
--- a/docs/static/deprecated-llama-stack-spec.yaml
+++ b/docs/static/deprecated-llama-stack-spec.yaml
@ -6493,13 +6493,9 @@ components:
        Error details for failed OpenAI response requests.
    OpenAIResponseInput:
      oneOf:
-        - $ref: '#/components/schemas/OpenAIResponseOutputMessageWebSearchToolCall'
-        - $ref: '#/components/schemas/OpenAIResponseOutputMessageFileSearchToolCall'
-        - $ref: '#/components/schemas/OpenAIResponseOutputMessageFunctionToolCall'
+        - $ref: '#/components/schemas/OpenAIResponseOutput'
        - $ref: '#/components/schemas/OpenAIResponseInputFunctionToolCallOutput'
-        - $ref: '#/components/schemas/OpenAIResponseMCPApprovalRequest'
        - $ref: '#/components/schemas/OpenAIResponseMCPApprovalResponse'
-        - $ref: '#/components/schemas/OpenAIResponseMessage'
    "OpenAIResponseInputFunctionToolCallOutput":
      type: object
      properties:
--- a/docs/static/llama-stack-spec.html
+++ b/docs/static/llama-stack-spec.html
@ -7308,25 +7308,13 @@
            "OpenAIResponseInput": {
                "oneOf": [
                    {
-                        "$ref": "#/components/schemas/OpenAIResponseOutputMessageWebSearchToolCall"
-                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseOutputMessageFileSearchToolCall"
-                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseOutputMessageFunctionToolCall"
+                        "$ref": "#/components/schemas/OpenAIResponseOutput"
                    },
                    {
                        "$ref": "#/components/schemas/OpenAIResponseInputFunctionToolCallOutput"
                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseMCPApprovalRequest"
-                    },
                    {
                        "$ref": "#/components/schemas/OpenAIResponseMCPApprovalResponse"
-                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseMessage"
                    }
                ]
            },
--- a/docs/static/llama-stack-spec.yaml
+++ b/docs/static/llama-stack-spec.yaml
@ -5511,13 +5511,9 @@ components:
        Error details for failed OpenAI response requests.
    OpenAIResponseInput:
      oneOf:
-        - $ref: '#/components/schemas/OpenAIResponseOutputMessageWebSearchToolCall'
-        - $ref: '#/components/schemas/OpenAIResponseOutputMessageFileSearchToolCall'
-        - $ref: '#/components/schemas/OpenAIResponseOutputMessageFunctionToolCall'
+        - $ref: '#/components/schemas/OpenAIResponseOutput'
        - $ref: '#/components/schemas/OpenAIResponseInputFunctionToolCallOutput'
-        - $ref: '#/components/schemas/OpenAIResponseMCPApprovalRequest'
        - $ref: '#/components/schemas/OpenAIResponseMCPApprovalResponse'
-        - $ref: '#/components/schemas/OpenAIResponseMessage'
    "OpenAIResponseInputFunctionToolCallOutput":
      type: object
      properties:
--- a/docs/static/stainless-llama-stack-spec.html
+++ b/docs/static/stainless-llama-stack-spec.html
@ -9317,25 +9317,13 @@
            "OpenAIResponseInput": {
                "oneOf": [
                    {
-                        "$ref": "#/components/schemas/OpenAIResponseOutputMessageWebSearchToolCall"
-                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseOutputMessageFileSearchToolCall"
-                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseOutputMessageFunctionToolCall"
+                        "$ref": "#/components/schemas/OpenAIResponseOutput"
                    },
                    {
                        "$ref": "#/components/schemas/OpenAIResponseInputFunctionToolCallOutput"
                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseMCPApprovalRequest"
-                    },
                    {
                        "$ref": "#/components/schemas/OpenAIResponseMCPApprovalResponse"
-                    },
-                    {
-                        "$ref": "#/components/schemas/OpenAIResponseMessage"
                    }
                ]
            },
--- a/docs/static/stainless-llama-stack-spec.yaml
+++ b/docs/static/stainless-llama-stack-spec.yaml
@ -6956,13 +6956,9 @@ components:
        Error details for failed OpenAI response requests.
    OpenAIResponseInput:
      oneOf:
-        - $ref: '#/components/schemas/OpenAIResponseOutputMessageWebSearchToolCall'
-        - $ref: '#/components/schemas/OpenAIResponseOutputMessageFileSearchToolCall'
-        - $ref: '#/components/schemas/OpenAIResponseOutputMessageFunctionToolCall'
+        - $ref: '#/components/schemas/OpenAIResponseOutput'
        - $ref: '#/components/schemas/OpenAIResponseInputFunctionToolCallOutput'
-        - $ref: '#/components/schemas/OpenAIResponseMCPApprovalRequest'
        - $ref: '#/components/schemas/OpenAIResponseMCPApprovalResponse'
-        - $ref: '#/components/schemas/OpenAIResponseMessage'
    "OpenAIResponseInputFunctionToolCallOutput":
      type: object
      properties:
--- a/llama_stack/apis/agents/openai_responses.py
+++ b/llama_stack/apis/agents/openai_responses.py
@ -746,15 +746,7 @@ class OpenAIResponseInputFunctionToolCallOutput(BaseModel):

 OpenAIResponseInput = Annotated[
    # Responses API allows output messages to be passed in as input
-    OpenAIResponseOutputMessageWebSearchToolCall
-    | OpenAIResponseOutputMessageFileSearchToolCall
-    | OpenAIResponseOutputMessageFunctionToolCall
-    | OpenAIResponseInputFunctionToolCallOutput
-    | OpenAIResponseMCPApprovalRequest
-    | OpenAIResponseMCPApprovalResponse
-    |
-    # Fallback to the generic message type as a last resort
-    OpenAIResponseMessage,
+    OpenAIResponseOutput | OpenAIResponseInputFunctionToolCallOutput | OpenAIResponseMCPApprovalResponse,
    Field(union_mode="left_to_right"),
 ]
 register_schema(OpenAIResponseInput, name="OpenAIResponseInput")
--- a/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py
+++ b/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py
@ -125,7 +125,9 @@ class StreamingResponseOrchestrator:
        while True:
            # Text is the default response format for chat completion so don't need to pass it
            # (some providers don't support non-empty response_format when tools are present)
-            response_format = None if self.ctx.response_format.type == "text" else self.ctx.response_format
+            response_format = (
+                None if getattr(self.ctx.response_format, "type", None) == "text" else self.ctx.response_format
+            )
            completion_result = await self.inference_api.openai_chat_completion(
                model=self.ctx.model,
                messages=messages,