blaxel 0.1.16rc60__tar.gz → 0.1.17__tar.gz

{blaxel-0.1.16rc60 → blaxel-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blaxel
-Version: 0.1.16rc60
+Version: 0.1.17
 Summary: Add your description here
 Author-email: cploujoux <cploujoux@blaxel.ai>
 License-File: LICENSE

{blaxel-0.1.16rc60 → blaxel-0.1.17}/integrationtest/sandbox.py

@@ -1,44 +1,21 @@
 import asyncio
 import logging
 import os
+import traceback
+
+from utils import create_or_get_sandbox
 
-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:latest"
-    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)
+        sandbox = await create_or_get_sandbox(sandbox_name)
 
         # Filesystem tests
         await sandbox.fs.write(f"/Users/{user}/Downloads/test", "Hello world")
@@ -72,9 +49,13 @@ async def main():
             await sandbox.process.kill("test")
         except ResponseError as e:
             logger.info(f"That is expected => {e.error}")
+    except Exception as e:
+        logger.error(f"Error => {e}")
+        tb_str = traceback.format_exception(type(e), e, e.__traceback__)
+        logger.error(f"Stacktrace: {''.join(tb_str)}")
     finally:
         logger.info("Deleting sandbox")
-        await SandboxInstance.delete(sandbox_name)
+        # await SandboxInstance.delete(sandbox_name)
 
 if __name__ == "__main__":
     asyncio.run(main())

{blaxel-0.1.16rc60 → blaxel-0.1.17}/integrationtest/sandbox_502.py

@@ -3,7 +3,8 @@ import logging
 import random
 import string
 
-from blaxel.client.models import Metadata, Port, Runtime, Sandbox, SandboxSpec
+from utils import create_or_get_sandbox
+
 from blaxel.sandbox.client.models import ProcessRequest
 from blaxel.sandbox.sandbox import SandboxInstance
 
@@ -14,28 +15,6 @@ def random_string(length: int):
     return ''.join(random.choices(string.ascii_letters + string.digits, k=length)).lower()
 
 
-async def create_sandbox(sandbox_name: str):
-    # Create sandbox
-    image = "blaxel/prod-base:latest"
-    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 run_process_with_retry(sandbox: SandboxInstance, command: str):
     for _ in range(2):
         try:
@@ -55,7 +34,7 @@ async def main():
     sandbox_name = random_string(10)
     try:
         print(f"Creating sandbox {sandbox_name}")
-        sandbox = await create_sandbox(sandbox_name)
+        sandbox = await create_or_get_sandbox(sandbox_name)
         sandbox = await SandboxInstance.get(sandbox_name)
         await run_process_with_retry(sandbox, 'pwd')
         await SandboxInstance.delete(sandbox_name)
@@ -67,7 +46,7 @@ async def main():
     sandbox_name = random_string(10)
     try:
         print(f"Creating sandbox {sandbox_name}")
-        sandbox = await create_sandbox(sandbox_name)
+        sandbox = await create_or_get_sandbox(sandbox_name)
         sandbox = await SandboxInstance.get(sandbox_name)
         await run_process_with_retry(sandbox, 'pwd')
         await SandboxInstance.delete(sandbox_name)

{blaxel-0.1.16rc60 → blaxel-0.1.17}/integrationtest/sandbox_preview.py

@@ -3,36 +3,14 @@ import logging
 from datetime import datetime, timedelta, timezone
 
 import aiohttp
+from utils import create_or_get_sandbox
 
-from blaxel.client.models import (Metadata, Port, Preview, PreviewSpec,
-                                  Runtime, Sandbox, SandboxSpec)
+from blaxel.client.models import Metadata, Preview, PreviewSpec
 from blaxel.common.settings import settings
 from blaxel.sandbox.sandbox import SandboxInstance
 
 logger = logging.getLogger(__name__)
 
