phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-10-03 19:57:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more

Browse source
This commit is contained in:
Ashwin Bharambe 2025-10-01 16:01:09 -07:00
parent 6749c853c0
commit ae14966204
6 changed files with 3221 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
llama_stack/models/llama/llama3/tool_utils.py
View file

@ -220,17 +220,18 @@ class ToolUtils:
@staticmethod
def encode_tool_call(t: ToolCall, tool_prompt_format: ToolPromptFormat) -> str:
args = json.loads(t.arguments)
if t.tool_name == BuiltinTool.brave_search:
q = t.arguments["query"]
q = args["query"]
return f'brave_search.call(query="{q}")'
elif t.tool_name == BuiltinTool.wolfram_alpha:
q = t.arguments["query"]
q = args["query"]
return f'wolfram_alpha.call(query="{q}")'
elif t.tool_name == BuiltinTool.photogen:
q = t.arguments["query"]
q = args["query"]
return f'photogen.call(query="{q}")'
elif t.tool_name == BuiltinTool.code_interpreter:
return t.arguments["code"]
return args["code"]
else:
fname = t.tool_name
@ -239,12 +240,11 @@ class ToolUtils:
{
"type": "function",
"name": fname,
"parameters": t.arguments,
"parameters": args,
}
)
elif tool_prompt_format == ToolPromptFormat.function_tag:
args = json.dumps(t.arguments)
return f"<function={fname}>{args}</function>"
return f"<function={fname}>{t.arguments}</function>"
elif tool_prompt_format == ToolPromptFormat.python_list:
@ -260,7 +260,7 @@ class ToolUtils:
else:
raise ValueError(f"Unsupported type: {type(value)}")
args_str = ", ".join(f"{k}={format_value(v)}" for k, v in t.arguments.items())
args_str = ", ".join(f"{k}={format_value(v)}" for k, v in args.items())
return f"[{fname}({args_str})]"
else:
raise ValueError(f"Unsupported tool prompt format: {tool_prompt_format}")

8
llama_stack/providers/inline/agents/meta_reference/agent_instance.py
View file

@ -875,12 +875,18 @@ class ChatAgent(ShieldRunnerMixin):
tool_name_str = tool_name
logger.info(f"executing tool call: {tool_name_str} with args: {tool_call.arguments}")
try:
args = json.loads(tool_call.arguments)
except json.JSONDecodeError as e:
raise ValueError(f"Failed to parse arguments for tool call: {tool_call.arguments}") from e
result = await self.tool_runtime_api.invoke_tool(
tool_name=tool_name_str,
kwargs={
"session_id": session_id,
# get the arguments generated by the model and augment with toolgroup arg overrides for the agent
**tool_call.arguments,
**args,
**self.tool_name_to_args.get(tool_name_str, {}),
},
)

1787
tests/integration/recordings/responses/1acd433c05d4.json Normal file
View file

File diff suppressed because it is too large Load diff

88
tests/integration/recordings/responses/8deded211f21.json
View file

