llama-deploy-core 0.3.0a16__tar.gz → 0.3.0a18__tar.gz

{llama_deploy_core-0.3.0a16 → llama_deploy_core-0.3.0a18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: llama-deploy-core
-Version: 0.3.0a16
+Version: 0.3.0a18
 Summary: Core models and schemas for LlamaDeploy
 License: MIT
 Requires-Dist: fastapi>=0.115.0
@@ -8,7 +8,7 @@ Requires-Dist: overrides>=7.7.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: types-pyyaml>=6.0.12.20250822
-Requires-Dist: httpx>=0.27.0 ; extra == 'client'
+Requires-Dist: httpx>=0.24.0,<1.0.0 ; extra == 'client'
 Requires-Dist: fastapi>=0.115.0 ; extra == 'server'
 Requires-Python: >=3.11, <4
 Provides-Extra: client

{llama_deploy_core-0.3.0a16 → llama_deploy_core-0.3.0a18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llama-deploy-core"
-version = "0.3.0a16"
+version = "0.3.0a18"
 description = "Core models and schemas for LlamaDeploy"
 readme = "README.md"
 license = { text = "MIT" }
@@ -18,7 +18,7 @@ server = [
     "fastapi>=0.115.0",
 ]
 client = [
-    "httpx>=0.27.0",
+    "httpx>=0.24.0,<1.0.0",
 ]
 
 [build-system]

{llama_deploy_core-0.3.0a16 → llama_deploy_core-0.3.0a18}/src/llama_deploy/core/deployment_config.py

@@ -6,12 +6,26 @@ from pathlib import Path
 from typing import Any, TypeVar
 
 import yaml
+from llama_deploy.core.git.git_util import get_git_root, is_git_repo
 from llama_deploy.core.path_util import validate_path_traversal
 from pydantic import BaseModel, ConfigDict, Field, ValidationError, model_validator
 
 DEFAULT_DEPLOYMENT_NAME = "default"
 
 
+def read_deployment_config_from_git_root_or_cwd(
+    cwd: Path, config_path: Path
+) -> "DeploymentConfig":
+    """
+    Read the deployment config from the git root or cwd.
+    """
+    if is_git_repo():
+        git_root = get_git_root()
+        relative_cwd_path = cwd.relative_to(git_root)
+        return read_deployment_config(git_root, relative_cwd_path / config_path)
+    return read_deployment_config(cwd, config_path)
+
+
 def read_deployment_config(source_root: Path, config_path: Path) -> "DeploymentConfig":
     """
     Read the deployment config from the config directory.
@@ -160,6 +174,10 @@ class DeploymentConfig(BaseModel):
         default=DEFAULT_DEPLOYMENT_NAME,
         description="The url safe path name of the deployment.",
     )
+    llama_cloud: bool = Field(
+        default=False,
+        description="If true, serving locally expects Llama Cloud access and will inject credentials when possible.",
+    )
     app: str | None = Field(
         None,
         description="A full bundle of all workflows as an 'app'. \"path.to_import:app_name\"",
@@ -186,6 +204,7 @@ class DeploymentConfig(BaseModel):
 
         return DeploymentConfig(
             name=_pick_non_default(self.name, config.name, "default"),
+            llama_cloud=self.llama_cloud or config.llama_cloud,
             app=self.app or config.app,
             workflows={**self.workflows, **config.workflows},
             env_files=list(set(self.env_files + config.env_files)),