blaxel 0.1.9rc36__py3-none-any.whl → 0.1.10rc38__py3-none-any.whl

blaxel/agents/__init__.py

@@ -1,4 +1,3 @@
-
 import json
 from logging import getLogger
 from typing import Any, Awaitable
@@ -8,6 +7,7 @@ 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.settings import settings
 from ..instrumentation.span import SpanManager
 
@@ -17,6 +17,19 @@ class BlAgent:
     def __init__(self, name: str):
         self.name = name
 
+    @property
+    def internal_url(self):
+        """Get the internal URL for the agent using a hash of workspace and agent name."""
+        hash = get_global_unique_hash(settings.workspace, "agent", self.name)
+        return f"{settings.run_internal_protocol}://bl-{settings.env}-{hash}.{settings.run_internal_hostname}"
+
+    @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
 
     @property
     def external_url(self):
@@ -30,11 +43,10 @@ class BlAgent:
 
     @property
     def url(self):
-        env_var = self.name.replace("-", "_").upper()
-        if env[f"BL_AGENT_{env_var}_URL"]:
-            return env[f"BL_AGENT_{env_var}_URL"]
-        if f"BL_AGENT_{env_var}_SERVICE_NAME" in settings.env:
-            return f"https://{settings.env[f'BL_AGENT_{env_var}_SERVICE_NAME']}.{settings.run_internal_hostname}"
+        if self.forced_url:
+            return self.forced_url
+        if settings.run_internal_hostname:
+            return self.internal_url
         return self.external_url
 
     def call(self, url, input_data, headers: dict = {}, params: dict = {}):
@@ -52,14 +64,14 @@ class BlAgent:
             params=params
         )
 
