blaxel 0.1.20rc67__tar.gz → 0.1.21rc69__tar.gz

{blaxel-0.1.20rc67 → blaxel-0.1.21rc69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blaxel
-Version: 0.1.20rc67
+Version: 0.1.21rc69
 Summary: Add your description here
 Project-URL: Homepage, https://blaxel.ai
 Project-URL: Documentation, https://docs.blaxel.ai

{blaxel-0.1.20rc67 → blaxel-0.1.21rc69}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blaxel"
-version = "0.1.20.pre-67"
+version = "0.1.21.pre-69"
 description = "Add your description here"
 readme = "README.md"
 authors = [{ name = "cploujoux", email = "cploujoux@blaxel.ai" }]

{blaxel-0.1.20rc67 → blaxel-0.1.21rc69}/src/blaxel/agents/__init__.py

@@ -6,8 +6,7 @@ from ..cache import find_from_cache
 from ..client import client
 from ..client.api.agents import get_agent
 from ..client.models import Agent
-from ..common.env import env
-from ..common.internal import get_global_unique_hash
+from ..common.internal import get_global_unique_hash, get_forced_url
 from ..common.settings import settings
 from ..instrumentation.span import SpanManager
 
@@ -26,10 +25,7 @@ class BlAgent:
     @property
     def forced_url(self):
         """Get the forced URL from environment variables if set."""
-        env_var = self.name.replace("-", "_").upper()
-        if env[f"BL_AGENT_{env_var}_URL"]:
-            return env[f"BL_AGENT_{env_var}_URL"]
-        return None
+        return get_forced_url("agent", self.name)
 
     @property
     def external_url(self):

{blaxel-0.1.20rc67 → blaxel-0.1.21rc69}/src/blaxel/common/internal.py

@@ -2,6 +2,7 @@ import hashlib
 import os
 from logging import getLogger
 from typing import Optional
+from .env import env
 
 logger = getLogger(__name__)
 
@@ -75,3 +76,70 @@ class Agent:
         env_var = self.agent_name.replace("-", "_").upper()
         env_key = f"BL_AGENT_{env_var}_URL"
         return os.environ.get(env_key)
+
+def pluralize(type_str: str) -> str:
+    """
+    Convert a string to its plural form following English pluralization rules.
+    
+    Args:
+        type_str: The input string to pluralize
+        
+    Returns:
+        The pluralized form of the input string
+    """
+    word = type_str.lower()
+
+    # Words ending in s, ss, sh, ch, x, z - add 'es'
+    if (word.endswith('s') or word.endswith('ss') or word.endswith('sh') or
+        word.endswith('ch') or word.endswith('x') or word.endswith('z')):
+        return type_str + 'es'
+
+    # Words ending in consonant + y - change y to ies
+    if word.endswith('y') and len(word) > 1:
+        before_y = word[-2]
+        if before_y not in 'aeiou':
+            return type_str[:-1] + 'ies'
+
+    # Words ending in f or fe - change to ves
+    if word.endswith('f'):
+        return type_str[:-1] + 'ves'
+    if word.endswith('fe'):
+        return type_str[:-2] + 'ves'
+
+    # Words ending in consonant + o - add 'es'
+    if word.endswith('o') and len(word) > 1:
+        before_o = word[-2]
+        if before_o not in 'aeiou':
+            return type_str + 'es'
+
+    # Default case - just add 's'
+    return type_str + 's'
+
+
+def get_forced_url(type_str: str, name: str) -> Optional[str]:
+    """
+    Check for forced URLs in environment variables using both plural and singular forms.
+    
+    Args:
+        type_str: The type identifier
+        name: The name identifier
+        
+    Returns:
+        The forced URL if found in environment variables, None otherwise
+    """
+    plural_type = pluralize(type_str)
+    env_var = name.replace("-", "_").upper()
+    
+    # BL_FUNCTIONS_NAME_URL (plural form)
+    plural_env_key = f"BL_{plural_type.upper()}_{env_var}_URL"
+    if env[plural_env_key] is not None:
+        return env[plural_env_key]
+    
+    # BL_FUNCTION_NAME_URL (singular form)
+    singular_env_key = f"BL_{type_str.upper()}_{env_var}_URL"
+    if env[singular_env_key] is not None:
+        return env[singular_env_key]
+    
+    return None
+
+

{blaxel-0.1.20rc67 → blaxel-0.1.21rc69}/src/blaxel/jobs/__init__.py

@@ -8,8 +8,7 @@ from typing import Any, Awaitable, Callable, Dict
 import requests
 
 from ..client import client
-from ..common.env import env
-from ..common.internal import get_global_unique_hash
+from ..common.internal import get_global_unique_hash, get_forced_url
 from ..common.settings import settings
 from ..instrumentation.span import SpanManager
 
@@ -77,10 +76,7 @@ class BlJob:
     @property
     def forced_url(self):
         """Get the forced URL from environment variables if set."""
-        env_var = self.name.replace("-", "_").upper()
-        if env[f"BL_JOB_{env_var}_URL"]:
-            return env[f"BL_JOB_{env_var}_URL"]
-        return None
+        return get_forced_url("job", self.name)
 
     @property
     def external_url(self):

{blaxel-0.1.20rc67 → blaxel-0.1.21rc69}/src/blaxel/sandbox/base.py

@@ -3,7 +3,7 @@ import os
 from httpx import Response
 
 from ..client.models import Sandbox
-from ..common.internal import get_global_unique_hash
+from ..common.internal import get_global_unique_hash, get_forced_url
 from ..common.settings import settings
 from .client.client import client
 from .client.models import ErrorResponse
@@ -50,9 +50,7 @@ class SandboxHandleBase:
 
     @property
     def forced_url(self):
-        env_var = self.name.replace("-", "_").upper()
-        env_name = f"BL_SANDBOX_{env_var}_URL"
-        return os.environ.get(env_name)
+        return get_forced_url("sandbox", self.name)
 
     @property
     def url(self):

{blaxel-0.1.20rc67 → blaxel-0.1.21rc69}/src/blaxel/tools/__init__.py

@@ -10,8 +10,7 @@ from mcp import ClientSession
 from mcp.types import CallToolResult
 from mcp.types import Tool as MCPTool
 
-from ..common.env import env
-from ..common.internal import get_global_unique_hash
+from ..common.internal import get_global_unique_hash, get_forced_url
 from ..common.settings import settings
 from ..instrumentation.span import SpanManager
 from ..mcp.client import websocket_client
@@ -43,18 +42,25 @@ class PersistentWebSocket:
         return self
 
     async def call_tool(self, tool_name: str, arguments: dict[str, Any]) -> CallToolResult:
-        await self._initialize()
-        if self.timeout_enabled:
-            self._remove_timer()
-        logger.debug(f"Calling tool {tool_name} with arguments {arguments}")
-        arguments.update(self.metas)
-        call_tool_result = await self.session.call_tool(tool_name, arguments)
-        logger.debug(f"Tool {tool_name} returned {call_tool_result}")
-        if self.timeout_enabled:
-            self._reset_timer()
-        else:
-            await self._close()
-        return call_tool_result
+        try:
+            await self._initialize()
+            if self.timeout_enabled:
+                self._remove_timer()
+            logger.debug(f"Calling tool {tool_name} with arguments {arguments}")
+            arguments.update(self.metas)
+            call_tool_result = await self.session.call_tool(tool_name, arguments)
+            logger.debug(f"Tool {tool_name} returned {call_tool_result}")
+            if self.timeout_enabled:
+                self._reset_timer()
+            else:
+                await self._close()
+            return call_tool_result
+        except Exception as e:
+            logger.error(f"Error calling tool {tool_name}: {e}\n{traceback.format_exc()}")
+            return CallToolResult(
+                content=[{"type": "text", "text": f"Error calling tool {tool_name}: {e}\n{traceback.format_exc()}"}],
+                isError=True,
+            )
 
     async def list_tools(self):
         logger.debug(f"Listing tools for {self.name}")
@@ -190,10 +196,7 @@ class BlTools:
 
     def _forced_url(self, name: str):
         """Get the forced URL from environment variables if set."""
-        env_var = name.replace("-", "_").upper()
-        if env[f"BL_FUNCTION_{env_var}_URL"]:
-            return env[f"BL_FUNCTION_{env_var}_URL"]
-        return None
+        return get_forced_url("function", name)
 
     def _external_url(self, name: str):
         return f"{settings.run_url}/{settings.workspace}/functions/{name}"