mbxai 1.2.2__py3-none-any.whl → 1.4.0__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "1.2.2" 
+__version__ = "1.4.0" 

mbxai/examples/mcp/mcp_client_example.py

@@ -51,6 +51,10 @@ def main():
                 if not hasattr(response, 'choices'):
                     logger.error(f"Invalid response format - no choices attribute: {response}")
                     return
+                
+                if response.choices is None:
+                    logger.error("Response choices is None")
+                    return
                     
                 if not response.choices:
                     logger.error("No choices in response")

mbxai/mcp/client.py

@@ -86,7 +86,7 @@ class MCPClient(ToolClient):
             
             try:
                 result = response.json()
-                logger.info(f"Tool {tool.name} response parsed successfully")
+                logger.debug(f"Tool {tool.name} response parsed successfully")
                 return result
             except Exception as e:
                 logger.error(f"Failed to parse tool {tool.name} response: {str(e)}")
@@ -105,7 +105,7 @@ class MCPClient(ToolClient):
         
         # Extract tools array from response
         tools_data = response_data.get("tools", [])
-        logger.info(f"Received {len(tools_data)} tools from server {name}")
+        logger.debug(f"Received {len(tools_data)} tools from server {name}")
         
         # Register each tool
         for idx, tool_data in enumerate(tools_data):
@@ -128,7 +128,7 @@ class MCPClient(ToolClient):
                 
                 # Register the tool with ToolClient
                 self._tools[tool.name] = tool
-                logger.info(f"Successfully registered tool: {tool.name}")
+                logger.debug(f"Successfully registered tool: {tool.name}")
             except Exception as e:
                 logger.error(f"Failed to register tool: {str(e)}")
                 logger.error(f"Tool data that caused the error: {json.dumps(tool_data, indent=2)}") 

mbxai/mcp/server.py

@@ -31,7 +31,7 @@ class MCPServer:
         self.app = FastAPI(
             title=self.name,
             description=self.description,
-            version="1.2.2",
+            version="1.4.0",
         )
         
         # Initialize MCP server

mbxai/openrouter/client.py

@@ -214,12 +214,12 @@ class OpenRouterClient:
         """Get a chat completion from OpenRouter."""
         try:
             # 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)}")
+            logger.debug(f"Sending chat completion request to OpenRouter with model: {model or self.model}")
+            logger.debug(f"Message count: {len(messages)}")
 
             # 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")
