From 084d8400b155ef65b0275a77ea72bb813e2224c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 1 Oct 2025 15:33:41 +0200 Subject: [PATCH] chore: remove double routes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We didn't follow the double route approach when we moved from `v1/openai/v1` to `/v1`. In order to remain consistent, let's abandon the double routes. Even if that breaks for 0.3.0. We will do the right announcements. Signed-off-by: Sébastien Han --- docs/static/llama-stack-spec.html | 786 +----------------------------- docs/static/llama-stack-spec.yaml | 566 +-------------------- llama_stack/apis/agents/agents.py | 44 -- llama_stack/apis/eval/eval.py | 12 - 4 files changed, 12 insertions(+), 1396 deletions(-) diff --git a/docs/static/llama-stack-spec.html b/docs/static/llama-stack-spec.html index 20f05a110..7a3cb054d 100644 --- a/docs/static/llama-stack-spec.html +++ b/docs/static/llama-stack-spec.html @@ -256,101 +256,6 @@ } } }, - "/v1/agents": { - "get": { - "responses": { - "200": { - "description": "A PaginatedResponse.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PaginatedResponse" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "List all agents.", - "description": "List all agents.", - "parameters": [ - { - "name": "start_index", - "in": "query", - "description": "The index to start the pagination from.", - "required": false, - "schema": { - "type": "integer" - } - }, - { - "name": "limit", - "in": "query", - "description": "The number of agents to return.", - "required": false, - "schema": { - "type": "integer" - } - } - ] - }, - "post": { - "responses": { - "200": { - "description": "An AgentCreateResponse with the agent ID.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentCreateResponse" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Create an agent with the given configuration.", - "description": "Create an agent with the given configuration.", - "parameters": [], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CreateAgentRequest" - } - } - }, - "required": true - } - } - }, "/v1alpha/agents/{agent_id}/session": { "post": { "responses": { @@ -405,60 +310,6 @@ } } }, - "/v1/agents/{agent_id}/session": { - "post": { - "responses": { - "200": { - "description": "An AgentSessionCreateResponse.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentSessionCreateResponse" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Create a new session for an agent.", - "description": "Create a new session for an agent.", - "parameters": [ - { - "name": "agent_id", - "in": "path", - "description": "The ID of the agent to create the session for.", - "required": true, - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CreateAgentSessionRequest" - } - } - }, - "required": true - } - } - }, "/v1alpha/agents/{agent_id}/session/{session_id}/turn": { "post": { "responses": { @@ -527,74 +378,6 @@ } } }, - "/v1/agents/{agent_id}/session/{session_id}/turn": { - "post": { - "responses": { - "200": { - "description": "If stream=False, returns a Turn object. If stream=True, returns an SSE event stream of AgentTurnResponseStreamChunk.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Turn" - } - }, - "text/event-stream": { - "schema": { - "$ref": "#/components/schemas/AgentTurnResponseStreamChunk" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Create a new turn for an agent.", - "description": "Create a new turn for an agent.", - "parameters": [ - { - "name": "agent_id", - "in": "path", - "description": "The ID of the agent to create the turn for.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "session_id", - "in": "path", - "description": "The ID of the session to create the turn for.", - "required": true, - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CreateAgentTurnRequest" - } - } - }, - "required": true - } - } - }, "/v1/responses": { "get": { "responses": { @@ -868,85 +651,6 @@ ] } }, - "/v1/agents/{agent_id}": { - "get": { - "responses": { - "200": { - "description": "An Agent of the agent.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Agent" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Describe an agent by its ID.", - "description": "Describe an agent by its ID.", - "parameters": [ - { - "name": "agent_id", - "in": "path", - "description": "ID of the agent.", - "required": true, - "schema": { - "type": "string" - } - } - ] - }, - "delete": { - "responses": { - "200": { - "description": "OK" - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Delete an agent by its ID and its associated sessions and turns.", - "description": "Delete an agent by its ID and its associated sessions and turns.", - "parameters": [ - { - "name": "agent_id", - "in": "path", - "description": "The ID of the agent to delete.", - "required": true, - "schema": { - "type": "string" - } - } - ] - } - }, "/v1alpha/agents/{agent_id}/session/{session_id}": { "get": { "responses": { @@ -1056,115 +760,6 @@ ] } }, - "/v1/agents/{agent_id}/session/{session_id}": { - "get": { - "responses": { - "200": { - "description": "A Session.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Session" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Retrieve an agent session by its ID.", - "description": "Retrieve an agent session by its ID.", - "parameters": [ - { - "name": "session_id", - "in": "path", - "description": "The ID of the session to get.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "agent_id", - "in": "path", - "description": "The ID of the agent to get the session for.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "turn_ids", - "in": "query", - "description": "(Optional) List of turn IDs to filter the session by.", - "required": false, - "schema": { - "type": "array", - "items": { - "type": "string" - } - } - } - ] - }, - "delete": { - "responses": { - "200": { - "description": "OK" - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Delete an agent session by its ID and its associated turns.", - "description": "Delete an agent session by its ID and its associated turns.", - "parameters": [ - { - "name": "session_id", - "in": "path", - "description": "The ID of the session to delete.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "agent_id", - "in": "path", - "description": "The ID of the agent to delete the session for.", - "required": true, - "schema": { - "type": "string" - } - } - ] - } - }, "/v1/responses/{response_id}": { "get": { "responses": { @@ -1570,77 +1165,6 @@ ] } }, - "/v1/agents/{agent_id}/session/{session_id}/turn/{turn_id}/step/{step_id}": { - "get": { - "responses": { - "200": { - "description": "An AgentStepResponse.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentStepResponse" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Retrieve an agent step by its ID.", - "description": "Retrieve an agent step by its ID.", - "parameters": [ - { - "name": "agent_id", - "in": "path", - "description": "The ID of the agent to get the step for.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "session_id", - "in": "path", - "description": "The ID of the session to get the step for.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "turn_id", - "in": "path", - "description": "The ID of the turn to get the step for.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "step_id", - "in": "path", - "description": "The ID of the step to get.", - "required": true, - "schema": { - "type": "string" - } - } - ] - } - }, "/v1alpha/agents/{agent_id}/session/{session_id}/turn/{turn_id}": { "get": { "responses": { @@ -1703,68 +1227,6 @@ ] } }, - "/v1/agents/{agent_id}/session/{session_id}/turn/{turn_id}": { - "get": { - "responses": { - "200": { - "description": "A Turn.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Turn" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Retrieve an agent turn by its ID.", - "description": "Retrieve an agent turn by its ID.", - "parameters": [ - { - "name": "agent_id", - "in": "path", - "description": "The ID of the agent to get the turn for.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "session_id", - "in": "path", - "description": "The ID of the session to get the turn for.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "turn_id", - "in": "path", - "description": "The ID of the turn to get.", - "required": true, - "schema": { - "type": "string" - } - } - ] - } - }, "/v1alpha/eval/benchmarks/{benchmark_id}": { "get": { "responses": { @@ -3235,103 +2697,6 @@ ] } }, - "/v1/eval/benchmarks/{benchmark_id}/jobs/{job_id}": { - "get": { - "responses": { - "200": { - "description": "The status of the evaluation job.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Job" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Eval" - ], - "summary": "Get the status of a job.", - "description": "Get the status of a job.", - "parameters": [ - { - "name": "benchmark_id", - "in": "path", - "description": "The ID of the benchmark to run the evaluation on.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "job_id", - "in": "path", - "description": "The ID of the job to get the status of.", - "required": true, - "schema": { - "type": "string" - } - } - ] - }, - "delete": { - "responses": { - "200": { - "description": "OK" - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Eval" - ], - "summary": "Cancel a job.", - "description": "Cancel a job.", - "parameters": [ - { - "name": "benchmark_id", - "in": "path", - "description": "The ID of the benchmark to run the evaluation on.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "job_id", - "in": "path", - "description": "The ID of the job to cancel.", - "required": true, - "schema": { - "type": "string" - } - } - ] - } - }, "/v1alpha/eval/benchmarks/{benchmark_id}/jobs/{job_id}/result": { "get": { "responses": { @@ -3385,15 +2750,15 @@ ] } }, - "/v1/eval/benchmarks/{benchmark_id}/jobs/{job_id}/result": { + "/v1/eval/benchmarks/{benchmark_id}/jobs/{job_id}": { "get": { "responses": { "200": { - "description": "The result of the job.", + "description": "The status of the evaluation job.", "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/EvaluateResponse" + "$ref": "#/components/schemas/Job" } } } @@ -3414,8 +2779,8 @@ "tags": [ "Eval" ], - "summary": "Get the result of a job.", - "description": "Get the result of a job.", + "summary": "Get the status of a job.", + "description": "Get the status of a job.", "parameters": [ { "name": "benchmark_id", @@ -3429,7 +2794,7 @@ { "name": "job_id", "in": "path", - "description": "The ID of the job to get the result of.", + "description": "The ID of the job to get the status of.", "required": true, "schema": { "type": "string" @@ -3500,68 +2865,6 @@ ] } }, - "/v1/agents/{agent_id}/sessions": { - "get": { - "responses": { - "200": { - "description": "A PaginatedResponse.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PaginatedResponse" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "List all session(s) of a given agent.", - "description": "List all session(s) of a given agent.", - "parameters": [ - { - "name": "agent_id", - "in": "path", - "description": "The ID of the agent to list sessions for.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "start_index", - "in": "query", - "description": "The index to start the pagination from.", - "required": false, - "schema": { - "type": "integer" - } - }, - { - "name": "limit", - "in": "query", - "description": "The number of sessions to return.", - "required": false, - "schema": { - "type": "integer" - } - } - ] - } - }, "/v1alpha/eval/benchmarks": { "get": { "responses": { @@ -6308,83 +5611,6 @@ } } }, - "/v1/agents/{agent_id}/session/{session_id}/turn/{turn_id}/resume": { - "post": { - "responses": { - "200": { - "description": "A Turn object if stream is False, otherwise an AsyncIterator of AgentTurnResponseStreamChunk objects.", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Turn" - } - }, - "text/event-stream": { - "schema": { - "$ref": "#/components/schemas/AgentTurnResponseStreamChunk" - } - } - } - }, - "400": { - "$ref": "#/components/responses/BadRequest400" - }, - "429": { - "$ref": "#/components/responses/TooManyRequests429" - }, - "500": { - "$ref": "#/components/responses/InternalServerError500" - }, - "default": { - "$ref": "#/components/responses/DefaultError" - } - }, - "tags": [ - "Agents" - ], - "summary": "Resume an agent turn with executed tool call responses.", - "description": "Resume an agent turn with executed tool call responses.\nWhen a Turn has the status `awaiting_input` due to pending input from client side tool calls, this endpoint can be used to submit the outputs from the tool calls once they are ready.", - "parameters": [ - { - "name": "agent_id", - "in": "path", - "description": "The ID of the agent to resume.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "session_id", - "in": "path", - "description": "The ID of the session to resume.", - "required": true, - "schema": { - "type": "string" - } - }, - { - "name": "turn_id", - "in": "path", - "description": "The ID of the turn to resume.", - "required": true, - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ResumeAgentTurnRequest" - } - } - }, - "required": true - } - } - }, "/v1alpha/eval/benchmarks/{benchmark_id}/jobs": { "post": { "responses": { diff --git a/docs/static/llama-stack-spec.yaml b/docs/static/llama-stack-spec.yaml index bf8357333..a2ea2e6de 100644 --- a/docs/static/llama-stack-spec.yaml +++ b/docs/static/llama-stack-spec.yaml @@ -163,74 +163,6 @@ paths: schema: $ref: '#/components/schemas/CreateAgentRequest' required: true - /v1/agents: - get: - responses: - '200': - description: A PaginatedResponse. - content: - application/json: - schema: - $ref: '#/components/schemas/PaginatedResponse' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: List all agents. - description: List all agents. - parameters: - - name: start_index - in: query - description: The index to start the pagination from. - required: false - schema: - type: integer - - name: limit - in: query - description: The number of agents to return. - required: false - schema: - type: integer - post: - responses: - '200': - description: >- - An AgentCreateResponse with the agent ID. - content: - application/json: - schema: - $ref: '#/components/schemas/AgentCreateResponse' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: >- - Create an agent with the given configuration. - description: >- - Create an agent with the given configuration. - parameters: [] - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/CreateAgentRequest' - required: true /v1alpha/agents/{agent_id}/session: post: responses: @@ -268,43 +200,6 @@ paths: schema: $ref: '#/components/schemas/CreateAgentSessionRequest' required: true - /v1/agents/{agent_id}/session: - post: - responses: - '200': - description: An AgentSessionCreateResponse. - content: - application/json: - schema: - $ref: '#/components/schemas/AgentSessionCreateResponse' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: Create a new session for an agent. - description: Create a new session for an agent. - parameters: - - name: agent_id - in: path - description: >- - The ID of the agent to create the session for. - required: true - schema: - type: string - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/CreateAgentSessionRequest' - required: true /v1alpha/agents/{agent_id}/session/{session_id}/turn: post: responses: @@ -354,55 +249,6 @@ paths: schema: $ref: '#/components/schemas/CreateAgentTurnRequest' required: true - /v1/agents/{agent_id}/session/{session_id}/turn: - post: - responses: - '200': - description: >- - If stream=False, returns a Turn object. If stream=True, returns an SSE - event stream of AgentTurnResponseStreamChunk. - content: - application/json: - schema: - $ref: '#/components/schemas/Turn' - text/event-stream: - schema: - $ref: '#/components/schemas/AgentTurnResponseStreamChunk' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: Create a new turn for an agent. - description: Create a new turn for an agent. - parameters: - - name: agent_id - in: path - description: >- - The ID of the agent to create the turn for. - required: true - schema: - type: string - - name: session_id - in: path - description: >- - The ID of the session to create the turn for. - required: true - schema: - type: string - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/CreateAgentTurnRequest' - required: true /v1/responses: get: responses: @@ -595,63 +441,6 @@ paths: required: true schema: type: string - /v1/agents/{agent_id}: - get: - responses: - '200': - description: An Agent of the agent. - content: - application/json: - schema: - $ref: '#/components/schemas/Agent' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: Describe an agent by its ID. - description: Describe an agent by its ID. - parameters: - - name: agent_id - in: path - description: ID of the agent. - required: true - schema: - type: string - delete: - responses: - '200': - description: OK - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: >- - Delete an agent by its ID and its associated sessions and turns. - description: >- - Delete an agent by its ID and its associated sessions and turns. - parameters: - - name: agent_id - in: path - description: The ID of the agent to delete. - required: true - schema: - type: string /v1alpha/agents/{agent_id}/session/{session_id}: get: responses: @@ -732,86 +521,6 @@ paths: required: true schema: type: string - /v1/agents/{agent_id}/session/{session_id}: - get: - responses: - '200': - description: A Session. - content: - application/json: - schema: - $ref: '#/components/schemas/Session' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: Retrieve an agent session by its ID. - description: Retrieve an agent session by its ID. - parameters: - - name: session_id - in: path - description: The ID of the session to get. - required: true - schema: - type: string - - name: agent_id - in: path - description: >- - The ID of the agent to get the session for. - required: true - schema: - type: string - - name: turn_ids - in: query - description: >- - (Optional) List of turn IDs to filter the session by. - required: false - schema: - type: array - items: - type: string - delete: - responses: - '200': - description: OK - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: >- - Delete an agent session by its ID and its associated turns. - description: >- - Delete an agent session by its ID and its associated turns. - parameters: - - name: session_id - in: path - description: The ID of the session to delete. - required: true - schema: - type: string - - name: agent_id - in: path - description: >- - The ID of the agent to delete the session for. - required: true - schema: - type: string /v1/responses/{response_id}: get: responses: @@ -1099,55 +808,6 @@ paths: required: true schema: type: string - /v1/agents/{agent_id}/session/{session_id}/turn/{turn_id}/step/{step_id}: - get: - responses: - '200': - description: An AgentStepResponse. - content: - application/json: - schema: - $ref: '#/components/schemas/AgentStepResponse' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: Retrieve an agent step by its ID. - description: Retrieve an agent step by its ID. - parameters: - - name: agent_id - in: path - description: The ID of the agent to get the step for. - required: true - schema: - type: string - - name: session_id - in: path - description: >- - The ID of the session to get the step for. - required: true - schema: - type: string - - name: turn_id - in: path - description: The ID of the turn to get the step for. - required: true - schema: - type: string - - name: step_id - in: path - description: The ID of the step to get. - required: true - schema: - type: string /v1alpha/agents/{agent_id}/session/{session_id}/turn/{turn_id}: get: responses: @@ -1191,49 +851,6 @@ paths: required: true schema: type: string - /v1/agents/{agent_id}/session/{session_id}/turn/{turn_id}: - get: - responses: - '200': - description: A Turn. - content: - application/json: - schema: - $ref: '#/components/schemas/Turn' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: Retrieve an agent turn by its ID. - description: Retrieve an agent turn by its ID. - parameters: - - name: agent_id - in: path - description: The ID of the agent to get the turn for. - required: true - schema: - type: string - - name: session_id - in: path - description: >- - The ID of the session to get the turn for. - required: true - schema: - type: string - - name: turn_id - in: path - description: The ID of the turn to get. - required: true - schema: - type: string /v1alpha/eval/benchmarks/{benchmark_id}: get: responses: @@ -2286,75 +1903,6 @@ paths: required: true schema: type: string - /v1/eval/benchmarks/{benchmark_id}/jobs/{job_id}: - get: - responses: - '200': - description: The status of the evaluation job. - content: - application/json: - schema: - $ref: '#/components/schemas/Job' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Eval - summary: Get the status of a job. - description: Get the status of a job. - parameters: - - name: benchmark_id - in: path - description: >- - The ID of the benchmark to run the evaluation on. - required: true - schema: - type: string - - name: job_id - in: path - description: The ID of the job to get the status of. - required: true - schema: - type: string - delete: - responses: - '200': - description: OK - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Eval - summary: Cancel a job. - description: Cancel a job. - parameters: - - name: benchmark_id - in: path - description: >- - The ID of the benchmark to run the evaluation on. - required: true - schema: - type: string - - name: job_id - in: path - description: The ID of the job to cancel. - required: true - schema: - type: string /v1alpha/eval/benchmarks/{benchmark_id}/jobs/{job_id}/result: get: responses: @@ -2392,15 +1940,15 @@ paths: required: true schema: type: string - /v1/eval/benchmarks/{benchmark_id}/jobs/{job_id}/result: + /v1/eval/benchmarks/{benchmark_id}/jobs/{job_id}: get: responses: '200': - description: The result of the job. + description: The status of the evaluation job. content: application/json: schema: - $ref: '#/components/schemas/EvaluateResponse' + $ref: '#/components/schemas/Job' '400': $ref: '#/components/responses/BadRequest400' '429': @@ -2413,8 +1961,8 @@ paths: $ref: '#/components/responses/DefaultError' tags: - Eval - summary: Get the result of a job. - description: Get the result of a job. + summary: Get the status of a job. + description: Get the status of a job. parameters: - name: benchmark_id in: path @@ -2425,7 +1973,7 @@ paths: type: string - name: job_id in: path - description: The ID of the job to get the result of. + description: The ID of the job to get the status of. required: true schema: type: string @@ -2472,49 +2020,6 @@ paths: required: false schema: type: integer - /v1/agents/{agent_id}/sessions: - get: - responses: - '200': - description: A PaginatedResponse. - content: - application/json: - schema: - $ref: '#/components/schemas/PaginatedResponse' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: List all session(s) of a given agent. - description: List all session(s) of a given agent. - parameters: - - name: agent_id - in: path - description: >- - The ID of the agent to list sessions for. - required: true - schema: - type: string - - name: start_index - in: query - description: The index to start the pagination from. - required: false - schema: - type: integer - - name: limit - in: query - description: The number of sessions to return. - required: false - schema: - type: integer /v1alpha/eval/benchmarks: get: responses: @@ -4537,65 +4042,6 @@ paths: schema: $ref: '#/components/schemas/ResumeAgentTurnRequest' required: true - /v1/agents/{agent_id}/session/{session_id}/turn/{turn_id}/resume: - post: - responses: - '200': - description: >- - A Turn object if stream is False, otherwise an AsyncIterator of AgentTurnResponseStreamChunk - objects. - content: - application/json: - schema: - $ref: '#/components/schemas/Turn' - text/event-stream: - schema: - $ref: '#/components/schemas/AgentTurnResponseStreamChunk' - '400': - $ref: '#/components/responses/BadRequest400' - '429': - $ref: >- - #/components/responses/TooManyRequests429 - '500': - $ref: >- - #/components/responses/InternalServerError500 - default: - $ref: '#/components/responses/DefaultError' - tags: - - Agents - summary: >- - Resume an agent turn with executed tool call responses. - description: >- - Resume an agent turn with executed tool call responses. - - When a Turn has the status `awaiting_input` due to pending input from client - side tool calls, this endpoint can be used to submit the outputs from the - tool calls once they are ready. - parameters: - - name: agent_id - in: path - description: The ID of the agent to resume. - required: true - schema: - type: string - - name: session_id - in: path - description: The ID of the session to resume. - required: true - schema: - type: string - - name: turn_id - in: path - description: The ID of the turn to resume. - required: true - schema: - type: string - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/ResumeAgentTurnRequest' - required: true /v1alpha/eval/benchmarks/{benchmark_id}/jobs: post: responses: diff --git a/llama_stack/apis/agents/agents.py b/llama_stack/apis/agents/agents.py index f732dd1ed..0f264775c 100644 --- a/llama_stack/apis/agents/agents.py +++ b/llama_stack/apis/agents/agents.py @@ -482,9 +482,6 @@ class Agents(Protocol): - Agents can also use Memory to retrieve information from knowledge bases. See the RAG Tool and Vector IO APIs for more details. """ - @webmethod( - route="/agents", method="POST", descriptive_name="create_agent", deprecated=True, level=LLAMA_STACK_API_V1 - ) @webmethod(route="/agents", method="POST", descriptive_name="create_agent", level=LLAMA_STACK_API_V1ALPHA) async def create_agent( self, @@ -497,13 +494,6 @@ class Agents(Protocol): """ ... - @webmethod( - route="/agents/{agent_id}/session/{session_id}/turn", - method="POST", - descriptive_name="create_agent_turn", - deprecated=True, - level=LLAMA_STACK_API_V1, - ) @webmethod( route="/agents/{agent_id}/session/{session_id}/turn", method="POST", @@ -534,13 +524,6 @@ class Agents(Protocol): """ ... - @webmethod( - route="/agents/{agent_id}/session/{session_id}/turn/{turn_id}/resume", - method="POST", - descriptive_name="resume_agent_turn", - deprecated=True, - level=LLAMA_STACK_API_V1, - ) @webmethod( route="/agents/{agent_id}/session/{session_id}/turn/{turn_id}/resume", method="POST", @@ -568,12 +551,6 @@ class Agents(Protocol): """ ... - @webmethod( - route="/agents/{agent_id}/session/{session_id}/turn/{turn_id}", - method="GET", - deprecated=True, - level=LLAMA_STACK_API_V1, - ) @webmethod( route="/agents/{agent_id}/session/{session_id}/turn/{turn_id}", method="GET", @@ -594,12 +571,6 @@ class Agents(Protocol): """ ... - @webmethod( - route="/agents/{agent_id}/session/{session_id}/turn/{turn_id}/step/{step_id}", - method="GET", - deprecated=True, - level=LLAMA_STACK_API_V1, - ) @webmethod( route="/agents/{agent_id}/session/{session_id}/turn/{turn_id}/step/{step_id}", method="GET", @@ -622,13 +593,6 @@ class Agents(Protocol): """ ... - @webmethod( - route="/agents/{agent_id}/session", - method="POST", - descriptive_name="create_agent_session", - deprecated=True, - level=LLAMA_STACK_API_V1, - ) @webmethod( route="/agents/{agent_id}/session", method="POST", @@ -648,7 +612,6 @@ class Agents(Protocol): """ ... - @webmethod(route="/agents/{agent_id}/session/{session_id}", method="GET", deprecated=True, level=LLAMA_STACK_API_V1) @webmethod(route="/agents/{agent_id}/session/{session_id}", method="GET", level=LLAMA_STACK_API_V1ALPHA) async def get_agents_session( self, @@ -665,9 +628,6 @@ class Agents(Protocol): """ ... - @webmethod( - route="/agents/{agent_id}/session/{session_id}", method="DELETE", deprecated=True, level=LLAMA_STACK_API_V1 - ) @webmethod(route="/agents/{agent_id}/session/{session_id}", method="DELETE", level=LLAMA_STACK_API_V1ALPHA) async def delete_agents_session( self, @@ -681,7 +641,6 @@ class Agents(Protocol): """ ... - @webmethod(route="/agents/{agent_id}", method="DELETE", deprecated=True, level=LLAMA_STACK_API_V1) @webmethod(route="/agents/{agent_id}", method="DELETE", level=LLAMA_STACK_API_V1ALPHA) async def delete_agent( self, @@ -693,7 +652,6 @@ class Agents(Protocol): """ ... - @webmethod(route="/agents", method="GET", deprecated=True, level=LLAMA_STACK_API_V1) @webmethod(route="/agents", method="GET", level=LLAMA_STACK_API_V1ALPHA) async def list_agents(self, start_index: int | None = None, limit: int | None = None) -> PaginatedResponse: """List all agents. @@ -704,7 +662,6 @@ class Agents(Protocol): """ ... - @webmethod(route="/agents/{agent_id}", method="GET", deprecated=True, level=LLAMA_STACK_API_V1) @webmethod(route="/agents/{agent_id}", method="GET", level=LLAMA_STACK_API_V1ALPHA) async def get_agent(self, agent_id: str) -> Agent: """Describe an agent by its ID. @@ -714,7 +671,6 @@ class Agents(Protocol): """ ... - @webmethod(route="/agents/{agent_id}/sessions", method="GET", deprecated=True, level=LLAMA_STACK_API_V1) @webmethod(route="/agents/{agent_id}/sessions", method="GET", level=LLAMA_STACK_API_V1ALPHA) async def list_agent_sessions( self, diff --git a/llama_stack/apis/eval/eval.py b/llama_stack/apis/eval/eval.py index bb81778f1..367e56dbb 100644 --- a/llama_stack/apis/eval/eval.py +++ b/llama_stack/apis/eval/eval.py @@ -133,12 +133,6 @@ class Eval(Protocol): """ ... - @webmethod( - route="/eval/benchmarks/{benchmark_id}/jobs/{job_id}", - method="DELETE", - level=LLAMA_STACK_API_V1, - deprecated=True, - ) @webmethod(route="/eval/benchmarks/{benchmark_id}/jobs/{job_id}", method="DELETE", level=LLAMA_STACK_API_V1ALPHA) async def job_cancel(self, benchmark_id: str, job_id: str) -> None: """Cancel a job. @@ -148,12 +142,6 @@ class Eval(Protocol): """ ... - @webmethod( - route="/eval/benchmarks/{benchmark_id}/jobs/{job_id}/result", - method="GET", - level=LLAMA_STACK_API_V1, - deprecated=True, - ) @webmethod( route="/eval/benchmarks/{benchmark_id}/jobs/{job_id}/result", method="GET", level=LLAMA_STACK_API_V1ALPHA )