blaxel 0.2.37__tar.gz → 0.2.38__tar.gz

{blaxel-0.2.37 → blaxel-0.2.38}/.github/workflows/test.yaml

@@ -57,12 +57,11 @@ jobs:
           make test
 
   integration-test:
-    name: Integration Tests
+    name: Integration Tests (Core)
     runs-on: ubuntu-latest
     env:
       BL_API_KEY: ${{ secrets.BL_API_KEY }}
       BL_WORKSPACE: ${{ secrets.BL_WORKSPACE }}
-    # Only run if secrets are available (not on forks)
     if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push'
 
     steps:
@@ -77,9 +76,40 @@ jobs:
         run: |
           uv venv
           source .venv/bin/activate
-          make install
+          uv sync --group test --extra telemetry
 
       - name: Run integration tests
         run: |
           source .venv/bin/activate
-          make test-integration
+          make test-integration
+
+  integration-test-framework:
+    name: Integration Tests (${{ matrix.framework }})
+    runs-on: ubuntu-latest
+    env:
+      BL_API_KEY: ${{ secrets.BL_API_KEY }}
+      BL_WORKSPACE: ${{ secrets.BL_WORKSPACE }}
+    if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push'
+    strategy:
+      fail-fast: false
+      matrix:
+        framework: [llamaindex, langgraph, openai, crewai, pydantic, googleadk, livekit]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Install uv"
+        uses: astral-sh/setup-uv@v4
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: |
+          uv venv
+          source .venv/bin/activate
+          uv sync --group test --extra ${{ matrix.framework }}
+
+      - name: Run ${{ matrix.framework }} integration tests
+        run: |
+          source .venv/bin/activate
+          make test-integration-${{ matrix.framework }}

{blaxel-0.2.37 → blaxel-0.2.38}/Makefile

@@ -5,10 +5,7 @@ GIT_COMMIT := $(shell git rev-parse HEAD 2>/dev/null || echo "unknown")
 GIT_COMMIT_SHORT := $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
 
 install:
-	uv sync --all-groups --all-packages --all-extras --group test --group dev
-
-install-groups:
-	uv sync --refresh --force-reinstall --extra telemetry --extra langgraph
+	uv sync --refresh --force-reinstall --group test --group dev
 
 sdk-sandbox:
 	@echo "Downloading sandbox definition from blaxel-ai/sandbox"
@@ -87,8 +84,14 @@ test:
 	uv sync --group test
 	uv run pytest tests/ -v --ignore=tests/integration/ --ignore=tests/sandbox/integration/
 
+FRAMEWORK_DIRS := llamaindex langgraph openai livekit crewai pydantic googleadk
+IGNORE_FRAMEWORK := $(foreach dir,$(FRAMEWORK_DIRS),--ignore=tests/integration/$(dir)/)
+
 test-integration:
-	uv run pytest tests/integration/
+	uv run pytest tests/integration/ $(IGNORE_FRAMEWORK) -s
+
+test-integration-%:
+	uv run --extra $* pytest tests/integration/$*/ -s
 
 install-dev:
 	uv sync --group test

