beamlit 0.0.29rc32__tar.gz → 0.0.30a0__tar.gz

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.29rc32
+Version: 0.0.30a0
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beamlit"
-version = "0.0.29.pre-32"
+version = "0.0.30-a"
 description = "Add your description here"
 readme = "README.md"
 authors = [

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/src/beamlit/common/__init__.py

@@ -1,6 +1,7 @@
+from .error import HTTPError
 from .logger import init as init_logger
 from .secrets import Secret
-from .settings import Settings, get_settings, init_agent
+from .settings import Settings, get_settings, init, init_agent
 from .utils import copy_folder
 
 __all__ = [
@@ -8,6 +9,8 @@ __all__ = [
     "Settings",
     "get_settings",
     "init_agent",
+    "init",
     "copy_folder",
     "init_logger",
+    "HTTPError",
 ]

beamlit-0.0.30a0/src/beamlit/common/error.py

@@ -0,0 +1,9 @@
+class HTTPError(Exception):
+    def __init__(self, status_code: int, message: str):
+        self.status_code = status_code
+        self.message = message
+        super().__init__(self.message)
+
+    def __str__(self):
+        return f"{self.status_code} {self.message}"
+

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/src/beamlit/common/settings.py

@@ -42,7 +42,7 @@ class SettingsServer(BaseSettings):
     module: str = Field(default="main.main")
     port: int = Field(default=80)
     host: str = Field(default="0.0.0.0")
-
+    directory: str = Field(default="src")
 
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/src/beamlit/deploy/deploy.py

@@ -174,15 +174,15 @@ def dockerfile(
     Returns:
         str: Dockerfile content
     """
+    settings = get_settings()
     if type == "agent":
         module = f"{resource.module.__file__.split('/')[-1].replace('.py', '')}.{resource.module.__name__}"
     else:
-        module = f"functions.{resource.module.__name__}.{resource.func.__name__}"
+        module = f"functions.{resource.module.__file__.split('/')[-1].replace('.py', '')}.{resource.module.__name__}"
     cmd = ["bl", "serve", "--port", "80", "--module", module]
     if type == "agent":
         cmd.append("--remote")
     cmd_str = ",".join([f'"{c}"' for c in cmd])
-
     return f"""
 FROM python:3.12-slim
 
@@ -201,7 +201,7 @@ RUN uv sync --no-cache
 
 COPY README.m[d] /beamlit/README.md
 COPY LICENS[E] /beamlit/LICENSE
-COPY src /beamlit/src
+COPY {settings.server.directory} /beamlit/src
 
 ENV PATH="/beamlit/.venv/bin:$PATH"
 
@@ -226,11 +226,11 @@ def generate_beamlit_deployment(directory: str):
     logger.info(f"Importing server module: {settings.server.module}")
     functions: list[tuple[Resource, Function]] = []
     agents: list[tuple[Resource, Agent]] = []
-    for resource in get_resources("agent"):
+    for resource in get_resources("agent", settings.server.directory):
         agent = get_beamlit_deployment_from_resource(resource)
         if agent:
             agents.append((resource, agent))
-    for resource in get_resources("function"):
+    for resource in get_resources("function", settings.server.directory):
         function = get_beamlit_deployment_from_resource(resource)
         if function:
             functions.append((resource, function))
@@ -251,6 +251,10 @@ def generate_beamlit_deployment(directory: str):
         with open(os.path.join(agent_dir, f"Dockerfile"), "w") as f:
             content = dockerfile("agent", resource, agent)
             f.write(content)
+        # write destination docker
+        with open(os.path.join(agent_dir, f"destination.txt"), "w") as f:
+            content = agent.spec.runtime.image
+            f.write(content)
     for resource, function in functions:
         # write deployment file
         function_dir = os.path.join(functions_dir, function.metadata.name)
@@ -262,3 +266,7 @@ def generate_beamlit_deployment(directory: str):
         with open(os.path.join(function_dir, f"Dockerfile"), "w") as f:
             content = dockerfile("function", resource, function)
             f.write(content)
+        # write destination docker
+        with open(os.path.join(function_dir, f"destination.txt"), "w") as f:
+            content = function.spec.runtime.image
+            f.write(content)

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/src/beamlit/deploy/parser.py

@@ -7,6 +7,7 @@ from typing import Callable, Literal
 
 from beamlit.models import StoreFunctionParameter
 
+
 @dataclass
 class Resource:
     type: Literal["agent", "function"]
@@ -16,7 +17,7 @@ class Resource:
     func: Callable
 
 
-def get_resources(from_decorator, dir="src") -> list[Resource]:
+def get_resources(from_decorator, dir) -> list[Resource]:
     """
     Scans through Python files in a directory to find functions decorated with a specific decorator.
 

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/src/beamlit/run.py

@@ -3,7 +3,7 @@ from typing import Any
 
 import requests
 from beamlit.client import AuthenticatedClient
-from beamlit.common.settings import get_settings
+from beamlit.common import HTTPError, get_settings
 
 
 class RunClient:
@@ -45,4 +45,6 @@ class RunClient:
             kwargs["json"] = json
 
         response = client.request(method, url, **kwargs)
+        if response.status_code >= 400:
+            raise HTTPError(response.status_code, response.text)
         return response

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/src/beamlit/serve/app.py

@@ -7,13 +7,10 @@ from logging import getLogger
 from uuid import uuid4
 
 from asgi_correlation_id import CorrelationIdMiddleware
-from beamlit.common.settings import get_settings, init
-from beamlit.common.instrumentation import (
-    get_metrics_exporter,
-    get_resource_attributes,
-    get_span_exporter,
-    instrument_app,
-)
+from beamlit.common import HTTPError, get_settings, init
+from beamlit.common.instrumentation import (get_metrics_exporter,
+                                            get_resource_attributes,
+                                            get_span_exporter, instrument_app)
 from fastapi import FastAPI, Request, Response
 from fastapi.responses import JSONResponse
 from traceloop.sdk import Traceloop
@@ -90,10 +87,17 @@ async def root(request: Request):
         content = {"error": str(e)}
         if settings.environment == "development":
             content["traceback"] = str(traceback.format_exc())
-        logger.error(f"{content}")
+        logger.error(str(traceback.format_exc()))
         return JSONResponse(status_code=400, content=content)
+    except HTTPError as e:
+        content = {"error": e.message, "status_code": e.status_code}
+        if settings.environment == "development":
+            content["traceback"] = str(traceback.format_exc())
+        logger.error(f"{e.status_code} {str(traceback.format_exc())}")
+        return JSONResponse(status_code=e.status_code, content=content)
     except Exception as e:
         content = {"error": f"Internal server error, {e}"}
         if settings.environment == "development":
             content["traceback"] = str(traceback.format_exc())
+        logger.error(str(traceback.format_exc()))
         return JSONResponse(status_code=500, content=content)

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/src/integrationtest/agent.py

@@ -15,8 +15,6 @@ from beamlit.agents import agent
             "model": "gpt-4o-mini",
         },
     },
-    mcp_hub=["brave-search"],
-    remote_functions=["github"],
 )
 async def main(agent, chat_model, tools, body, headers=None, query_params=None, **_):
     agent_config = {"configurable": {"thread_id": str(uuid.uuid4())}}

{beamlit-0.0.29rc32 → beamlit-0.0.30a0}/src/integrationtest/functions/helloworld.py

@@ -2,6 +2,6 @@ from beamlit.functions import function
 
 
 @function()
-def helloworld(query: str):
+def helloworld2(query: str):
     """A function for saying hello to the world."""
     return "Hello from beamlit!"

beamlit-0.0.30a0/src/integrationtest/pyproject.toml

@@ -0,0 +1,9 @@
+[project]
+name = "integrationtest"
+version = "0.1.0"
+description = ""
+
+requires-python = ">=3.12"
+dependencies = [
+    "beamlit>=0.0.29rc21",
+]