beamlit 0.0.30rc33__py3-none-any.whl → 0.0.30rc34__py3-none-any.whl

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/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))
@@ -240,17 +240,17 @@ def generate_beamlit_deployment(directory: str):
     # Create directory if it doesn't exist
     os.makedirs(agents_dir, exist_ok=True)
     os.makedirs(functions_dir, exist_ok=True)
-    for resource, agent in agents:
-        # write deployment file
-        agent_dir = os.path.join(agents_dir, agent.metadata.name)
-        os.makedirs(agent_dir, exist_ok=True)
-        with open(os.path.join(agent_dir, f"agent.yaml"), "w") as f:
-            content = get_agent_yaml(agent, functions, settings)
-            f.write(content)
-        # write dockerfile for build
-        with open(os.path.join(agent_dir, f"Dockerfile"), "w") as f:
-            content = dockerfile("agent", resource, agent)
-            f.write(content)
+    # for resource, agent in agents:
+    #     # write deployment file
+    #     agent_dir = os.path.join(agents_dir, agent.metadata.name)
+    #     os.makedirs(agent_dir, exist_ok=True)
+    #     with open(os.path.join(agent_dir, f"agent.yaml"), "w") as f:
+    #         content = get_agent_yaml(agent, functions, settings)
+    #         f.write(content)
+    #     # write dockerfile for build
+    #     with open(os.path.join(agent_dir, f"Dockerfile"), "w") as f:
+    #         content = dockerfile("agent", resource, agent)
+    #         f.write(content)
     for resource, function in functions:
         # write deployment file
         function_dir = os.path.join(functions_dir, function.metadata.name)

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.30rc33.dist-info → beamlit-0.0.30rc34.dist-info}/METADATA

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

{beamlit-0.0.30rc33.dist-info → beamlit-0.0.30rc34.dist-info}/RECORD

@@ -134,12 +134,12 @@ beamlit/common/generate.py,sha256=LtdCju_QayRS4lZrrb_0VHqWWvTcv4Mbf-iV1TB_Qko,75
 beamlit/common/instrumentation.py,sha256=MsBDfFcMYqGDiHHj4j5hLHE4EWxZExkhmCeFS3SKzJY,3181
 beamlit/common/logger.py,sha256=VFRbaZh93n8ZGugeeYKe88IP2nI3g2JNa7XN4j8wVJE,1116
 beamlit/common/secrets.py,sha256=sid81bOe3LflkMKDHwBsBs9nIju8bp5-v9qU9gkyNMc,212
-beamlit/common/settings.py,sha256=bxgQxMV5ncNqDGcWS_Wj3nzOF8FgAmC6alMP2fOdEDU,5895
+beamlit/common/settings.py,sha256=2V06qodZHwPBqRDdpPyZhdCO7HeMjWr2rkEePOgmHqE,5936
 beamlit/common/utils.py,sha256=jouz5igBvT37Xn_e94-foCHyQczVim-UzVcoIF6RWJ4,657
 beamlit/deploy/__init__.py,sha256=GS7l7Jtm2yKs7iNLKcfjYO-rAhUzggQ3xiYSf3oxLBY,91
-beamlit/deploy/deploy.py,sha256=on1i93SdECKrLVRMm3V2BRW5JeolPPq1dJHa4Evp0ns,9188
+beamlit/deploy/deploy.py,sha256=cLQ9K6EG5Rnvv_FpfBpMdgHVS6pOgjm5pEUFMZbZb6A,9353
 beamlit/deploy/format.py,sha256=78tOoeNPJ8969AhQTeFlIwZgQ3un8gmTSMmrYbRQSds,1818
-beamlit/deploy/parser.py,sha256=uT-bezLX6yjyxr1ogm1GXIT_MeREqHDUBlKiyav5qg0,6912
+beamlit/deploy/parser.py,sha256=Ga0poCZkoRnuTw082QnTcNGCBJncoRAnVsn8-1FsaJE,6907
 beamlit/functions/__init__.py,sha256=_RPG1Bfg54JGdIPnViAU6n9zD7E1cDNsdXi8oYGskzE,138
 beamlit/functions/decorator.py,sha256=NsdIWs55Yhn-TUO855DIE2AarV-euXtl7Qt5c2W3AUo,3239
 beamlit/functions/github/__init__.py,sha256=gYnUkeegukOfbymdabuuJkScvH-_ZJygX05BoqkPn0o,49
@@ -256,6 +256,6 @@ beamlit/serve/app.py,sha256=k9THiOqcPs4lcQQhZaucLcboXCR_5AKP9AFCMNRbdPI,3559
 beamlit/serve/middlewares/__init__.py,sha256=1dVmnOmhAQWvWktqHkKSIX-YoF6fmMU8xkUQuhg_rJU,148
 beamlit/serve/middlewares/accesslog.py,sha256=Mu4T4_9OvHybjA0ApzZFpgi2C8f3X1NbUk-76v634XM,631
 beamlit/serve/middlewares/processtime.py,sha256=lDAaIasZ4bwvN-HKHvZpaD9r-yrkVNZYx4abvbjbrCg,411
-beamlit-0.0.30rc33.dist-info/METADATA,sha256=NQdt4gFJboZxWip3Z_i19Tkn759fbWvjZgi0ffzBYrQ,2405
-beamlit-0.0.30rc33.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.30rc33.dist-info/RECORD,,
+beamlit-0.0.30rc34.dist-info/METADATA,sha256=ueLL99sarr_KpTO6FvRg2mKPhjHyQC56FdUXOJJG0Wk,2405
+beamlit-0.0.30rc34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.30rc34.dist-info/RECORD,,