mbxai 0.6.3__tar.gz → 0.6.4__tar.gz
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-0.6.3 → mbxai-0.6.4}/PKG-INFO +1 -1
- {mbxai-0.6.3 → mbxai-0.6.4}/pyproject.toml +1 -1
- {mbxai-0.6.3 → mbxai-0.6.4}/setup.py +1 -1
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/__init__.py +1 -1
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/mcp/server.py +1 -1
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/tools/client.py +19 -69
- {mbxai-0.6.3 → mbxai-0.6.4}/uv.lock +7 -7
- {mbxai-0.6.3 → mbxai-0.6.4}/.gitignore +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/LICENSE +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/README.md +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/core.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/mcp/__init__.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/mcp/client.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/mcp/example.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/openrouter/__init__.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/openrouter/client.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/openrouter/config.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/openrouter/models.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/tools/__init__.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/tools/example.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/src/mbxai/tools/types.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/tests/test_core.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/tests/test_mcp.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/tests/test_openrouter.py +0 -0
- {mbxai-0.6.3 → mbxai-0.6.4}/tests/test_tools.py +0 -0
@@ -267,78 +267,28 @@ class ToolClient:
|
|
267
267
|
Returns:
|
268
268
|
The parsed response from the model
|
269
269
|
"""
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
kwargs
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
270
|
+
# First use the chat function to handle any tool calls
|
271
|
+
response = await self.chat(
|
272
|
+
messages=messages,
|
273
|
+
model=model,
|
274
|
+
stream=stream,
|
275
|
+
**kwargs,
|
276
|
+
)
|
277
|
+
|
278
|
+
if stream:
|
279
|
+
return response
|
280
|
+
|
281
|
+
# Now that we have the final response, parse it into the desired format
|
282
|
+
try:
|
283
|
+
final_response = await self._openrouter_client.chat_completion_parse(
|
283
284
|
messages=messages,
|
284
285
|
response_format=response_format,
|
285
286
|
model=model,
|
286
287
|
stream=stream,
|
288
|
+
tools=None, # No tools for the final parse
|
287
289
|
**kwargs,
|
288
290
|
)
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
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
|
-
|
304
|
-
# Check for tool calls first
|
305
|
-
if message.tool_calls:
|
306
|
-
# Add the assistant's message with tool calls
|
307
|
-
assistant_message = {
|
308
|
-
"role": "assistant",
|
309
|
-
"content": None,
|
310
|
-
"tool_calls": [
|
311
|
-
{
|
312
|
-
"id": tool_call.id,
|
313
|
-
"type": "function",
|
314
|
-
"function": {
|
315
|
-
"name": tool_call.function.name,
|
316
|
-
"arguments": tool_call.function.arguments,
|
317
|
-
},
|
318
|
-
}
|
319
|
-
for tool_call in message.tool_calls
|
320
|
-
]
|
321
|
-
}
|
322
|
-
messages.append(assistant_message)
|
323
|
-
logger.info(f"Message count: {len(messages)}, Added assistant message with tool calls: {[tc.function.name for tc in message.tool_calls]}")
|
324
|
-
|
325
|
-
# Process all tool calls
|
326
|
-
await self._process_tool_calls(message, messages)
|
327
|
-
|
328
|
-
# Continue the loop to get the next response
|
329
|
-
continue
|
330
|
-
|
331
|
-
# If we have a parsed response, return it
|
332
|
-
if hasattr(message, "parsed") and message.parsed:
|
333
|
-
return response
|
334
|
-
|
335
|
-
# If we have content but no tool calls, try to parse it
|
336
|
-
if message.content:
|
337
|
-
try:
|
338
|
-
return response
|
339
|
-
except Exception as e:
|
340
|
-
logger.error(f"Failed to parse response: {e}")
|
341
|
-
raise ValueError(f"Failed to parse response as {response_format.__name__}: {str(e)}")
|
342
|
-
|
343
|
-
# If we have neither parsed content nor tool calls, something is wrong
|
344
|
-
raise ValueError("Response has neither parsed content nor tool calls")
|
291
|
+
return final_response
|
292
|
+
except Exception as e:
|
293
|
+
logger.error(f"Failed to parse response: {e}")
|
294
|
+
raise ValueError(f"Failed to parse response as {response_format.__name__}: {str(e)}")
|
@@ -292,11 +292,11 @@ wheels = [
|
|
292
292
|
|
293
293
|
[[package]]
|
294
294
|
name = "httpx-sse"
|
295
|
-
version = "0.6.
|
295
|
+
version = "0.6.4"
|
296
296
|
source = { registry = "https://pypi.org/simple" }
|
297
|
-
sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.6.
|
297
|
+
sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.6.4.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
|
298
298
|
wheels = [
|
299
|
-
{ url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.6.
|
299
|
+
{ url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.6.4-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
|
300
300
|
]
|
301
301
|
|
302
302
|
[[package]]
|
@@ -446,7 +446,7 @@ wheels = [
|
|
446
446
|
|
447
447
|
[[package]]
|
448
448
|
name = "mbxai"
|
449
|
-
version = "0.6.
|
449
|
+
version = "0.6.4"
|
450
450
|
source = { editable = "." }
|
451
451
|
dependencies = [
|
452
452
|
{ name = "fastapi" },
|
@@ -980,14 +980,14 @@ wheels = [
|
|
980
980
|
|
981
981
|
[[package]]
|
982
982
|
name = "typing-inspection"
|
983
|
-
version = "0.6.
|
983
|
+
version = "0.6.4"
|
984
984
|
source = { registry = "https://pypi.org/simple" }
|
985
985
|
dependencies = [
|
986
986
|
{ name = "typing-extensions" },
|
987
987
|
]
|
988
|
-
sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.6.
|
988
|
+
sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.6.4.tar.gz", hash = "sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122", size = 76222 }
|
989
989
|
wheels = [
|
990
|
-
{ url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.6.
|
990
|
+
{ url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.6.4-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125 },
|
991
991
|
]
|
992
992
|
|
993
993
|
[[package]]
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|