llama-deploy-appserver 0.3.0a2__tar.gz → 0.3.0a4__tar.gz

{llama_deploy_appserver-0.3.0a2 → llama_deploy_appserver-0.3.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: llama-deploy-appserver
-Version: 0.3.0a2
+Version: 0.3.0a4
 Summary: Application server components for LlamaDeploy
 Author: Massimiliano Pippi
 Author-email: Massimiliano Pippi <mpippi@gmail.com>
@@ -10,7 +10,7 @@ Requires-Dist: pydantic-settings>=2.10.1
 Requires-Dist: uvicorn>=0.24.0
 Requires-Dist: fastapi>=0.100.0
 Requires-Dist: websockets>=12.0
-Requires-Dist: llama-deploy-core>=0.3.0a2,<0.4.0
+Requires-Dist: llama-deploy-core>=0.3.0a4,<0.4.0
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: prometheus-fastapi-instrumentator>=7.1.0
 Requires-Python: >=3.12, <4

{llama_deploy_appserver-0.3.0a2 → llama_deploy_appserver-0.3.0a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llama-deploy-appserver"
-version = "0.3.0a2"
+version = "0.3.0a4"
 description = "Application server components for LlamaDeploy"
 readme = "README.md"
 license = { text = "MIT" }
@@ -14,7 +14,7 @@ dependencies = [
     "uvicorn>=0.24.0",
     "fastapi>=0.100.0",
     "websockets>=12.0",
-    "llama-deploy-core>=0.3.0a2,<0.4.0",
+    "llama-deploy-core>=0.3.0a4,<0.4.0",
     "httpx>=0.28.1",
     "prometheus-fastapi-instrumentator>=7.1.0",
 ]

{llama_deploy_appserver-0.3.0a2 → llama_deploy_appserver-0.3.0a4}/src/llama_deploy/appserver/app.py

@@ -13,6 +13,7 @@ from fastapi.middleware.cors import CORSMiddleware
 from llama_deploy.appserver.workflow_loader import (
     build_ui,
     do_install,
+    load_environment_variables,
     start_dev_ui_process,
 )
 import uvicorn
@@ -97,6 +98,7 @@ def start_server(
     configure_settings(
         proxy_ui=proxy_ui, app_root=cwd, deployment_file_path=deployment_file
     )
+    load_environment_variables(get_deployment_config(), settings.config_parent)
     if install:
         do_install()
     if build:

{llama_deploy_appserver-0.3.0a2 → llama_deploy_appserver-0.3.0a4}/src/llama_deploy/appserver/bootstrap.py

@@ -8,7 +8,11 @@ import os
 from pathlib import Path
 from llama_deploy.appserver.settings import settings
 from llama_deploy.appserver.deployment_config_parser import get_deployment_config
-from llama_deploy.appserver.workflow_loader import build_ui, do_install
+from llama_deploy.appserver.workflow_loader import (
+    build_ui,
+    do_install,
+    load_environment_variables,
+)
 from llama_deploy.core.git.git_util import (
     clone_repo,
 )
@@ -47,6 +51,7 @@ def bootstrap_app_from_repo(
     )
 
     built = True
+    load_environment_variables(get_deployment_config(), Path(target_dir))
     if build:
         do_install()
         built = build_ui(settings.config_parent, get_deployment_config())

{llama_deploy_appserver-0.3.0a2 → llama_deploy_appserver-0.3.0a4}/src/llama_deploy/appserver/workflow_loader.py

@@ -159,14 +159,14 @@ def load_environment_variables(config: DeploymentConfig, source_root: Path) -> N
     Load environment variables from the deployment config.
     """
     for service_id, service_config in config.services.items():
-        if service_config.env:
-            env_vars = {**service_config.env}
-            for env_file in service_config.env_files or []:
-                env_file_path = source_root / env_file
-                env_vars.update(**dotenv_values(env_file_path))
-            for key, value in env_vars.items():
-                if value:
-                    os.environ[key] = value
+        env_vars = {**service_config.env} if service_config.env else {}
+        for env_file in service_config.env_files or []:
+            env_file_path = source_root / env_file
+            values = dotenv_values(env_file_path)
+            env_vars.update(**values)
+        for key, value in env_vars.items():
+            if value:
+                os.environ[key] = value
 
 
 def install_python_dependencies(config: DeploymentConfig, source_root: Path) -> None:
@@ -175,7 +175,7 @@ def install_python_dependencies(config: DeploymentConfig, source_root: Path) ->
     """
     path = _find_install_target(source_root, config)
     if path is not None:
-        print(f"Installing python dependencies from {path}")
+        logger.info(f"Installing python dependencies from {path}")
         _ensure_uv_available()
         _install_to_current_python(path, source_root)
 
@@ -240,9 +240,6 @@ def _install_to_current_python(path: str, source_root: Path) -> None:
     python_bin_path = os.path.dirname(sys.executable)
     python_parent_dir = os.path.dirname(python_bin_path)
     _validate_path_is_safe(path, source_root, "python_dependencies")
-    print(
-        f"Installing python dependencies from {path} to {python_parent_dir} to {source_root}"
-    )
     try:
         _run_with_prefix(
             [