ravmem-cli 1.1.1__tar.gz → 1.2.0__tar.gz

{ravmem_cli-1.1.1/ravmem_cli.egg-info → ravmem_cli-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ravmem-cli
-Version: 1.1.1
+Version: 1.2.0
 Summary: RavMem CLI — lightweight client for the RavMem code knowledge graph server
 Author-email: RavMem <harpreet.singh@ravmem.com>
 License-Expression: MIT
@@ -44,8 +44,10 @@ pip install ravmem-cli
 # Point the CLI at your RavMem server
 ravmem remote config --url http://localhost:7432 --api-key <ADMIN_TOKEN>
 
-# Activate the license (one command: seals the key to this machine, then
-# brings the server live — the key is never stored in a file)
+# Activate the license (one command: seals the key to the server's machine,
+# then brings the server live — the key is saved on the server's own data
+# volume so it survives restarts; it's never stored on the machine you run
+# this CLI command from)
 ravmem license activate RAVMEM-XXXX-XXXX-XXXX-XXXX
 
 # Register a repository

{ravmem_cli-1.1.1 → ravmem_cli-1.2.0}/README.md

@@ -14,8 +14,10 @@ pip install ravmem-cli
 # Point the CLI at your RavMem server
 ravmem remote config --url http://localhost:7432 --api-key <ADMIN_TOKEN>
 
-# Activate the license (one command: seals the key to this machine, then
-# brings the server live — the key is never stored in a file)
+# Activate the license (one command: seals the key to the server's machine,
+# then brings the server live — the key is saved on the server's own data
+# volume so it survives restarts; it's never stored on the machine you run
+# this CLI command from)
 ravmem license activate RAVMEM-XXXX-XXXX-XXXX-XXXX
 
 # Register a repository

{ravmem_cli-1.1.1 → ravmem_cli-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ravmem-cli"
-version = "1.1.1"
+version = "1.2.0"
 description = "RavMem CLI — lightweight client for the RavMem code knowledge graph server"
 readme = "README.md"
 requires-python = ">=3.10"

{ravmem_cli-1.1.1 → ravmem_cli-1.2.0}/ravmem/cli/license.py

@@ -39,6 +39,24 @@ def _get_client():
     return RavMemClient(base_url=cfg["server_url"], api_key=cfg.get("api_key") or None)
 
 
+def _post_with_key_fallback(client, con: Console, path: str, body: Optional[dict] = None) -> dict:
+    """POST to `path`; if the server has no license key on file, prompt for it
+    once and retry with it included in the body (the server persists it there,
+    so this shouldn't come up again on subsequent calls)."""
+    body = dict(body or {})
+    try:
+        return client.post(path, json=body)
+    except RavMemAPIError as exc:
+        if exc.status == 400 and "RAVMEM_LICENSE_KEY is not set" in (exc.detail or ""):
+            con.print("[yellow]Server has no license key on file — enter it to proceed.[/yellow]")
+            key = typer.prompt("License key", hide_input=True).strip()
+            if not key:
+                raise
+            body["license_key"] = key
+            return client.post(path, json=body)
+        raise
+
+
 # ---------------------------------------------------------------------------
 # ravmem license init
 # ---------------------------------------------------------------------------
@@ -106,9 +124,11 @@ def activate_cmd(
 ) -> None:
     """One-step activation: seal the license to this machine and bring the server live.
 
-    The key is sent once, sealed to this machine (machine-bound), then discarded —
-    it is never stored in .env. Works whether the server is in activation-only mode
-    (first run) or already running.
+    The key is sent once and sealed to this machine (machine-bound). It's also
+    saved to the server's own data volume (not to its .env) so the license
+    survives restarts and container recreates without needing the key re-entered.
+    It is never stored on the machine you run this CLI command from. Works
+    whether the server is in activation-only mode (first run) or already running.
     """
     con = _console()
     if not key:
@@ -168,7 +188,34 @@ def activate_cmd(
         result = client.post("/api/license/init", json=init_payload)
     except RavMemAPIError as exc:
         if exc.status == 409:
-            con.print("[bold green]License already initialized — ravmem is ready.[/bold green]")
+            # Already initialized — a 409 alone doesn't mean the stored token is
+            # still usable (e.g. a container recreate can make it undecryptable).
+            # Check token_integrity and repair if it isn't "ok" before declaring
+            # success.
+            con.print("[dim]License already initialized — verifying token integrity…[/dim]")
+            try:
+                status_data = client.get("/api/license/status")
+            except RavMemAPIError as exc2:
+                con.print(f"[red]Could not verify license status: {exc2}[/red]")
+                raise typer.Exit(1)
+
+            integrity = status_data.get("token_integrity")
+            if integrity == "ok":
+                con.print("[bold green]License already initialized — ravmem is ready.[/bold green]")
+                return
+
+            con.print(f"[yellow]Stored token integrity is '{integrity}' — repairing…[/yellow]")
+            try:
+                # Already have the key in scope from this activate call — no
+                # need to prompt again even if the server has nothing on file.
+                repair_result = client.post("/api/license/repair", json={"license_key": key})
+            except RavMemAPIError as exc3:
+                con.print(f"[red]Repair failed: {exc3}[/red]")
+                raise typer.Exit(1)
+
+            con.print("\n[bold green]License repaired. ravmem is ready.[/bold green]")
+            con.print(f"  Status:  {repair_result.get('status')}")
+            con.print(f"  Expires: {repair_result.get('expiry_ts')}")
             return
         con.print(f"[red]Entitlement init failed: {exc}[/red]")
         raise typer.Exit(1)
@@ -374,7 +421,7 @@ def renew_cmd() -> None:
     client = _get_client()
     con.print("Renewing license…")
     try:
-        result = client.post("/api/license/renew", json={})
+        result = _post_with_key_fallback(client, con, "/api/license/renew")
     except RavMemAPIError as exc:
         con.print(f"[red]Renewal failed: {exc}[/red]")
         raise typer.Exit(1)
@@ -397,7 +444,7 @@ def repair_cmd() -> None:
 
     client = _get_client()
     try:
-        result = client.post("/api/license/repair", json={})
+        result = _post_with_key_fallback(client, con, "/api/license/repair")
     except RavMemAPIError as exc:
         con.print(f"[red]Repair failed: {exc}[/red]")
         raise typer.Exit(1)
@@ -463,7 +510,7 @@ def rebind_cmd() -> None:
 
     client = _get_client()
     try:
-        result = client.post("/api/license/rebind", json={})
+        result = _post_with_key_fallback(client, con, "/api/license/rebind")
     except RavMemAPIError as exc:
         con.print(f"[red]Rebind request failed: {exc}[/red]")
         raise typer.Exit(1)

{ravmem_cli-1.1.1 → ravmem_cli-1.2.0/ravmem_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ravmem-cli
-Version: 1.1.1
+Version: 1.2.0
 Summary: RavMem CLI — lightweight client for the RavMem code knowledge graph server
 Author-email: RavMem <harpreet.singh@ravmem.com>
 License-Expression: MIT
@@ -44,8 +44,10 @@ pip install ravmem-cli
 # Point the CLI at your RavMem server
 ravmem remote config --url http://localhost:7432 --api-key <ADMIN_TOKEN>
 
-# Activate the license (one command: seals the key to this machine, then
-# brings the server live — the key is never stored in a file)
+# Activate the license (one command: seals the key to the server's machine,
+# then brings the server live — the key is saved on the server's own data
+# volume so it survives restarts; it's never stored on the machine you run
+# this CLI command from)
 ravmem license activate RAVMEM-XXXX-XXXX-XXXX-XXXX
 
 # Register a repository