cave-cli 3.6.0b4__tar.gz → 3.6.1__tar.gz

{cave_cli-3.6.0b4/cave_cli.egg-info → cave_cli-3.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cave_cli
-Version: 3.6.0b4
+Version: 3.6.1
 Summary: CLI for creating and managing Docker-based CAVE web applications.
 Author-email: MIT-CAVE <cave-contact@mit.edu>
 License: Apache-2.0

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/cli.py

@@ -164,8 +164,7 @@ def main():
         "reset",
         aliases=["reset-db"],
         help=(
-            "Remove Docker containers and volumes, "
-            "then rebuild from scratch"
+            "Remove Docker containers and volumes, " "then rebuild from scratch"
         ),
     )
     add_global_args(p_reset)

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/create.py

@@ -8,7 +8,12 @@ from pathlib import Path
 from cave_cli.commands.reset import reset
 from cave_cli.commands.run import run_cave
 from cave_cli.utils.constants import HTTPS_URL
-from cave_cli.utils.display import print_section, step_done, step_fail, step_start
+from cave_cli.utils.display import (
+    print_section,
+    step_done,
+    step_fail,
+    step_start,
+)
 from cave_cli.utils.docker import build_image, generate_secret_key
 from cave_cli.utils.env import create_env_interactive
 from cave_cli.utils.git import add, branch_rename, clone, commit, init

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/doctor.py

@@ -59,7 +59,10 @@ def check_uv(return_path: bool = True) -> tuple[bool, str, str | None]:
                 return output
         except Exception:
             pass
-    output = False, "uv is not installed. Please install uv: https://github.com/astral-sh/uv"
+    output = (
+        False,
+        "uv is not installed. Please install uv: https://github.com/astral-sh/uv",
+    )
     if return_path:
         return output + (None,)
     return output

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/list_cmd.py

@@ -21,6 +21,7 @@ def list_cmd(args: argparse.Namespace) -> None:
     if show_all:
         print_section("CAVE App Containers (All)")
         from cave_cli.utils.display import _QUIET
+
         for suffix in ("_django", "_db_host", "_redis_host", "_nginx_host"):
             for name in get_all_containers(suffix):
                 if not _QUIET:
@@ -42,7 +43,8 @@ def list_cmd(args: argparse.Namespace) -> None:
             else:
                 port = get_container_host_port(f"{app_name}_django")
                 print_key_value(app_name, f"http://localhost:{port}")
-    
+
     from cave_cli.utils.display import _QUIET
+
     if not _QUIET:
         print("")

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/list_versions.py

@@ -48,7 +48,8 @@ def list_versions(args: argparse.Namespace) -> None:
 
     all_versions = sorted(
         (
-            v for v in set().union(*repo_tags.values())
+            v
+            for v in set().union(*repo_tags.values())
             if not pattern or fnmatch.fnmatch(v, pattern)
         ),
         key=version_tuple,
@@ -88,7 +89,10 @@ def list_versions(args: argparse.Namespace) -> None:
             row = indent + f"{v:<{version_w}}"
             for r, w in zip(repos, col_w):
                 mark = f"{GREEN}✓{RESET}" if v in repo_tags[r] else ""
-                row += " " * pad + f"{mark:^{w + len(GREEN) + len(RESET) if mark else w}}"
+                row += (
+                    " " * pad
+                    + f"{mark:^{w + len(GREEN) + len(RESET) if mark else w}}"
+                )
             print(row)
 
         if hidden:

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/purge.py

@@ -64,11 +64,19 @@ def purge(args: argparse.Namespace) -> None:
             "Some files are owned by root (created by Docker). "
             "Removing via Docker..."
         )
-        run_and_log([
-            "docker", "run", "--rm",
-            "-v", f"{abs_path}:/purge",
-            "alpine", "rm", "-rf", "/purge",
-        ])
+        run_and_log(
+            [
+                "docker",
+                "run",
+                "--rm",
+                "-v",
+                f"{abs_path}:/purge",
+                "alpine",
+                "rm",
+                "-rf",
+                "/purge",
+            ]
+        )
         if os.path.isdir(abs_path):
             try:
                 shutil.rmtree(abs_path)

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/reset.py