+            logger.debug(f"Total message size: {total_size} bytes")
 
             request = {
                 "model": model or self.model,
@@ -234,6 +234,15 @@ class OpenRouterClient:
                 logger.error("Received None response from OpenRouter API")
                 raise OpenRouterAPIError("Received None response from OpenRouter API")
 
+            # Validate response structure
+            if not hasattr(response, 'choices'):
+                logger.error(f"Response missing 'choices' attribute. Available attributes: {dir(response)}")
+                raise OpenRouterAPIError("Invalid response format: missing 'choices' attribute")
+
+            if response.choices is None:
+                logger.error("Response choices is None")
+                raise OpenRouterAPIError("Invalid response format: choices is None")
+
             logger.debug(f"Response type: {type(response)}")
             logger.debug(f"Response attributes: {dir(response)}")
             logger.debug(f"Received response from OpenRouter: {len(response.choices)} choices")
@@ -281,13 +290,13 @@ class OpenRouterClient:
 
         try:
             # Log the request details
-            logger.info(f"Sending parse request to OpenRouter with model: {model or self.model}")
-            logger.info(f"Message count: {len(messages)}")
-            logger.info(f"Response format: {response_format}")
+            logger.debug(f"Sending parse request to OpenRouter with model: {model or self.model}")
+            logger.debug(f"Message count: {len(messages)}")
+            logger.debug(f"Response format: {response_format}")
 
             # 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")
+            logger.debug(f"Total message size: {total_size} bytes")
 
             try:
                 response = self._client.beta.chat.completions.parse(**request)
@@ -320,48 +329,7 @@ class OpenRouterClient:
                 logger.error("Received None response from OpenRouter API")
                 raise OpenRouterAPIError("Received None response from OpenRouter API")
 
-            # Try to get the raw response content if available
-            if hasattr(response, '_response'):
-                try:
-                    raw_content = response._response.text
-                    logger.debug(f"Raw response content: {raw_content[:1000]}...")
-                except Exception as e:
-                    logger.debug(f"Could not get raw response content: {e}")
-
-            # Validate response structure
-            if not hasattr(response, 'choices'):
-                logger.error(f"Response missing 'choices' attribute. Available attributes: {dir(response)}")
-                raise OpenRouterAPIError("Invalid response format: missing 'choices' attribute")
-
-            if not response.choices:
-                logger.error("Response has empty choices list")
-                raise OpenRouterAPIError("Invalid response format: empty choices list")
-
-            if not hasattr(response.choices[0], 'message'):
-                logger.error(f"First choice missing 'message' attribute. Available attributes: {dir(response.choices[0])}")
-                raise OpenRouterAPIError("Invalid response format: missing 'message' attribute in first choice")
-
-            # Check if the message has a parsed attribute or content
-            if not hasattr(response.choices[0].message, 'parsed') and not hasattr(response.choices[0].message, 'content'):
-                logger.error(f"Message missing both 'parsed' and 'content' attributes. Available attributes: {dir(response.choices[0].message)}")
-                raise OpenRouterAPIError("Invalid response format: message must have either 'parsed' or 'content' attribute")
-
-            # If there's no parsed attribute but there is content, try to parse it
-            if not hasattr(response.choices[0].message, 'parsed') and hasattr(response.choices[0].message, 'content'):
-                try:
-                    content = response.choices[0].message.content
-                    if isinstance(content, str):
-                        parsed = json.loads(content)
-                        response.choices[0].message.parsed = parsed
-                    else:
-                        response.choices[0].message.parsed = content
-                except Exception as e:
-                    stack_trace = traceback.format_exc()
-                    logger.error(f"Failed to parse message content: {str(e)}")
-                    logger.error(f"Stack trace:\n{stack_trace}")
-                    raise OpenRouterAPIError(f"Failed to parse message content: {str(e)}\nStack trace:\n{stack_trace}")
-
-            logger.info(f"Received response from OpenRouter: {len(response.choices)} choices")
+            logger.debug(f"Received response from OpenRouter: {len(response.choices)} choices")
 
             return response
 
@@ -409,13 +377,13 @@ class OpenRouterClient:
             response_format_param = type_to_response_format_param(response_format)
 
             # Log the request details
-            logger.info(f"Sending parsed chat completion request to OpenRouter with model: {model or self.model}")
-            logger.info(f"Message count: {len(messages)}")
+            logger.debug(f"Sending parsed chat completion request to OpenRouter with model: {model or self.model}")
+            logger.debug(f"Message count: {len(messages)}")
             logger.debug(f"Response format: {json.dumps(response_format_param, indent=2)}")
 
             # 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")
+            logger.debug(f"Total message size: {total_size} bytes")
 
             request = {
                 "model": model or self.model,
@@ -431,6 +399,15 @@ class OpenRouterClient:
                 logger.error("Received None response from OpenRouter API")
                 raise OpenRouterAPIError("Received None response from OpenRouter API")
 
+            # Validate response structure
+            if not hasattr(response, 'choices'):
+                logger.error(f"Response missing 'choices' attribute. Available attributes: {dir(response)}")
+                raise OpenRouterAPIError("Invalid response format: missing 'choices' attribute")
+
+            if response.choices is None:
+                logger.error("Response choices is None")
+                raise OpenRouterAPIError("Invalid response format: choices is None")
+
             logger.debug(f"Response type: {type(response)}")
             logger.debug(f"Response attributes: {dir(response)}")
             logger.debug(f"Received response from OpenRouter: {len(response.choices)} choices")

mbxai/tools/client.py

@@ -48,7 +48,7 @@ class ToolClient:
             schema=schema,
         )
         self._tools[name] = tool
-        logger.info(f"Registered tool: {name}")
+        logger.debug(f"Registered tool: {name}")
 
     def _truncate_content(self, content: str | None, max_length: int = 100) -> str:
         """Truncate content for logging."""
@@ -88,11 +88,11 @@ class ToolClient:
                 # Track tool calls
                 for tc in msg["tool_calls"]:
                     tool_call_ids.add(tc["id"])
-                    logger.info(f"Found tool call {tc['id']} for {tc['function']['name']} in message {i}")
+                    logger.debug(f"Found tool call {tc['id']} for {tc['function']['name']} in message {i}")
             elif role == "tool":
                 # Track tool responses
                 tool_response_ids.add(msg["tool_call_id"])
-                logger.info(f"Found tool response for call ID {msg['tool_call_id']} in message {i}")
+                logger.debug(f"Found tool response for call ID {msg['tool_call_id']} in message {i}")
         
         # Only validate responses if requested
         if validate_responses:
@@ -118,7 +118,7 @@ class ToolClient:
             messages: The messages to log
             validate_responses: Whether to validate that all tool calls have responses
         """
-        logger.info("Sending messages to OpenRouter:")
+        logger.debug("Sending messages to OpenRouter:")
         for i, msg in enumerate(messages):
             role = msg.get("role", "unknown")
             content = self._truncate_content(msg.get("content"))
@@ -130,11 +130,11 @@ class ToolClient:
                     f"{tc['function']['name']}(id={tc['id']})"
                     for tc in tool_calls
                 ]
-                logger.info(f"  Message {i} - {role}: content='{content}', tool_calls={tool_call_info}")
+                logger.debug(f"  Message {i} - {role}: content='{content}', tool_calls={tool_call_info}")
             elif tool_call_id:
-                logger.info(f"  Message {i} - {role}: content='{content}', tool_call_id={tool_call_id}")
+                logger.debug(f"  Message {i} - {role}: content='{content}', tool_call_id={tool_call_id}")
             else:
-                logger.info(f"  Message {i} - {role}: content='{content}'")
+                logger.debug(f"  Message {i} - {role}: content='{content}'")
         
         # Validate message sequence
         self._validate_message_sequence(messages, validate_responses)
@@ -166,7 +166,7 @@ class ToolClient:
                     raise ValueError(f"Invalid tool arguments format: {arguments}")
 
             # Call the tool
-            logger.info(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
+            logger.debug(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
             if inspect.iscoroutinefunction(tool.function):
                 result = await tool.function(**arguments)
             else:
@@ -183,11 +183,11 @@ class ToolClient:
                 "content": result,
             }
             tool_responses.append(tool_response)
-            logger.info(f"Created tool response for call ID {tool_call.id}")
+            logger.debug(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")
+        logger.debug(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)
@@ -207,7 +207,7 @@ class ToolClient:
         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]}")
+            logger.debug(f"Available tools: {[tool['function']['name'] for tool in tools]}")
             kwargs["tools"] = tools
         
         while True:
@@ -234,11 +234,11 @@ class ToolClient:
             tool_calls = response.choices[0].message.tool_calls            
             # Process function calls if any
             if tool_calls:
-                logger.info(f"Tool calls: {len(tool_calls)} - Tools: {[tc.function.name for tc in tool_calls]}")
+                logger.debug(f"Tool calls: {len(tool_calls)} - Tools: {[tc.function.name for tc in tool_calls]}")
                 
                 # Process each function call
                 for tool_call in tool_calls:
-                    logger.info(f"Processing tool call: {tool_call.function.name}")
+                    logger.debug(f"Processing tool call: {tool_call.function.name}")
 
                     # Get the tool
                     tool = self._tools.get(tool_call.function.name)
@@ -253,10 +253,10 @@ class ToolClient:
                         raise ValueError(f"Invalid tool arguments format: {tool_call.function.arguments}")
 
                     # Call the tool
-                    logger.info(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
+                    logger.debug(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
                     try:
                         result = tool.function(**arguments)
-                        logger.info(f"Tool {tool.name} completed successfully")
+                        logger.debug(f"Tool {tool.name} completed successfully")
                     except Exception as e:
                         logger.error(f"Error calling tool {tool.name}: {str(e)}")
                         result = {"error": f"Tool execution failed: {str(e)}"}
@@ -273,12 +273,12 @@ class ToolClient:
                         "content": result,
                     })
                     
-                    logger.info(f"Added function call and output for {tool_call.function.name}")
+                    logger.debug(f"Added function call and output for {tool_call.function.name}")
 
                 # Continue the conversation after processing all calls
                 continue
             else:
-                logger.info("Final response")
+                logger.debug("Final response")
                 return response
             
     def parse(
@@ -293,7 +293,7 @@ class ToolClient:
         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]}")
+            logger.debug(f"Available tools: {[tool['function']['name'] for tool in tools]}")
             kwargs["tools"] = tools
         
         while True:
@@ -317,11 +317,11 @@ class ToolClient:
             tool_calls = response.choices[0].message.tool_calls            
             # Process function calls if any
             if tool_calls:
-                logger.info(f"Tool calls: {len(tool_calls)} - Tools: {[tc.function.name for tc in tool_calls]}")
+                logger.debug(f"Tool calls: {len(tool_calls)} - Tools: {[tc.function.name for tc in tool_calls]}")
                 
                 # Process each function call
                 for tool_call in tool_calls:
-                    logger.info(f"Processing tool call: {tool_call.function.name}")
+                    logger.debug(f"Processing tool call: {tool_call.function.name}")
 
                     # Get the tool
                     tool = self._tools.get(tool_call.function.name)
@@ -336,10 +336,10 @@ class ToolClient:
                         raise ValueError(f"Invalid tool arguments format: {tool_call.function.arguments}")
 
                     # Call the tool
-                    logger.info(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
+                    logger.debug(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
                     try:
                         result = tool.function(**arguments)
-                        logger.info(f"Tool {tool.name} completed successfully")
+                        logger.debug(f"Tool {tool.name} completed successfully")
                     except Exception as e:
                         logger.error(f"Error calling tool {tool.name}: {str(e)}")
                         result = {"error": f"Tool execution failed: {str(e)}"}
@@ -356,10 +356,10 @@ class ToolClient:
                         "content": result,
                     })
                     
-                    logger.info(f"Added function call and output for {tool_call.function.name}")
+                    logger.debug(f"Added function call and output for {tool_call.function.name}")
 
                 # Continue the conversation after processing all calls
                 continue
             else:
-                logger.info("Final response")
+                logger.debug("Final response")
                 return response

{mbxai-1.2.2.dist-info → mbxai-1.4.0.dist-info}/METADATA

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

{mbxai-1.2.2.dist-info → mbxai-1.4.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mbxai/__init__.py,sha256=CaI4CMV8Eswv3HMCO8KNKv5hrNhl0wFIHDHcX6sagwA,47
+mbxai/__init__.py,sha256=E7p4_3-qHNUH7NcRh8unQZwHeS5pRX-O8zL-n0jaR2M,47
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/examples/openrouter_example.py,sha256=-grXHKMmFLoh-yUIEMc31n8Gg1S7uSazBWCIOWxgbyQ,1317
 mbxai/examples/parse_example.py,sha256=eCKMJoOl6qwo8sDP6Trc6ncgjPlgTqi5tPE2kB5_P0k,3821
@@ -7,22 +7,22 @@ mbxai/examples/request.json,sha256=fjVMses305wVUXgcmjESCvPgP81Js8Kk6zHjZ8EDyEg,5
 mbxai/examples/response.json,sha256=4SGJJyQjWWeN__Mrxm6ZtHIo1NUtLEheldd5KaA2mHw,856
 mbxai/examples/send_request.py,sha256=O5gCHUHy7RvkEFo9IQATgnSOfOdu8OqKHfjAlLDwWPg,6023
 mbxai/examples/tool_client_example.py,sha256=9DNaejXLA85dPbExMiv5y76qlFhzOJF9E5EnMOsy_Dc,3993
-mbxai/examples/mcp/mcp_client_example.py,sha256=R4H-OU5FvGL41cCkTdLa3bocsmVJYQYOcOHRf61nbZc,2822
+mbxai/examples/mcp/mcp_client_example.py,sha256=d5-TRHNDdp3nT_NGt0tKpT3VUAJVvqAHSyqkzk9Dd2s,2972
 mbxai/examples/mcp/mcp_server_example.py,sha256=nFfg22Jnc6HMW_ezLO3So1xwDdx2_rItj5CR-y_Nevs,3966
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
-mbxai/mcp/client.py,sha256=rrUq2ObvUZOcz6fRyZ7ukB2rzUXIPqnQtBFwyt3VrJY,5216
+mbxai/mcp/client.py,sha256=QRzId6o4_WRWVv3rtm8cfZZGaoY_UlaOO-oqNjY-tmw,5219
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=779lPFAXYbOc3dBO-tK_PBCtICStyDc1zQaNdo1xfxU,3454
+mbxai/mcp/server.py,sha256=V-o8BugXj9Jj_yUIGepH0fCw8lrxYSpVRpI5CFfAvnk,3454
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
-mbxai/openrouter/client.py,sha256=au2VDSoIU6zKd1LIlQ6ObG_YpUK2AaG9bW-fBV2iVgk,19882
+mbxai/openrouter/client.py,sha256=3LD6WDJ8wjo_nefH5d1NJCsrWPvBc_KBf2NsItUoSt8,18302
 mbxai/openrouter/config.py,sha256=Ia93s-auim9Sq71eunVDbn9ET5xX2zusXpV4JBdHAzs,3251
 mbxai/openrouter/models.py,sha256=b3IjjtZAjeGOf2rLsdnCD1HacjTnS8jmv_ZXorc-KJQ,2604
 mbxai/openrouter/schema.py,sha256=H_77ZrA9zmbX155bWpCJj1jehUyJPS0QybEW1IVAoe0,540
 mbxai/tools/__init__.py,sha256=ogxrHvgJ7OR62Lmd5x9Eh5d2C0jqWyQis7Zy3yKpZ78,218
-mbxai/tools/client.py,sha256=YbQMWMw8c5XPwarT1u6TRgbsqYBJaTsO8j3EyCBoz9g,14906
+mbxai/tools/client.py,sha256=j6yB2hYxvWbaQ5SqN1Fs_YFdPtwettdcMoXcdeV-520,14930
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=7gNIJBjzr9i4DT50OGLMjn3-6yBXqlK-kIz_RWcqywo,5875
-mbxai-1.2.2.dist-info/METADATA,sha256=9lTianvqao9yH8Ix7X_KrYOhzuBL3yny0XxdexDPQTw,4147
-mbxai-1.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-1.2.2.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-1.2.2.dist-info/RECORD,,
+mbxai-1.4.0.dist-info/METADATA,sha256=EWpGN5OMQTKiNodh1zxL-tU1Ud3U3-Q20Sz-Ep7YUuA,4147
+mbxai-1.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-1.4.0.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-1.4.0.dist-info/RECORD,,