blaxel 0.1.9rc35__py3-none-any.whl → 0.1.9rc37__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}"
@@ -98,5 +135,5 @@ async def get_agent_metadata(name):
         return Agent.from_dict(cache_data)
     try:
         return await get_agent.asyncio(client=client, agent_name=name)
-    except Exception as e:
+    except Exception:
         return None

blaxel/authentication/__init__.py

@@ -4,7 +4,6 @@ from pathlib import Path
 from typing import Optional
 
 import yaml
-from httpx import Auth
 
 from .apikey import ApiKey
 from .clientcredentials import ClientCredentials
@@ -73,15 +72,15 @@ def auth(env: str, base_url: str) -> BlaxelAuth:
         return None
 
     if credentials.api_key:
-        logger.debug(f"Using API key for authentication")
+        logger.debug("Using API key for authentication")
         return ApiKey(credentials, credentials.workspace, base_url)
 
     if credentials.client_credentials:
-        logger.debug(f"Using client credentials for authentication")
+        logger.debug("Using client credentials for authentication")
         return ClientCredentials(credentials, credentials.workspace, base_url)
 
     if credentials.device_code:
-        logger.debug(f"Using device code for authentication")
+        logger.debug("Using device code for authentication")
         return DeviceMode(credentials, credentials.workspace, base_url)
 
     return BlaxelAuth(credentials, credentials.workspace, base_url)

blaxel/client/api/compute/create_sandbox.py

