obsideo-cli 0.2.7__tar.gz → 0.2.9__tar.gz

{obsideo_cli-0.2.7 → obsideo_cli-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obsideo-cli
-Version: 0.2.7
+Version: 0.2.9
 Summary: Obsideo Cloud - encrypted storage we can't read. Save, browse, and sync whatever you want, from your terminal.
 License: MIT
 Project-URL: Homepage, https://obsideo.io

{obsideo_cli-0.2.7 → obsideo_cli-0.2.9}/obsideo/cli.py

@@ -146,10 +146,12 @@ def show_status() -> None:
     Makes a network call, so it's shown at session start / post-login only."""
     if not _chrome_enabled() or not config.is_logged_in():
         return
-    usage = _fetch_usage()
+    usage = _fetch_account_info() or _fetch_usage()
     if not usage:
         return
     used, quota = usage.get("used_bytes", 0), usage.get("quota_bytes", 0)
+    if not quota:
+        return  # no quota to show a bar against; account command shows raw usage
     pct = usage.get("percent_used")
     if pct is None:
         pct = (used / quota) if quota else 0.0
@@ -339,6 +341,14 @@ class ObsideoShell(cmd.Cmd):
         self._cwd = ""  # S3 key prefix; "" = root
         self._refresh_prompt()
 
+    def precmd(self, line: str) -> str:
+        # Tolerate a leading "obsideo " typed out of habit inside the shell
+        # (e.g. "obsideo ls" -> "ls"), so it doesn't error with Unknown syntax.
+        stripped = line.lstrip()
+        if stripped.lower().startswith("obsideo "):
+            return stripped[len("obsideo "):]
+        return line
+
     # ── path helpers ────────────────────────────────────────────────────────
     def _refresh_prompt(self):
         self.prompt = f"obsideo:/{self._cwd} "
@@ -560,28 +570,41 @@ class ObsideoShell(cmd.Cmd):
         if not self._require_login():
             return
         from obsideo import sync as sync_mod
+        # Usage + quota for any account via the gateway (works with just the S3
+        # creds); fall back to the signup-service token, then to a storage-only
+        # count - so this always shows something useful and never nags to log in.
+        info = _fetch_account_info() or (_fetch_usage() if config.account_token() else None)
         print()
         print("  -- Obsideo account --------------------------")
-        print("     Plan:  Free")
-        if not config.account_token():
-            # No shim token (e.g. creds set via env / pre-login account): we can't
-            # query usage. Don't claim the service is down — tell them how to link it.
-            print("     Usage: sign in with `obsideo login` to see usage details")
-        else:
-            usage = _fetch_usage()
-            if usage:
-                used, quota = usage["used_bytes"], usage["quota_bytes"]
-                pct = usage.get("percent_used", (used / quota if quota else 0))
-                print(f"     Used:  {_human(used)} / {_human(quota)} ({pct*100:.1f}%)")
+        if info:
+            tier = (info.get("tier") or "free").replace("testdrive", "Free").title()
+            print(f"     Plan:  {tier}")
+            used = info.get("used_bytes", 0)
+            quota = info.get("quota_bytes", 0)
+            if quota:
+                pct = used / quota
                 bar_len = 30
                 filled = int(bar_len * min(pct, 1.0))
-                print(f"     [{'#'*filled}{'-'*(bar_len-filled)}]")
+                print(f"     Used:  {_human(used)} / {_human(quota)} ({pct*100:.1f}%)")
+                print(f"            [{'#'*filled}{'-'*(bar_len-filled)}]")
                 if pct >= 0.8:
-                    print("     You're near your limit - reply to any Obsideo email to upgrade.")
+                    print("     Near your limit - reply to any Obsideo email to upgrade.")
             else:
-                print("     Usage: couldn't reach the account service - try again shortly")
-        print(f"     Files: bucket '{storage.bucket()}'  ·  sync folder {sync_mod.ensure_sync_dir()}")
-        print(f"     Keys:  {config.CONFIG_DIR}  (back up data.key)")
+                print(f"     Used:  {_human(used)}")
+            if info.get("object_count"):
+                print(f"     Files: {info['object_count']} object(s)")
+            if info.get("days_remaining"):
+                print(f"     Renews/expires in {info['days_remaining']} day(s)")
+        else:
+            print("     Plan:  Free")
+            try:
+                used, n = storage.total_usage()
+                print(f"     Used:  {_human(used)} across {n} file(s)")
+            except Exception:
+                print("     Used:  (couldn't read storage just now)")
+        print(f"     Bucket: {storage.bucket()}")
+        print(f"     Sync folder: {sync_mod.ensure_sync_dir()}")
+        print(f"     Keys: {config.CONFIG_DIR}  (back up data.key)")
         print("  ---------------------------------------------")
         print()
 
@@ -732,6 +755,32 @@ def _fetch_usage() -> dict | None:
         return None
 
 
+def _fetch_account_info() -> dict | None:
+    """Usage + quota for the calling account via the gateway's SigV4-authed
+    /v1/account. Works for ANY account using only the S3 creds we already have
+    (no signup-service token needed). Returns {used_bytes, quota_bytes, tier,
+    object_count, days_remaining, ...} or None if unavailable (e.g. the gateway
+    endpoint isn't deployed yet, or no creds) — callers fall back gracefully."""
+    ak = os.environ.get("OBSIDEO_S3_ACCESS_KEY")
+    sk = os.environ.get("OBSIDEO_S3_SECRET_KEY")
+    if not (ak and sk):
+        return None
+    try:
+        from botocore.auth import SigV4Auth
+        from botocore.awsrequest import AWSRequest
+        from botocore.credentials import Credentials
+        endpoint = os.environ.get("OBSIDEO_S3_ENDPOINT", "https://s3.obsideo.io").rstrip("/")
+        region = os.environ.get("OBSIDEO_S3_REGION", "us-east-1")
+        url = f"{endpoint}/v1/account"
+        signed = AWSRequest(method="GET", url=url)
+        SigV4Auth(Credentials(ak, sk), "s3", region).add_auth(signed)
+        req = urllib.request.Request(url, headers=dict(signed.headers), method="GET")
+        with urllib.request.urlopen(req, timeout=15, context=config.ssl_context()) as resp:
+            return json.loads(resp.read().decode())
+    except Exception:
+        return None
+
+
 def main():
     argv = sys.argv[1:]
 

{obsideo_cli-0.2.7 → obsideo_cli-0.2.9}/obsideo_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obsideo-cli
-Version: 0.2.7
+Version: 0.2.9
 Summary: Obsideo Cloud - encrypted storage we can't read. Save, browse, and sync whatever you want, from your terminal.
 License: MIT
 Project-URL: Homepage, https://obsideo.io

{obsideo_cli-0.2.7 → obsideo_cli-0.2.9}/obsideo_core/storage.py

@@ -189,6 +189,31 @@ def exists(key: str) -> bool:
     return head(key) is not None
 
 
+def total_usage() -> tuple[int, int]:
+    """Total stored bytes + object count across the account's bucket (flat list).
+    Lets `account` show real usage without the signup-service token — it just reads
+    the storage the account can already see. Names stay opaque; only sizes summed."""
+    s3 = _s3()
+    total = 0
+    count = 0
+    token = None
+    while True:
+        kwargs = dict(Bucket=bucket())
+        if token:
+            kwargs["ContinuationToken"] = token
+        resp = s3.list_objects_v2(**kwargs)
+        for obj in resp.get("Contents", []):
+            if obj["Key"].endswith("/"):
+                continue  # folder marker, not a real object
+            total += obj.get("Size", 0)
+            count += 1
+        if resp.get("IsTruncated"):
+            token = resp.get("NextContinuationToken")
+        else:
+            break
+    return total, count
+
+
 def list_prefix(prefix: str = "", delimiter: str = "/") -> dict:
     """List one VFS level. Returns {'folders': [name...], 'files': [{name,key,size}]}.
 

{obsideo_cli-0.2.7 → obsideo_cli-0.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "obsideo-cli"
-version = "0.2.7"
+version = "0.2.9"
 description = "Obsideo Cloud - encrypted storage we can't read. Save, browse, and sync whatever you want, from your terminal."
 readme = "README.md"
 requires-python = ">=3.10"

{obsideo_cli-0.2.7 → obsideo_cli-0.2.9}/tests/test_cli.py

@@ -282,16 +282,51 @@ def test_messages_handles_unreachable(monkeypatch, capsys):
     monkeypatch.setattr(cli.urllib.request, "urlopen", boom)
     cli.ObsideoShell().do_messages("")
     assert "couldn't reach" in capsys.readouterr().out.lower()
-
-
-def test_sync_readme_created_and_not_pushed(tmp_path, monkeypatch, capsys):
-    from obsideo import sync
-    sd = tmp_path / "obsideo-sync"
-    monkeypatch.setattr(sync, "_sync_dir", lambda: sd)
-    sync.ensure_sync_dir()
-    readme = sd / sync.README_NAME
-    assert readme.exists() and "sync push" in readme.read_text()  # guide dropped in
-    # A folder containing ONLY the README is treated as empty (README never uploads).
-    n = sync.push(verbose=True)
-    assert n == 0
-    assert "empty" in capsys.readouterr().out.lower()
+
+
+def test_sync_readme_created_and_not_pushed(tmp_path, monkeypatch, capsys):
+    from obsideo import sync
+    sd = tmp_path / "obsideo-sync"
+    monkeypatch.setattr(sync, "_sync_dir", lambda: sd)
+    sync.ensure_sync_dir()
+    readme = sd / sync.README_NAME
+    assert readme.exists() and "sync push" in readme.read_text()  # guide dropped in
+    # A folder containing ONLY the README is treated as empty (README never uploads).
+    n = sync.push(verbose=True)
+    assert n == 0
+    assert "empty" in capsys.readouterr().out.lower()
+
+
+def test_account_computes_usage_without_token(monkeypatch, tmp_path, capsys):
+    # No gateway info + no signup token -> compute from storage, NOT nag to log in.
+    from obsideo import sync
+    monkeypatch.setattr(cli, "_fetch_account_info", lambda: None)  # don't hit network
+    monkeypatch.setattr(cli.config, "account_token", lambda: None)
+    monkeypatch.setattr(cli.storage, "total_usage", lambda: (1_500_000, 7))
+    monkeypatch.setattr(cli.storage, "bucket", lambda: "tb")
+    monkeypatch.setattr(sync, "_sync_dir", lambda: tmp_path / "s")
+    cli.ObsideoShell().do_account("")
+    out = capsys.readouterr().out
+    assert "across 7 file" in out
+    assert "obsideo login" not in out and "sign in" not in out.lower()
+
+
+def test_account_shows_percentage_from_gateway(monkeypatch, tmp_path, capsys):
+    # When the gateway returns quota, account shows used / quota / % + a bar.
+    from obsideo import sync
+    monkeypatch.setattr(cli, "_fetch_account_info",
+                        lambda: {"tier": "testdrive", "used_bytes": 500_000_000,
+                                 "quota_bytes": 5_368_709_120, "object_count": 314})
+    monkeypatch.setattr(cli.storage, "bucket", lambda: "obsideo")
+    monkeypatch.setattr(sync, "_sync_dir", lambda: tmp_path / "s")
+    cli.ObsideoShell().do_account("")
+    out = capsys.readouterr().out
+    assert "/" in out and "%" in out and "[" in out  # used / quota (pct) + bar
+    assert "314 object" in out and "Free" in out  # testdrive shown as Free
+
+
+def test_precmd_strips_obsideo_prefix():
+    sh = cli.ObsideoShell()
+    assert sh.precmd("obsideo ls") == "ls"
+    assert sh.precmd("obsideo login") == "login"
+    assert sh.precmd("ls") == "ls"  # unchanged when no prefix