@@ -46,5 +46,7 @@ def reset(
         verbose=getattr(args, "verbose", False),
         loglevel=getattr(args, "loglevel", "INFO"),
     )
-    run_cave(app_dir, app_name, reset_args, skip_header=True, skip_build=skip_build)
+    run_cave(
+        app_dir, app_name, reset_args, skip_header=True, skip_build=skip_build
+    )
     step_done("Reset complete")

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/run.py

@@ -49,14 +49,21 @@ def run_cave(
     interactive = getattr(args, "interactive", False) or getattr(
         args, "it", False
     )
-    show_all = getattr(args, "show_all", False) or getattr(args, "verbose", False) or getattr(args, "loglevel", "INFO").upper() == "DEBUG"
+    show_all = (
+        getattr(args, "show_all", False)
+        or getattr(args, "verbose", False)
+        or getattr(args, "loglevel", "INFO").upper() == "DEBUG"
+    )
     entrypoint = getattr(args, "entrypoint", None) or "./utils/run_server.sh"
     docker_args_str = getattr(args, "docker_args", "") or ""
     extra_docker_args = shlex.split(docker_args_str) if docker_args_str else []
     ip_port_arg = getattr(args, "ip_port", None)
     command_args = getattr(args, "command_args", []) or []
     extra_env = getattr(args, "extra_env", {}) or {}
-    quiet = getattr(args, "quiet", False) or getattr(args, "loglevel", "INFO").upper() == "SILENT"
+    quiet = (
+        getattr(args, "quiet", False)
+        or getattr(args, "loglevel", "INFO").upper() == "SILENT"
+    )
 
     is_server_run = entrypoint == "./utils/run_server.sh" and not interactive
     use_tui = is_server_run and not show_all
@@ -180,7 +187,10 @@ def run_cave(
             else:
                 step_done("Checking database")
         else:
-            step_fail("Checking database", "Database container failed to become ready.")
+            step_fail(
+                "Checking database",
+                "Database container failed to become ready.",
+            )
             remove_containers(app_name)
             sys.exit(1)
 
@@ -190,9 +200,7 @@ def run_cave(
     if parsed:
         ip, port = parsed
         if not is_port_available(port):
-            logger.error(
-                "The specified port is in use. Please try another."
-            )
+            logger.error("The specified port is in use. Please try another.")
             sys.exit(1)
 
         if is_server_run and not interactive:

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/sync_cmd.py

@@ -5,14 +5,19 @@ import tempfile
 
 from cave_cli.commands.reset import reset
 from cave_cli.utils.constants import HTTPS_URL
-from cave_cli.utils.display import print_section, step_done, step_start, print_key_value
+from cave_cli.utils.display import (
+    print_section,
+    step_done,
+    step_start,
+    print_key_value,
+)
 from cave_cli.utils.git import clone
 from cave_cli.utils.logger import logger
 from cave_cli.utils.sync import sync_files
 from cave_cli.utils.validate import confirm_action, find_app_dir
 
 
-def sync_cmd(args: argparse.Namespace, do_reset: bool=True) -> None:
+def sync_cmd(args: argparse.Namespace, do_reset: bool = True) -> None:
     """
     Usage:
 

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/uninstall.py

@@ -30,7 +30,9 @@ def uninstall(args: argparse.Namespace) -> None:
     has_uv, uv_message, uv_path = check_uv()
     if not has_uv:
         logger.error(uv_message)
-        logger.error(f"You may need to uninstall CAVE CLI manually based on how it was installed.")
+        logger.error(
+            f"You may need to uninstall CAVE CLI manually based on how it was installed."
+        )
         sys.exit(1)
 
     step_start("Removing installation")

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/update.py

@@ -26,16 +26,24 @@ def update(args: argparse.Namespace) -> None:
     - On Windows, the update runs in a new console window because Windows
       locks running executables and cave.exe cannot replace itself.
     """
-    has_uv, uv_message, uv_path= check_uv()
+    has_uv, uv_message, uv_path = check_uv()
     if not has_uv:
         logger.error(uv_message)
-        logger.error(f"The cave_cli package may need to be updated manually based on how it was installed.")
+        logger.error(
+            f"The cave_cli package may need to be updated manually based on how it was installed."
+        )
         sys.exit(1)
 
     version = getattr(args, "version", None)
     if version:
         label = f"Reinstalling CAVE CLI ({version})"
-        cmd = [uv_path, "tool", "install", "--reinstall", f"cave_cli @ git+{CLI_REPO_URL}@{version}"]
+        cmd = [
+            uv_path,
+            "tool",
+            "install",
+            "--reinstall",
+            f"cave_cli @ git+{CLI_REPO_URL}@{version}",
+        ]
     else:
         label = "Updating CAVE CLI"
         cmd = [uv_path, "tool", "upgrade", "cave_cli"]

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/upgrade.py

@@ -53,7 +53,9 @@ def migrate_3_6_0(app_dir: str) -> None:
         if utils_pyproject.exists():
             shutil.move(utils_pyproject, legacy_utils_dir / "pyproject.toml")
         if utils_extra_req.exists():
-            shutil.move(utils_extra_req, legacy_utils_dir / "extra_requirements.txt")
+            shutil.move(
+                utils_extra_req, legacy_utils_dir / "extra_requirements.txt"
+            )
 
     # Remove VERSION file
     version_file = app_path / "VERSION"
@@ -68,12 +70,14 @@ def migrate_3_6_0(app_dir: str) -> None:
             legacy_cave_core.mkdir(exist_ok=True)
             shutil.move(models_file, legacy_cave_core / "models.py")
         except Exception as e:
-            logger.warn(f"Failed to move cave_core/models.py to legacy/cave_core/models.py: {e}")
+            logger.warn(
+                f"Failed to move cave_core/models.py to legacy/cave_core/models.py: {e}"
+            )
 
     # Collect api requirements from cave_api/requirements.txt and cave_api/pyproject.toml
     # before moving/restructuring the cave_api directory
     api_requirements = []
-    
+
     # 1. Pull from cave_api/requirements.txt
     cave_api_req = app_path / "cave_api" / "requirements.txt"
     if cave_api_req.exists():
@@ -91,7 +95,9 @@ def migrate_3_6_0(app_dir: str) -> None:
         try:
             with open(cave_api_pyproject, "rb") as f:
                 cave_api_pyproject_data = tomllib.loads(f.read().decode())
-            deps = cave_api_pyproject_data.get("project", {}).get("dependencies", [])
+            deps = cave_api_pyproject_data.get("project", {}).get(
+                "dependencies", []
+            )
             for dep in deps:
                 dep = dep.strip()
                 if dep and dep not in api_requirements:
@@ -116,23 +122,23 @@ def migrate_3_6_0(app_dir: str) -> None:
             content = content_bytes.decode()
 
             deps_str = "\n".join(f'  "{dep}",' for dep in cleaned_requirements)
-            
+
             if "[project.optional-dependencies]" in content:
-                if re.search(r"api\s*=\s*\[", content):
+                if re.search(r"(?<![\w-])api\s*=\s*\[", content):
                     content = re.sub(
-                        r"(api\s*=\s*\[)[^\]]*(\])",
+                        r"(?<![\w-])(api\s*=\s*\[)[^\]]*(\])",
                         f"\\1\n{deps_str}\n\\2",
                         content,
-                        flags=re.DOTALL
+                        flags=re.DOTALL,
                     )
                 else:
                     content = re.sub(
                         r"(\[project\.optional-dependencies\])",
                         f"\\1\napi = [\n{deps_str}\n]",
-                        content
+                        content,
                     )
             else:
-                content += f'\n[project.optional-dependencies]\napi = [\n{deps_str}\n]\n'
+                content += f"\n[project.optional-dependencies]\napi = [\n{deps_str}\n]\n"
 
             with open(pyproject_path, "wb") as f:
                 f.write(content.encode())
@@ -157,12 +163,15 @@ def migrate_3_6_0(app_dir: str) -> None:
         shutil.move(cave_api, legacy_cave_api)
         shutil.copytree(legacy_cave_api / "cave_api", cave_api)
     else:
-        logger.warn("Expected cave_api/cave_api directory not found, skipping API migration steps.")
+        logger.warn(
+            "Expected cave_api/cave_api directory not found, skipping API migration steps."
+        )
 
     # Update code references, skipping legacy/ and tool directories
     for py_file in app_path.rglob("*.py"):
         if any(
-            part.startswith(".") or part in ("__pycache__", "venv", ".venv", ".nox", "legacy")
+            part.startswith(".")
+            or part in ("__pycache__", "venv", ".venv", ".nox", "legacy")
             for part in py_file.parts
         ):
             continue
@@ -171,10 +180,12 @@ def migrate_3_6_0(app_dir: str) -> None:
             new_content = content.replace("cave_api.cave_api", "cave_api")
             new_content = new_content.replace("cave_api/cave_api", "cave_api")
             new_content = new_content.replace(
-                'importlib.resources.files("cave_api") / "cave_api"', 'importlib.resources.files("cave_api")'
+                'importlib.resources.files("cave_api") / "cave_api"',
+                'importlib.resources.files("cave_api")',
             )
             new_content = new_content.replace(
-                "importlib.resources.files('cave_api') / 'cave_api'", "importlib.resources.files('cave_api')"
+                "importlib.resources.files('cave_api') / 'cave_api'",
+                "importlib.resources.files('cave_api')",
             )
 
             if new_content != content:
@@ -203,17 +214,22 @@ def upgrade(args: argparse.Namespace) -> None:
     if os.path.exists(pyproject_path):
         try:
             import tomllib
+
             with open(pyproject_path, "rb") as f:
                 pyproject = tomllib.load(f)
-            api_deps = pyproject.get("project", {}).get("optional-dependencies", {}).get("api", [])
+            api_deps = (
+                pyproject.get("project", {})
+                .get("optional-dependencies", {})
+                .get("api", [])
+            )
         except Exception:
             pass
 
     current_v = get_app_version(app_dir)
     current_version = version_tuple(current_v)
-    is_pre_3_6 = (
-        (current_version and current_version < (3, 6, 0)) or
-        (not current_version and os.path.exists(os.path.join(app_dir, "requirements.txt")))
+    is_pre_3_6 = (current_version and current_version < (3, 6, 0)) or (
+        not current_version
+        and os.path.exists(os.path.join(app_dir, "requirements.txt"))
     )
     target_v = version or "main"
 
@@ -230,7 +246,9 @@ def upgrade(args: argparse.Namespace) -> None:
     msg = "This will potentially update all files not in 'cave_api/', 'tests/' or '.env' and reset your database"
     if is_breaking_change(current_v, target_v):
         instructions = get_breaking_instructions(current_v, target_v)
-        instruction_text = "\n" + "\n".join(instructions) if instructions else ""
+        instruction_text = (
+            "\n" + "\n".join(instructions) if instructions else ""
+        )
         msg = f"Upgrading from {current_v} to {target_v} is a BREAKING CHANGE.{instruction_text}\n\n{msg}"
 
     confirm_action(msg, auto_yes=auto_yes)
@@ -258,9 +276,9 @@ def upgrade(args: argparse.Namespace) -> None:
             deps_list_str = "\n".join(f'    "{dep}",' for dep in api_deps)
 
             if "[project.optional-dependencies]" in content:
-                if re.search(r"api\s*=\s*\[", content):
+                if re.search(r"(?<![\w-])api\s*=\s*\[", content):
                     content = re.sub(
-                        r"(api\s*=\s*\[)[^\]]*(\])",
+                        r"(?<![\w-])(api\s*=\s*\[)[^\]]*(\])",
                         f"\\1\n{deps_list_str}\n  \\2",
                         content,
                         flags=re.DOTALL,
@@ -272,13 +290,13 @@ def upgrade(args: argparse.Namespace) -> None:
                         content,
                     )
             else:
-                content += (
-                    f"\n[project.optional-dependencies]\napi = [\n{deps_list_str}\n]\n"
-                )
+                content += f"\n[project.optional-dependencies]\napi = [\n{deps_list_str}\n]\n"
 
             with open(pyproject_path, "w") as f:
                 f.write(content)
-            logger.info("Preserved 'api' optional dependencies in pyproject.toml")
+            logger.info(
+                "Preserved 'api' optional dependencies in pyproject.toml"
+            )
         except Exception as e:
             logger.warn(f"Failed to preserve 'api' optional dependencies: {e}")
 
@@ -293,7 +311,7 @@ def upgrade(args: argparse.Namespace) -> None:
         )
         if should_migrate:
             migrate_3_6_0(app_dir)
-    
+
     reset_args = argparse.Namespace(
         yes=True,
         verbose=getattr(args, "verbose", False),

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/commands/version.py

@@ -19,6 +19,7 @@ def version(args: argparse.Namespace) -> None:
     print_key_value("CLI Version", __version__)
     print_app_versions()
 
+
 def print_app_versions() -> None:
     try:
         app_dir, app_name = get_app()
@@ -35,20 +36,23 @@ def print_app_versions() -> None:
     cave_app_version = get_app_version(app_dir)
     cave_static_version = "Unknown"
     cave_utils_version = "Unknown"
-    
+
     if pyproject_file.is_file():
         try:
             import tomllib
+
             with open(pyproject_file, "rb") as f:
                 pyproject_data = tomllib.load(f)
             deps = pyproject_data.get("project", {}).get("dependencies", [])
             cave_utils_version = get_version_from_req_list("cave_utils", deps)
-        except Exception:   
+        except Exception:
             pass
     if req_file.is_file() and cave_utils_version == "Unknown":
         try:
             req_strings = req_file.read_text().splitlines()
-            cave_utils_version = get_version_from_req_list("cave_utils", req_strings)
+            cave_utils_version = get_version_from_req_list(
+                "cave_utils", req_strings
+            )
         except Exception:
             pass
 

{cave_cli-3.6.0b4 → cave_cli-3.6.1}/cave_cli/utils/cache.py

@@ -97,9 +97,7 @@ def save_entry(name: str, label: str, value: str) -> None:
     entries = load_entries(name)
     entries = [e for e in entries if e["value"] != value]
     entries.append({"label": label, "value": value})
-    Path(cache_path(name)).write_text(
-        json.dumps(entries, indent=2) + "\n"
-    )
+    Path(cache_path(name)).write_text(json.dumps(entries, indent=2) + "\n")
 
 
 def set_setting(name: str, value: str) -> None:
@@ -241,9 +239,7 @@ def prompt_cached_entry(
     print(f"\n{prompt_new}")
     print(f"Saved entries:")
     for i, entry in enumerate(entries, 1):
-        display = (
-            _mask_value(entry["value"]) if mask else entry["value"]
-        )
+        display = _mask_value(entry["value"]) if mask else entry["value"]
         suffix = " (default)" if i == 1 else ""
         print(f"  [{i}] {entry['label']} ({display}){suffix}")
     print(f"  [N] Enter a new value")
@@ -277,9 +273,7 @@ def prompt_cached_entry(
             except (EOFError, KeyboardInterrupt):
                 label = ""
             if not label:
-                label = (
-                    value if not mask else f"entry-{len(entries) + 1}"
-                )
+                label = value if not mask else f"entry-{len(entries) + 1}"
             save_entry(name, label, value)
             return value