llama-deploy-core 0.3.0a15__py3-none-any.whl → 0.3.0a17__py3-none-any.whl

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)),

llama_deploy/core/server/manage_api/_create_deployments_router.py

@@ -23,18 +23,21 @@ async def get_project_id(project_id: Annotated[str, Query()]) -> str:
 def create_v1beta1_deployments_router(
     deployments_service: AbstractDeploymentsService,
     public_service: AbstractPublicDeploymentsService,
-    get_project_id: Callable[[str], Awaitable[str]] = get_project_id,
-    dependencies: list[params.Depends] = [],
-    public_dependencies: list[params.Depends] = [],
+    get_project_id: Callable[..., Awaitable[str]] = get_project_id,
+    dependencies: list[params.Depends] | None = None,
+    public_dependencies: list[params.Depends] | None = None,
+    include_in_schema: bool = True,
 ) -> APIRouter:
-    base_router = APIRouter(prefix="/api/v1beta1")
+    base_router = APIRouter(prefix="/api/v1beta1", include_in_schema=include_in_schema)
     public_router = APIRouter(
         tags=["v1beta1-deployments-public"],
         dependencies=public_dependencies,
+        include_in_schema=include_in_schema,
     )
     router = APIRouter(
         tags=["v1beta1-deployments"],
         dependencies=dependencies,
+        include_in_schema=include_in_schema,
     )
 
     @public_router.get("/version")

{llama_deploy_core-0.3.0a15.dist-info → llama_deploy_core-0.3.0a17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: llama-deploy-core
-Version: 0.3.0a15
+Version: 0.3.0a17
 Summary: Core models and schemas for LlamaDeploy
 License: MIT
 Requires-Dist: fastapi>=0.115.0

{llama_deploy_core-0.3.0a15.dist-info → llama_deploy_core-0.3.0a17.dist-info}/RECORD

@@ -1,7 +1,7 @@
 llama_deploy/core/__init__.py,sha256=112612bf2e928c2e0310d6556bb13fc28c00db70297b90a8527486cd2562e408,43
 llama_deploy/core/client/manage_client.py,sha256=0f2f63c0d5ba657580af758edd5c5f07602061d7ae13a5964ff82b71127d8324,8542
 llama_deploy/core/config.py,sha256=69bb0ea8ac169eaa4e808cd60a098b616bddd3145d26c6c35e56db38496b0e6a,35
-llama_deploy/core/deployment_config.py,sha256=b052fa66bd140fa39dea2de6cda362b39f8aca22f9c1cc0011c9f4a025263d0c,15117
+llama_deploy/core/deployment_config.py,sha256=bde431070758421f578f2e27f006152147e8cd752ee1054f1bf7c37ca95b0b38,15853
 llama_deploy/core/git/git_util.py,sha256=c581c1da13871b4e89eda58f56ddb074139454c06ae9b04c0b396fdb2b9a5176,9193
 llama_deploy/core/path_util.py,sha256=14d50c0c337c8450ed46cafc88436027056b365a48370a69cdb76c88d7c26fd1,798
 llama_deploy/core/py.typed,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
@@ -13,9 +13,9 @@ llama_deploy/core/schema/projects.py,sha256=726f91e90ff8699c90861d9740819c44c3f0
 llama_deploy/core/schema/public.py,sha256=022129c8fc09192f5e503b0500ccf54d106f5712b9cf8ce84b3b1c37e186f930,147
 llama_deploy/core/server/manage_api/__init__.py,sha256=e477ccab59cfd084edbad46f209972a282e623eb314d0847a754a46a16361db5,457
 llama_deploy/core/server/manage_api/_abstract_deployments_service.py,sha256=85ceab2a343c3642db7f77d4a665d5710a14bca920bbfdc25c5f1168cce30b22,4638
-llama_deploy/core/server/manage_api/_create_deployments_router.py,sha256=cde496f5922a74ae6199224abb25aefa1a357bb45c06ce25de79283d6f1a7174,6622
+llama_deploy/core/server/manage_api/_create_deployments_router.py,sha256=9bc8468169445e1cc7f2a479e1c7da42b4bdd7482fa3b440e03ee49cd09a75df,6801
 llama_deploy/core/server/manage_api/_exceptions.py,sha256=ee71cd9c2354a665e6905cd9cc752d2d65f71f0b936d33fec3c1c5229c38accf,246
 llama_deploy/core/ui_build.py,sha256=290dafa951918e5593b9035570fa4c66791d7e5ea785bd372ad11e99e8283857,1514
-llama_deploy_core-0.3.0a15.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
-llama_deploy_core-0.3.0a15.dist-info/METADATA,sha256=5a7554326e637c56fd06c98ac10bc489293a844f33f36f1624f38e72a31c04c2,659
-llama_deploy_core-0.3.0a15.dist-info/RECORD,,
+llama_deploy_core-0.3.0a17.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llama_deploy_core-0.3.0a17.dist-info/METADATA,sha256=85c28a4082b785d8eef56e19c9c2e1598c0e8a08c1ed812dde622bb93828cb16,659
+llama_deploy_core-0.3.0a17.dist-info/RECORD,,