mbxai 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- mbxai/__init__.py +1 -1
- mbxai/mcp/server.py +1 -1
- mbxai/tools/client.py +16 -47
- {mbxai-0.6.0.dist-info → mbxai-0.6.1.dist-info}/METADATA +1 -1
- {mbxai-0.6.0.dist-info → mbxai-0.6.1.dist-info}/RECORD +7 -7
- {mbxai-0.6.0.dist-info → mbxai-0.6.1.dist-info}/WHEEL +0 -0
- {mbxai-0.6.0.dist-info → mbxai-0.6.1.dist-info}/licenses/LICENSE +0 -0
mbxai/__init__.py
CHANGED
mbxai/mcp/server.py
CHANGED
mbxai/tools/client.py
CHANGED
@@ -279,7 +279,7 @@ class ToolClient:
|
|
279
279
|
self._log_messages(messages)
|
280
280
|
|
281
281
|
# Get the model's response
|
282
|
-
response = self._openrouter_client.chat_completion_parse(
|
282
|
+
response = await self._openrouter_client.chat_completion_parse(
|
283
283
|
messages=messages,
|
284
284
|
response_format=response_format,
|
285
285
|
model=model,
|
@@ -290,12 +290,24 @@ class ToolClient:
|
|
290
290
|
if stream:
|
291
291
|
return response
|
292
292
|
|
293
|
-
|
293
|
+
if not response or not response.choices:
|
294
|
+
raise ValueError("No response received from OpenRouter")
|
295
|
+
|
296
|
+
choice = response.choices[0]
|
297
|
+
if not choice:
|
298
|
+
raise ValueError("Empty choice in response")
|
299
|
+
|
300
|
+
message = choice.message
|
301
|
+
if not message:
|
302
|
+
raise ValueError("Choice missing message")
|
303
|
+
|
294
304
|
# Add the assistant's message with tool calls
|
295
305
|
assistant_message = {
|
296
306
|
"role": "assistant",
|
297
|
-
"
|
307
|
+
"parsed": message.parsed if hasattr(message, "parsed") else None,
|
308
|
+
"content": message.content if not hasattr(message, "parsed") else None,
|
298
309
|
}
|
310
|
+
|
299
311
|
if message.tool_calls:
|
300
312
|
assistant_message["tool_calls"] = [
|
301
313
|
{
|
@@ -316,50 +328,7 @@ class ToolClient:
|
|
316
328
|
return response
|
317
329
|
|
318
330
|
# Process all tool calls
|
319
|
-
|
320
|
-
for tool_call in message.tool_calls:
|
321
|
-
tool = self._tools.get(tool_call.function.name)
|
322
|
-
if not tool:
|
323
|
-
raise ValueError(f"Unknown tool: {tool_call.function.name}")
|
324
|
-
|
325
|
-
# Parse arguments if they're a string
|
326
|
-
arguments = tool_call.function.arguments
|
327
|
-
if isinstance(arguments, str):
|
328
|
-
try:
|
329
|
-
arguments = json.loads(arguments)
|
330
|
-
except json.JSONDecodeError as e:
|
331
|
-
logger.error(f"Failed to parse tool arguments: {e}")
|
332
|
-
raise ValueError(f"Invalid tool arguments format: {arguments}")
|
333
|
-
|
334
|
-
# Call the tool
|
335
|
-
logger.info(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
|
336
|
-
if inspect.iscoroutinefunction(tool.function):
|
337
|
-
result = await tool.function(**arguments)
|
338
|
-
else:
|
339
|
-
result = tool.function(**arguments)
|
340
|
-
|
341
|
-
# Convert result to JSON string if it's not already
|
342
|
-
if not isinstance(result, str):
|
343
|
-
result = json.dumps(result)
|
344
|
-
|
345
|
-
# Create the tool response
|
346
|
-
tool_response = {
|
347
|
-
"role": "tool",
|
348
|
-
"tool_call_id": tool_call.id,
|
349
|
-
"content": result,
|
350
|
-
}
|
351
|
-
tool_responses.append(tool_response)
|
352
|
-
logger.info(f"Created tool response for call ID {tool_call.id}")
|
353
|
-
|
354
|
-
# Add all tool responses to the messages
|
355
|
-
messages.extend(tool_responses)
|
356
|
-
logger.info(f"Message count: {len(messages)}, Added {len(tool_responses)} tool responses to messages")
|
357
|
-
|
358
|
-
# Validate the message sequence
|
359
|
-
self._validate_message_sequence(messages, validate_responses=True)
|
360
|
-
|
361
|
-
# Log the messages we're about to send
|
362
|
-
self._log_messages(messages, validate_responses=False)
|
331
|
+
await self._process_tool_calls(message, messages)
|
363
332
|
|
364
333
|
# Continue the loop to get the next response
|
365
334
|
continue
|
@@ -1,18 +1,18 @@
|
|
1
|
-
mbxai/__init__.py,sha256=
|
1
|
+
mbxai/__init__.py,sha256=O7gk5I9PkTWLFa6aPnoRKIwoXwoOVHvpKVW0VlaBZbc,47
|
2
2
|
mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
|
3
3
|
mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
|
4
4
|
mbxai/mcp/client.py,sha256=B8ZpH-uecmTCgoDw65LwwVxsFWVoX-08t5ff0hOEPXk,6011
|
5
5
|
mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
|
6
|
-
mbxai/mcp/server.py,sha256=
|
6
|
+
mbxai/mcp/server.py,sha256=1RVX7pZ7nl19akDLjBENh-5zsg90pOvS6jvbtQKdzQk,3462
|
7
7
|
mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
|
8
8
|
mbxai/openrouter/client.py,sha256=RO5tbF42vkcjxjvC-QFB8DGA0gQLljH3KPBn3HgZV8I,13662
|
9
9
|
mbxai/openrouter/config.py,sha256=Ia93s-auim9Sq71eunVDbn9ET5xX2zusXpV4JBdHAzs,3251
|
10
10
|
mbxai/openrouter/models.py,sha256=b3IjjtZAjeGOf2rLsdnCD1HacjTnS8jmv_ZXorc-KJQ,2604
|
11
11
|
mbxai/tools/__init__.py,sha256=QUFaXhDm-UKcuAtT1rbKzhBkvyRBVokcQIOf9cxIuwc,160
|
12
|
-
mbxai/tools/client.py,sha256=
|
12
|
+
mbxai/tools/client.py,sha256=K1_GOb_LepUIZsl4v-iWVDLYe8qJ6t6v6dUMLixRv5s,13075
|
13
13
|
mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
|
14
14
|
mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
|
15
|
-
mbxai-0.6.
|
16
|
-
mbxai-0.6.
|
17
|
-
mbxai-0.6.
|
18
|
-
mbxai-0.6.
|
15
|
+
mbxai-0.6.1.dist-info/METADATA,sha256=cW3SmCohk4q0BQQ9H2daHCNCKyflxi9xBhwtaVD7CcU,4107
|
16
|
+
mbxai-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
17
|
+
mbxai-0.6.1.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
|
18
|
+
mbxai-0.6.1.dist-info/RECORD,,
|
File without changes
|
File without changes
|