gravity-cli 0.3.0__tar.gz → 0.3.1__tar.gz

{gravity_cli-0.3.0 → gravity_cli-0.3.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.5
 Name: gravity-cli
-Version: 0.3.0
+Version: 0.3.1
 Summary: gravity cli — init, run, and push python agents to the Gravity marketplace
 License-Expression: Apache-2.0
 License-File: LICENSE
 License-File: NOTICE
 Requires-Python: >=3.12
-Requires-Dist: gravity-schema==0.3.0
+Requires-Dist: gravity-schema==0.3.1
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: keyring>=25.0.0
 Requires-Dist: python-dotenv>=1.0.0

{gravity_cli-0.3.0 → gravity_cli-0.3.1}/packages/gravity-schema/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gravity-schema"
-version = "0.3.0"
+version = "0.3.1"
 description = "Gravity agent manifest contract — models, validation, and JSON Schema export"
 readme = "README.md"
 license = "Apache-2.0"

{gravity_cli-0.3.0 → gravity_cli-0.3.1}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "gravity-cli"
-version = "0.3.0"
+version = "0.3.1"
 description = "gravity cli — init, run, and push python agents to the Gravity marketplace"
 readme = "README.md"
 license = "Apache-2.0"
 license-files = ["LICENSE", "NOTICE"]
 requires-python = ">=3.12"
 dependencies = [
-    "gravity-schema==0.3.0",  # released in lockstep: always the same version as this package
+    "gravity-schema==0.3.1",  # released in lockstep: always the same version as this package
     "typer>=0.15.0",
     "httpx>=0.27.0",
     "rich>=13.9.0",

{gravity_cli-0.3.0 → gravity_cli-0.3.1}/src/gravity_cli/api.py

@@ -23,16 +23,22 @@ def _token() -> str:
     return token
 
 
-def _request(method: str, path: str, *, auth: bool = True, timeout: int = 60, headers: dict | None = None, **kw) -> Any:
+def _request(method: str, path: str, *, auth: bool = True, timeout: int = 60, headers: dict | None = None, retry: bool = True, **kw) -> Any:
     """The JSON body. A refused connection or an error status becomes a Problem."""
-    headers = {**({"Authorization": f"Bearer {_token()}"} if auth else {}), **(headers or {})}
+    extra = headers or {}
+    sent = {**({"Authorization": f"Bearer {_token()}"} if auth else {}), **extra}
     try:
-        with httpx.Client(base_url=config.api_url(), timeout=timeout, headers=headers) as client:
+        with httpx.Client(base_url=config.api_url(), timeout=timeout, headers=sent) as client:
             resp = client.request(method, path, **kw)
     except httpx.TransportError as e:
         raise Problem(
             f"Can't reach Gravity at {config.api_url()}", str(e), "Check GRAVITY_API_URL in ~/.gravity/.env"
         ) from e
+    if resp.status_code == 401 and auth and not os.environ.get("GRAVITY_API_TOKEN"):
+        # A session's access token lasts an hour. Renew it once; if that can't be done, say so plainly.
+        if retry and _refresh():
+            return _request(method, path, auth=auth, timeout=timeout, headers=extra, retry=False, **kw)
+        raise Problem("Your sign-in has expired", fix="Run gravity login again.")
     if resp.status_code >= 400:
         try:
             body = resp.json()
@@ -47,6 +53,30 @@ def _request(method: str, path: str, *, auth: bool = True, timeout: int = 60, he
     return resp.json()
 
 
+def _refresh() -> bool:
+    """A new session from the stored refresh token. Needs Gravity's config to name Supabase and its anon key."""
+    session = config.load_session()
+    settings = service_config()
+    url, key = settings.get("supabase_url"), settings.get("supabase_anon_key")
+    if not (session and url and key):
+        return False
+    try:
+        resp = httpx.post(
+            f"{url.rstrip('/')}/auth/v1/token",
+            params={"grant_type": "refresh_token"},
+            json={"refresh_token": session.refresh_token},
+            headers={"apikey": key},
+            timeout=15,
+        )
+    except httpx.TransportError:
+        return False
+    if resp.status_code != 200:
+        return False
+    data = resp.json()
+    config.save_session(config.Session(data["access_token"], data["refresh_token"]))
+    return True
+
+
 def service_config() -> dict:
     """Where Gravity's services are: api_url, gateway_url, min_cli_version. No sign-in needed."""
     return _request("GET", "/api/cli/config", auth=False, timeout=15)

{gravity_cli-0.3.0 → gravity_cli-0.3.1}/src/gravity_cli/commands/validate.py

@@ -8,7 +8,7 @@ import time
 from pathlib import Path
 
 import typer
-from gravity_schema import LOCKFILE_PLATFORM
+from gravity_schema import DEV_TOOL_NAMES, LOCKFILE_PLATFORM
 from gravity_schema.contract import TOOL_NAME_RE as _TOOL_NAME_RE
 
 from .. import ui
@@ -111,7 +111,9 @@ def _scan_drift(project_dir: Path, declared_tools: list[str]) -> list[tuple[str,
             f"{', '.join(sorted(imported_network_libs))} imported, but permissions.tools is empty: hosted agents can only reach the gateway.",
             "Declare the tools you need under permissions.tools, or drop the import.",
         ))
-    if undeclared := sorted(referenced_tool_names - set(declared_tools)):
+    # Only names under an app the catalog knows: "package.json" is a file, not a tool.
+    apps = {name.split(".")[0] for name in DEV_TOOL_NAMES}
+    if undeclared := sorted(n for n in referenced_tool_names - set(declared_tools) if n.split(".")[0] in apps):
         warnings.append((
             "Undeclared tool",
             f"{', '.join(undeclared)} appears in your code",

{gravity_cli-0.3.0 → gravity_cli-0.3.1}/src/gravity_cli/ui.py

@@ -156,7 +156,7 @@ def table(headers: list[str], rows: list[list[str]], footer: str = "") -> None:
         if len(row) == 1:
             grid.add_row(Text(f"\n{row[0]}", style="bold"))
         else:
-            grid.add_row(*(Text(str(cell)) for cell in row))
+            grid.add_row(*(Text("" if cell is None else str(cell)) for cell in row))
     if any(headers):
         say()
     say(Padding(grid, (0, 0, 0, 2)))

{gravity_cli-0.3.0 → gravity_cli-0.3.1}/tests/test_api.py

@@ -63,3 +63,38 @@ def test_whoami_works_with_only_the_env_token(control_plane, monkeypatch, capsys
     whoami_command()
     assert control_plane["auth"] == "Bearer cp_dev"
     assert "local-builder (dev token)" in capsys.readouterr().out
+
+
+def test_an_expired_session_is_renewed_once_when_gravity_names_supabase(monkeypatch):
+    """A 401 with a stored session: refresh against Supabase, then retry with the new token."""
+    saved: list = []
+    monkeypatch.delenv("GRAVITY_API_TOKEN", raising=False)
+    monkeypatch.setattr(config, "load_session", lambda: saved[-1] if saved else SESSION)
+    monkeypatch.setattr(config, "save_session", saved.append)
+    monkeypatch.setattr(api, "service_config", lambda: {"supabase_url": "https://sb.example", "supabase_anon_key": "anon"})
+    calls: list = []
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        calls.append((request.url.host, request.headers.get("Authorization") or request.headers.get("apikey")))
+        if request.url.host == "sb.example":
+            return httpx.Response(200, json={"access_token": "fresh", "refresh_token": "r2"})
+        if request.headers["Authorization"] == "Bearer fresh":
+            return httpx.Response(200, json=[{"name": "demo"}])
+        return httpx.Response(401, json={"message": "Unauthorized"})
+
+    real = httpx.Client
+    monkeypatch.setattr(api.httpx, "Client", lambda **kw: real(transport=httpx.MockTransport(handler), **kw))
+    monkeypatch.setattr(api.httpx, "post", lambda url, **kw: real(transport=httpx.MockTransport(handler)).post(url, **kw))
+    assert api.get("/api/cli/agents") == [{"name": "demo"}]
+    assert saved[-1].access_token == "fresh" and [c[0] for c in calls].count("sb.example") == 1
+
+
+def test_an_expired_session_without_refresh_says_sign_in_again(monkeypatch):
+    monkeypatch.delenv("GRAVITY_API_TOKEN", raising=False)
+    monkeypatch.setattr(config, "load_session", lambda: SESSION)
+    monkeypatch.setattr(api, "service_config", dict)  # no Supabase details yet
+    real = httpx.Client
+    monkeypatch.setattr(api.httpx, "Client", lambda **kw: real(transport=httpx.MockTransport(lambda r: httpx.Response(401)), **kw))
+    with pytest.raises(typer.Exit) as e:
+        api.get("/api/cli/agents")
+    assert "sign-in has expired" in str(e.value) and "gravity login" in str(e.value)

{gravity_cli-0.3.0 → gravity_cli-0.3.1}/uv.lock

@@ -164,7 +164,7 @@ wheels = [
 
 [[package]]
 name = "gravity-cli"
-version = "0.3.0"
+version = "0.3.1"
 source = { editable = "." }
 dependencies = [
     { name = "gravity-schema" },
@@ -201,7 +201,7 @@ dev = [
 
 [[package]]
 name = "gravity-schema"
-version = "0.3.0"
+version = "0.3.1"
 source = { editable = "packages/gravity-schema" }
 dependencies = [
     { name = "pydantic" },