From 6665d31cdf875888a5c3365b4610e7f2a30b7ba5 Mon Sep 17 00:00:00 2001 From: Ashwin Bharambe Date: Mon, 16 Sep 2024 21:21:11 -0700 Subject: [PATCH] Moved some stuff out of common/; re-generated OpenAPI spec --- llama_stack/apis/agents/agents.py | 2 +- llama_stack/apis/common/__init__.py | 5 + .../{ => apis}/common/deployment_types.py | 0 .../{ => apis}/common/training_types.py | 0 llama_stack/apis/evals/evals.py | 2 +- .../apis/post_training/post_training.py | 2 +- llama_stack/apis/safety/safety.py | 2 +- llama_stack/core/datatypes.py | 2 +- llama_stack/core/server.py | 2 +- llama_stack/stack.py | 2 +- .../llama-stack-spec.html | 239 +++++++++--------- .../llama-stack-spec.yaml | 216 ++++++++-------- 12 files changed, 238 insertions(+), 236 deletions(-) create mode 100644 llama_stack/apis/common/__init__.py rename llama_stack/{ => apis}/common/deployment_types.py (100%) rename llama_stack/{ => apis}/common/training_types.py (100%) diff --git a/llama_stack/apis/agents/agents.py b/llama_stack/apis/agents/agents.py index 5f55568b4..da07d596a 100644 --- a/llama_stack/apis/agents/agents.py +++ b/llama_stack/apis/agents/agents.py @@ -14,7 +14,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing_extensions import Annotated from llama_models.llama3.api.datatypes import * # noqa: F403 -from llama_stack.common.deployment_types import * # noqa: F403 +from llama_stack.apis.common.deployment_types import * # noqa: F403 from llama_stack.apis.inference import * # noqa: F403 from llama_stack.apis.safety import * # noqa: F403 from llama_stack.apis.memory import * # noqa: F403 diff --git a/llama_stack/apis/common/__init__.py b/llama_stack/apis/common/__init__.py new file mode 100644 index 000000000..756f351d8 --- /dev/null +++ b/llama_stack/apis/common/__init__.py @@ -0,0 +1,5 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# All rights reserved. +# +# This source code is licensed under the terms described in the LICENSE file in +# the root directory of this source tree. diff --git a/llama_stack/common/deployment_types.py b/llama_stack/apis/common/deployment_types.py similarity index 100% rename from llama_stack/common/deployment_types.py rename to llama_stack/apis/common/deployment_types.py diff --git a/llama_stack/common/training_types.py b/llama_stack/apis/common/training_types.py similarity index 100% rename from llama_stack/common/training_types.py rename to llama_stack/apis/common/training_types.py diff --git a/llama_stack/apis/evals/evals.py b/llama_stack/apis/evals/evals.py index d17ed9fdc..0be2243ab 100644 --- a/llama_stack/apis/evals/evals.py +++ b/llama_stack/apis/evals/evals.py @@ -13,7 +13,7 @@ from pydantic import BaseModel from llama_models.llama3.api.datatypes import * # noqa: F403 from llama_stack.apis.dataset import * # noqa: F403 -from llama_stack.common.training_types import * # noqa: F403 +from llama_stack.apis.common.training_types import * # noqa: F403 class TextGenerationMetric(Enum): diff --git a/llama_stack/apis/post_training/post_training.py b/llama_stack/apis/post_training/post_training.py index 2e7adf320..d943f48b2 100644 --- a/llama_stack/apis/post_training/post_training.py +++ b/llama_stack/apis/post_training/post_training.py @@ -15,7 +15,7 @@ from pydantic import BaseModel, Field from llama_models.llama3.api.datatypes import * # noqa: F403 from llama_stack.apis.dataset import * # noqa: F403 -from llama_stack.common.training_types import * # noqa: F403 +from llama_stack.apis.common.training_types import * # noqa: F403 class OptimizerType(Enum): diff --git a/llama_stack/apis/safety/safety.py b/llama_stack/apis/safety/safety.py index f1abac409..2733dde73 100644 --- a/llama_stack/apis/safety/safety.py +++ b/llama_stack/apis/safety/safety.py @@ -11,7 +11,7 @@ from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel, validator from llama_models.llama3.api.datatypes import * # noqa: F403 -from llama_stack.common.deployment_types import RestAPIExecutionConfig +from llama_stack.apis.common.deployment_types import RestAPIExecutionConfig @json_schema_type diff --git a/llama_stack/core/datatypes.py b/llama_stack/core/datatypes.py index a996d5ca9..06eb1cc49 100644 --- a/llama_stack/core/datatypes.py +++ b/llama_stack/core/datatypes.py @@ -151,7 +151,7 @@ as being "Llama Stack compatible" def module(self) -> str: if self.adapter: return self.adapter.module - return f"llama_stack.{self.api.value}.client" + return f"llama_stack.apis.{self.api.value}.client" @property def pip_packages(self) -> List[str]: diff --git a/llama_stack/core/server.py b/llama_stack/core/server.py index 914a663a5..ee7e5be4e 100644 --- a/llama_stack/core/server.py +++ b/llama_stack/core/server.py @@ -309,7 +309,7 @@ async def resolve_impls( specs[api] = RouterProviderSpec( api=api, - module=f"llama_stack.{api.value.lower()}.router", + module=f"llama_stack.providers.routers.{api.value.lower()}", api_dependencies=[], inner_specs=inner_specs, ) diff --git a/llama_stack/stack.py b/llama_stack/stack.py index f972edc1e..f6c66d23b 100644 --- a/llama_stack/stack.py +++ b/llama_stack/stack.py @@ -7,7 +7,7 @@ from llama_models.llama3.api.datatypes import * # noqa: F403 from llama_stack.apis.agents import * # noqa: F403 from llama_stack.apis.dataset import * # noqa: F403 -from llama_stack.evaluations.api import * # noqa: F403 +from llama_stack.apis.evals import * # noqa: F403 from llama_stack.apis.inference import * # noqa: F403 from llama_stack.apis.batch_inference import * # noqa: F403 from llama_stack.apis.memory import * # noqa: F403 diff --git a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html index 6e7fe287f..ed9f4c28e 100644 --- a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html +++ b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.html @@ -21,7 +21,7 @@ "info": { "title": "[DRAFT] Llama Stack Specification", "version": "0.0.1", - "description": "This is the specification of the llama stack that provides\n a set of endpoints and their corresponding interfaces that are tailored to\n best leverage Llama Models. The specification is still in draft and subject to change.\n Generated at 2024-09-11 16:05:23.016090" + "description": "This is the specification of the llama stack that provides\n a set of endpoints and their corresponding interfaces that are tailored to\n best leverage Llama Models. The specification is still in draft and subject to change.\n Generated at 2024-09-16 21:21:00.554769" }, "servers": [ { @@ -209,7 +209,7 @@ } } }, - "/agentic_system/create": { + "/agents/create": { "post": { "responses": { "200": { @@ -217,21 +217,21 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/AgenticSystemCreateResponse" + "$ref": "#/components/schemas/AgentCreateResponse" } } } } }, "tags": [ - "AgenticSystem" + "Agents" ], "parameters": [], "requestBody": { "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/CreateAgenticSystemRequest" + "$ref": "#/components/schemas/CreateAgentRequest" } } }, @@ -239,7 +239,7 @@ } } }, - "/agentic_system/session/create": { + "/agents/session/create": { "post": { "responses": { "200": { @@ -247,21 +247,21 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/AgenticSystemSessionCreateResponse" + "$ref": "#/components/schemas/AgentSessionCreateResponse" } } } } }, "tags": [ - "AgenticSystem" + "Agents" ], "parameters": [], "requestBody": { "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/CreateAgenticSystemSessionRequest" + "$ref": "#/components/schemas/CreateAgentSessionRequest" } } }, @@ -269,29 +269,29 @@ } } }, - "/agentic_system/turn/create": { + "/agents/turn/create": { "post": { "responses": { "200": { "description": "OK", "content": { - "text/event-stream": { + "application/json": { "schema": { - "$ref": "#/components/schemas/AgenticSystemTurnResponseStreamChunk" + "$ref": "#/components/schemas/AgentTurnResponseStreamChunk" } } } } }, "tags": [ - "AgenticSystem" + "Agents" ], "parameters": [], "requestBody": { "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/CreateAgenticSystemTurnRequest" + "$ref": "#/components/schemas/CreateAgentTurnRequest" } } }, @@ -352,7 +352,7 @@ } } }, - "/agentic_system/delete": { + "/agents/delete": { "post": { "responses": { "200": { @@ -360,14 +360,14 @@ } }, "tags": [ - "AgenticSystem" + "Agents" ], "parameters": [], "requestBody": { "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/DeleteAgenticSystemRequest" + "$ref": "#/components/schemas/DeleteAgentsRequest" } } }, @@ -375,7 +375,7 @@ } } }, - "/agentic_system/session/delete": { + "/agents/session/delete": { "post": { "responses": { "200": { @@ -383,14 +383,14 @@ } }, "tags": [ - "AgenticSystem" + "Agents" ], "parameters": [], "requestBody": { "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/DeleteAgenticSystemSessionRequest" + "$ref": "#/components/schemas/DeleteAgentsSessionRequest" } } }, @@ -594,7 +594,7 @@ } } }, - "/agentic_system/session/get": { + "/agents/session/get": { "post": { "responses": { "200": { @@ -609,7 +609,7 @@ } }, "tags": [ - "AgenticSystem" + "Agents" ], "parameters": [ { @@ -633,7 +633,7 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/GetAgenticSystemSessionRequest" + "$ref": "#/components/schemas/GetAgentsSessionRequest" } } }, @@ -641,7 +641,7 @@ } } }, - "/agentic_system/step/get": { + "/agents/step/get": { "get": { "responses": { "200": { @@ -649,14 +649,14 @@ "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/AgenticSystemStepResponse" + "$ref": "#/components/schemas/AgentStepResponse" } } } } }, "tags": [ - "AgenticSystem" + "Agents" ], "parameters": [ { @@ -686,7 +686,7 @@ ] } }, - "/agentic_system/turn/get": { + "/agents/turn/get": { "get": { "responses": { "200": { @@ -701,7 +701,7 @@ } }, "tags": [ - "AgenticSystem" + "Agents" ], "parameters": [ { @@ -2672,7 +2672,7 @@ "type" ] }, - "CreateAgenticSystemRequest": { + "CreateAgentRequest": { "type": "object", "properties": { "agent_config": { @@ -2684,7 +2684,7 @@ "agent_config" ] }, - "AgenticSystemCreateResponse": { + "AgentCreateResponse": { "type": "object", "properties": { "agent_id": { @@ -2696,7 +2696,7 @@ "agent_id" ] }, - "CreateAgenticSystemSessionRequest": { + "CreateAgentSessionRequest": { "type": "object", "properties": { "agent_id": { @@ -2712,7 +2712,7 @@ "session_name" ] }, - "AgenticSystemSessionCreateResponse": { + "AgentSessionCreateResponse": { "type": "object", "properties": { "session_id": { @@ -2753,7 +2753,7 @@ "mime_type" ] }, - "CreateAgenticSystemTurnRequest": { + "CreateAgentTurnRequest": { "type": "object", "properties": { "agent_id": { @@ -2792,25 +2792,25 @@ "messages" ] }, - "AgenticSystemTurnResponseEvent": { + "AgentTurnResponseEvent": { "type": "object", "properties": { "payload": { "oneOf": [ { - "$ref": "#/components/schemas/AgenticSystemTurnResponseStepStartPayload" + "$ref": "#/components/schemas/AgentTurnResponseStepStartPayload" }, { - "$ref": "#/components/schemas/AgenticSystemTurnResponseStepProgressPayload" + "$ref": "#/components/schemas/AgentTurnResponseStepProgressPayload" }, { - "$ref": "#/components/schemas/AgenticSystemTurnResponseStepCompletePayload" + "$ref": "#/components/schemas/AgentTurnResponseStepCompletePayload" }, { - "$ref": "#/components/schemas/AgenticSystemTurnResponseTurnStartPayload" + "$ref": "#/components/schemas/AgentTurnResponseTurnStartPayload" }, { - "$ref": "#/components/schemas/AgenticSystemTurnResponseTurnCompletePayload" + "$ref": "#/components/schemas/AgentTurnResponseTurnCompletePayload" } ] } @@ -2821,7 +2821,7 @@ ], "title": "Streamed agent execution response." }, - "AgenticSystemTurnResponseStepCompletePayload": { + "AgentTurnResponseStepCompletePayload": { "type": "object", "properties": { "event_type": { @@ -2861,7 +2861,7 @@ "step_details" ] }, - "AgenticSystemTurnResponseStepProgressPayload": { + "AgentTurnResponseStepProgressPayload": { "type": "object", "properties": { "event_type": { @@ -2897,7 +2897,7 @@ "step_id" ] }, - "AgenticSystemTurnResponseStepStartPayload": { + "AgentTurnResponseStepStartPayload": { "type": "object", "properties": { "event_type": { @@ -2949,11 +2949,11 @@ "step_id" ] }, - "AgenticSystemTurnResponseStreamChunk": { + "AgentTurnResponseStreamChunk": { "type": "object", "properties": { "event": { - "$ref": "#/components/schemas/AgenticSystemTurnResponseEvent" + "$ref": "#/components/schemas/AgentTurnResponseEvent" } }, "additionalProperties": false, @@ -2961,7 +2961,7 @@ "event" ] }, - "AgenticSystemTurnResponseTurnCompletePayload": { + "AgentTurnResponseTurnCompletePayload": { "type": "object", "properties": { "event_type": { @@ -2978,7 +2978,7 @@ "turn" ] }, - "AgenticSystemTurnResponseTurnStartPayload": { + "AgentTurnResponseTurnStartPayload": { "type": "object", "properties": { "event_type": { @@ -3532,7 +3532,7 @@ "config" ] }, - "DeleteAgenticSystemRequest": { + "DeleteAgentsRequest": { "type": "object", "properties": { "agent_id": { @@ -3544,7 +3544,7 @@ "agent_id" ] }, - "DeleteAgenticSystemSessionRequest": { + "DeleteAgentsSessionRequest": { "type": "object", "properties": { "agent_id": { @@ -3720,7 +3720,7 @@ "metrics" ] }, - "GetAgenticSystemSessionRequest": { + "GetAgentsSessionRequest": { "type": "object", "properties": { "turn_ids": { @@ -3764,7 +3764,7 @@ ], "title": "A single session of an interaction with an Agentic System." }, - "AgenticSystemStepResponse": { + "AgentStepResponse": { "type": "object", "properties": { "step": { @@ -3859,7 +3859,6 @@ "required": [ "document_id", "content", - "mime_type", "metadata" ] }, @@ -5141,38 +5140,38 @@ } ], "tags": [ - { - "name": "SyntheticDataGeneration" - }, - { - "name": "Datasets" - }, - { - "name": "Evaluations" - }, { "name": "Safety" }, - { - "name": "Inference" - }, - { - "name": "Telemetry" - }, - { - "name": "PostTraining" - }, { "name": "Memory" }, { - "name": "RewardScoring" + "name": "PostTraining" + }, + { + "name": "Evaluations" + }, + { + "name": "Agents" + }, + { + "name": "Datasets" + }, + { + "name": "Inference" }, { "name": "BatchInference" }, { - "name": "AgenticSystem" + "name": "Telemetry" + }, + { + "name": "SyntheticDataGeneration" + }, + { + "name": "RewardScoring" }, { "name": "BuiltinTool", @@ -5343,56 +5342,56 @@ "description": "" }, { - "name": "CreateAgenticSystemRequest", - "description": "" + "name": "CreateAgentRequest", + "description": "" }, { - "name": "AgenticSystemCreateResponse", - "description": "" + "name": "AgentCreateResponse", + "description": "" }, { - "name": "CreateAgenticSystemSessionRequest", - "description": "" + "name": "CreateAgentSessionRequest", + "description": "" }, { - "name": "AgenticSystemSessionCreateResponse", - "description": "" + "name": "AgentSessionCreateResponse", + "description": "" }, { "name": "Attachment", "description": "" }, { - "name": "CreateAgenticSystemTurnRequest", - "description": "" + "name": "CreateAgentTurnRequest", + "description": "" }, { - "name": "AgenticSystemTurnResponseEvent", - "description": "Streamed agent execution response.\n\n" + "name": "AgentTurnResponseEvent", + "description": "Streamed agent execution response.\n\n" }, { - "name": "AgenticSystemTurnResponseStepCompletePayload", - "description": "" + "name": "AgentTurnResponseStepCompletePayload", + "description": "" }, { - "name": "AgenticSystemTurnResponseStepProgressPayload", - "description": "" + "name": "AgentTurnResponseStepProgressPayload", + "description": "" }, { - "name": "AgenticSystemTurnResponseStepStartPayload", - "description": "" + "name": "AgentTurnResponseStepStartPayload", + "description": "" }, { - "name": "AgenticSystemTurnResponseStreamChunk", - "description": "" + "name": "AgentTurnResponseStreamChunk", + "description": "" }, { - "name": "AgenticSystemTurnResponseTurnCompletePayload", - "description": "" + "name": "AgentTurnResponseTurnCompletePayload", + "description": "" }, { - "name": "AgenticSystemTurnResponseTurnStartPayload", - "description": "" + "name": "AgentTurnResponseTurnStartPayload", + "description": "" }, { "name": "InferenceStep", @@ -5443,12 +5442,12 @@ "description": "" }, { - "name": "DeleteAgenticSystemRequest", - "description": "" + "name": "DeleteAgentsRequest", + "description": "" }, { - "name": "DeleteAgenticSystemSessionRequest", - "description": "" + "name": "DeleteAgentsSessionRequest", + "description": "" }, { "name": "DeleteDatasetRequest", @@ -5487,16 +5486,16 @@ "description": "" }, { - "name": "GetAgenticSystemSessionRequest", - "description": "" + "name": "GetAgentsSessionRequest", + "description": "" }, { "name": "Session", "description": "A single session of an interaction with an Agentic System.\n\n" }, { - "name": "AgenticSystemStepResponse", - "description": "" + "name": "AgentStepResponse", + "description": "" }, { "name": "GetDocumentsRequest", @@ -5675,7 +5674,7 @@ { "name": "Operations", "tags": [ - "AgenticSystem", + "Agents", "BatchInference", "Datasets", "Evaluations", @@ -5692,16 +5691,16 @@ "name": "Types", "tags": [ "AgentConfig", - "AgenticSystemCreateResponse", - "AgenticSystemSessionCreateResponse", - "AgenticSystemStepResponse", - "AgenticSystemTurnResponseEvent", - "AgenticSystemTurnResponseStepCompletePayload", - "AgenticSystemTurnResponseStepProgressPayload", - "AgenticSystemTurnResponseStepStartPayload", - "AgenticSystemTurnResponseStreamChunk", - "AgenticSystemTurnResponseTurnCompletePayload", - "AgenticSystemTurnResponseTurnStartPayload", + "AgentCreateResponse", + "AgentSessionCreateResponse", + "AgentStepResponse", + "AgentTurnResponseEvent", + "AgentTurnResponseStepCompletePayload", + "AgentTurnResponseStepProgressPayload", + "AgentTurnResponseStepStartPayload", + "AgentTurnResponseStreamChunk", + "AgentTurnResponseTurnCompletePayload", + "AgentTurnResponseTurnStartPayload", "Attachment", "BatchChatCompletionRequest", "BatchChatCompletionResponse", @@ -5722,14 +5721,14 @@ "CompletionRequest", "CompletionResponse", "CompletionResponseStreamChunk", - "CreateAgenticSystemRequest", - "CreateAgenticSystemSessionRequest", - "CreateAgenticSystemTurnRequest", + "CreateAgentRequest", + "CreateAgentSessionRequest", + "CreateAgentTurnRequest", "CreateDatasetRequest", "CreateMemoryBankRequest", "DPOAlignmentConfig", - "DeleteAgenticSystemRequest", - "DeleteAgenticSystemSessionRequest", + "DeleteAgentsRequest", + "DeleteAgentsSessionRequest", "DeleteDatasetRequest", "DeleteDocumentsRequest", "DialogGenerations", @@ -5746,7 +5745,7 @@ "EvaluationJobStatusResponse", "FinetuningAlgorithm", "FunctionCallToolDefinition", - "GetAgenticSystemSessionRequest", + "GetAgentsSessionRequest", "GetDocumentsRequest", "InferenceStep", "InsertDocumentsRequest", diff --git a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml index 4d1b27bb7..df44edd7f 100644 --- a/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml +++ b/rfcs/RFC-0001-llama-stack-assets/llama-stack-spec.yaml @@ -152,7 +152,7 @@ components: - model - instructions type: object - AgenticSystemCreateResponse: + AgentCreateResponse: additionalProperties: false properties: agent_id: @@ -160,7 +160,7 @@ components: required: - agent_id type: object - AgenticSystemSessionCreateResponse: + AgentSessionCreateResponse: additionalProperties: false properties: session_id: @@ -168,7 +168,7 @@ components: required: - session_id type: object - AgenticSystemStepResponse: + AgentStepResponse: additionalProperties: false properties: step: @@ -180,21 +180,21 @@ components: required: - step type: object - AgenticSystemTurnResponseEvent: + AgentTurnResponseEvent: additionalProperties: false properties: payload: oneOf: - - $ref: '#/components/schemas/AgenticSystemTurnResponseStepStartPayload' - - $ref: '#/components/schemas/AgenticSystemTurnResponseStepProgressPayload' - - $ref: '#/components/schemas/AgenticSystemTurnResponseStepCompletePayload' - - $ref: '#/components/schemas/AgenticSystemTurnResponseTurnStartPayload' - - $ref: '#/components/schemas/AgenticSystemTurnResponseTurnCompletePayload' + - $ref: '#/components/schemas/AgentTurnResponseStepStartPayload' + - $ref: '#/components/schemas/AgentTurnResponseStepProgressPayload' + - $ref: '#/components/schemas/AgentTurnResponseStepCompletePayload' + - $ref: '#/components/schemas/AgentTurnResponseTurnStartPayload' + - $ref: '#/components/schemas/AgentTurnResponseTurnCompletePayload' required: - payload title: Streamed agent execution response. type: object - AgenticSystemTurnResponseStepCompletePayload: + AgentTurnResponseStepCompletePayload: additionalProperties: false properties: event_type: @@ -218,7 +218,7 @@ components: - step_type - step_details type: object - AgenticSystemTurnResponseStepProgressPayload: + AgentTurnResponseStepProgressPayload: additionalProperties: false properties: event_type: @@ -244,7 +244,7 @@ components: - step_type - step_id type: object - AgenticSystemTurnResponseStepStartPayload: + AgentTurnResponseStepStartPayload: additionalProperties: false properties: event_type: @@ -274,15 +274,15 @@ components: - step_type - step_id type: object - AgenticSystemTurnResponseStreamChunk: + AgentTurnResponseStreamChunk: additionalProperties: false properties: event: - $ref: '#/components/schemas/AgenticSystemTurnResponseEvent' + $ref: '#/components/schemas/AgentTurnResponseEvent' required: - event type: object - AgenticSystemTurnResponseTurnCompletePayload: + AgentTurnResponseTurnCompletePayload: additionalProperties: false properties: event_type: @@ -294,7 +294,7 @@ components: - event_type - turn type: object - AgenticSystemTurnResponseTurnStartPayload: + AgentTurnResponseTurnStartPayload: additionalProperties: false properties: event_type: @@ -617,7 +617,7 @@ components: - delta title: streamed completion response. type: object - CreateAgenticSystemRequest: + CreateAgentRequest: additionalProperties: false properties: agent_config: @@ -625,7 +625,7 @@ components: required: - agent_config type: object - CreateAgenticSystemSessionRequest: + CreateAgentSessionRequest: additionalProperties: false properties: agent_id: @@ -636,7 +636,7 @@ components: - agent_id - session_name type: object - CreateAgenticSystemTurnRequest: + CreateAgentTurnRequest: additionalProperties: false properties: agent_id: @@ -741,7 +741,7 @@ components: - epsilon - gamma type: object - DeleteAgenticSystemRequest: + DeleteAgentsRequest: additionalProperties: false properties: agent_id: @@ -749,7 +749,7 @@ components: required: - agent_id type: object - DeleteAgenticSystemSessionRequest: + DeleteAgentsSessionRequest: additionalProperties: false properties: agent_id: @@ -973,7 +973,7 @@ components: - description - parameters type: object - GetAgenticSystemSessionRequest: + GetAgentsSessionRequest: additionalProperties: false properties: turn_ids: @@ -1155,7 +1155,6 @@ components: required: - document_id - content - - mime_type - metadata type: object MemoryRetrievalStep: @@ -2357,77 +2356,77 @@ info: description: "This is the specification of the llama stack that provides\n \ \ a set of endpoints and their corresponding interfaces that are tailored\ \ to\n best leverage Llama Models. The specification is still in\ - \ draft and subject to change.\n Generated at 2024-09-11 16:05:23.016090" + \ draft and subject to change.\n Generated at 2024-09-16 21:21:00.554769" title: '[DRAFT] Llama Stack Specification' version: 0.0.1 jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema openapi: 3.1.0 paths: - /agentic_system/create: + /agents/create: post: parameters: [] requestBody: content: application/json: schema: - $ref: '#/components/schemas/CreateAgenticSystemRequest' + $ref: '#/components/schemas/CreateAgentRequest' required: true responses: '200': content: application/json: schema: - $ref: '#/components/schemas/AgenticSystemCreateResponse' + $ref: '#/components/schemas/AgentCreateResponse' description: OK tags: - - AgenticSystem - /agentic_system/delete: + - Agents + /agents/delete: post: parameters: [] requestBody: content: application/json: schema: - $ref: '#/components/schemas/DeleteAgenticSystemRequest' + $ref: '#/components/schemas/DeleteAgentsRequest' required: true responses: '200': description: OK tags: - - AgenticSystem - /agentic_system/session/create: + - Agents + /agents/session/create: post: parameters: [] requestBody: content: application/json: schema: - $ref: '#/components/schemas/CreateAgenticSystemSessionRequest' + $ref: '#/components/schemas/CreateAgentSessionRequest' required: true responses: '200': content: application/json: schema: - $ref: '#/components/schemas/AgenticSystemSessionCreateResponse' + $ref: '#/components/schemas/AgentSessionCreateResponse' description: OK tags: - - AgenticSystem - /agentic_system/session/delete: + - Agents + /agents/session/delete: post: parameters: [] requestBody: content: application/json: schema: - $ref: '#/components/schemas/DeleteAgenticSystemSessionRequest' + $ref: '#/components/schemas/DeleteAgentsSessionRequest' required: true responses: '200': description: OK tags: - - AgenticSystem - /agentic_system/session/get: + - Agents + /agents/session/get: post: parameters: - in: query @@ -2444,7 +2443,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/GetAgenticSystemSessionRequest' + $ref: '#/components/schemas/GetAgentsSessionRequest' required: true responses: '200': @@ -2454,8 +2453,8 @@ paths: $ref: '#/components/schemas/Session' description: OK tags: - - AgenticSystem - /agentic_system/step/get: + - Agents + /agents/step/get: get: parameters: - in: query @@ -2478,29 +2477,29 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/AgenticSystemStepResponse' + $ref: '#/components/schemas/AgentStepResponse' description: OK tags: - - AgenticSystem - /agentic_system/turn/create: + - Agents + /agents/turn/create: post: parameters: [] requestBody: content: application/json: schema: - $ref: '#/components/schemas/CreateAgenticSystemTurnRequest' + $ref: '#/components/schemas/CreateAgentTurnRequest' required: true responses: '200': content: - text/event-stream: + application/json: schema: - $ref: '#/components/schemas/AgenticSystemTurnResponseStreamChunk' + $ref: '#/components/schemas/AgentTurnResponseStreamChunk' description: OK tags: - - AgenticSystem - /agentic_system/turn/get: + - Agents + /agents/turn/get: get: parameters: - in: query @@ -2521,7 +2520,7 @@ paths: $ref: '#/components/schemas/Turn' description: OK tags: - - AgenticSystem + - Agents /batch_inference/chat_completion: post: parameters: [] @@ -3145,17 +3144,17 @@ security: servers: - url: http://any-hosted-llama-stack.com tags: -- name: SyntheticDataGeneration -- name: Datasets -- name: Evaluations - name: Safety -- name: Inference -- name: Telemetry -- name: PostTraining - name: Memory -- name: RewardScoring +- name: PostTraining +- name: Evaluations +- name: Agents +- name: Datasets +- name: Inference - name: BatchInference -- name: AgenticSystem +- name: Telemetry +- name: SyntheticDataGeneration +- name: RewardScoring - description: name: BuiltinTool - description: name: WolframAlphaToolDefinition -- description: - name: CreateAgenticSystemRequest -- description: - name: AgenticSystemCreateResponse -- description: - name: CreateAgenticSystemSessionRequest -- description: - name: AgenticSystemSessionCreateResponse + name: AgentSessionCreateResponse - description: name: Attachment -- description: - name: CreateAgenticSystemTurnRequest + name: CreateAgentTurnRequest - description: 'Streamed agent execution response. - ' - name: AgenticSystemTurnResponseEvent -- description: ' + name: AgentTurnResponseEvent +- description: - name: AgenticSystemTurnResponseStepCompletePayload -- description: - name: AgenticSystemTurnResponseStepProgressPayload -- description: - name: AgenticSystemTurnResponseStepStartPayload -- description: - name: AgenticSystemTurnResponseStreamChunk -- description: - name: AgenticSystemTurnResponseTurnCompletePayload -- description: - name: AgenticSystemTurnResponseTurnStartPayload + name: AgentTurnResponseTurnStartPayload - description: name: InferenceStep - description: name: MemoryBank -- description: - name: DeleteAgenticSystemRequest -- description: - name: DeleteAgenticSystemSessionRequest + name: DeleteAgentsSessionRequest - description: name: DeleteDatasetRequest @@ -3397,17 +3395,17 @@ tags: - description: name: EvaluateTextGenerationRequest -- description: - name: GetAgenticSystemSessionRequest + name: GetAgentsSessionRequest - description: 'A single session of an interaction with an Agentic System. ' name: Session -- description: - name: AgenticSystemStepResponse + name: AgentStepResponse - description: name: GetDocumentsRequest @@ -3552,7 +3550,7 @@ tags: x-tagGroups: - name: Operations tags: - - AgenticSystem + - Agents - BatchInference - Datasets - Evaluations @@ -3566,16 +3564,16 @@ x-tagGroups: - name: Types tags: - AgentConfig - - AgenticSystemCreateResponse - - AgenticSystemSessionCreateResponse - - AgenticSystemStepResponse - - AgenticSystemTurnResponseEvent - - AgenticSystemTurnResponseStepCompletePayload - - AgenticSystemTurnResponseStepProgressPayload - - AgenticSystemTurnResponseStepStartPayload - - AgenticSystemTurnResponseStreamChunk - - AgenticSystemTurnResponseTurnCompletePayload - - AgenticSystemTurnResponseTurnStartPayload + - AgentCreateResponse + - AgentSessionCreateResponse + - AgentStepResponse + - AgentTurnResponseEvent + - AgentTurnResponseStepCompletePayload + - AgentTurnResponseStepProgressPayload + - AgentTurnResponseStepStartPayload + - AgentTurnResponseStreamChunk + - AgentTurnResponseTurnCompletePayload + - AgentTurnResponseTurnStartPayload - Attachment - BatchChatCompletionRequest - BatchChatCompletionResponse @@ -3596,14 +3594,14 @@ x-tagGroups: - CompletionRequest - CompletionResponse - CompletionResponseStreamChunk - - CreateAgenticSystemRequest - - CreateAgenticSystemSessionRequest - - CreateAgenticSystemTurnRequest + - CreateAgentRequest + - CreateAgentSessionRequest + - CreateAgentTurnRequest - CreateDatasetRequest - CreateMemoryBankRequest - DPOAlignmentConfig - - DeleteAgenticSystemRequest - - DeleteAgenticSystemSessionRequest + - DeleteAgentsRequest + - DeleteAgentsSessionRequest - DeleteDatasetRequest - DeleteDocumentsRequest - DialogGenerations @@ -3620,7 +3618,7 @@ x-tagGroups: - EvaluationJobStatusResponse - FinetuningAlgorithm - FunctionCallToolDefinition - - GetAgenticSystemSessionRequest + - GetAgentsSessionRequest - GetDocumentsRequest - InferenceStep - InsertDocumentsRequest