-    async def acall(self, input_data, headers: dict = {}, params: dict = {}):
+    async def acall(self, url, input_data, headers: dict = {}, params: dict = {}):
         logger.debug(f"Agent Calling: {self.name}")
         body = input_data
         if not isinstance(body, str):
             body = json.dumps(body)
 
         return await client.get_async_httpx_client().post(
-            self.url,
+            url,
             headers={
                 'Content-Type': 'application/json',
                 **headers
@@ -69,19 +81,44 @@ class BlAgent:
         )
 
     def run(self, input: Any, headers: dict = {}, params: dict = {}) -> str:
-        with SpanManager("blaxel-tracer").create_active_span(self.name, {"agent.name": self.name, "agent.args": json.dumps(input)}):
+        attributes = {
+            "agent.name": self.name,
+            "agent.args": json.dumps(input),
+            "span.type": "agent.run",
+        }
+        with SpanManager("blaxel-tracer").create_active_span(self.name, attributes) as span:
             logger.debug(f"Agent Calling: {self.name}")
             response = self.call(self.url, input, headers, params)
             if response.status_code >= 400:
-                raise Exception(f"Agent {self.name} returned status code {response.status_code} with body {response.text}")
+                if not self.fallback_url:
+                    span.set_attribute("agent.run.error", response.text)
+                    raise Exception(f"Agent {self.name} returned status code {response.status_code} with body {response.text}")
+                response = self.call(self.fallback_url, input, headers, params)
+                if response.status_code >= 400:
+                    span.set_attribute("agent.run.error", response.text)
+                    raise Exception(f"Agent {self.name} returned status code {response.status_code} with body {response.text}")
+            span.set_attribute("agent.run.result", response.text)
             return response.text
 
     async def arun(self, input: Any, headers: dict = {}, params: dict = {}) -> Awaitable[str]:
-        logger.debug(f"Agent Calling: {self.name}")
-        response = await self.acall(input, headers, params)
-        if response.status_code >= 400:
-            raise Exception(f"Agent {self.name} returned status code {response.status_code} with body {response.text}")
-        return response.text
+        attributes = {
+            "agent.name": self.name,
+            "agent.args": json.dumps(input),
+            "span.type": "agent.run",
+        }
+        with SpanManager("blaxel-tracer").create_active_span(self.name, attributes) as span:
+            logger.debug(f"Agent Calling: {self.name}")
+            response = await self.acall(self.url, input, headers, params)
+            if response.status_code >= 400:
+                if not self.fallback_url:
+                    span.set_attribute("agent.run.error", response.text)
+                    raise Exception(f"Agent {self.name} returned status code {response.status_code} with body {response.text}")
+                response = await self.acall(self.fallback_url, input, headers, params)
+                if response.status_code >= 400:
+                    span.set_attribute("agent.run.error", response.text)
+                    raise Exception(f"Agent {self.name} returned status code {response.status_code} with body {response.text}")
+            span.set_attribute("agent.run.result", response.text)
+            return response.text
 
     def __str__(self):
         return f"Agent {self.name}"

blaxel/authentication/__init__.py

@@ -19,16 +19,25 @@ def get_credentials() -> Optional[CredentialsType]:
     Returns:
         Optional[CredentialsType]: The credentials or None if not found
     """
+    def get_workspace():
+        if os.environ.get("BL_WORKSPACE"):
+            return os.environ.get("BL_WORKSPACE")
+        home_dir = Path.home()
+        config_path = home_dir / '.blaxel' / 'config.yaml'
+        with open(config_path, encoding='utf-8') as f:
+            config_json = yaml.safe_load(f)
+        return config_json.get("context", {}).get("workspace")
+
     if os.environ.get("BL_API_KEY"):
         return CredentialsType(
             api_key=os.environ.get("BL_API_KEY"),
-            workspace=os.environ.get("BL_WORKSPACE")
+            workspace=get_workspace()
         )
 
     if os.environ.get("BL_CLIENT_CREDENTIALS"):
         return CredentialsType(
             client_credentials=os.environ.get("BL_CLIENT_CREDENTIALS"),
-            workspace=os.environ.get("BL_WORKSPACE")
+            workspace=get_workspace()
         )
 
     try:

blaxel/authentication/devicemode.py

@@ -117,6 +117,7 @@ class DeviceMode(BlaxelAuth):
         current_time = datetime.now()
         # Refresh if token expires in less than 10 minutes
         if current_time + timedelta(minutes=10) > exp_time:
+            print("Refreshing token")
             return self.do_refresh()
 
         return None

blaxel/common/autoload.py

@@ -1,5 +1,3 @@
-
-
 from ..client import client
 from ..instrumentation.manager import telemetry_manager
 from .settings import settings

blaxel/common/internal.py

@@ -0,0 +1,75 @@
+import base64
+import hashlib
+import os
+import re
+from logging import getLogger
+from typing import Optional
+
+logger = getLogger(__name__)
+
+def get_alphanumeric_limited_hash(input_str, max_size):
+    # Create SHA-256 hash of the input string
+    hash_obj = hashlib.sha256(input_str.encode('utf-8'))
+
+    # Get the hash digest in base64 format
+    hash_base64 = base64.b64encode(hash_obj.digest()).decode('utf-8')
+
+    # Remove non-alphanumeric characters and convert to lowercase
+    alphanumeric = re.sub(r'[^a-zA-Z0-9]', '', hash_base64).lower()
+
+    # Skip the first character to match the Node.js crypto output
+    alphanumeric = alphanumeric[1:]
+
+    # Limit to max_size characters
+    return alphanumeric[:max_size] if len(alphanumeric) > max_size else alphanumeric
+
+
+def get_global_unique_hash(workspace: str, type: str, name: str) -> str:
+    """
+    Generate a unique hash for a combination of workspace, type, and name.
+
+    Args:
+        workspace: The workspace identifier
+        type: The type identifier
+        name: The name identifier
+
+    Returns:
+        A unique alphanumeric hash string of maximum length 48
+    """
+    global_unique_name = f"{workspace}-{type}-{name}"
+    hash = get_alphanumeric_limited_hash(global_unique_name, 48)
+    return hash
+
+class Agent:
+    def __init__(self, agent_name: str, workspace: str, run_internal_protocol: str, run_internal_hostname: str):
+        self.agent_name = agent_name
+        self.workspace = workspace
+        self.run_internal_protocol = run_internal_protocol
+        self.run_internal_hostname = run_internal_hostname
+
+    @property
+    def internal_url(self) -> str:
+        """
+        Generate the internal URL for the agent using a unique hash.
+
+        Returns:
+            The internal URL as a string
+        """
+        hash_value = get_global_unique_hash(
+            self.workspace,
+            "agent",
+            self.agent_name
+        )
+        return f"{self.run_internal_protocol}://{hash_value}.{self.run_internal_hostname}"
+
+    @property
+    def forced_url(self) -> Optional[str]:
+        """
+        Check for a forced URL in environment variables.
+
+        Returns:
+            The forced URL if found in environment variables, None otherwise
+        """
+        env_var = self.agent_name.replace("-", "_").upper()
+        env_key = f"BL_AGENT_{env_var}_URL"
+        return os.environ.get(env_key)

blaxel/common/settings.py

@@ -21,7 +21,7 @@ class Settings:
     @property
     def log_level(self) -> str:
         """Get the log level."""
-        return os.environ.get("LOG_LEVEL", "INFO")
+        return os.environ.get("LOG_LEVEL", "INFO").upper()
 
     @property
     def base_url(self) -> str:
@@ -69,6 +69,11 @@ class Settings:
         """Is running on bl cloud."""
         return os.environ.get("BL_CLOUD", "") == "true"
 
+    @property
+    def run_internal_protocol(self) -> str:
+        """Get the run internal protocol."""
+        return os.environ.get("BL_RUN_INTERNAL_PROTOCOL", "https")
+
     @property
     def enable_opentelemetry(self) -> bool:
         """Get the enable opentelemetry."""

blaxel/mcp/server.py

@@ -65,7 +65,8 @@ class BlaxelMcpServerTransport:
                                 "mcp.message.parsed": True,
                                 "mcp.method": getattr(msg, "method", None),
                                 "mcp.messageId": getattr(msg, "id", None),
-                                "mcp.toolName": getattr(getattr(msg, "params", None), "name", None)
+                                "mcp.toolName": getattr(getattr(msg, "params", None), "name", None),
+                                "span.type": "mcp.message",
                             })
                             self.spans[client_id+":"+msg.id] =  span
                         await read_stream_writer.send(msg)

blaxel/sandbox/base.py

@@ -0,0 +1,68 @@
+import os
+
+from httpx import Response
+
+from ..client.models import Sandbox
+from ..common.internal import get_global_unique_hash
+from ..common.settings import settings
+from .client.client import client
+from .client.models import ErrorResponse
+
+
+class ResponseError(Exception):
+    def __init__(self, response: Response):
+        self.status_code = response.status_code
+        self.status_text = response.content
+        self.error = None
+        data_error = {
+            "status": response.status_code,
+            "statusText": response.content,
+        }
+        if hasattr(response, "parsed") and isinstance(response.parsed, ErrorResponse):
+            data_error["error"] = response.parsed.error
+            self.error = response.parsed.error
+        super().__init__(str(data_error))
+
+
+class SandboxHandleBase:
+    def __init__(self, sandbox: Sandbox):
+        self.sandbox = sandbox
+        self.client = client.with_base_url(self.url).with_headers(settings.headers)
+
+    @property
+    def name(self):
+        return self.sandbox.metadata and self.sandbox.metadata.name
+
+    @property
+    def fallback_url(self):
+        if self.external_url != self.url:
+            return self.external_url
+        return None
+
+    @property
+    def external_url(self):
+        return f"{settings.run_url}/{settings.workspace}/sandboxes/{self.name}"
+
+    @property
+    def internal_url(self):
+        hash_ = get_global_unique_hash(settings.workspace, "sandbox", self.name)
+        return f"{settings.run_internal_protocol}://bl-{settings.env}-{hash_}.{settings.run_internal_hostname}"
+
+    @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)
+
+    @property
+    def url(self):
+        if self.forced_url:
+            return self.forced_url
+        if settings.run_internal_hostname:
+            return self.internal_url
+        return self.external_url
+
+    def handle_response(self, response: Response):
+        if response.status_code >= 400:
+            raise ResponseError(response)
+

blaxel/sandbox/client/__init__.py

@@ -0,0 +1,8 @@
+"""A client library for accessing Sandbox API"""
+
+from .client import Client, client
+
+__all__ = (
+    "Client",
+    "client",
+)

blaxel/sandbox/client/api/__init__.py

@@ -0,0 +1 @@
+"""Contains methods for accessing the API"""

blaxel/sandbox/client/api/filesystem/delete_filesystem_path.py

@@ -0,0 +1,184 @@
+from http import HTTPStatus
+from typing import Any, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import Client
+from ...models.error_response import ErrorResponse
+from ...models.success_response import SuccessResponse
+from ...types import UNSET, Response, Unset
+
+
+def _get_kwargs(
+    path: str,
+    *,
+    recursive: Union[Unset, bool] = UNSET,
+) -> dict[str, Any]:
+    params: dict[str, Any] = {}
+
+    params["recursive"] = recursive
+
+    params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
+
+    _kwargs: dict[str, Any] = {
+        "method": "delete",
+        "url": f"/filesystem/{path}",
+        "params": params,
+    }
+
+    return _kwargs
+
+
+def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Union[ErrorResponse, SuccessResponse]]:
+    if response.status_code == 200:
+        response_200 = SuccessResponse.from_dict(response.json())
+
+        return response_200
+    if response.status_code == 404:
+        response_404 = ErrorResponse.from_dict(response.json())
+
+        return response_404
+    if response.status_code == 500:
+        response_500 = ErrorResponse.from_dict(response.json())
+
+        return response_500
+    if client.raise_on_unexpected_status:
+        raise errors.UnexpectedStatus(response.status_code, response.content)
+    else:
+        return None
+
+
+def _build_response(*, client: Client, response: httpx.Response) -> Response[Union[ErrorResponse, SuccessResponse]]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    path: str,
+    *,
+    client: Union[Client],
+    recursive: Union[Unset, bool] = UNSET,
+) -> Response[Union[ErrorResponse, SuccessResponse]]:
+    """Delete file or directory
+
+     Delete a file or directory
+
+    Args:
+        path (str):
+        recursive (Union[Unset, bool]):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[Union[ErrorResponse, SuccessResponse]]
+    """
+
+    kwargs = _get_kwargs(
+        path=path,
+        recursive=recursive,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+def sync(
+    path: str,
+    *,
+    client: Union[Client],
+    recursive: Union[Unset, bool] = UNSET,
+) -> Optional[Union[ErrorResponse, SuccessResponse]]:
+    """Delete file or directory
+
+     Delete a file or directory
+
+    Args:
+        path (str):
+        recursive (Union[Unset, bool]):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Union[ErrorResponse, SuccessResponse]
+    """
+
+    return sync_detailed(
+        path=path,
+        client=client,
+        recursive=recursive,
+    ).parsed
+
+
+async def asyncio_detailed(
+    path: str,
+    *,
+    client: Union[Client],
+    recursive: Union[Unset, bool] = UNSET,
+) -> Response[Union[ErrorResponse, SuccessResponse]]:
+    """Delete file or directory
+
+     Delete a file or directory
+
+    Args:
+        path (str):
+        recursive (Union[Unset, bool]):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[Union[ErrorResponse, SuccessResponse]]
+    """
+
+    kwargs = _get_kwargs(
+        path=path,
+        recursive=recursive,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio(
+    path: str,
+    *,
+    client: Union[Client],
+    recursive: Union[Unset, bool] = UNSET,
+) -> Optional[Union[ErrorResponse, SuccessResponse]]:
+    """Delete file or directory
+
+     Delete a file or directory
+
+    Args:
+        path (str):
+        recursive (Union[Unset, bool]):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Union[ErrorResponse, SuccessResponse]
+    """
+
+    return (
+        await asyncio_detailed(
+            path=path,
+            client=client,
+            recursive=recursive,
+        )
+    ).parsed