blaxel 0.2.34__py3-none-any.whl → 0.2.35__py3-none-any.whl

blaxel/core/volume/volume.py

@@ -11,9 +11,19 @@ from ..client.api.volumes.list_volumes import asyncio as list_volumes
 from ..client.api.volumes.list_volumes import sync as list_volumes_sync
 from ..client.client import client
 from ..client.models import Metadata, Volume, VolumeSpec
+from ..client.models.error import Error
 from ..client.types import UNSET
 
 
+class VolumeAPIError(Exception):
+    """Exception raised when volume API returns an error."""
+
+    def __init__(self, message: str, status_code: int | None = None, code: str | None = None):
+        super().__init__(message)
+        self.status_code = status_code
+        self.code = code
+
+
 class _AsyncDeleteDescriptor:
     """Descriptor that provides both class-level and instance-level delete functionality."""
 
@@ -171,11 +181,19 @@ class VolumeInstance:
             volume.spec.size = default_size
 
         response = await create_volume(client=client, body=volume)
+        if isinstance(response, Error):
+            status_code = int(response.code) if response.code is not UNSET else None
+            message = response.message if response.message is not UNSET else response.error
+            raise VolumeAPIError(message, status_code=status_code, code=response.error)
         return cls(response)
 
     @classmethod
     async def get(cls, volume_name: str) -> "VolumeInstance":
         response = await get_volume(volume_name=volume_name, client=client)
+        if isinstance(response, Error):
+            status_code = int(response.code) if response.code is not UNSET else None
+            message = response.message if response.message is not UNSET else response.error
+            raise VolumeAPIError(message, status_code=status_code, code=response.error)
         return cls(response)
 
     @classmethod
@@ -190,11 +208,9 @@ class VolumeInstance:
         """Create a volume if it doesn't exist, otherwise return existing."""
         try:
             return await cls.create(config)
-        except Exception as e:
+        except VolumeAPIError as e:
             # Check if it's a 409 conflict error (volume already exists)
-            if (hasattr(e, "status_code") and e.status_code == 409) or (
-                hasattr(e, "code") and e.code in [409, "VOLUME_ALREADY_EXISTS"]
-            ):
+            if e.status_code == 409 or e.code in ["409", "VOLUME_ALREADY_EXISTS"]:
                 # Extract name from different configuration types
                 if isinstance(config, VolumeCreateConfiguration):
                     name = config.name
@@ -210,7 +226,7 @@ class VolumeInstance:
 
                 volume_instance = await cls.get(name)
                 return volume_instance
-            raise e
+            raise
 
 
 class SyncVolumeInstance:
@@ -306,12 +322,20 @@ class SyncVolumeInstance:
             volume.spec.size = default_size
 
         response = create_volume_sync(client=client, body=volume)
+        if isinstance(response, Error):
+            status_code = int(response.code) if response.code is not UNSET else None
+            message = response.message if response.message is not UNSET else response.error
+            raise VolumeAPIError(message, status_code=status_code, code=response.error)
         return cls(response)
 
     @classmethod
     def get(cls, volume_name: str) -> "SyncVolumeInstance":
         """Get a volume by name synchronously."""
         response = get_volume_sync(volume_name=volume_name, client=client)
+        if isinstance(response, Error):
+            status_code = int(response.code) if response.code is not UNSET else None
+            message = response.message if response.message is not UNSET else response.error
+            raise VolumeAPIError(message, status_code=status_code, code=response.error)
         return cls(response)
 
     @classmethod
@@ -327,11 +351,9 @@ class SyncVolumeInstance:
         """Create a volume if it doesn't exist, otherwise return existing."""
         try:
             return cls.create(config)
-        except Exception as e:
+        except VolumeAPIError as e:
             # Check if it's a 409 conflict error (volume already exists)
-            if (hasattr(e, "status_code") and e.status_code == 409) or (
-                hasattr(e, "code") and e.code in [409, "VOLUME_ALREADY_EXISTS"]
-            ):
+            if e.status_code == 409 or e.code in ["409", "VOLUME_ALREADY_EXISTS"]:
                 # Extract name from different configuration types
                 if isinstance(config, VolumeCreateConfiguration):
                     name = config.name
@@ -347,7 +369,7 @@ class SyncVolumeInstance:
 
                 volume_instance = cls.get(name)
                 return volume_instance
-            raise e
+            raise
 
 
 async def _delete_volume_by_name(volume_name: str) -> Volume:

