agent: display http errors nicely
This commit is contained in:
ochafik
parent
f5320af02a
commit
0f5d63943f
1 changed files with 89 additions and 82 deletions
|
|
@ -14,10 +14,10 @@ from functools import wraps
|
|||
import json
|
||||
from openapi import discover_tools
|
||||
import os
|
||||
from pydantic import BaseModel
|
||||
from pydantic import BaseModel, Field, Json
|
||||
import sys
|
||||
import typer
|
||||
from typing import Annotated, Literal, Optional
|
||||
from typing import Annotated, Dict, Literal, Optional
|
||||
import urllib.parse
|
||||
|
||||
|
||||
|
|
@ -81,93 +81,100 @@ async def main(
|
|||
|
||||
sys.stdout.write(f'🛠️ Tools: {", ".join(tool_map.keys()) if tool_map else "<none>"}\n')
|
||||
|
||||
messages = []
|
||||
if system:
|
||||
messages.append(dict(
|
||||
role='system',
|
||||
content=system,
|
||||
))
|
||||
messages.append(
|
||||
dict(
|
||||
role='user',
|
||||
content=goal,
|
||||
)
|
||||
)
|
||||
try:
|
||||
|
||||
headers = {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': f'Bearer {api_key}'
|
||||
}
|
||||
async def run_turn():
|
||||
for i in range(max_iterations or sys.maxsize):
|
||||
url = f'{endpoint}chat/completions'
|
||||
payload = dict(
|
||||
messages=messages,
|
||||
model=model,
|
||||
tools=tools,
|
||||
messages = []
|
||||
if system:
|
||||
messages.append(dict(
|
||||
role='system',
|
||||
content=system,
|
||||
))
|
||||
messages.append(
|
||||
dict(
|
||||
role='user',
|
||||
content=goal,
|
||||
)
|
||||
if provider == 'llama.cpp':
|
||||
payload.update(dict(
|
||||
seed=seed,
|
||||
cache_prompt=cache_prompt,
|
||||
)) # type: ignore
|
||||
)
|
||||
|
||||
if verbose:
|
||||
print(f'Calling {url} with {json.dumps(payload, indent=2)}', file=sys.stderr)
|
||||
async with aiohttp.ClientSession(headers=headers) as session:
|
||||
async with session.post(url, json=payload) as response:
|
||||
response.raise_for_status()
|
||||
response = await response.json()
|
||||
if verbose:
|
||||
print(f'Response: {json.dumps(response, indent=2)}', file=sys.stderr)
|
||||
headers = {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': f'Bearer {api_key}'
|
||||
}
|
||||
async def run_turn():
|
||||
for i in range(max_iterations or sys.maxsize):
|
||||
url = f'{endpoint}chat/completions'
|
||||
payload = dict(
|
||||
messages=messages,
|
||||
model=model,
|
||||
tools=tools,
|
||||
)
|
||||
if provider == 'llama.cpp':
|
||||
payload.update(dict(
|
||||
seed=seed,
|
||||
cache_prompt=cache_prompt,
|
||||
)) # type: ignore
|
||||
|
||||
assert len(response['choices']) == 1
|
||||
choice = response['choices'][0]
|
||||
if verbose:
|
||||
print(f'Calling {url} with {json.dumps(payload, indent=2)}', file=sys.stderr)
|
||||
async with aiohttp.ClientSession(headers=headers) as session:
|
||||
async with session.post(url, json=payload) as response:
|
||||
response.raise_for_status()
|
||||
response = await response.json()
|
||||
if verbose:
|
||||
print(f'Response: {json.dumps(response, indent=2)}', file=sys.stderr)
|
||||
|
||||
content = choice['message']['content']
|
||||
if choice['finish_reason'] == 'tool_calls':
|
||||
messages.append(choice['message'])
|
||||
assert choice['message']['tool_calls']
|
||||
for tool_call in choice['message']['tool_calls']:
|
||||
if content:
|
||||
print(f'💭 {content}', file=sys.stderr)
|
||||
assert len(response['choices']) == 1
|
||||
choice = response['choices'][0]
|
||||
|
||||
name = tool_call['function']['name']
|
||||
args = json.loads(tool_call['function']['arguments'])
|
||||
pretty_call = f'{name}({", ".join(f"{k}={v.model_dump_json() if isinstance(v, BaseModel) else json.dumps(v)}" for k, v in args.items())})'
|
||||
print(f'⚙️ {pretty_call}', file=sys.stderr, end=None)
|
||||
sys.stdout.flush()
|
||||
try:
|
||||
tool_result = await tool_map[name](**args)
|
||||
except Exception as e:
|
||||
tool_result = 'ERROR: ' + str(e)
|
||||
tool_result_str = tool_result if isinstance(tool_result, str) else json.dumps(tool_result)
|
||||
def describe(res, res_str, max_len = 1000):
|
||||
if isinstance(res, list):
|
||||
return f'{len(res)} items'
|
||||
return f'{len(res_str)} chars\n {res_str[:1000] if len(res_str) > max_len else res_str}...'
|
||||
print(f' → {describe(tool_result, tool_result_str)}', file=sys.stderr)
|
||||
if verbose:
|
||||
print(tool_result_str, file=sys.stderr)
|
||||
messages.append(dict(
|
||||
tool_call_id=tool_call.get('id'),
|
||||
role='tool',
|
||||
content=tool_result_str,
|
||||
))
|
||||
else:
|
||||
assert content
|
||||
print(content)
|
||||
return
|
||||
content = choice['message']['content']
|
||||
if choice['finish_reason'] == 'tool_calls':
|
||||
messages.append(choice['message'])
|
||||
assert choice['message']['tool_calls']
|
||||
for tool_call in choice['message']['tool_calls']:
|
||||
if content:
|
||||
print(f'💭 {content}', file=sys.stderr)
|
||||
|
||||
if max_iterations is not None:
|
||||
raise Exception(f'Failed to get a valid response after {max_iterations} tool calls')
|
||||
name = tool_call['function']['name']
|
||||
args = json.loads(tool_call['function']['arguments'])
|
||||
print(f'tool_call: {json.dumps(tool_call, indent=2)}', file=sys.stderr)
|
||||
pretty_call = f'{name}({", ".join(f"{k}={v.model_dump_json() if isinstance(v, BaseModel) else json.dumps(v)}" for k, v in args.items())})'
|
||||
print(f'⚙️ {pretty_call}', file=sys.stderr, end=None)
|
||||
sys.stdout.flush()
|
||||
try:
|
||||
tool_result = await tool_map[name](**args)
|
||||
except Exception as e:
|
||||
tool_result = 'ERROR: ' + str(e)
|
||||
tool_result_str = tool_result if isinstance(tool_result, str) else json.dumps(tool_result)
|
||||
def describe(res, res_str, max_len = 1000):
|
||||
if isinstance(res, list):
|
||||
return f'{len(res)} items'
|
||||
return f'{len(res_str)} chars\n {res_str[:1000] if len(res_str) > max_len else res_str}...'
|
||||
print(f' → {describe(tool_result, tool_result_str)}', file=sys.stderr)
|
||||
if verbose:
|
||||
print(tool_result_str, file=sys.stderr)
|
||||
messages.append(dict(
|
||||
tool_call_id=tool_call.get('id'),
|
||||
role='tool',
|
||||
content=tool_result_str,
|
||||
))
|
||||
else:
|
||||
assert content
|
||||
print(content)
|
||||
return
|
||||
|
||||
while interactive:
|
||||
await run_turn()
|
||||
messages.append(dict(
|
||||
role='user',
|
||||
content=input('💬 ')
|
||||
))
|
||||
if max_iterations is not None:
|
||||
raise Exception(f'Failed to get a valid response after {max_iterations} tool calls')
|
||||
|
||||
while interactive:
|
||||
await run_turn()
|
||||
messages.append(dict(
|
||||
role='user',
|
||||
content=input('💬 ')
|
||||
))
|
||||
|
||||
except aiohttp.ClientResponseError as e:
|
||||
sys.stdout.write(f'💥 {e}\n')
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue