katalon-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{katalon_cli-0.3.0 → katalon_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: katalon-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: Installer & Updater CLI für Katalon Production-Instanzen
 Author: Karl Krägelin
 Author-email: Karl Krägelin <karlkraegelin@gmail.com>

{katalon_cli-0.3.0 → katalon_cli-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "katalon-cli"
-version = "0.3.0"
+version = "0.3.2"
 description = "Installer & Updater CLI für Katalon Production-Instanzen"
 readme = "README.md"
 requires-python = ">=3.12"

{katalon_cli-0.3.0 → katalon_cli-0.3.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "katalon-cli"
-version = "0.3.0"
+version = "0.3.2"
 description = "Installer & Updater CLI für Katalon Production-Instanzen"
 readme = "README.md"
 authors = [

{katalon_cli-0.3.0 → katalon_cli-0.3.2}/src/katalon_cli/core/checks.py

@@ -26,6 +26,8 @@ def check_docker() -> CheckResult:
 
 
 def check_compose() -> CheckResult:
+    if not shutil.which("docker"):
+        return CheckResult("Docker Compose", False, "Docker fehlt")
     probe = subprocess.run(["docker", "compose", "version"], capture_output=True, text=True)
     if probe.returncode == 0:
         return CheckResult("Docker Compose", True, probe.stdout.strip())

{katalon_cli-0.3.0 → katalon_cli-0.3.2}/src/katalon_cli/core/reindex.py

@@ -49,10 +49,15 @@ finally:
     _run(engine.dispose())
 """
 
-_BUILDING = re.compile(r"building (\d+) index docs for '(\w+)'")
-_BUILT = re.compile(r"(\d+)/(\d+) docs built for '(\w+)'")
-_INDEXED = re.compile(r"successfully indexed (\d+) records for '(\w+)'")
+# Logzeilen von bulk_reindex_type_task. Katalon >= 1.42 (Alias-Swap-Rebuild) loggt
+# "streaming N docs", "n/N docs" und "indexed N, removed M stale"; ältere Versionen
+# "building N index docs", "n/N docs built" und "successfully indexed N records".
+_BUILDING = re.compile(r"(?:building|streaming) (\d+) (?:index )?docs for '(\w+)'")
+_BUILT = re.compile(r"(\d+)/(\d+) docs (?:built )?for '(\w+)'")
+_INDEXED = re.compile(r"(?:successfully indexed (\d+) records|indexed (\d+), removed \d+ stale) for '(\w+)'")
 _FINISHED = re.compile(r"Task katalon\.reindex_all\[(?P<id>[0-9a-f-]+)\] (?P<state>succeeded|raised|failed)")
+# Ergebnis von reindex_all ab Katalon 1.42: {..., 'types': {'object': {'indexed': 31815, ...}}}
+_RESULT_INDEXED = re.compile(r"'(\w+)': \{'status': '\w+', 'indexed': (\d+)")
 _RECEIVED = re.compile(r"Task katalon\.reindex_all\[(?P<id>[0-9a-f-]+)\] received")
 
 
@@ -98,10 +103,13 @@ def parse_progress(log_text: str, task_id: str, known_totals: dict[str, int] | N
             progress.current = m[3]
             progress.built[m[3]] = int(m[1])
         elif (m := _INDEXED.search(line)):
-            progress.indexed[m[2]] = int(m[1])
+            progress.indexed[m[3]] = int(m[1] or m[2])
         elif (m := _FINISHED.search(line)) and m["id"] == task_id:
             progress.finished = True
             progress.failed = m["state"] != "succeeded"
+            # Das Task-Ergebnis ist die verlässlichste Quelle für die Endzahlen.
+            for rtype, count in _RESULT_INDEXED.findall(line[m.end():]):
+                progress.indexed[rtype] = int(count)
     return progress
 
 

{katalon_cli-0.3.0 → katalon_cli-0.3.2}/src/katalon_cli/core/release.py

@@ -34,6 +34,8 @@ class ReleaseMetadata(BaseModel):
     version: str
     minimum_installer_version: str
     migration_required: bool
+    # Suchindex-Kopien der Vorversion sind veraltet (Katalon >= 1.43.2); fehlt bei älteren Releases.
+    reindex_required: bool = False
     breaking: bool
     compose_revision: int
     requires: ReleaseRequirements = ReleaseRequirements()

{katalon_cli-0.3.0 → katalon_cli-0.3.2}/src/katalon_cli/main.py

@@ -490,6 +490,9 @@ def _ensure_media_permissions(dir: Path) -> bool:
 
 
 def _start(dir: Path, show_credentials: bool = False) -> None:
+    # Ohne capture: Fortschritt sichtbar, sonst wirkt der erste Image-Pull wie ein Hänger.
+    console.print("Lade Images (beim ersten Start einige Minuten) …")
+    docker.compose(dir, "pull")
     _ensure_media_permissions(dir)
     docker.compose(dir, "up", "-d")
     console.print("[green]✔[/] Stack gestartet.")
@@ -680,6 +683,9 @@ def update(
     dir: Path | None = typer.Option(None, "--dir"),
     target: str = typer.Option(None, "--target", help="Zielversion, default = latest"),
     yes: bool = typer.Option(False, "--yes", help="Ohne Rückfrage"),
+    reindex: bool = typer.Option(
+        False, "--reindex", help="Suchindex nach dem Update neu aufbauen, wenn das Release es verlangt."
+    ),
 ):
     """Update auf neue Version — Backup zuerst, immer."""
     dir = instance_dir_or_raise(dir)
@@ -711,6 +717,12 @@ def update(
         console.print("[red]⚠ Breaking Change in diesem Release.[/]")
     if meta.migration_required:
         console.print("[yellow]⚠ DB-Migration erforderlich.[/]")
+    reindex_needed = any(item.reindex_required for item in update_releases) or meta.reindex_required
+    if reindex_needed:
+        console.print(
+            "[yellow]⚠ Suchindex muss danach neu aufgebaut werden. Bis dahin liefern OAI und "
+            "Exporte langsamer (Aufbau aus der Datenbank).[/]"
+        )
     if meta.compose_revision != state.compose_revision:
         console.print(
             f"[yellow]⚠ compose.yaml wird neu generiert "
@@ -780,6 +792,12 @@ def update(
         console.rule("Changelog")
         console.print(notes)
 
+    if reindex_needed:
+        if reindex or (not yes and Confirm.ask("Suchindex jetzt neu aufbauen?", default=True)):
+            _run_reindex(dir)
+        else:
+            console.print("[yellow]⚠ Suchindex neu aufbauen:[/] [bold]katalon reindex[/]")
+
     _print_next_steps(dir, state.base_url)
 
 
@@ -863,7 +881,14 @@ def _run_reindex(dir: Path, wait: bool = True) -> None:
             raise typer.Exit(1) from exc
         bar.update(task, description="Reindex", total=bar.tasks[task].total, completed=bar.tasks[task].total)
     indexed = sum(final.indexed.values())
-    console.print(f"[green]✔[/] Suchindex neu aufgebaut ({indexed} Datensätze).")
+    if not indexed:
+        console.print(
+            "[yellow]⚠[/] Reindex beendet, aber keine indizierten Datensätze erkannt — "
+            "bitte prüfen: [bold]katalon logs worker[/]"
+        )
+        return
+    per_type = ", ".join(f"{t} {n}" for t, n in final.indexed.items())
+    console.print(f"[green]✔[/] Suchindex neu aufgebaut ({indexed} Datensätze: {per_type}).")
 
 
 @app.command()