blaxel/langgraph/tools.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Dict
 
 from langchain_core.tools import StructuredTool
 from mcp.types import (
@@ -14,6 +14,35 @@ from blaxel.core.tools.types import Tool, ToolException
 NonTextContent = ImageContent | EmbeddedResource
 
 
+def _clean_schema_for_openai(schema: Dict[str, Any]) -> Dict[str, Any]:
+    """Clean JSON schema to be compatible with OpenAI function calling.
+
+    OpenAI requires object schemas to have a 'properties' field, even if empty.
+    This function ensures the schema is properly formatted.
+    """
+    if not isinstance(schema, dict):
+        return schema
+
+    cleaned = schema.copy()
+
+    # Ensure object type schemas have properties
+    if cleaned.get("type") == "object":
+        if "properties" not in cleaned:
+            cleaned["properties"] = {}
+        if "required" not in cleaned:
+            cleaned["required"] = []
+
+    # Recursively clean nested schemas
+    if "properties" in cleaned:
+        cleaned["properties"] = {
+            k: _clean_schema_for_openai(v) for k, v in cleaned["properties"].items()
+        }
+    if "items" in cleaned and isinstance(cleaned["items"], dict):
+        cleaned["items"] = _clean_schema_for_openai(cleaned["items"])
+
+    return cleaned
+
+
 def get_langchain_tool(tool: Tool) -> StructuredTool:
     async def langchain_coroutine(
         **arguments: dict[str, Any],
@@ -36,10 +65,13 @@ def get_langchain_tool(tool: Tool) -> StructuredTool:
 
         return tool_content, non_text_contents or None
 
+    # Clean the schema to ensure OpenAI compatibility
+    cleaned_schema = _clean_schema_for_openai(tool.input_schema)
+
     return StructuredTool(
         name=tool.name,
         description=tool.description,
-        args_schema=tool.input_schema,
+        args_schema=cleaned_schema,
         coroutine=langchain_coroutine,
         sync_coroutine=tool.sync_coroutine,
     )

blaxel/openai/tools.py

@@ -7,6 +7,36 @@ from blaxel.core.tools import bl_tools as bl_tools_core
 from blaxel.core.tools.types import Tool
 
 
+def _clean_schema_for_openai(schema: dict) -> dict:
+    """Clean JSON schema to be compatible with OpenAI agents SDK.
+
+    OpenAI agents SDK doesn't allow additionalProperties on object types.
+    This function recursively removes additionalProperties and $schema fields.
+    """
+    if not isinstance(schema, dict):
+        return schema
+
+    cleaned_schema = schema.copy()
+
+    # Remove $schema and additionalProperties at current level
+    if "$schema" in cleaned_schema:
+        del cleaned_schema["$schema"]
+    if "additionalProperties" in cleaned_schema:
+        del cleaned_schema["additionalProperties"]
+
+    # Recursively clean properties if they exist
+    if "properties" in cleaned_schema:
+        cleaned_schema["properties"] = {
+            k: _clean_schema_for_openai(v) for k, v in cleaned_schema["properties"].items()
+        }
+
+    # Recursively clean items for array types
+    if "items" in cleaned_schema:
+        cleaned_schema["items"] = _clean_schema_for_openai(cleaned_schema["items"])
+
+    return cleaned_schema
+
+
 def get_openai_tool(tool: Tool) -> FunctionTool:
     async def openai_coroutine(
         _: RunContextWrapper,
@@ -15,10 +45,12 @@ def get_openai_tool(tool: Tool) -> FunctionTool:
         result = await tool.coroutine(**json.loads(arguments))
         return result
 
+    cleaned_schema = _clean_schema_for_openai(tool.input_schema)
+
     return FunctionTool(
         name=tool.name,
         description=tool.description,
-        params_json_schema=tool.input_schema,
+        params_json_schema=cleaned_schema,
         on_invoke_tool=openai_coroutine,
     )
 

{blaxel-0.2.34.dist-info → blaxel-0.2.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blaxel
-Version: 0.2.34
+Version: 0.2.35
 Summary: Blaxel - AI development platform SDK
 Project-URL: Homepage, https://blaxel.ai
 Project-URL: Documentation, https://docs.blaxel.ai
@@ -23,7 +23,7 @@ Provides-Extra: all
 Requires-Dist: crewai==0.159.0; extra == 'all'
 Requires-Dist: google-adk>=1.4.0; extra == 'all'
 Requires-Dist: langchain-anthropic>=0.3.10; extra == 'all'
-Requires-Dist: langchain-cerebras>=0.5.0; extra == 'all'
+Requires-Dist: langchain-cerebras<0.6.0,>=0.5.0; extra == 'all'
 Requires-Dist: langchain-cohere>=0.4.3; extra == 'all'
 Requires-Dist: langchain-community<0.4.0,>=0.3.3; extra == 'all'
 Requires-Dist: langchain-core<0.4.0,>=0.3.13; extra == 'all'
@@ -74,7 +74,7 @@ Requires-Dist: google-adk>=1.4.0; extra == 'googleadk'
 Requires-Dist: litellm>=1.63.11; extra == 'googleadk'
 Provides-Extra: langgraph
 Requires-Dist: langchain-anthropic>=0.3.10; extra == 'langgraph'
-Requires-Dist: langchain-cerebras>=0.5.0; extra == 'langgraph'
+Requires-Dist: langchain-cerebras<0.6.0,>=0.5.0; extra == 'langgraph'
 Requires-Dist: langchain-cohere>=0.4.3; extra == 'langgraph'
 Requires-Dist: langchain-community<0.4.0,>=0.3.3; extra == 'langgraph'
 Requires-Dist: langchain-core<0.4.0,>=0.3.13; extra == 'langgraph'