blaxel 0.1.20rc67__py3-none-any.whl → 0.1.21rc69__py3-none-any.whl

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/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/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/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/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}"

{blaxel-0.1.20rc67.dist-info → blaxel-0.1.21rc69.dist-info}/METADATA

@@ -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.dist-info → blaxel-0.1.21rc69.dist-info}/RECORD

@@ -1,5 +1,5 @@
 blaxel/__init__.py,sha256=qmuJKjl5oGnjj4TbqHcJqUkKoxk4PvCsMb6-8rp67pE,159
-blaxel/agents/__init__.py,sha256=RDWkvfICIXXaQxJuuSu63jsFj_F8NBAL4U752hfN4AE,5262
+blaxel/agents/__init__.py,sha256=zvhjkFOUD3Rz4TAs_IC_TC2ElHgASPpZPW9HS0NrTQc,5132
 blaxel/authentication/__init__.py,sha256=tL9XKNCek5ixszTqjlKRBvidXMg4Nj6ODlBKlxxA9uk,3283
 blaxel/authentication/apikey.py,sha256=nOgLVba7EfVk3V-qm7cj-30LAL-BT7NOMIlGL9Ni1jY,1249
 blaxel/authentication/clientcredentials.py,sha256=BZTg2cYmTe9hhWpHrkoVEoRe-ku8VY5RsxbyYpA7mdc,3879
@@ -284,7 +284,7 @@ blaxel/client/models/workspace_runtime.py,sha256=dxEpmwCFPOCRKHRKhY-iW7j6TbtL5qU
 blaxel/client/models/workspace_user.py,sha256=70CcifQWYbeWG7TDui4pblTzUe5sVK0AS19vNCzKE8g,3423
 blaxel/common/autoload.py,sha256=NFuK71-IHOY2JQyEBSjDCVfUaQ8D8PJsEUEryIdG4AU,263
 blaxel/common/env.py,sha256=wTbzPDdNgz4HMJiS2NCZmQlN0qpxy1PQEYBaZgtvhoc,1247
-blaxel/common/internal.py,sha256=6lZENUQrh3bvpMIPLaie6-g2upiNzf21QG-dQ0hGJWU,2371
+blaxel/common/internal.py,sha256=Koy2p0XLgn8BKm2stxZ3E-zY-3236vgWPiiDrAXh6Mo,4387
 blaxel/common/logger.py,sha256=TNuWqwFDU87TwPDHLLDTluwgEyw2axj-d0kPOkN5J8M,4489
 blaxel/common/settings.py,sha256=7KTryuBdud0IfHqykX7xEEtpgq5M5h1Z8YEzYKsHB-Q,2327
 blaxel/instrumentation/exporters.py,sha256=EoX3uaBVku1Rg49pSNXKFyHhgY5OV3Ih6UlqgjF5epw,1670
@@ -292,7 +292,7 @@ blaxel/instrumentation/log.py,sha256=RvQByRjZMoP_dRaAZu8oK6DTegsHs-xV4W-UIqis6CA
 blaxel/instrumentation/manager.py,sha256=odiz9ew5eB3LnuG-pqU27Vf05V5ifjSbikZuLMZAj50,8974
 blaxel/instrumentation/map.py,sha256=zZoiUiQHmik5WQZ4VCWNARSa6ppMi0r7D6hlb41N-Mg,1589
 blaxel/instrumentation/span.py,sha256=X2lwfu_dyxwQTMQJT2vbXOrbVSChEhjRLc413QOxQJM,3244
-blaxel/jobs/__init__.py,sha256=poA8uVN-3H_nKexavjKIC5WkLHXo_4m6KYwGqcX_yGo,6473
+blaxel/jobs/__init__.py,sha256=J7D2qNUWAn41C6vuCUYw2UFcH2QaOqL99d4QS-NGX9k,6345
 blaxel/mcp/__init__.py,sha256=KednMrtuc4Y0O3lv7u1Lla54FCk8UX9c1k0USjL3Ahk,69
 blaxel/mcp/client.py,sha256=cFFXfpKXoMu8qTUly2ejF0pX2iBQkSNAxqwvDV1V6xY,4979
 blaxel/mcp/server.py,sha256=GIldtA_NgIc2dzd7ZpPvpbhpIt_7AfKu5yS_YJ0bDGg,7310