-async def create_sandbox(sandbox_name: str):
-    # Create sandbox
-    image = "blaxel/prod-base:latest"
-    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 test_public_preview(sandbox: SandboxInstance):
     try:
         # Create a public preview
@@ -120,7 +98,7 @@ async def main():
     sandbox_name = "sandbox-preview-test"
     sandbox = None
     try:
-        sandbox = await create_sandbox(sandbox_name)
+        sandbox = await create_or_get_sandbox(sandbox_name)
         await test_public_preview(sandbox)
         await test_private_preview(sandbox)
     finally:

{blaxel-0.1.16rc60 → blaxel-0.1.17}/integrationtest/sandbox_small.py

@@ -2,14 +2,14 @@ import asyncio
 import json
 import logging
 
-from blaxel.sandbox.sandbox import SandboxInstance
+from utils import create_or_get_sandbox
 
 logger = logging.getLogger(__name__)
 
 
 async def main():
-    sandbox_name = "spinup-test5"
-    sandbox = await SandboxInstance.get(sandbox_name)
+    sandbox_name = "sandbox-test-3"
+    sandbox = await create_or_get_sandbox(sandbox_name)
     result = await sandbox.fs.ls("/root")
     print(json.dumps(result.to_dict(), indent=4))
     # Filesystem tests

blaxel-0.1.17/integrationtest/utils.py

@@ -0,0 +1,41 @@
+import logging
+import os
+
+from blaxel.client.models import Metadata, Port, Runtime, Sandbox, SandboxSpec
+from blaxel.sandbox.sandbox import SandboxInstance
+
+logger = logging.getLogger(__name__)
+
+async def local_sandbox(sandbox_name: str):
+    os.environ[f"BL_SANDBOX_{sandbox_name.replace('-', '_').upper()}_URL"] = "http://localhost:8080"
+    sandbox = SandboxInstance(Sandbox(
+        metadata=Metadata(name=sandbox_name),
+    ))
+    return sandbox
+
+async def create_or_get_sandbox(sandbox_name: str):
+    # Create sandbox
+    # return await local_sandbox(sandbox_name)
+    try:
+        sandbox = await SandboxInstance.get(sandbox_name)
+        return sandbox
+    except Exception:
+        image = "blaxel/prod-base:latest"
+        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

{blaxel-0.1.16rc60 → blaxel-0.1.17}/pyproject.toml

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

{blaxel-0.1.16rc60 → blaxel-0.1.17}/src/blaxel/authentication/clientcredentials.py