@ -21,7 +21,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:15.998653Z",
"created_at": "2025-10-01T23:00:19.457795Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -39,7 +39,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.042936Z",
"created_at": "2025-10-01T23:00:19.499711Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -57,7 +57,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.086689Z",
"created_at": "2025-10-01T23:00:19.544576Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -75,7 +75,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.128398Z",
"created_at": "2025-10-01T23:00:19.588521Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -93,7 +93,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.172808Z",
"created_at": "2025-10-01T23:00:19.633501Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -111,7 +111,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.215123Z",
"created_at": "2025-10-01T23:00:19.677395Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -129,7 +129,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.259326Z",
"created_at": "2025-10-01T23:00:19.720407Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -147,7 +147,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.303332Z",
"created_at": "2025-10-01T23:00:19.763935Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -165,7 +165,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.345453Z",
"created_at": "2025-10-01T23:00:19.807169Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -183,7 +183,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.388745Z",
"created_at": "2025-10-01T23:00:19.851019Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -201,7 +201,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.432258Z",
"created_at": "2025-10-01T23:00:19.893637Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -219,7 +219,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.474552Z",
"created_at": "2025-10-01T23:00:19.935864Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -237,7 +237,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.51763Z",
"created_at": "2025-10-01T23:00:19.978334Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -255,7 +255,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.561623Z",
"created_at": "2025-10-01T23:00:20.020617Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -273,7 +273,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.605498Z",
"created_at": "2025-10-01T23:00:20.063212Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -291,7 +291,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.649228Z",
"created_at": "2025-10-01T23:00:20.106093Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -309,7 +309,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.691311Z",
"created_at": "2025-10-01T23:00:20.149989Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -327,7 +327,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.735229Z",
"created_at": "2025-10-01T23:00:20.192674Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -345,7 +345,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.77891Z",
"created_at": "2025-10-01T23:00:20.236337Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -363,7 +363,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.822779Z",
"created_at": "2025-10-01T23:00:20.278777Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -381,7 +381,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.864798Z",
"created_at": "2025-10-01T23:00:20.320886Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -399,7 +399,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.908719Z",
"created_at": "2025-10-01T23:00:20.363891Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -417,7 +417,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.952037Z",
"created_at": "2025-10-01T23:00:20.40745Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -435,7 +435,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:16.997344Z",
"created_at": "2025-10-01T23:00:20.451859Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -453,7 +453,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.040154Z",
"created_at": "2025-10-01T23:00:20.494751Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -471,7 +471,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.084207Z",
"created_at": "2025-10-01T23:00:20.536928Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -489,7 +489,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.125633Z",
"created_at": "2025-10-01T23:00:20.581229Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -507,7 +507,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.169076Z",
"created_at": "2025-10-01T23:00:20.623455Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -525,7 +525,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.211634Z",
"created_at": "2025-10-01T23:00:20.665328Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -543,7 +543,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.254149Z",
"created_at": "2025-10-01T23:00:20.707445Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -561,7 +561,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.298417Z",
"created_at": "2025-10-01T23:00:20.749803Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -579,7 +579,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.339693Z",
"created_at": "2025-10-01T23:00:20.792527Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -597,7 +597,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.382919Z",
"created_at": "2025-10-01T23:00:20.835252Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -615,7 +615,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.42623Z",
"created_at": "2025-10-01T23:00:20.878606Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -633,7 +633,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.468642Z",
"created_at": "2025-10-01T23:00:20.921646Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -651,7 +651,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.512136Z",
"created_at": "2025-10-01T23:00:20.963436Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -669,7 +669,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.553518Z",
"created_at": "2025-10-01T23:00:21.012147Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -687,7 +687,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.597107Z",
"created_at": "2025-10-01T23:00:21.063248Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -705,7 +705,7 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.640858Z",
"created_at": "2025-10-01T23:00:21.10591Z",
"done": false,
"done_reason": null,
"total_duration": null,
@ -723,15 +723,15 @@
"__type__": "ollama._types.GenerateResponse",
"__data__": {
"model": "llama3.2:3b-instruct-fp16",
"created_at": "2025-10-01T22:46:17.685634Z",
"created_at": "2025-10-01T23:00:21.149804Z",
"done": true,
"done_reason": "stop",
"total_duration": 7493315500,
"load_duration": 4640587750,
"total_duration": 3544551625,
"load_duration": 122599250,
"prompt_eval_count": 556,
"prompt_eval_duration": 1163238292,
"prompt_eval_duration": 1727890958,
"eval_count": 40,
"eval_duration": 1687901500,
"eval_duration": 1693076542,
"response": "",
"thinking": null,
"context": null

21
tests/integration/recordings/responses/d0ac68cbde69.json
View file

@ -11,7 +11,26 @@
"body": {
"__type__": "ollama._types.ProcessResponse",
"__data__": {
"models": []
"models": [
{
"model": "llama3.2:3b-instruct-fp16",
"name": "llama3.2:3b-instruct-fp16",
"digest": "195a8c01d91ec3cb1e0aad4624a51f2602c51fa7d96110f8ab5a20c84081804d",
"expires_at": "2025-10-01T16:04:02.100179-07:00",
"size": 7919570944,
"size_vram": 7919570944,
"details": {
"parent_model": "",
"format": "gguf",
"family": "llama",
"families": [
"llama"
],
"parameter_size": "3.2B",
"quantization_level": "F16"
}
}
]
}
},
"is_streaming": false

1355
tests/integration/recordings/responses/eeb26200786f.json Normal file
View file

File diff suppressed because it is too large Load diff