@@ -307,7 +307,7 @@ blaxel/models/pydantic.py,sha256=4_z2KtaeEiRMt_Zz6Ghy6il-QiaXzE3yizDJnCBcWO8,332
 blaxel/models/custom/langchain/gemini.py,sha256=AkhpuVMXnh1CyJ0zR2NMTtxQFPPHtAdHf_cyNzV3EsA,55421
 blaxel/models/custom/llamaindex/cohere.py,sha256=Igj5Y1ozf1V4feIXfBHDdaTFU7od_wuOhm0yChZNxMY,19109
 blaxel/models/custom/pydantic/gemini.py,sha256=rbsunh-M7EEKlD5ir3GlA-8a12JzPFcvsf6NISjzE5I,1052
-blaxel/sandbox/base.py,sha256=J5rd2uJ8N9vrti97EU4D21TaEzP7Jyfwf7s0248XIZw,2285
+blaxel/sandbox/base.py,sha256=rc05uTkb8k0ymJK0l6wX9NZUNg6tahyXRJjXPXvBVbo,2212
 blaxel/sandbox/filesystem.py,sha256=3dvg92owjHypv0aFmBdx6i9QfMSfp6z9Z0D93yKfeiQ,4653
 blaxel/sandbox/preview.py,sha256=2L9JVfyvD7-65YXqLlvj3rOjq3p-Q-ich9gVAjMbDPs,4893
 blaxel/sandbox/process.py,sha256=Xma8fIMgDoJM8z-XZOeqU8R-0yjDFGDgnxW8Fi4YPJQ,2531
@@ -354,7 +354,7 @@ blaxel/sandbox/client/models/process_response.py,sha256=13UN4aTg0OZJnABCD-bzsHNz
 blaxel/sandbox/client/models/process_response_status.py,sha256=hCE1gCtheV83T6PYURG3k-rPZSauvyTFhsxLEtudgYE,246
 blaxel/sandbox/client/models/subdirectory.py,sha256=j1ORkqO74vAdPQ-oUMer85P8Gb2mAwky3P2gBCnqyGQ,1761
 blaxel/sandbox/client/models/success_response.py,sha256=JQbCUIdVJy_TJ3mp8IuvCGbKgCm_iZQMMrqn8uZkxCk,1874
-blaxel/tools/__init__.py,sha256=4lzqDt0FNWcO8L0DkFzY1KTHLNtgEux66id4Psq7sXY,11520
+blaxel/tools/__init__.py,sha256=8uQI2fldDyd2ZFu2UB6PIq-5PpZB6O-2e9emknsGM8Q,11767
 blaxel/tools/common.py,sha256=JGK052v_fvwWBFYnIArlBnFFViYyFrqdDn3gdVf53EU,1332
 blaxel/tools/crewai.py,sha256=rPrRGwkXejunJQ6In1IsYAxJPNbr6d9EckXrSIHQods,638
 blaxel/tools/googleadk.py,sha256=65qJysecgAMujxsyGxuCEVL0fWoR5I489DMiSA3ZaGs,2265
@@ -364,7 +364,7 @@ blaxel/tools/llamaindex.py,sha256=-gQ-C9V_h9a11J4ItsbWjXrCJOg0lRKsb98v9rVsNak,71
 blaxel/tools/openai.py,sha256=GuFXkj6bXEwldyVr89jEsRAi5ihZUVEVe327QuWiGNs,653
 blaxel/tools/pydantic.py,sha256=CvnNbAG_J4yBtA-XFI4lQrq3FYKjNd39hu841vZT004,1801
 blaxel/tools/types.py,sha256=YPCGJ4vZDhqR0X2H_TWtc5chQScsC32nGTQdRKJlO8Y,707
-blaxel-0.1.20rc67.dist-info/METADATA,sha256=igMEEIUv3MLAPj8Nlvp73kw9yoSl8Px2vgLVv5i2rbU,6706
-blaxel-0.1.20rc67.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-blaxel-0.1.20rc67.dist-info/licenses/LICENSE,sha256=p5PNQvpvyDT_0aYBDgmV1fFI_vAD2aSV0wWG7VTgRis,1069
-blaxel-0.1.20rc67.dist-info/RECORD,,
+blaxel-0.1.21rc69.dist-info/METADATA,sha256=-sspM9gwOD_pX3-NXA1ClHWRGcm2-rCMaDctVESelI0,6706
+blaxel-0.1.21rc69.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+blaxel-0.1.21rc69.dist-info/licenses/LICENSE,sha256=p5PNQvpvyDT_0aYBDgmV1fFI_vAD2aSV0wWG7VTgRis,1069
+blaxel-0.1.21rc69.dist-info/RECORD,,