@@ -0,0 +1,166 @@
+from http import HTTPStatus
+from typing import Any, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import Client
+from ...models.sandbox import Sandbox
+from ...types import Response
+
+
+def _get_kwargs(
+    *,
+    body: Sandbox,
+) -> dict[str, Any]:
+    headers: dict[str, Any] = {}
+
+    _kwargs: dict[str, Any] = {
+        "method": "post",
+        "url": "/sandboxes",
+    }
+
+    if type(body) == dict:
+        _body = body
+    else:
+        _body = body.to_dict()
+
+    _kwargs["json"] = _body
+    headers["Content-Type"] = "application/json"
+
+    _kwargs["headers"] = headers
+    return _kwargs
+
+
+def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Sandbox]:
+    if response.status_code == 200:
+        response_200 = Sandbox.from_dict(response.json())
+
+        return response_200
+    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[Sandbox]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    *,
+    client: Union[Client],
+    body: Sandbox,
+) -> Response[Sandbox]:
+    """Create Sandbox
+
+     Creates a Sandbox.
+
+    Args:
+        body (Sandbox): Micro VM for running agentic tasks
+
+    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[Sandbox]
+    """
+
+    kwargs = _get_kwargs(
+        body=body,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+def sync(
+    *,
+    client: Union[Client],
+    body: Sandbox,
+) -> Optional[Sandbox]:
+    """Create Sandbox
+
+     Creates a Sandbox.
+
+    Args:
+        body (Sandbox): Micro VM for running agentic tasks
+
+    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:
+        Sandbox
+    """
+
+    return sync_detailed(
+        client=client,
+        body=body,
+    ).parsed
+
+
+async def asyncio_detailed(
+    *,
+    client: Union[Client],
+    body: Sandbox,
+) -> Response[Sandbox]:
+    """Create Sandbox
+
+     Creates a Sandbox.
+
+    Args:
+        body (Sandbox): Micro VM for running agentic tasks
+
+    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[Sandbox]
+    """
+
+    kwargs = _get_kwargs(
+        body=body,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio(
+    *,
+    client: Union[Client],
+    body: Sandbox,
+) -> Optional[Sandbox]:
+    """Create Sandbox
+
+     Creates a Sandbox.
+
+    Args:
+        body (Sandbox): Micro VM for running agentic tasks
+
+    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:
+        Sandbox
+    """
+
+    return (
+        await asyncio_detailed(
+            client=client,
+            body=body,
+        )
+    ).parsed

blaxel/client/api/compute/delete_sandbox.py

@@ -0,0 +1,154 @@
+from http import HTTPStatus
+from typing import Any, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import Client
+from ...models.sandbox import Sandbox
+from ...types import Response
+
+
+def _get_kwargs(
+    sandbox_name: str,
+) -> dict[str, Any]:
+    _kwargs: dict[str, Any] = {
+        "method": "delete",
+        "url": f"/sandboxes/{sandbox_name}",
+    }
+
+    return _kwargs
+
+
+def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Sandbox]:
+    if response.status_code == 200:
+        response_200 = Sandbox.from_dict(response.json())
+
+        return response_200
+    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[Sandbox]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    sandbox_name: str,
+    *,
+    client: Union[Client],
+) -> Response[Sandbox]:
+    """Delete Sandbox
+
+     Deletes a Sandbox by name.
+
+    Args:
+        sandbox_name (str):
+
+    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[Sandbox]
+    """
+
+    kwargs = _get_kwargs(
+        sandbox_name=sandbox_name,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+def sync(
+    sandbox_name: str,
+    *,
+    client: Union[Client],
+) -> Optional[Sandbox]:
+    """Delete Sandbox
+
+     Deletes a Sandbox by name.
+
+    Args:
+        sandbox_name (str):
+
+    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:
+        Sandbox
+    """
+
+    return sync_detailed(
+        sandbox_name=sandbox_name,
+        client=client,
+    ).parsed
+
+
+async def asyncio_detailed(
+    sandbox_name: str,
+    *,
+    client: Union[Client],
+) -> Response[Sandbox]:
+    """Delete Sandbox
+
+     Deletes a Sandbox by name.
+
+    Args:
+        sandbox_name (str):
+
+    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[Sandbox]
+    """
+
+    kwargs = _get_kwargs(
+        sandbox_name=sandbox_name,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio(
+    sandbox_name: str,
+    *,
+    client: Union[Client],
+) -> Optional[Sandbox]:
+    """Delete Sandbox
+
+     Deletes a Sandbox by name.
+
+    Args:
+        sandbox_name (str):
+
+    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:
+        Sandbox
+    """
+
+    return (
+        await asyncio_detailed(
+            sandbox_name=sandbox_name,
+            client=client,
+        )
+    ).parsed

blaxel/client/api/compute/get_sandbox.py

@@ -0,0 +1,154 @@
+from http import HTTPStatus
+from typing import Any, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import Client
+from ...models.sandbox import Sandbox
+from ...types import Response
+
+
+def _get_kwargs(
+    sandbox_name: str,
+) -> dict[str, Any]:
+    _kwargs: dict[str, Any] = {
+        "method": "get",
+        "url": f"/sandboxes/{sandbox_name}",
+    }
+
+    return _kwargs
+
+
+def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Sandbox]:
+    if response.status_code == 200:
+        response_200 = Sandbox.from_dict(response.json())
+
+        return response_200
+    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[Sandbox]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    sandbox_name: str,
+    *,
+    client: Union[Client],
+) -> Response[Sandbox]:
+    """Get Sandbox
+
+     Returns a Sandbox by name.
+
+    Args:
+        sandbox_name (str):
+
+    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[Sandbox]
+    """
+
+    kwargs = _get_kwargs(
+        sandbox_name=sandbox_name,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+def sync(
+    sandbox_name: str,
+    *,
+    client: Union[Client],
+) -> Optional[Sandbox]:
+    """Get Sandbox
+
+     Returns a Sandbox by name.
+
+    Args:
+        sandbox_name (str):
+
+    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:
+        Sandbox
+    """
+
+    return sync_detailed(
+        sandbox_name=sandbox_name,
+        client=client,
+    ).parsed
+
+
+async def asyncio_detailed(
+    sandbox_name: str,
+    *,
+    client: Union[Client],
+) -> Response[Sandbox]:
+    """Get Sandbox
+
+     Returns a Sandbox by name.
+
+    Args:
+        sandbox_name (str):
+
+    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[Sandbox]
+    """
+
+    kwargs = _get_kwargs(
+        sandbox_name=sandbox_name,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio(
+    sandbox_name: str,
+    *,
+    client: Union[Client],
+) -> Optional[Sandbox]:
+    """Get Sandbox
+
+     Returns a Sandbox by name.
+
+    Args:
+        sandbox_name (str):
+
+    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:
+        Sandbox
+    """
+
+    return (
+        await asyncio_detailed(
+            sandbox_name=sandbox_name,
+            client=client,
+        )
+    ).parsed