mbxai 0.5.22__py3-none-any.whl → 0.5.24__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.5.22" 
+__version__ = "0.5.24" 

mbxai/mcp/server.py

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

mbxai/openrouter/client.py

@@ -4,10 +4,12 @@ OpenRouter client implementation.
 
 from typing import Any, Optional, Union
 from openai import OpenAI, OpenAIError
-from pydantic import BaseModel, TypeAdapter
+from pydantic import BaseModel, TypeAdapter, Field
 from .models import OpenRouterModel, OpenRouterModelRegistry
 from .config import OpenRouterConfig
 import logging
+import time
+from functools import wraps
 
 logger = logging.getLogger(__name__)
 
@@ -27,6 +29,65 @@ class OpenRouterAPIError(OpenRouterError):
     pass
 
 
+def with_retry(max_retries: int = 3, initial_delay: float = 1.0, max_delay: float = 10.0):
+    """Decorator to add retry logic to a function.
+    
+    Args:
+        max_retries: Maximum number of retry attempts
+        initial_delay: Initial delay between retries in seconds
+        max_delay: Maximum delay between retries in seconds
+    """
+    def decorator(func):
+        @wraps(func)
+        async def async_wrapper(*args, **kwargs):
+            last_error = None
+            delay = initial_delay
+            
+            for attempt in range(max_retries + 1):
+                try:
+                    return await func(*args, **kwargs)
+                except (OpenRouterConnectionError, OpenRouterAPIError) as e:
+                    last_error = e
+                    if attempt < max_retries:
+                        logger.warning(f"Attempt {attempt + 1} failed: {str(e)}. Retrying in {delay:.1f}s...")
+                        await asyncio.sleep(delay)
+                        delay = min(delay * 2, max_delay)
+                    else:
+                        logger.error(f"All {max_retries + 1} attempts failed")
+                        raise last_error
+                except Exception as e:
+                    # Don't retry other types of errors
+                    raise e
+            
+            raise last_error
+
+        @wraps(func)
+        def sync_wrapper(*args, **kwargs):
+            last_error = None
+            delay = initial_delay
+            
+            for attempt in range(max_retries + 1):
+                try:
+                    return func(*args, **kwargs)
+                except (OpenRouterConnectionError, OpenRouterAPIError) as e:
+                    last_error = e
+                    if attempt < max_retries:
+                        logger.warning(f"Attempt {attempt + 1} failed: {str(e)}. Retrying in {delay:.1f}s...")
+                        time.sleep(delay)
+                        delay = min(delay * 2, max_delay)
+                    else:
+                        logger.error(f"All {max_retries + 1} attempts failed")
+                        raise last_error
+                except Exception as e:
+                    # Don't retry other types of errors
+                    raise e
+            
+            raise last_error
+
+        return async_wrapper if asyncio.iscoroutinefunction(func) else sync_wrapper
+    return decorator
+
+
 class OpenRouterClient:
     """Client for interacting with the OpenRouter API."""
 
@@ -36,6 +97,9 @@ class OpenRouterClient:
         model: Union[str, OpenRouterModel] = OpenRouterModel.GPT4_TURBO,
         base_url: Optional[str] = None,
         default_headers: Optional[dict[str, str]] = None,
+        max_retries: int = 3,
+        retry_initial_delay: float = 1.0,
+        retry_max_delay: float = 10.0,
     ) -> None:
         """Initialize the OpenRouter client.
 
@@ -44,6 +108,9 @@ class OpenRouterClient:
             model: The model to use (default: GPT4_TURBO)
             base_url: Optional custom base URL for the API
             default_headers: Optional default headers for API requests
+            max_retries: Maximum number of retry attempts (default: 3)
+            retry_initial_delay: Initial delay between retries in seconds (default: 1.0)
+            retry_max_delay: Maximum delay between retries in seconds (default: 10.0)
 
         Raises:
             OpenRouterError: If initialization fails
@@ -56,7 +123,10 @@ class OpenRouterClient:
                 default_headers=default_headers or {
                     "HTTP-Referer": "https://github.com/mibexx/mbxai",
                     "X-Title": "MBX AI",
-                }
+                },
+                max_retries=max_retries,
+                retry_initial_delay=retry_initial_delay,
+                retry_max_delay=retry_max_delay,
             )
             
             self._client = OpenAI(
@@ -86,6 +156,10 @@ class OpenRouterClient:
             raise OpenRouterAPIError(f"API error during {operation}: {error_msg}")
         elif "Connection" in error_msg:
             raise OpenRouterConnectionError(f"Connection error during {operation}: {error_msg}")
+        elif "Expecting value" in error_msg and "line" in error_msg:
+            # This is a JSON parsing error, likely due to a truncated or malformed response
+            logger.error("JSON parsing error detected. This might be due to a large response or network issues.")
+            raise OpenRouterAPIError(f"Response parsing error during {operation}. The response might be too large or malformed.")
         else:
             raise OpenRouterError(f"Error during {operation}: {error_msg}")
 
@@ -111,80 +185,59 @@ class OpenRouterClient:
         """
         self.model = value
 
+    @with_retry()
     def chat_completion(
         self,
         messages: list[dict[str, Any]],
         *,
-        model: Optional[Union[str, OpenRouterModel]] = None,
+        model: str | None = None,
         stream: bool = False,
         **kwargs: Any,
     ) -> Any:
-        """Create a chat completion.
-
-        Args:
-            messages: list of messages
-            model: Optional model override
-            stream: Whether to stream the response
-            **kwargs: Additional parameters
-
-        Returns:
-            Completion response
-
-        Raises:
-            OpenRouterConnectionError: For connection issues
-            OpenRouterAPIError: For API errors
-            OpenRouterError: For other errors
-        """
+        """Get a chat completion from OpenRouter."""
         try:
