blaxel 0.1.9rc36__tar.gz → 0.1.10rc38__tar.gz

{blaxel-0.1.9rc36 → blaxel-0.1.10rc38}/.gitignore

@@ -23,4 +23,5 @@ dmypy.json
 /.coverage
 uv.lock
 
-telemetry.sh
+telemetry.sh
+definition.yml

{blaxel-0.1.9rc36 → blaxel-0.1.10rc38}/Makefile

@@ -1,6 +1,19 @@
 ARGS:= $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
 
-sdk:
+sdk-sandbox:
+	cp ../sandbox/sandbox-api/docs/openapi.yml ./definition.yml
+	rm -rf src/blaxel/sandbox/client/api src/blaxel/sandbox/client/models
+	openapi-python-client generate \
+		--path=definition.yml \
+		--output-path=./tmp-sdk-sandbox \
+		--overwrite \
+		--custom-template-path=./templates \
+		--config=./openapi-python-client.yml
+	cp -r ./tmp-sdk-sandbox/blaxel/* ./src/blaxel/sandbox/client
+	rm -rf ./tmp-sdk-sandbox
+	uv run ruff check --fix
+
+sdk-controlplane:
 	cp ../controlplane/api/api/definitions/controlplane.yml ./definition.yml
 	rm -rf src/blaxel/client/api src/blaxel/client/models
 	openapi-python-client generate \
@@ -13,6 +26,8 @@ sdk:
 	rm -rf ./tmp-sdk-python
 	uv run ruff check --fix
 
+sdk: sdk-sandbox sdk-controlplane
+
 doc:
 	rm -rf docs
 	uv run pdoc blaxel-docs src/blaxel -o docs --force --skip-errors

{blaxel-0.1.9rc36 → blaxel-0.1.10rc38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blaxel
-Version: 0.1.9rc36
+Version: 0.1.10rc38
 Summary: Add your description here
 Author-email: cploujoux <cploujoux@blaxel.ai>
 License-File: LICENSE

{blaxel-0.1.9rc36 → blaxel-0.1.10rc38}/integrationtest/bl_agents.py

@@ -4,7 +4,7 @@ from blaxel.agents import bl_agent
 
 
 async def main():
-    agent = bl_agent("vercel-first")
+    agent = bl_agent("template-google-adk-py")
     print(await agent.arun({"inputs": "Hello, world!"}))
     print(agent.run({"inputs": "Hello, world!"}))
 

blaxel-0.1.10rc38/integrationtest/global_hash.py

@@ -0,0 +1,3 @@
+from blaxel.common.internal import get_alphanumeric_limited_hash
+
+print(get_alphanumeric_limited_hash("dawa-function-pym", 48))

blaxel-0.1.10rc38/integrationtest/sandbox.py

@@ -0,0 +1,80 @@
+import asyncio
+import logging
+import os
+
+from blaxel.client.models import Metadata, Port, Runtime, Sandbox, SandboxSpec
+from blaxel.sandbox.base import ResponseError
+from blaxel.sandbox.client.models import ProcessRequest
+from blaxel.sandbox.sandbox import SandboxInstance
+
+logger = logging.getLogger(__name__)
+
+
+async def create_sandbox(sandbox_name: str):
+    # Create sandbox
+    image = "blaxel/prod-base:14769328323"
+    logger.info(f"Creating sandbox {sandbox_name} with image {image}")
+    sandbox = await SandboxInstance.create(Sandbox(
+        metadata=Metadata(name=sandbox_name),
+        spec=SandboxSpec(
+            runtime=Runtime(
+                image=image,
+                memory=2048,
+                cpu=2,
+                ports=[
+                    Port(name="sandbox-api", target=8080, protocol="HTTP")
+                ]
+            )
+        )
+    ))
+    logger.info("Waiting for sandbox to be deployed")
+    await sandbox.wait(max_wait=120000, interval=1000)
+    logger.info("Sandbox deployed")
+    return sandbox
+
+async def main():
+    user = os.environ.get("USER")
+    sandbox_name = "sandbox-test-3"
+    sandbox = None
+    try:
+        sandbox = await create_sandbox(sandbox_name)
+        sandbox = await SandboxInstance.get(sandbox_name)
+
+        # Filesystem tests
+        await sandbox.fs.write(f"/Users/{user}/Downloads/test", "Hello world")
+        content = await sandbox.fs.read(f"/Users/{user}/Downloads/test")
+        assert content == "Hello world", "File content is not correct"
+        dir = await sandbox.fs.ls(f"/Users/{user}/Downloads")
+        assert dir.files and len(dir.files) >= 1, "Directory is empty"
+        assert any(f.path == f"/Users/{user}/Downloads/test" for f in dir.files), "File not found in directory"
+        await sandbox.fs.mkdir(f"/Users/{user}/Downloads/test2")
+        after_mkdir = await sandbox.fs.ls(f"/Users/{user}/Downloads/test2")
+        assert not after_mkdir.files or len(after_mkdir.files) == 0, "Directory is not empty after mkdir"
+        await sandbox.fs.cp(f"/Users/{user}/Downloads/test", f"/Users/{user}/Downloads/test2/test")
+        after_cp_ls = await sandbox.fs.ls(f"/Users/{user}/Downloads/test2")
+        assert after_cp_ls.files and any(f.path == f"/Users/{user}/Downloads/test2/test" for f in after_cp_ls.files), "File not found in directory after cp"
+        await sandbox.fs.rm(f"/Users/{user}/Downloads/test")
+        try:
+            await sandbox.fs.rm(f"/Users/{user}/Downloads/test2")
+        except ResponseError as e:
+            logger.info(f"That is expected => {e.error}")
+        await sandbox.fs.rm(f"/Users/{user}/Downloads/test2", True)
+
+        # Process tests
+        process = await sandbox.process.exec(ProcessRequest(name="test", command="echo 'Hello world'"))
+        assert getattr(process, "status", None) != "completed", "Process did complete without waiting"
+        await asyncio.sleep(0.01)
+        completed_process = await sandbox.process.get("test")
+        assert getattr(completed_process, "status", None) == "completed", "Process did not complete"
+        logs = await sandbox.process.logs("test")
+        assert logs == 'Hello world\n', "Logs are not correct"
+        try:
+            await sandbox.process.kill("test")
+        except ResponseError as e:
+            logger.info(f"That is expected => {e.error}")
+    finally:
+        logger.info("Deleting sandbox")
+        await SandboxInstance.delete(sandbox_name)
+
+if __name__ == "__main__":
+    asyncio.run(main())

{blaxel-0.1.9rc36 → blaxel-0.1.10rc38}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blaxel"
-version = "0.1.9.pre-36"
+version = "0.1.10.pre-38"
 description = "Add your description here"
 readme = "README.md"
 authors = [{ name = "cploujoux", email = "cploujoux@blaxel.ai" }]

blaxel-0.1.10rc38/src/blaxel/agents/__init__.py

@@ -0,0 +1,139 @@
+import json
+from logging import getLogger
+from typing import Any, Awaitable
+
+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.settings import settings
+from ..instrumentation.span import SpanManager
+
+logger = getLogger(__name__)
+
+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):
+        return f"{settings.run_url}/{settings.workspace}/agents/{self.name}"
+
+    @property
+    def fallback_url(self):
+        if self.external_url != self.url:
+            return self.external_url
+        return None
+
+    @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 call(self, url, input_data, headers: dict = {}, params: dict = {}):
+        body = input_data
+        if not isinstance(body, str):
+            body = json.dumps(body)
+
+        return client.get_httpx_client().post(
+            url,
+            headers={
+                'Content-Type': 'application/json',
+                **headers
+            },
+            data=body,
+            params=params
+        )
+
+    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(
+            url,
+            headers={
+                'Content-Type': 'application/json',
+                **headers
+            },
+            data=body,
+            params=params
+        )
+
+    def run(self, input: Any, headers: dict = {}, params: dict = {}) -> str:
+        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:
+                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]:
+        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}"
+
+    def __repr__(self):
+        return self.__str__()
+
+def bl_agent(name: str):
+    return BlAgent(name)
+
+async def get_agent_metadata(name):
+    cache_data = await find_from_cache('Agent', name)
+    if cache_data:
+        return Agent.from_dict(cache_data)
+    try:
+        return await get_agent.asyncio(client=client, agent_name=name)
+    except Exception:
+        return None

{blaxel-0.1.9rc36 → blaxel-0.1.10rc38}/src/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-0.1.9rc36 → blaxel-0.1.10rc38}/src/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-0.1.9rc36 → blaxel-0.1.10rc38}/src/blaxel/common/autoload.py

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

blaxel-0.1.10rc38/src/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-0.1.9rc36 → blaxel-0.1.10rc38}/src/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-0.1.9rc36 → blaxel-0.1.10rc38}/src/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-0.1.10rc38/src/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-0.1.10rc38/src/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-0.1.10rc38/src/blaxel/sandbox/client/api/__init__.py

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