phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-23 00:12:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

address feedback

Browse source
This commit is contained in:
Dinesh Yeduguru 2024-12-30 15:47:01 -08:00
parent 8bf3f8ea56
commit ac46bd5eb4
8 changed files with 24 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
llama_stack/apis/agents/agents.py
View file

@ -36,7 +36,7 @@ from llama_stack.apis.inference import (
)
from llama_stack.apis.memory import MemoryBank
from llama_stack.apis.safety import SafetyViolation
from llama_stack.apis.tools import CustomToolDef
from llama_stack.apis.tools import UserDefinedToolDef
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
@ -137,8 +137,8 @@ class AgentConfigCommon(BaseModel):
input_shields: Optional[List[str]] = Field(default_factory=list)
output_shields: Optional[List[str]] = Field(default_factory=list)
available_tools: Optional[List[str]] = Field(default_factory=list)
custom_tools: Optional[List[CustomToolDef]] = Field(default_factory=list)
tool_names: Optional[List[str]] = Field(default_factory=list)
client_tools: Optional[List[UserDefinedToolDef]] = Field(default_factory=list)
preprocessing_tools: Optional[List[str]] = Field(default_factory=list)
tool_choice: Optional[ToolChoice] = Field(default=ToolChoice.auto)
tool_prompt_format: Optional[ToolPromptFormat] = Field(

17
llama_stack/apis/tools/tools.py
View file

@ -48,8 +48,8 @@ class Tool(Resource):
@json_schema_type
class CustomToolDef(BaseModel):
type: Literal["custom"] = "custom"
class UserDefinedToolDef(BaseModel):
type: Literal["user_defined"] = "user_defined"
name: str
description: str
parameters: List[ToolParameter]
@ -67,7 +67,7 @@ class BuiltInToolDef(BaseModel):
ToolDef = register_schema(
Annotated[Union[CustomToolDef, BuiltInToolDef], Field(discriminator="type")],
Annotated[Union[UserDefinedToolDef, BuiltInToolDef], Field(discriminator="type")],
name="ToolDef",
)
@ -172,14 +172,3 @@ class ToolRuntime(Protocol):
) -> ToolInvocationResult:
"""Run a tool with the given arguments"""
...
# Three tool types:
# 1. Built-in tools
# 2. Client tools
# 3. Model-context-protocol tools
# Suport registration of agents with tool groups
# TBD: Have a client utility to hide the pre processing tools.
# Attachments are confusing right now since they are inserted into memory first and retireved through RAG, even before a question is asked.
#