llama-deploy-core 0.3.0a4__tar.gz → 0.3.0a5__tar.gz

{llama_deploy_core-0.3.0a4 → llama_deploy_core-0.3.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: llama-deploy-core
-Version: 0.3.0a4
+Version: 0.3.0a5
 Summary: Core models and schemas for LlamaDeploy
 License: MIT
 Requires-Dist: pydantic>=2.0.0

{llama_deploy_core-0.3.0a4 → llama_deploy_core-0.3.0a5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llama-deploy-core"
-version = "0.3.0a4"
+version = "0.3.0a5"
 description = "Core models and schemas for LlamaDeploy"
 readme = "README.md"
 license = { text = "MIT" }

llama_deploy_core-0.3.0a5/src/llama_deploy/core/deployment_config.py

@@ -0,0 +1,99 @@
+from pathlib import Path
+from typing import Any
+
+import yaml
+from pydantic import BaseModel, ConfigDict, Field, model_validator
+
+
+class ServiceSource(BaseModel):
+    """Configuration for where to load the workflow or other source. Path is relative to the config file its declared within."""
+
+    location: str
+
+    @model_validator(mode="before")
+    @classmethod
+    def validate_fields(cls, data: Any) -> Any:
+        if isinstance(data, dict):
+            if "name" in data:
+                data["location"] = data.pop("name")
+        return data
+
+
+class Service(BaseModel):
+    """Configuration for a single service."""
+
+    source: ServiceSource | None = Field(None)
+    import_path: str | None = Field(None)
+    env: dict[str, str] | None = Field(None)
+    env_files: list[str] | None = Field(None)
+    python_dependencies: list[str] | None = Field(None)
+
+    @model_validator(mode="before")
+    @classmethod
+    def validate_fields(cls, data: Any) -> Any:
+        if isinstance(data, dict):
+            # Handle YAML aliases
+            if "path" in data:
+                data["import_path"] = data.pop("path")
+            if "import-path" in data:
+                data["import_path"] = data.pop("import-path")
+            if "env-files" in data:
+                data["env_files"] = data.pop("env-files")
+
+        return data
+
+    def module_location(self) -> tuple[str, str]:
+        """
+        Parses the import path, and target, discarding legacy file path portion, if any
+
+        "src/module.workflow:my_workflow" -> ("module.workflow", "my_workflow")
+        """
+        if self.import_path is None:
+            raise ValueError("import_path is required to compute module_location")
+        module_name, workflow_name = self.import_path.split(":")
+        return Path(module_name).name, workflow_name
+
+
+class UIService(Service):
+    port: int = Field(
+        default=3000,
+        description="The TCP port to use for the nextjs server",
+    )
+
+
+class DeploymentConfig(BaseModel):
+    """Model definition mapping a deployment config file."""
+
+    model_config = ConfigDict(populate_by_name=True, extra="ignore")
+
+    name: str
+    default_service: str | None = Field(None)
+    services: dict[str, Service]
+    ui: UIService | None = None
+
+    @model_validator(mode="before")
+    @classmethod
+    def validate_fields(cls, data: Any) -> Any:
+        # Handle YAML aliases
+        if isinstance(data, dict):
+            if "default-service" in data:
+                data["default_service"] = data.pop("default-service")
+
+        return data
+
+    @classmethod
+    def from_yaml_bytes(cls, src: bytes) -> "DeploymentConfig":
+        """Read config data from bytes containing yaml code."""
+        config = yaml.safe_load(src) or {}
+        return cls(**config)
+
+    @classmethod
+    def from_yaml(cls, path: Path, name: str | None = None) -> "DeploymentConfig":
+        """Read config data from a yaml file."""
+        with open(path, "r", encoding="utf-8") as yaml_file:
+            config = yaml.safe_load(yaml_file) or {}
+
+        instance = cls(**config)
+        if name:
+            instance.name = name
+        return instance

{llama_deploy_core-0.3.0a4 → llama_deploy_core-0.3.0a5}/src/llama_deploy/core/git/git_util.py

@@ -3,11 +3,11 @@ Git utilities for the purpose of exploring, cloning, and parsing llama-deploy re
 Responsibilities are lower level git access, as well as some application specific config parsing.
 """
 
-from dataclasses import dataclass
 import re
 import subprocess
-from pathlib import Path
 import tempfile
+from dataclasses import dataclass
+from pathlib import Path
 
 import yaml
 
@@ -203,7 +203,7 @@ def validate_deployment_file(repo_dir: Path, deployment_file_path: str) -> bool:
             return False
 
 
-async def validate_git_public_access(repository_url: str) -> bool:
+def validate_git_public_access(repository_url: str) -> bool:
     """Check if a git repository is publicly accessible using git ls-remote."""
 
     try:
@@ -219,7 +219,7 @@ async def validate_git_public_access(repository_url: str) -> bool:
         return False
 
 
-async def validate_git_credential_access(repository_url: str, basic_auth: str) -> bool:
+def validate_git_credential_access(repository_url: str, basic_auth: str) -> bool:
     """Check if a credential provides access to a git repository."""
 
     auth_url = inject_basic_auth(repository_url, basic_auth)
@@ -234,3 +234,30 @@ async def validate_git_credential_access(repository_url: str, basic_auth: str) -
         return result.returncode == 0
     except (subprocess.TimeoutExpired, Exception):
         return False
+
+
+def is_git_repo() -> bool:
+    """
+    checks if the cwd is a git repo
+    """
+    try:
+        _run_process(["git", "status"])
+        return True
+    except GitAccessError:
+        return False
+
+
+def list_remotes() -> list[str]:
+    """
+    list the remote urls for the current git repo
+    """
+    result = _run_process(["git", "remote", "-v"])
+    return [line.split()[1] for line in result.splitlines()]
+
+
+def get_current_branch() -> str | None:
+    """
+    get the current branch for the current git repo
+    """
+    result = _run_process(["git", "branch", "--show-current"])
+    return result.strip() if result.strip() else None

{llama_deploy_core-0.3.0a4 → llama_deploy_core-0.3.0a5}/src/llama_deploy/core/schema/__init__.py

@@ -2,14 +2,14 @@ from .base import Base
 from .deployments import (
     DeploymentCreate,
     DeploymentResponse,
-    DeploymentUpdate,
     DeploymentsListResponse,
+    DeploymentUpdate,
+    LlamaDeploymentPhase,
     LlamaDeploymentSpec,
     apply_deployment_update,
-    LlamaDeploymentPhase,
 )
-from .git_validation import RepositoryValidationResponse, RepositoryValidationRequest
-from .projects import ProjectSummary, ProjectsListResponse
+from .git_validation import RepositoryValidationRequest, RepositoryValidationResponse
+from .projects import ProjectsListResponse, ProjectSummary
 
 __all__ = [
     "Base",

{llama_deploy_core-0.3.0a4 → llama_deploy_core-0.3.0a5}/src/llama_deploy/core/schema/deployments.py

@@ -1,11 +1,11 @@
-from typing import Literal
 from datetime import datetime
+from pathlib import Path
+from typing import Literal
 
 from pydantic import HttpUrl
 
 from .base import Base
 
-
 # K8s CRD phase values
 LlamaDeploymentPhase = Literal[
     "Syncing",  # Initial reconciliation phase - controller is processing the deployment
@@ -70,6 +70,8 @@ class LlamaDeploymentSpec(Base):
     gitSha: str | None = None
     name: str
     secretName: str | None = None
+    # when true, the deployment will prebuild the UI assets and serve them from a static file server
+    staticAssetsPath: str | None = None
 
 
 class LlamaDeploymentStatus(Base):
@@ -108,6 +110,7 @@ class DeploymentUpdate(Base):
     git_sha: str | None = None
     personal_access_token: str | None = None
     secrets: dict[str, str | None] | None = None
+    static_assets_path: Path | None = None
 
 
 class DeploymentUpdateResult(Base):
@@ -157,6 +160,12 @@ def apply_deployment_update(
     if update.git_sha is not None:
         updated_spec.gitSha = None if update.git_sha == "" else update.git_sha
 
+    # always apply this, as it should be cleared out if none, and is only set by the server
+    updated_spec.staticAssetsPath = (
+        str(update.static_assets_path) if update.static_assets_path else None
+    )
+    print(f"staticAssetsPath: {updated_spec.staticAssetsPath}")
+
     # Track secret changes
     secret_adds: dict[str, str] = {}
     secret_removes: list[str] = []

{llama_deploy_core-0.3.0a4 → llama_deploy_core-0.3.0a5}/src/llama_deploy/core/schema/git_validation.py

@@ -1,4 +1,6 @@
+from pathlib import Path
 from typing import Optional
+
 from pydantic import BaseModel, Field
 
 
@@ -17,11 +19,11 @@ class RepositoryValidationResponse(BaseModel):
         default=False,
         description="True if validation succeeded via GitHub App for a deployment that previously used a PAT",
     )
-    github_app_name: Optional[str] = Field(
+    github_app_name: str | None = Field(
         default=None,
         description="Name of the GitHub App if repository is a private GitHub repo and server has GitHub App configured",
     )
-    github_app_installation_url: Optional[str] = Field(
+    github_app_installation_url: str | None = Field(
         default=None,
         description="GitHub App installation URL if repository is a private GitHub repo and server has GitHub App configured",
     )
@@ -29,8 +31,8 @@ class RepositoryValidationResponse(BaseModel):
 
 class RepositoryValidationRequest(BaseModel):
     repository_url: str
-    deployment_id: Optional[str] = None
-    pat: Optional[str] = None
+    deployment_id: str | None = None
+    pat: str | None = None
 
 
 class GitApplicationValidationResponse(BaseModel):
@@ -44,3 +46,7 @@ class GitApplicationValidationResponse(BaseModel):
     git_ref: str | None = None
     git_sha: str | None = None
     valid_deployment_file_path: str | None = None
+    ui_build_output_path: Path | None = Field(
+        default=None,
+        description="Path to the UI build output, if the deployment's UI has a package.json with a build script; None if no UI is configured",
+    )

llama_deploy_core-0.3.0a5/src/llama_deploy/core/ui_build.py

@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+from .deployment_config import DeploymentConfig
+
+
+def resolve_ui_root(config_parent: Path, config: DeploymentConfig) -> Path | None:
+    """Return the absolute path to the UI root if UI is configured; otherwise None."""
+    if config.ui is None:
+        return None
+    rel = config.ui.source.location if config.ui.source else "."
+    return (config_parent / rel).resolve()
+
+
+def ui_build_output_path(config_parent: Path, config: DeploymentConfig) -> Path | None:
+    """
+    Determine if the UI has a build script defined in package.json, and where the output will be.
+    Right now, assumes its just `/dist` in the UI root.
+
+    Returns:
+    - True if a package.json exists and contains a "build" script
+    - False if a package.json exists but lacks a "build" script
+    - None if there is no UI configured or no package.json exists
+    """
+    ui_root = resolve_ui_root(config_parent, config)
+    if ui_root is None:
+        return None
+    package_json = ui_root / "package.json"
+    if not package_json.exists():
+        return None
+    try:
+        with open(package_json, "r", encoding="utf-8") as f:
+            pkg = json.load(f)
+        scripts = pkg.get("scripts", {}) or {}
+        if "build" in scripts:
+            return (ui_root / "dist").relative_to(config_parent)
+    except Exception:
+        # Do not raise for malformed package.json in validation contexts
+        return None