mbxai 0.6.2__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.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: mbxai
3
- Version: 0.6.2
3
+ Version: 0.6.4
4
4
  Summary: MBX AI SDK
5
5
  Project-URL: Homepage, https://www.mibexx.de
6
6
  Project-URL: Documentation, https://www.mibexx.de
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "mbxai"
7
- version = "0.6.2"
7
+ version = "0.6.4"
8
8
  authors = [
9
9
  { name = "MBX AI" }
10
10
  ]
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
2
2
 
3
3
  setup(
4
4
  name="mbxai",
5
- version="0.6.2",
5
+ version="0.6.4",
6
6
  author="MBX AI",
7
7
  description="MBX AI SDK",
8
8
  long_description=open("README.md").read(),
@@ -2,4 +2,4 @@
2
2
  MBX AI package.
3
3
  """
4
4
 
5
- __version__ = "0.6.2"
5
+ __version__ = "0.6.4"
@@ -31,7 +31,7 @@ class MCPServer:
31
31
  self.app = FastAPI(
32
32
  title=self.name,
33
33
  description=self.description,
34
- version="0.6.2",
34
+ version="0.6.4",
35
35
  )
36
36
 
37
37
  # Initialize MCP server
@@ -267,79 +267,28 @@ class ToolClient:
267
267
  Returns:
268
268
  The parsed response from the model
269
269
  """
270
- tools = [tool.to_openai_function() for tool in self._tools.values()]
271
-
272
- if tools:
273
- logger.info(f"Available tools: {[tool['function']['name'] for tool in tools]}")
274
- kwargs["tools"] = tools
275
- kwargs["tool_choice"] = "auto"
276
-
277
- while True:
278
- # Log messages before sending to OpenRouter
279
- self._log_messages(messages)
280
-
281
- # Get the model's response
282
- response = await self._openrouter_client.chat_completion_parse(
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
- if stream:
291
- return response
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
- # Add the assistant's message with tool calls
305
- assistant_message = {
306
- "role": "assistant",
307
- "parsed": message.parsed if hasattr(message, "parsed") else None,
308
- "content": message.content if not hasattr(message, "parsed") else None,
309
- }
310
-
311
- if message.tool_calls:
312
- assistant_message["tool_calls"] = [
313
- {
314
- "id": tool_call.id,
315
- "type": "function",
316
- "function": {
317
- "name": tool_call.function.name,
318
- "arguments": tool_call.function.arguments,
319
- },
320
- }
321
- for tool_call in message.tool_calls
322
- ]
323
- messages.append(assistant_message)
324
- logger.info(f"Message count: {len(messages)}, Added assistant message with tool calls: {[tc.function.name for tc in message.tool_calls]}")
325
-
326
- # Process all tool calls
327
- await self._process_tool_calls(message, messages)
328
-
329
- # Continue the loop to get the next response
330
- continue
331
-
332
- # If we have a parsed response, return it
333
- if hasattr(message, "parsed") and message.parsed:
334
- return response
335
-
336
- # If we have content but no tool calls, try to parse it
337
- if message.content:
338
- try:
339
- return response
340
- except Exception as e:
341
- logger.error(f"Failed to parse response: {e}")
342
- raise ValueError(f"Failed to parse response as {response_format.__name__}: {str(e)}")
343
-
344
- # If we have neither parsed content nor tool calls, something is wrong
345
- 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.2"
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.2.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
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.2-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
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.2"
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.2"
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.2.tar.gz", hash = "sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122", size = 76222 }
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.2-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125 },
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