@@ -4,10 +4,10 @@ authentication for Blaxel. It manages token refreshing and authentication flows
 client credentials and refresh tokens.
 """
 
+import time
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Generator, Optional
-import time
 
 import requests
 from httpx import Request, Response

blaxel-0.1.17/src/blaxel/client/api/jobs/create_job.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.job import Job
+from ...types import Response
+
+
+def _get_kwargs(
+    *,
+    body: Job,
+) -> dict[str, Any]:
+    headers: dict[str, Any] = {}
+
+    _kwargs: dict[str, Any] = {
+        "method": "post",
+        "url": "/jobs",
+    }
+
+    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[Job]:
+    if response.status_code == 200:
+        response_200 = Job.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[Job]:
+    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: Job,
+) -> Response[Job]:
+    """Create job
+
+     Creates a job.
+
+    Args:
+        body (Job): Job
+
+    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[Job]
+    """
+
+    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: Job,
+) -> Optional[Job]:
+    """Create job
+
+     Creates a job.
+
+    Args:
+        body (Job): Job
+
+    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:
+        Job
+    """
+
+    return sync_detailed(
+        client=client,
+        body=body,
+    ).parsed
+
+
+async def asyncio_detailed(
+    *,
+    client: Union[Client],
+    body: Job,
+) -> Response[Job]:
+    """Create job
+
+     Creates a job.
+
+    Args:
+        body (Job): Job
+
+    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[Job]
+    """
+
+    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: Job,
+) -> Optional[Job]:
+    """Create job
+
+     Creates a job.
+
+    Args:
+        body (Job): Job
+
+    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:
+        Job
+    """
+
+    return (
+        await asyncio_detailed(
+            client=client,
+            body=body,
+        )
+    ).parsed

blaxel-0.1.16rc60/src/blaxel/client/api/default/get_template_contents.py → blaxel-0.1.17/src/blaxel/client/api/jobs/delete_job.py

@@ -1,27 +1,28 @@
 from http import HTTPStatus
-from typing import Any, Optional, Union, cast
+from typing import Any, Optional, Union
 
 import httpx
 
 from ... import errors
 from ...client import Client
+from ...models.job import Job
 from ...types import Response
 
 
 def _get_kwargs(
-    template_name: str,
+    job_id: str,
 ) -> dict[str, Any]:
     _kwargs: dict[str, Any] = {
-        "method": "get",
-        "url": f"/templates/{template_name}/contents",
+        "method": "delete",
+        "url": f"/jobs/{job_id}",
     }
 
     return _kwargs
 
 
-def _parse_response(*, client: Client, response: httpx.Response) -> Optional[list[str]]:
+def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Job]:
     if response.status_code == 200:
-        response_200 = cast(list[str], response.json())
+        response_200 = Job.from_dict(response.json())
 
         return response_200
     if client.raise_on_unexpected_status:
@@ -30,7 +31,7 @@ def _parse_response(*, client: Client, response: httpx.Response) -> Optional[lis
         return None
 
 
-def _build_response(*, client: Client, response: httpx.Response) -> Response[list[str]]:
+def _build_response(*, client: Client, response: httpx.Response) -> Response[Job]:
     return Response(
         status_code=HTTPStatus(response.status_code),
         content=response.content,
@@ -40,24 +41,27 @@ def _build_response(*, client: Client, response: httpx.Response) -> Response[lis
 
 
 def sync_detailed(
-    template_name: str,
+    job_id: str,
     *,
     client: Union[Client],
-) -> Response[list[str]]:
-    """
+) -> Response[Job]:
+    """Delete job
+
+     Deletes a job by name.
+
     Args:
-        template_name (str):
+        job_id (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[list[str]]
+        Response[Job]
     """
 
     kwargs = _get_kwargs(
-        template_name=template_name,
+        job_id=job_id,
     )
 
     response = client.get_httpx_client().request(
@@ -68,47 +72,53 @@ def sync_detailed(
 
 
 def sync(
-    template_name: str,
+    job_id: str,
     *,
     client: Union[Client],
-) -> Optional[list[str]]:
-    """
+) -> Optional[Job]:
+    """Delete job
+
+     Deletes a job by name.
+
     Args:
-        template_name (str):
+        job_id (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:
-        list[str]
+        Job
     """
 
     return sync_detailed(
-        template_name=template_name,
+        job_id=job_id,
         client=client,
     ).parsed
 
 
 async def asyncio_detailed(
-    template_name: str,
+    job_id: str,
     *,
     client: Union[Client],
-) -> Response[list[str]]:
-    """
+) -> Response[Job]:
+    """Delete job
+
+     Deletes a job by name.
+
     Args:
-        template_name (str):
+        job_id (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[list[str]]
+        Response[Job]
     """
 
     kwargs = _get_kwargs(
-        template_name=template_name,
+        job_id=job_id,
     )
 
     response = await client.get_async_httpx_client().request(**kwargs)
@@ -117,25 +127,28 @@ async def asyncio_detailed(
 
 
 async def asyncio(
-    template_name: str,
+    job_id: str,
     *,
     client: Union[Client],
-) -> Optional[list[str]]:
-    """
+) -> Optional[Job]:
+    """Delete job
+
+     Deletes a job by name.
+
     Args:
-        template_name (str):
+        job_id (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:
-        list[str]
+        Job
     """
 
     return (
         await asyncio_detailed(
-            template_name=template_name,
+            job_id=job_id,
             client=client,
         )
     ).parsed