homeconsole-cli 0.0.3__tar.gz → 0.0.4__tar.gz

{homeconsole_cli-0.0.3 → homeconsole_cli-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: homeconsole-cli
-Version: 0.0.3
+Version: 0.0.4
 Summary: HomeConsole CLI (hc) — управление платформой через HTTP API
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{homeconsole_cli-0.0.3 → homeconsole_cli-0.0.4}/hc/commands/deploy.py

@@ -52,11 +52,15 @@ _STACK_ENV_COMPOSE: dict[str, str] = {
 }
 
 
+_MONOREPO_SIBLINGS = frozenset({"home-console-cli", "packages", "platform-home-console"})
+
+
 def _find_repo_root() -> Path | None:
     here = Path(__file__).resolve()
     for p in [here, *here.parents]:
         if (p / "core-runtime-service").exists():
-            return p
+            if any((p / s).exists() for s in _MONOREPO_SIBLINGS):
+                return p
     return None
 
 
@@ -106,6 +110,28 @@ def _run_env(cmd: list[str], *, cwd: Path | None = None, env: dict[str, str] | N
         raise typer.Exit(code=p.returncode)
 
 
+def _run_pull(
+    cmd: list[str],
+    *,
+    cwd: Path | None = None,
+    env: dict[str, str] | None = None,
+    image: str,
+) -> None:
+    """docker compose pull с понятной подсказкой при ошибке авторизации."""
+    p = subprocess.run(cmd, cwd=str(cwd) if cwd else None, env=env, check=False)  # noqa: S603
+    if p.returncode != 0:
+        registry = image.split("/")[0] if "/" in image else "ghcr.io"
+        raise HcCliError(
+            message=f"Не удалось загрузить образ {image}",
+            hint=(
+                f"Образ недоступен (denied / unauthorized).\n"
+                f"  Авторизуйся в реестре:\n"
+                f"  docker login {registry} -u <github_username> -p <PAT_read:packages>"
+            ),
+            exit_code=p.returncode,
+        )
+
+
 def _copy_dir_contents(src: Path, dst: Path) -> None:
     if dst.exists():
         shutil.rmtree(dst)
@@ -707,10 +733,11 @@ def register(app: typer.Typer) -> None:
             env = {**os.environ, "PLATFORM_IMAGE": full_image}
             console.print(f"[cyan]→[/cyan] Deploy platform image [bold]{full_image}[/bold]")
             if start:
-                _run_env(
+                _run_pull(
                     ["docker", "compose", "-f", str(compose_file), "pull", "platform-web"],
                     cwd=platform_root,
                     env=env,
+                    image=full_image,
                 )
                 _run_env(
                     ["docker", "compose", "-f", str(compose_file), "up", "-d"],
@@ -1477,10 +1504,11 @@ def register(app: typer.Typer) -> None:
         console.print(f"Local rollout: [bold]{full}[/bold]")
         env = {**os.environ, "CORE_RUNTIME_IMAGE": full, **_compose_env_overrides(db=db, cache=cache)}
         if do_pull:
-            _run_env(
+            _run_pull(
                 ["docker", "compose", "-f", str(project.compose_file), "pull", "core-runtime"],
                 cwd=project.cwd,
                 env=env,
+                image=full,
             )
         _run_env(
             ["docker", "compose", "-f", str(project.compose_file), "up", "-d"],

{homeconsole_cli-0.0.3 → homeconsole_cli-0.0.4}/hc/commands/env.py

@@ -11,7 +11,7 @@ from rich.console import Console
 from rich.table import Table
 
 from hc.core_ops import compose_project_from_source, require_docker
-from hc.core_source import CoreSource, get_core_source_from_repo, get_core_source_local
+from hc.core_source import CoreSource, get_core_source_from_repo, get_core_source_local, init_core_source
 from hc.errors import CoreSourcesNotFoundError, HcCliError
 
 
@@ -105,11 +105,17 @@ _DB_HELP = "sqlite | postgres  (без --db: интерактивный выбо
 
 # ─── Helpers ──────────────────────────────────────────────────────────────────
 
+# Known siblings of core-runtime-service that confirm we're in the monorepo root.
+# Without them, a standalone core-runtime-service clone in any parent dir would be mistaken for monorepo.
+_MONOREPO_SIBLINGS = frozenset({"home-console-cli", "packages", "platform-home-console"})
+
+
 def _find_repo_root() -> Path | None:
     here = Path(__file__).resolve()
     for p in [here, *here.parents]:
         if (p / "core-runtime-service").exists():
-            return p
+            if any((p / s).exists() for s in _MONOREPO_SIBLINGS):
+                return p
     return None
 
 
@@ -122,10 +128,36 @@ def _resolve_source(console: Console) -> CoreSource:
     src = get_core_source_local()
     if src:
         return src
+
+    # On a fresh machine: offer to auto-clone core-runtime-service.
+    from hc.constants import CORE_SRC_DIR, DEFAULT_CORE_REPO
+    console.print(f"[yellow]Исходники Core не найдены.[/yellow] ({CORE_SRC_DIR})")
+
+    if sys.stdin.isatty():
+        try:
+            import questionary
+            answer = questionary.confirm(
+                f"Скачать core-runtime-service в {CORE_SRC_DIR}?",
+                default=True,
+            ).ask()
+        except ImportError:
+            answer = None
+
+        if answer is None:
+            raise typer.Abort()
+        if not answer:
+            raise CoreSourcesNotFoundError(
+                message="Исходники Core не найдены.",
+                exit_code=1,
+                hint=f"Запусти: hc core init  (клонирует {DEFAULT_CORE_REPO})",
+            )
+
+        return init_core_source(console, None, None)
+
     raise CoreSourcesNotFoundError(
         message="Исходники Core не найдены.",
         exit_code=1,
-        hint="Сделай `hc core init` или запусти из монорепы HomeConsole.",
+        hint=f"Запусти: hc core init  (клонирует {DEFAULT_CORE_REPO})",
     )
 
 

{homeconsole_cli-0.0.3 → homeconsole_cli-0.0.4}/hc/commands/update.py

@@ -23,11 +23,15 @@ from hc.errors import (
 )
 
 
+_MONOREPO_SIBLINGS = frozenset({"home-console-cli", "packages", "platform-home-console"})
+
+
 def _find_repo_root() -> Path | None:
     here = Path(__file__).resolve()
     for p in [here, *here.parents]:
         if (p / "core-runtime-service").exists():
-            return p
+            if any((p / s).exists() for s in _MONOREPO_SIBLINGS):
+                return p
     return None
 
 
@@ -81,6 +85,28 @@ def _run(cmd: list[str], *, cwd: Path | None = None, env: dict[str, str] | None
         raise typer.Exit(code=p.returncode)
 
 
+def _run_pull(
+    cmd: list[str],
+    *,
+    cwd: Path | None = None,
+    env: dict[str, str] | None = None,
+    image: str,
+) -> None:
+    """docker compose pull с понятной подсказкой при ошибке авторизации."""
+    p = subprocess.run(cmd, cwd=str(cwd) if cwd else None, env=env, check=False)  # noqa: S603
+    if p.returncode != 0:
+        registry = image.split("/")[0] if "/" in image else "ghcr.io"
+        raise HcCliError(
+            message=f"Не удалось загрузить образ {image}",
+            hint=(
+                f"Образ недоступен (denied / unauthorized).\n"
+                f"  Авторизуйся в реестре:\n"
+                f"  docker login {registry} -u <github_username> -p <PAT_read:packages>"
+            ),
+            exit_code=p.returncode,
+        )
+
+
 def _fmt_s(seconds: float) -> str:
     if seconds < 60:
         return f"{seconds:.1f}s"
@@ -307,10 +333,11 @@ def register(app: typer.Typer) -> None:
                 project = compose_project_from_source(console, src, mode=deploy_mode)
                 env = {**os.environ, "CORE_RUNTIME_IMAGE": full}
                 t0 = time.monotonic()
-                _run(
+                _run_pull(
                     ["docker", "compose", "-f", str(project.compose_file), "pull", "core-runtime"],
                     cwd=project.cwd,
                     env=env,
+                    image=full,
                 )
                 _run(["docker", "compose", "-f", str(project.compose_file), "up", "-d"], cwd=project.cwd, env=env)
                 dt = time.monotonic() - t0

{homeconsole_cli-0.0.3 → homeconsole_cli-0.0.4}/hc/constants.py

@@ -23,7 +23,7 @@ DEFAULT_CORE_REPO = "https://github.com/home-console/core-runtime-service"
 DEFAULT_CORE_REF = "master"
 
 # Образ для prod / dev-image rollout (Ghcr). Локально собранный тег задаёт через --image.
-DEFAULT_CORE_IMAGE = "ghcr.io/home-console/core-runtime"
+DEFAULT_CORE_IMAGE = "ghcr.io/home-console/core-runtime-service"
 
 DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 8080

{homeconsole_cli-0.0.3 → homeconsole_cli-0.0.4}/hc/core_ops.py

@@ -9,7 +9,7 @@ import typer
 from rich.console import Console
 
 from hc.config import Config
-from hc.core_source import VALID_MODES, CoreSource
+from hc.core_source import COMPOSE_MODES, VALID_MODES, CoreSource
 from hc.env_bootstrap import ensure_core_env
 from hc.errors import DockerNotFoundError, HcCliError
 
@@ -46,10 +46,17 @@ def compose_project_from_source(console: Console, src: CoreSource, mode: str | N
             hint=f"Допустимые режимы: {valid}",
         ) from exc
     if not compose.exists():
+        available = [m for m, rel in COMPOSE_MODES.items() if (src.path / rel).exists()]
+        hint = f"Режим {mode!r} → {src.compose_rel(mode)}. Файл не найден в {src.path}."
+        if available:
+            hint += f"\n  Доступные режимы: {' | '.join(available)}"
+            hint += f"\n  Попробуй: hc env up --mode {available[0]}"
+        else:
+            hint += "\n  Сделай `hc core init` для загрузки исходников Core."
         raise HcCliError(
             message=f"Не найден compose-файл: {compose}",
             exit_code=1,
-            hint=f"Режим {mode!r} → {src.compose_rel(mode)}. Проверь наличие файла в core-runtime-service.",
+            hint=hint,
         )
     return ComposeProject(compose_file=compose)
 

{homeconsole_cli-0.0.3 → homeconsole_cli-0.0.4}/homeconsole_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: homeconsole-cli
-Version: 0.0.3
+Version: 0.0.4
 Summary: HomeConsole CLI (hc) — управление платформой через HTTP API
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{homeconsole_cli-0.0.3 → homeconsole_cli-0.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "homeconsole-cli"
-version = "0.0.3"
+version = "0.0.4"
 description = "HomeConsole CLI (hc) — управление платформой через HTTP API"
 readme = "README.md"
 requires-python = ">=3.11"