{blaxel-0.2.37 → blaxel-0.2.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blaxel
-Version: 0.2.37
+Version: 0.2.38
 Summary: Blaxel - AI development platform SDK
 Project-URL: Homepage, https://blaxel.ai
 Project-URL: Documentation, https://docs.blaxel.ai
@@ -17,52 +17,11 @@ Requires-Dist: pyjwt>=2.0.0
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: pyyaml>=6.0.0
 Requires-Dist: requests>=2.32.3
-Requires-Dist: tomli>=2.2.1
+Requires-Dist: tomli>=2.0.2
 Requires-Dist: websockets<16.0.0
-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.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'
-Requires-Dist: langchain-deepseek-official>=0.1.0.post1; extra == 'all'
-Requires-Dist: langchain-openai>=0.3.10; extra == 'all'
-Requires-Dist: langchain-xai>=0.2.2; extra == 'all'
-Requires-Dist: langgraph<0.3.0,>=0.2.40; extra == 'all'
-Requires-Dist: litellm==1.74.9; extra == 'all'
-Requires-Dist: litellm>=1.63.11; extra == 'all'
-Requires-Dist: livekit-agents[anthropic,cartesia,deepgram,elevenlabs,groq,openai,silero,turn-detector]~=1.0; extra == 'all'
-Requires-Dist: livekit-plugins-noise-cancellation~=0.2; extra == 'all'
-Requires-Dist: llama-index-llms-anthropic>=0.6.14; extra == 'all'
-Requires-Dist: llama-index-llms-cerebras>=0.2.2; extra == 'all'
-Requires-Dist: llama-index-llms-cohere>=0.4.1; extra == 'all'
-Requires-Dist: llama-index-llms-deepseek>=0.1.1; extra == 'all'
-Requires-Dist: llama-index-llms-google-genai>=0.1.13; extra == 'all'
-Requires-Dist: llama-index-llms-groq>=0.3.1; extra == 'all'
-Requires-Dist: llama-index-llms-mistralai>=0.4.0; extra == 'all'
-Requires-Dist: llama-index-llms-openai>=0.3.42; extra == 'all'
-Requires-Dist: llama-index>=0.12.46; extra == 'all'
-Requires-Dist: openai-agents>=0.0.19; extra == 'all'
-Requires-Dist: openai==1.99.9; extra == 'all'
-Requires-Dist: opentelemetry-exporter-otlp>=1.28.0; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-anthropic==0.41.0; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-cohere==0.41.0; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-crewai==0.41.0; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-fastapi==0.56b0; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-google-generativeai==0.41.0; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-langchain>=0.35.0; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.40.7; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-ollama==0.41.0; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-openai==0.41.0; extra == 'all'
-Requires-Dist: pillow>=10.0.0; extra == 'all'
-Requires-Dist: pydantic-ai>=0.0.48; extra == 'all'
 Provides-Extra: core
 Provides-Extra: crewai
-Requires-Dist: crewai==0.159.0; extra == 'crewai'
-Requires-Dist: litellm==1.74.9; extra == 'crewai'
-Requires-Dist: openai==1.99.9; extra == 'crewai'
+Requires-Dist: crewai[litellm]==1.9.3; extra == 'crewai'
 Requires-Dist: opentelemetry-instrumentation-crewai==0.41.0; extra == 'crewai'
 Provides-Extra: dev
 Requires-Dist: pyright; extra == 'dev'
@@ -96,7 +55,7 @@ Requires-Dist: llama-index-llms-google-genai>=0.1.13; extra == 'llamaindex'
 Requires-Dist: llama-index-llms-groq>=0.3.1; extra == 'llamaindex'
 Requires-Dist: llama-index-llms-mistralai>=0.4.0; extra == 'llamaindex'
 Requires-Dist: llama-index-llms-openai>=0.3.42; extra == 'llamaindex'
-Requires-Dist: llama-index>=0.12.46; extra == 'llamaindex'
+Requires-Dist: llama-index>=0.14.13; extra == 'llamaindex'
 Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.40.7; extra == 'llamaindex'
 Provides-Extra: openai
 Requires-Dist: openai-agents>=0.0.19; extra == 'openai'
@@ -106,7 +65,7 @@ Provides-Extra: telemetry
 Requires-Dist: opentelemetry-exporter-otlp>=1.28.0; extra == 'telemetry'
 Requires-Dist: opentelemetry-instrumentation-anthropic==0.41.0; extra == 'telemetry'
 Requires-Dist: opentelemetry-instrumentation-cohere==0.41.0; extra == 'telemetry'
-Requires-Dist: opentelemetry-instrumentation-fastapi==0.56b0; extra == 'telemetry'
+Requires-Dist: opentelemetry-instrumentation-fastapi==0.55b0; extra == 'telemetry'
 Requires-Dist: opentelemetry-instrumentation-google-generativeai==0.41.0; extra == 'telemetry'
 Requires-Dist: opentelemetry-instrumentation-ollama==0.41.0; extra == 'telemetry'
 Requires-Dist: opentelemetry-instrumentation-openai==0.41.0; extra == 'telemetry'

{blaxel-0.2.37 → blaxel-0.2.38}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blaxel"
-version = "0.2.37"
+version = "0.2.38"
 description = "Blaxel - AI development platform SDK"
 readme = "README.md"
 authors = [{ name = "cploujoux", email = "cploujoux@blaxel.ai" }]
@@ -12,7 +12,7 @@ dependencies = [
   "python-dateutil>=2.8.0",
   "pyyaml>=6.0.0",
   "requests>=2.32.3",
-  "tomli>=2.2.1",
+  "tomli>=2.0.2",
   "websockets<16.0.0",
   "attrs>=21.3.0",
   "httpx>=0.27.0",
@@ -28,7 +28,7 @@ telemetry = [
   "opentelemetry-exporter-otlp>=1.28.0",
   "opentelemetry-instrumentation-anthropic==0.41.0",
   "opentelemetry-instrumentation-cohere==0.41.0",
-  "opentelemetry-instrumentation-fastapi==0.56b0",
+  "opentelemetry-instrumentation-fastapi==0.55b0",
   "opentelemetry-instrumentation-google-generativeai==0.41.0",
   "opentelemetry-instrumentation-ollama==0.41.0",
   "opentelemetry-instrumentation-openai==0.41.0",
@@ -36,9 +36,7 @@ telemetry = [
 
 # CrewAI module
 crewai = [
-  "crewai==0.159.0",
-  "litellm==1.74.9",
-  "openai==1.99.9",
+  "crewai[litellm]==1.9.3",
   "opentelemetry-instrumentation-crewai==0.41.0",
 ]
 
@@ -68,7 +66,7 @@ livekit = [
 
 # LlamaIndex module
 llamaindex = [
-  "llama-index>=0.12.46",
+  "llama-index>=0.14.13",
   "llama-index-llms-anthropic>=0.6.14",
   "llama-index-llms-cerebras>=0.2.2",
   "llama-index-llms-cohere>=0.4.1",
@@ -86,11 +84,6 @@ pydantic = ["pydantic-ai>=0.0.48"]
 # Google ADK module
 googleadk = ["google-adk>=1.4.0", "litellm>=1.63.11"]
 
-# Convenience extras for common combinations
-all = [
-  "blaxel[core,telemetry,crewai,openai,langgraph,livekit,llamaindex,pydantic,googleadk]",
-]
-
 # Development dependencies
 dev = ["ruff", "pyright", "pytest", "uv"]
 
@@ -120,6 +113,21 @@ testpaths = ["tests"]
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "function"
 
+[tool.uv]
+# crewai, llamaindex, and livekit have conflicting transitive dependencies
+# (openai, tokenizers, opentelemetry-sdk) and cannot be installed together.
+conflicts = [
+  [
+    { extra = "crewai" },
+    { extra = "llamaindex" },
+    { extra = "livekit" },
+    { extra = "openai" },
+    { extra = "pydantic" },
+    { extra = "googleadk" },
+    { extra = "langgraph" },
+  ],
+]
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"

{blaxel-0.2.37 → blaxel-0.2.38}/src/blaxel/__init__.py

@@ -4,8 +4,8 @@ from .core.common.autoload import autoload
 from .core.common.env import env
 from .core.common.settings import settings
 
-__version__ = "0.2.37"
-__commit__ = "a09d7ea6c786074ceaa4639ce6415958524a7a5f"
+__version__ = "0.2.38"
+__commit__ = "a95d23798044e6e88b9247801edf94612972b31c"
 __sentry_dsn__ = "https://9711de13cd02b285ca4378c01de8dc30@o4508714045276160.ingest.us.sentry.io/4510461121462272"
 __all__ = ["autoload", "settings", "env"]
 

{blaxel-0.2.37 → blaxel-0.2.38}/src/blaxel/core/tools/__init__.py

@@ -254,6 +254,10 @@ class PersistentMcpClient:
                 await self.client_exit_stack.aclose()
             except Exception as e:
                 logger.debug(f"Error closing client exit stack: {e}")
+            # Create fresh exit stacks so that future initialize() calls
+            # don't reuse stacks tainted by old cancel scopes
+            self.session_exit_stack = AsyncExitStack()
+            self.client_exit_stack = AsyncExitStack()
             logger.debug("WebSocket connection closed due to inactivity.")
 
 

{blaxel-0.2.37 → blaxel-0.2.38}/src/blaxel/core/volume/volume.py

@@ -137,6 +137,8 @@ class VolumeCreateConfiguration:
 
 
 class VolumeInstance:
+    delete: "_AsyncDeleteDescriptor"
+
     def __init__(self, volume: Volume):
         self.volume = volume
 
@@ -275,6 +277,8 @@ class VolumeInstance:
 
 
 class SyncVolumeInstance:
+    delete: "_SyncDeleteDescriptor"
+
     """Synchronous volume instance for managing persistent storage."""
 
     def __init__(self, volume: Volume):

blaxel-0.2.38/src/blaxel/crewai/model.py

@@ -0,0 +1,106 @@
+from logging import getLogger
+
+import httpx
+from crewai import LLM  # type: ignore[import-not-found]
+from crewai.llms.hooks.base import BaseInterceptor  # type: ignore[import-not-found]
+
+from blaxel.core import bl_model as bl_model_core
+from blaxel.core import settings
+
+logger = getLogger(__name__)
+
+
+class AuthInterceptor(BaseInterceptor[httpx.Request, httpx.Response]):
+    """Interceptor that injects dynamic auth headers into every HTTP request.
+
+    Used for crewai native providers (OpenAI, Anthropic, Gemini, etc.)
+    where the LLM.__new__ factory returns a provider-specific instance
+    and subclass overrides are not possible.
+    """
+
+    def on_outbound(self, message: httpx.Request) -> httpx.Request:
+        auth_headers = settings.auth.get_headers()
+        # Remove the SDK's default "Authorization: Bearer replaced" header
+        # when our auth uses a different header (e.g. X-Blaxel-Authorization with API keys)
+        if "Authorization" not in auth_headers:
+            message.headers.pop("Authorization", None)
+            message.headers.pop("authorization", None)
+        for key, value in auth_headers.items():
+            message.headers[key] = value
+        return message
+
+    def on_inbound(self, message: httpx.Response) -> httpx.Response:
+        return message
+
+    async def aon_outbound(self, message: httpx.Request) -> httpx.Request:
+        return self.on_outbound(message)
+
+    async def aon_inbound(self, message: httpx.Response) -> httpx.Response:
+        return message
+
+
+# Provider types that crewai routes to native SDK implementations.
+# These support the interceptor mechanism for auth.
+_NATIVE_PROVIDER_PREFIXES = {"openai", "anthropic", "gemini", "azure", "bedrock"}
+
+
+def _is_native_route(provider_prefix: str) -> bool:
+    """Check if a provider prefix will be routed to a native SDK by crewai."""
+    return provider_prefix.lower() in _NATIVE_PROVIDER_PREFIXES
+
+
+async def bl_model(name: str, **kwargs):
+    url, type, model = await bl_model_core(name).get_parameters()
+
+    # Map blaxel model types to crewai provider prefixes and base URLs
+    if type == "mistral":
+        provider_prefix = "mistral"
+        base_url = f"{url}/v1"
+    elif type == "xai":
+        provider_prefix = "groq"
+        base_url = f"{url}/v1"
+    elif type == "deepseek":
+        provider_prefix = "openai"
+        base_url = f"{url}/v1"
+    elif type == "anthropic":
+        provider_prefix = "anthropic"
+        base_url = url
+    elif type == "gemini":
+        provider_prefix = "gemini"
+        base_url = f"{url}/v1beta/models/{model}"
+    elif type == "cerebras":
+        provider_prefix = "cerebras"
+        base_url = f"{url}/v1"
+    else:
+        if type != "openai":
+            logger.warning(f"Model {model} is not supported by CrewAI, defaulting to OpenAI")
+        provider_prefix = "openai"
+        base_url = f"{url}/v1"
+
+    model_string = f"{provider_prefix}/{model}"
+    auth_headers = settings.auth.get_headers()
+
+    if _is_native_route(provider_prefix):
+        # Native providers: use interceptor for dynamic auth headers.
+        # Always pass api_key="replaced" because crewai's native providers
+        # require a non-None api_key. The AuthInterceptor handles stripping
+        # the dummy Authorization header and injecting the real auth.
+        return LLM(
+            model=model_string,
+            api_key="replaced",
+            base_url=base_url,
+            interceptor=AuthInterceptor(),
+            **kwargs,
+        )
+    else:
+        # LiteLLM fallback: pass auth headers via extra_headers param.
+        # Omit api_key when auth uses X-Blaxel-Authorization to prevent
+        # litellm from adding "Authorization: Bearer replaced".
+        llm_api_key = "replaced" if "Authorization" in auth_headers else None
+        return LLM(
+            model=model_string,
+            api_key=llm_api_key,
+            base_url=base_url,
+            extra_headers=auth_headers,
+            **kwargs,
+        )

blaxel-0.2.38/src/blaxel/crewai/tools.py

@@ -0,0 +1,109 @@
+from typing import Any
+
+from crewai.tools import BaseTool
+from pydantic import BaseModel
+
+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 strict mode.
+
+    Recursively resolves anyOf patterns, ensures all schemas have type keys,
+    removes additionalProperties and $schema, and ensures object types have
+    properties and required fields.
+    """
+    if not isinstance(schema, dict):
+        return schema
+
+    cleaned = schema.copy()
+
+    # Remove unsupported keys
+    cleaned.pop("$schema", None)
+    cleaned.pop("additionalProperties", None)
+
+    # Resolve anyOf: pick the non-null type
+    if "anyOf" in cleaned:
+        any_of = cleaned.pop("anyOf")
+        non_null = [s for s in any_of if s.get("type") != "null"]
+        if non_null:
+            # Merge the first non-null variant into current schema
+            resolved = _clean_schema_for_openai(non_null[0])
+            cleaned.update(resolved)
+        else:
+            cleaned["type"] = "string"
+
+    # Ensure type exists
+    if "type" not in cleaned and "properties" in cleaned:
+        cleaned["type"] = "object"
+
+    # Handle object types
+    if cleaned.get("type") == "object":
+        if "properties" not in cleaned:
+            cleaned["properties"] = {}
+        if "required" not in cleaned:
+            cleaned["required"] = list(cleaned["properties"].keys())
+
+    # Recursively clean properties
+    if "properties" in cleaned:
+        cleaned["properties"] = {
+            k: _clean_schema_for_openai(v) for k, v in cleaned["properties"].items()
+        }
+
+    # Recursively clean array items
+    if "items" in cleaned:
+        cleaned["items"] = _clean_schema_for_openai(cleaned["items"])
+        # Ensure items has a type
+        if "type" not in cleaned["items"]:
+            cleaned["items"]["type"] = "string"
+
+    return cleaned
+
+
+def _make_clean_args_schema(tool: Tool) -> type[BaseModel]:
+    """Create a Pydantic model whose JSON schema returns the pre-cleaned schema.
+
+    CrewAI calls model_json_schema() on args_schema to build the OpenAI tool
+    parameters. By overriding model_json_schema we ensure the cleaned schema
+    is used directly, avoiding issues with Pydantic re-introducing anyOf or
+    dropping type keys on array items.
+    """
+    clean = _clean_schema_for_openai(tool.input_schema)
+
+    class CleanArgsSchema(BaseModel):
+        @classmethod
+        def model_json_schema(cls, *args: Any, **kwargs: Any) -> dict[str, Any]:
+            return clean
+
+    CleanArgsSchema.__name__ = f"{tool.name}Schema"
+    CleanArgsSchema.__qualname__ = f"{tool.name}Schema"
+    return CleanArgsSchema
+
+
+class CrewAITool(BaseTool):
+    _tool: Tool
+
+    def __init__(self, tool: Tool):
+        super().__init__(
+            name=tool.name,
+            description=tool.description,
+            args_schema=_make_clean_args_schema(tool),
+        )
+        self._tool = tool
+
+    def _run(self, *args, **kwargs):
+        if not self._tool.sync_coroutine:
+            raise ValueError(f"Tool {self._tool.name} does not have a sync_coroutine defined")
+        return self._tool.sync_coroutine(**kwargs)
+
+    async def _arun(self, *args, **kwargs):
+        if not self._tool.coroutine:
+            raise ValueError(f"Tool {self._tool.name} does not have a coroutine defined")
+        return await self._tool.coroutine(**kwargs)
+
+
+async def bl_tools(tools_names: list[str], **kwargs) -> list[BaseTool]:
+    tools = bl_tools_core(tools_names, **kwargs)
+    await tools.initialize()
+    return [CrewAITool(tool) for tool in tools.get_tools()]

{blaxel-0.2.37 → blaxel-0.2.38}/src/blaxel/googleadk/model.py

@@ -1,6 +1,9 @@
 from logging import getLogger
 
-from google.adk.models.lite_llm import LiteLlm, LiteLLMClient
+from google.adk.models.lite_llm import (  # type: ignore[import-not-found]
+    LiteLlm,
+    LiteLLMClient,
+)
 
 from blaxel.core import bl_model as bl_model_core
 from blaxel.core import settings
@@ -23,7 +26,15 @@ class AuthenticatedLiteLLMClient(LiteLLMClient):
         Returns:
           The model response as a message.
         """
-        kwargs["extra_headers"] = settings.auth.get_headers()
+        auth_headers = settings.auth.get_headers()
+        extra = dict(auth_headers)
+        # When auth uses X-Blaxel-Authorization (API keys), override the
+        # Authorization header that litellm sets from api_key or OPENAI_API_KEY
+        # env var. Without this, the server sees an invalid Authorization header
+        # and rejects the request.
+        if "Authorization" not in auth_headers:
+            extra["Authorization"] = ""
+        kwargs["extra_headers"] = extra
         return await super().acompletion(
             model=model,
             messages=messages,
@@ -44,7 +55,15 @@ class AuthenticatedLiteLLMClient(LiteLLMClient):
         Returns:
           The response from the model.
         """
-        kwargs["extra_headers"] = settings.auth.get_headers()
+        auth_headers = settings.auth.get_headers()
+        extra = dict(auth_headers)
+        # When auth uses X-Blaxel-Authorization (API keys), override the
+        # Authorization header that litellm sets from api_key or OPENAI_API_KEY
+        # env var. Without this, the server sees an invalid Authorization header
+        # and rejects the request.
+        if "Authorization" not in auth_headers:
+            extra["Authorization"] = ""
+        kwargs["extra_headers"] = extra
         return super().completion(
             model=model,
             messages=messages,

{blaxel-0.2.37 → blaxel-0.2.38}/src/blaxel/googleadk/tools.py

@@ -1,8 +1,8 @@
 import inspect
-from typing import Any, override
+from typing import Any
 
-from google.adk.tools import BaseTool, ToolContext
-from google.genai import types
+from google.adk.tools import BaseTool, ToolContext  # type: ignore[import-not-found]
+from google.genai import types  # type: ignore[import-not-found]
 
 from blaxel.core.tools import bl_tools as bl_tools_core
 from blaxel.core.tools.types import Tool
@@ -31,15 +31,33 @@ class GoogleADKTool(BaseTool):
         if "additionalProperties" in cleaned_schema:
             del cleaned_schema["additionalProperties"]
 
+        # Google genai Schema expects type as a single enum string (e.g. "STRING"),
+        # not a JSON Schema union list like ["null", "string"].
+        if "type" in cleaned_schema and isinstance(cleaned_schema["type"], list):
+            type_list = [t for t in cleaned_schema["type"] if t != "null"]
+            cleaned_schema["type"] = type_list[0].upper() if type_list else "STRING"
+            # Mark as nullable if "null" was in the original list
+            if "null" in schema["type"]:
+                cleaned_schema["nullable"] = True
+        elif "type" in cleaned_schema and isinstance(cleaned_schema["type"], str):
+            cleaned_schema["type"] = cleaned_schema["type"].upper()
+
+        # Ensure object types have properties
+        if cleaned_schema.get("type") == "OBJECT" and "properties" not in cleaned_schema:
+            cleaned_schema["properties"] = {}
+
         # Recursively clean properties if they exist
         if "properties" in cleaned_schema:
             cleaned_schema["properties"] = {
                 k: self._clean_schema(v) for k, v in cleaned_schema["properties"].items()
             }
 
+        # Recursively clean items for array types
+        if "items" in cleaned_schema and isinstance(cleaned_schema["items"], dict):
+            cleaned_schema["items"] = self._clean_schema(cleaned_schema["items"])
+
         return cleaned_schema
 
-    @override
     def _get_declaration(self) -> types.FunctionDeclaration | None:
         # Clean the schema recursively
         schema = self._clean_schema(self._tool.input_schema)
@@ -48,14 +66,15 @@ class GoogleADKTool(BaseTool):
             types.FunctionDeclaration(
                 name=self._tool.name,
                 description=self._tool.description,
-                parameters=schema,
+                parameters=types.Schema(**schema),
             )
         )
 
         return function_decl
 
-    @override
     async def run_async(self, *, args: dict[str, Any], tool_context: ToolContext) -> Any:
+        if not self._tool.coroutine:
+            raise ValueError(f"Tool {self._tool.name} does not have a coroutine defined")
         args_to_call = args.copy()
         signature = inspect.signature(self._tool.coroutine)
         if "tool_context" in signature.parameters:

{blaxel-0.2.37 → blaxel-0.2.38}/src/blaxel/langgraph/custom/gemini.py

@@ -23,16 +23,18 @@ from typing import (
 
 import httpx
 import requests
-from langchain_core.callbacks.manager import (
+from langchain_core.callbacks.manager import (  # type: ignore[import-not-found]
     AsyncCallbackManagerForLLMRun,
     CallbackManagerForLLMRun,
 )
-from langchain_core.language_models import LanguageModelInput
-from langchain_core.language_models.chat_models import (
+from langchain_core.language_models import (  # type: ignore[import-not-found]
+    LanguageModelInput,
+)
+from langchain_core.language_models.chat_models import (  # type: ignore[import-not-found]
     BaseChatModel,
     LangSmithParams,
 )
-from langchain_core.messages import (
+from langchain_core.messages import (  # type: ignore[import-not-found]
     AIMessage,
     AIMessageChunk,
     BaseMessage,
@@ -41,25 +43,30 @@ from langchain_core.messages import (
     SystemMessage,
     ToolMessage,
 )
-from langchain_core.messages.ai import UsageMetadata
-from langchain_core.messages.tool import (
+from langchain_core.messages.ai import UsageMetadata  # type: ignore[import-not-found]
+from langchain_core.messages.tool import (  # type: ignore[import-not-found]
     invalid_tool_call,
     tool_call,
     tool_call_chunk,
 )
-from langchain_core.output_parsers.openai_tools import (
+from langchain_core.output_parsers.openai_tools import (  # type: ignore[import-not-found]
     JsonOutputKeyToolsParser,
     PydanticToolsParser,
     parse_tool_calls,
 )
-from langchain_core.outputs import (
+from langchain_core.outputs import (  # type: ignore[import-not-found]
     ChatGeneration,
     ChatGenerationChunk,
     ChatResult,
 )
-from langchain_core.runnables import Runnable, RunnablePassthrough
-from langchain_core.tools import BaseTool
-from langchain_core.utils.function_calling import convert_to_openai_tool
+from langchain_core.runnables import (  # type: ignore[import-not-found]
+    Runnable,
+    RunnablePassthrough,
+)
+from langchain_core.tools import BaseTool  # type: ignore[import-not-found]
+from langchain_core.utils.function_calling import (  # type: ignore[import-not-found]
+    convert_to_openai_tool,
+)
 from PIL import Image
 from pydantic import BaseModel, ConfigDict, Field, SecretStr, model_validator
 from tenacity import (
@@ -1467,4 +1474,4 @@ def image_bytes_to_b64_string(image_bytes: bytes, image_format: str = "jpeg") ->
     """Convert image bytes to base64 string."""
     import base64
 
-    return f"data:image/{image_format};base64,{base64.b64encode(image_bytes).decode('utf-8')}"
+    return f"data:image/{image_format};base64,{base64.b64encode(image_bytes).decode('utf-8')}"