buildai-cli 0.3.30__tar.gz → 0.3.31__tar.gz

{buildai_cli-0.3.30 → buildai_cli-0.3.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildai-cli
-Version: 0.3.30
+Version: 0.3.31
 Summary: Build AI CLI (Typer)
 Requires-Python: >=3.11
 Requires-Dist: buildai-data

{buildai_cli-0.3.30 → buildai_cli-0.3.31}/cli/context.py

@@ -85,14 +85,14 @@ def resolve_admin_connection_config(
     deployment profile, then the production password fallback already used by
     privileged database commands.
     """
-    from infra.deployment_profiles import deployment_profile_for_app_env, resolve_deployment_profile
+    from infra.deployment_profiles import resolve_deployment_profile
 
     admin_iam_user = settings.effective_alloydb_admin_iam_user
     admin_impersonate_sa = settings.effective_alloydb_admin_impersonate_sa
 
     if not admin_iam_user or not admin_impersonate_sa:
         try:
-            profile_name = deployment_profile_for_app_env(settings.app_env.value)
+            profile_name = os.environ.get("BUILDAI_DEPLOYMENT_PROFILE", "production")
             profile = resolve_deployment_profile(profile_name)
             if profile.database_admin:
                 admin_iam_user = admin_iam_user or profile.database_admin.iam_user

{buildai_cli-0.3.30 → buildai_cli-0.3.31}/cli/dev_context.py

@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+import hashlib
 import json
 import os
+import re
 import shlex
 import subprocess
 from datetime import datetime, timezone
@@ -12,10 +14,23 @@ from typing import Any
 
 from infra.deployment_profiles import (
     list_deployment_profiles,
-    normalize_preview_env_id,
     resolve_deployment_profile,
 )
 
+_PREVIEW_ENV_ID_MAX_LEN = 26
+
+
+def _normalize_env_id(branch_name: str) -> str:
+    """Normalize a branch name into a DNS-safe env id (max 26 chars)."""
+    slug = re.sub(r"[^a-z0-9]+", "-", branch_name.lower()).strip("-")
+    if not slug:
+        slug = "preview"
+    if len(slug) <= _PREVIEW_ENV_ID_MAX_LEN:
+        return slug
+    digest = hashlib.sha256(branch_name.encode()).hexdigest()[:8]
+    return f"{slug[:_PREVIEW_ENV_ID_MAX_LEN - 1 - len(digest)]}-{digest}".rstrip("-")
+
+
 DEV_CONTEXT_DIRNAME = ".buildai"
 DEV_CONTEXT_FILENAME = "context.json"
 DEV_CONTEXT_SUMMARY_FILENAME = "context.md"
@@ -90,15 +105,19 @@ def get_branch_preview_name(branch: str | None, start_path: Path | None = None)
         return None
     cwd = (start_path or Path.cwd()).resolve()
     value = _git_output(["config", "--local", "--get", f"branch.{branch}.buildaiPreviewName"], cwd)
-    return normalize_preview_env_id(value) if value else None
+    return _normalize_env_id(value) if value else None
 
 
-def set_branch_preview_name(branch: str | None, preview_name: str, start_path: Path | None = None) -> None:
+def set_branch_preview_name(
+    branch: str | None,
+    preview_name: str,
+    start_path: Path | None = None,
+) -> None:
     """Persist one branch-local preview alias into local git config."""
     if not branch:
         raise RuntimeError("Cannot save preview alias without an active git branch.")
     cwd = (start_path or Path.cwd()).resolve()
-    normalized = normalize_preview_env_id(preview_name)
+    normalized = _normalize_env_id(preview_name)
     subprocess.run(
         ["git", "config", "--local", f"branch.{branch}.buildaiPreviewName", normalized],
         cwd=str(cwd),
@@ -129,7 +148,7 @@ def _repo_metadata(start_path: Path | None = None) -> dict[str, Any]:
     cwd = (start_path or Path.cwd()).resolve()
     branch = _git_output(["branch", "--show-current"], cwd) if repo_root else None
     commit_sha = _git_output(["rev-parse", "HEAD"], cwd) if repo_root else None
-    preview_env_id = normalize_preview_env_id(branch) if branch else None
+    preview_env_id = _normalize_env_id(branch) if branch else None
     return {
         "repo_root": str(repo_root) if repo_root else None,
         "worktree_path": str(cwd),
@@ -145,7 +164,6 @@ def _profile_defaults(profile: str, metadata: dict[str, Any]) -> dict[str, Any]:
         resolved = resolve_deployment_profile(
             profile,
             env_id=env_id,
-            override_key=metadata.get("branch"),
         )
         return {
             "deployment_profile": resolved.name,

{buildai_cli-0.3.30 → buildai_cli-0.3.31}/cli/ops_init.py

@@ -11,7 +11,7 @@ import os
 from enum import Enum
 
 import typer
-from infra.deployment_profiles import deployment_profile_for_app_env, resolve_deployment_profile
+from infra.deployment_profiles import resolve_deployment_profile
 
 from cli.console import error, info, warning
 
@@ -59,11 +59,6 @@ def _apply_context_database_target(
                 if isinstance(context, dict) and context.get("preview_env_id")
                 else None
             ),
-            override_key=(
-                str(context.get("branch")).strip()
-                if isinstance(context, dict) and context.get("branch")
-                else None
-            ),
         )
         database_target = resolved_profile.database_target.as_context_dict()
         runtime_target["region"] = resolved_profile.runtime_region
@@ -189,10 +184,14 @@ def init_ops_context(ctx: typer.Context):
             os.environ["BUILDAI_PREVIEW_ENV_ID"] = preview_env_id.strip()
     if env_flag is not None:
         deployment_profile = (
-            "" if app_env == Environment.TEST else deployment_profile_for_app_env(app_env.value)
+            ""
+            if app_env == Environment.TEST
+            else "local"
+            if app_env == Environment.DEVELOPMENT
+            else "production"
         )
     elif deployment_profile is None and app_env != Environment.TEST:
-        deployment_profile = deployment_profile_for_app_env(app_env.value)
+        deployment_profile = "local" if app_env == Environment.DEVELOPMENT else "production"
     if deployment_profile:
         os.environ["BUILDAI_DEPLOYMENT_PROFILE"] = deployment_profile
     _apply_context_database_target(workspace_context, deployment_profile=deployment_profile)

{buildai_cli-0.3.30 → buildai_cli-0.3.31}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "buildai-cli"
-version = "0.3.30"
+version = "0.3.31"
 description = "Build AI CLI (Typer)"
 requires-python = ">=3.11"
 dependencies = [