-            # Remove any incompatible parameters
-            kwargs.pop("parse", None)  # Remove parse parameter if present
+            # 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"Making chat completion request with model {model or self.model}")
-            logger.debug(f"Request messages: {messages}")
-            logger.debug(f"Request kwargs: {kwargs}")
+            # 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._client.chat.completions.create(
-                model=str(model or self.model),
                 messages=messages,
+                model=model or self.model,
                 stream=stream,
                 **kwargs,
             )
             
-            # Log response structure for debugging
-            logger.debug(f"Response type: {type(response)}")
-            logger.debug(f"Response attributes: {dir(response)}")
-            logger.debug(f"Raw response: {response}")
-            
-            # Handle streaming response differently
-            if stream:
-                return response
-            
-            # Validate response structure
-            if response is None:
-                logger.error("Received None response from API")
-                raise OpenRouterError("Received None response from API")
-                
-            if not hasattr(response, 'choices'):
-                logger.error(f"Invalid response: missing choices attribute. Response: {response}")
-                raise OpenRouterError("Invalid response: missing choices attribute")
-                
-            if not response.choices:
-                logger.error(f"Invalid response: empty choices list. Response: {response}")
-                raise OpenRouterError("Invalid response: empty choices list")
-            
-            if not hasattr(response.choices[0], 'message'):
-                logger.error(f"Invalid response: missing message in first choice. Response: {response}")
-                raise OpenRouterError("Invalid response: missing message in first choice")
+            # 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")
+                if hasattr(response.choices[0], 'message'):
+                    content = response.choices[0].message.content
+                    content_length = len(content) if content else 0
+                    logger.info(f"First choice has message with content length: {content_length}")
+                    if content_length > 1000000:  # Log warning for very large responses
+                        logger.warning(f"Response content is very large ({content_length} bytes)")
             
-            logger.debug(f"Response message: {response.choices[0].message}")
             return response
             
         except Exception as e:
             logger.error(f"Error in chat completion: {str(e)}")
-            if isinstance(e, OpenRouterError):
-                raise
+            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 chat_completion_parse(
         self,
         messages: list[dict[str, Any]],
@@ -251,6 +304,7 @@ class OpenRouterClient:
         except Exception as e:
             self._handle_api_error("chat completion parse", e)
 
+    @with_retry()
     def embeddings(
         self,
         input: Union[str, list[str]],

mbxai/openrouter/config.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field, field_validator
-from typing import Union
+from typing import Union, Optional
 from .models import OpenRouterModel, OpenRouterModelRegistry
 
 class OpenRouterConfig(BaseModel):
@@ -21,6 +21,18 @@ class OpenRouterConfig(BaseModel):
         },
         description="Default headers to include in all requests"
     )
+    max_retries: int = Field(
+        default=3,
+        description="Maximum number of retry attempts"
+    )
+    retry_initial_delay: float = Field(
+        default=1.0,
+        description="Initial delay between retries in seconds"
+    )
+    retry_max_delay: float = Field(
+        default=10.0,
+        description="Maximum delay between retries in seconds"
+    )
 
     @field_validator("token")
     def validate_token(cls, v: str) -> str:

{mbxai-0.5.22.dist-info → mbxai-0.5.24.dist-info}/METADATA

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

{mbxai-0.5.22.dist-info → mbxai-0.5.24.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=Y0TOlMhMNWJBWpYsqp-fuKo6LuQ2nlSRQ9Q4CfNQ1mM,48
+mbxai/__init__.py,sha256=uOU108fCrriuZbpIuLG4acnQ0ZDvDwD6AnuvvE9mA4A,48
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
 mbxai/mcp/client.py,sha256=B8ZpH-uecmTCgoDw65LwwVxsFWVoX-08t5ff0hOEPXk,6011
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=xtialyKJMkHnggu26AseV0BfCzY36xQgQ7DxcOYeLXM,3463
+mbxai/mcp/server.py,sha256=-oTWHpKJBF2p6Y9s8FhSFY4mytwNzCCx4S2lwR5Xr_E,3463
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
-mbxai/openrouter/client.py,sha256=XLRMRNRJH96Jl6_af0KkzRDdLJnixh8I3RvEEcFuXyg,10840
-mbxai/openrouter/config.py,sha256=MTX_YHsFrM7JYqovJSkEF6JzVyIdajeI5Dja2CALH58,2874
+mbxai/openrouter/client.py,sha256=YOjcYkD8VLMVzBd6z_rB7kLGEzNwIVSUEOyMZlcIhkw,13647
+mbxai/openrouter/config.py,sha256=Ia93s-auim9Sq71eunVDbn9ET5xX2zusXpV4JBdHAzs,3251
 mbxai/openrouter/models.py,sha256=b3IjjtZAjeGOf2rLsdnCD1HacjTnS8jmv_ZXorc-KJQ,2604
 mbxai/tools/__init__.py,sha256=QUFaXhDm-UKcuAtT1rbKzhBkvyRBVokcQIOf9cxIuwc,160
 mbxai/tools/client.py,sha256=t7rdITqgCbDXQPFOZhGj6VDDPAwqdilJMKPfCOcJaFo,17279
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.5.22.dist-info/METADATA,sha256=aIlB2mJ22tPjTPwU5CsUYXkr9_R4pe0xCKXfe54KotY,4108
-mbxai-0.5.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.5.22.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.5.22.dist-info/RECORD,,
+mbxai-0.5.24.dist-info/METADATA,sha256=yA2MFVTn6yxrLmoC_XgS8frW9MalTT2XEv2Re5S7Org,4108
+mbxai-0.5.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.5.24.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.5.24.dist-info/RECORD,,