mbxai 0.6.12__tar.gz → 0.6.14__tar.gz

{mbxai-0.6.12 → mbxai-0.6.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbxai
-Version: 0.6.12
+Version: 0.6.14
 Summary: MBX AI SDK
 Project-URL: Homepage, https://www.mibexx.de
 Project-URL: Documentation, https://www.mibexx.de

{mbxai-0.6.12 → mbxai-0.6.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mbxai"
-version = "0.6.12"
+version = "0.6.14"
 authors = [
     { name = "MBX AI" }
 ]

{mbxai-0.6.12 → mbxai-0.6.14}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="mbxai",
-    version="0.6.12",
+    version="0.6.14",
     author="MBX AI",
     description="MBX AI SDK",
     long_description=open("README.md").read(),

{mbxai-0.6.12 → mbxai-0.6.14}/src/mbxai/openrouter/client.py

@@ -245,7 +245,6 @@ class OpenRouterClient:
         response_format: type[BaseModel],
         *,
         model: Optional[Union[str, OpenRouterModel]] = None,
-        stream: bool = False,
         **kwargs: Any,
     ) -> Any:
         """Create a chat completion and parse the response.
@@ -254,7 +253,6 @@ class OpenRouterClient:
             messages: list of messages
             response_format: Pydantic model to parse the response into
             model: Optional model override
-            stream: Whether to stream the response
             **kwargs: Additional parameters
 
         Returns:
@@ -267,43 +265,40 @@ class OpenRouterClient:
             ValueError: If response parsing fails
         """
         try:
-            # Add system message to enforce JSON output if not present
-            if not any(msg.get("role") == "system" for msg in messages):
-                messages.insert(0, {
-                    "role": "system",
-                    "content": "You are a helpful assistant that responds in valid JSON format."
-                })
+            # Log the request details
+            logger.info(f"Sending chat completion request to OpenRouter with model: {model or self.model}")
+            logger.info(f"Message count: {len(messages)}")
             
-            # Add format instructions to user message
-            last_user_msg = next((msg for msg in reversed(messages) if msg.get("role") == "user"), None)
-            if last_user_msg:
-                format_desc = f"Respond with valid JSON matching this Pydantic model: {response_format.__name__}"
-                last_user_msg["content"] = f"{format_desc}\n\n{last_user_msg['content']}"
+            # Calculate total message size for logging
+            total_size = sum(len(str(msg)) for msg in messages)
+            logger.info(f"Total message size: {total_size} bytes")
             
-            response = self.chat_completion(
-                messages,
-                model=model,
-                stream=stream,
-                response_format={"type": "json_object"},  # Force JSON response
-                **kwargs
+            response = self._client.beta.chat.completions.parse(
+                messages=messages,
+                model=model or self.model,
+                response_format=response_format,
+                **kwargs,
             )
             
-            if stream:
-                return response
-
-            # Parse the response content into the specified format
-            content = response.choices[0].message.content
-            adapter = TypeAdapter(response_format)
-            try:
-                parsed = adapter.validate_json(content)
-                response.choices[0].message.parsed = parsed
-                return response
-            except Exception as e:
-                raise ValueError(f"Failed to parse response as {response_format.__name__}: {str(e)}")
-        except ValueError as e:
-            raise e
+            # Log response details
+            logger.info("Received response from OpenRouter")
+            if hasattr(response, 'choices') and response.choices:
+                logger.info(f"Response has {len(response.choices)} choices")
+            
+            return response
+            
         except Exception as e:
-            self._handle_api_error("chat completion parse", e)
+            logger.error(f"Error in chat completion: {str(e)}")
+            if hasattr(e, 'response') and e.response is not None:
+                logger.error(f"Response status: {e.response.status_code}")
+                logger.error(f"Response headers: {e.response.headers}")
+                try:
+                    content = e.response.text
+                    logger.error(f"Response content length: {len(content)} bytes")
+                    logger.error(f"Response content preview: {content[:1000]}...")
+                except:
+                    logger.error("Could not read response content")
+            self._handle_api_error("chat completion", e)
 
     @with_retry()
     def embeddings(

{mbxai-0.6.12 → mbxai-0.6.14}/src/mbxai/tools/client.py

@@ -312,7 +312,6 @@ class ToolClient:
         response_format: type[T],
         *,
         model: str | None = None,
-        stream: bool = False,
         **kwargs: Any,
     ) -> Any:
         """Chat with the model and parse the response into a Pydantic model.
@@ -321,42 +320,106 @@ class ToolClient:
             messages: The conversation messages
             response_format: The Pydantic model to parse the response into
             model: Optional model override
-            stream: Whether to stream the response
             **kwargs: Additional parameters for the chat completion
 
         Returns:
             The parsed response from the model
         """
-        # First, use chat to handle any tool calls
-        chat_response = await self.chat(
-            messages=messages,
-            model=model,
-            stream=stream,
-            **kwargs,
-        )
-
-        if stream:
-            return chat_response
-
-        # Get the final message after all tool calls are handled
-        final_message = chat_response.choices[0].message
+        tools = [tool.to_openai_function() for tool in self._tools.values()]
+        
+        if tools:
+            logger.info(f"Available tools: {[tool['function']['name'] for tool in tools]}")
+            kwargs["tools"] = tools
+            kwargs["tool_choice"] = "auto"
+        
+        while True:
+            # Get the model's response
+            response = self._client.chat_completion_parse(
+                messages=messages,
+                response_format=response_format,
+                model=model,
+                **kwargs,
+            )
 
-        # Create a new message list with just the final response
-        parse_messages = [
-            *messages,  # Include original context
-            {
+            message = response.choices[0].message
+            # Add the assistant's message with tool calls
+            assistant_message = {
                 "role": "assistant",
-                "content": final_message.content,
+                "content": message.content or None,
+                "parsed": message.parsed or None,
             }
-        ]
+            if message.tool_calls:
+                assistant_message["tool_calls"] = [
+                    {
+                        "id": tool_call.id,
+                        "type": "function",
+                        "function": {
+                            "name": tool_call.function.name,
+                            "arguments": tool_call.function.arguments,
+                        },
+                    }
+                    for tool_call in message.tool_calls
+                ]
+            messages.append(assistant_message)
+            logger.info(f"Message count: {len(messages)}, Added assistant message with tool calls: {[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
 
-        # Make a final parse request with the structured output format
-        parse_kwargs = kwargs.copy()
-        parse_kwargs["response_format"] = response_format
-        
-        return self._client.chat_completion_parse(
-            messages=parse_messages,
-            model=model,
-            stream=stream,
-            **parse_kwargs,
-        ) 
+            # If there are no tool calls, we're done
+            if not message.tool_calls:
+                return response
+
+            # Process all tool calls
+            tool_responses = []
+            for tool_call in message.tool_calls:
+                tool = self._tools.get(tool_call.function.name)
+                if not tool:
+                    raise ValueError(f"Unknown tool: {tool_call.function.name}")
+
+                # Parse arguments if they're a string
+                arguments = tool_call.function.arguments
+                if isinstance(arguments, str):
+                    try:
+                        arguments = json.loads(arguments)
+                    except json.JSONDecodeError as e:
+                        logger.error(f"Failed to parse tool arguments: {e}")
+                        raise ValueError(f"Invalid tool arguments format: {arguments}")
+
+                # Call the tool
+                logger.info(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
+                try:
+                    if inspect.iscoroutinefunction(tool.function):
+                        result = await asyncio.wait_for(tool.function(**arguments), timeout=300.0)  # 5 minutes timeout
+                    else:
+                        result = tool.function(**arguments)
+                    logger.info(f"Tool {tool.name} completed successfully")
+                except asyncio.TimeoutError:
+                    logger.error(f"Tool {tool.name} timed out after 5 minutes")
+                    result = {"error": "Tool execution timed out after 5 minutes"}
+                except Exception as e:
+                    logger.error(f"Error calling tool {tool.name}: {str(e)}")
+                    result = {"error": f"Tool execution failed: {str(e)}"}
+
+                # Convert result to JSON string if it's not already
+                if not isinstance(result, str):
+                    result = json.dumps(result)
+
+                # Create the tool response
+                tool_response = {
+                    "role": "tool",
+                    "tool_call_id": tool_call.id,
+                    "content": result,
+                }
+                tool_responses.append(tool_response)
+                logger.info(f"Created tool response for call ID {tool_call.id}")
+
+            # Add all tool responses to the messages
+            messages.extend(tool_responses)
+            logger.info(f"Message count: {len(messages)}, Added {len(tool_responses)} tool responses to messages")
+
+            # Validate the message sequence
+            self._validate_message_sequence(messages, validate_responses=True)
+
+            # Log the messages we're about to send
+            self._log_messages(messages, validate_responses=False)
+
+            # Continue the loop to get the next response
+            continue

{mbxai-0.6.12 → mbxai-0.6.14}/uv.lock

@@ -292,11 +292,11 @@ wheels = [
 
 [[package]]
 name = "httpx-sse"
-version = "0.6.12"
+version = "0.6.14"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.6.12.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
+sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.6.14.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.6.12-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
+    { url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.6.14-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
 ]
 
 [[package]]
@@ -446,7 +446,7 @@ wheels = [
 
 [[package]]
 name = "mbxai"
-version = "0.6.12"
+version = "0.6.14"
 source = { editable = "." }
 dependencies = [
     { name = "fastapi" },
@@ -980,14 +980,14 @@ wheels = [
 
 [[package]]
 name = "typing-inspection"
-version = "0.6.12"
+version = "0.6.14"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.6.12.tar.gz", hash = "sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122", size = 76222 }
+sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.6.14.tar.gz", hash = "sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122", size = 76222 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.6.12-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125 },
+    { url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.6.14-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125 },
 ]
 
 [[package]]