jartify 0.2.2__tar.gz → 0.2.4__tar.gz

{jartify-0.2.2 → jartify-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jartify
-Version: 0.2.2
+Version: 0.2.4
 Summary: TUI and CLI for searching JFrog Artifactory artifacts (version, filename, sha256)
 Author-email: Jakob Holst <code@jakobholst.dk>
 License: MIT
@@ -134,6 +134,9 @@ jartify-locate --init
 # commits so Ctrl+C keeps everything already indexed):
 jartify-locate --init --status=progress
 
+# Or one AQL per repo, printing the repo name as it goes (commits per repo):
+jartify-locate --init --status=step
+
 # Then search locally:
 jartify-locate                       # list everything (respects --repo / --limit)
 jartify-locate '*.json'              # glob

{jartify-0.2.2 → jartify-0.2.4}/README.md

@@ -108,6 +108,9 @@ jartify-locate --init
 # commits so Ctrl+C keeps everything already indexed):
 jartify-locate --init --status=progress
 
+# Or one AQL per repo, printing the repo name as it goes (commits per repo):
+jartify-locate --init --status=step
+
 # Then search locally:
 jartify-locate                       # list everything (respects --repo / --limit)
 jartify-locate '*.json'              # glob

{jartify-0.2.2 → jartify-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jartify"
-version = "0.2.2"
+version = "0.2.4"
 description = "TUI and CLI for searching JFrog Artifactory artifacts (version, filename, sha256)"
 readme = "README.md"
 requires-python = ">=3.10"

jartify-0.2.4/src/jartify/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.4"

{jartify-0.2.2 → jartify-0.2.4}/src/jartify/client.py

@@ -19,6 +19,8 @@ from urllib.parse import urljoin
 
 import requests
 from packaging.utils import parse_sdist_filename, parse_wheel_filename
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
 
 
 @dataclass
@@ -85,6 +87,22 @@ class ArtifactoryClient:
             self.base_url = self.base_url + "/artifactory"
         self.timeout = timeout
         self.session = session or requests.Session()
+        # Transparently retry on connection drops (RemoteDisconnected, reset
+        # keep-alives) and transient 5xx. Exponential backoff: 0, 1, 2, 4, 8s.
+        _retry = Retry(
+            total=5,
+            connect=5,
+            read=5,
+            status=5,
+            backoff_factor=1.0,
+            status_forcelist=(502, 503, 504),
+            allowed_methods=frozenset(["GET", "POST", "HEAD"]),
+            raise_on_status=False,
+            respect_retry_after_header=True,
+        )
+        _adapter = HTTPAdapter(max_retries=_retry)
+        self.session.mount("http://", _adapter)
+        self.session.mount("https://", _adapter)
         self.session.verify = verify
         if not verify:
             # One-shot: silence the per-request InsecureRequestWarning.

{jartify-0.2.2 → jartify-0.2.4}/src/jartify/locate.py

@@ -287,6 +287,76 @@ def _init_paginated(
     return total_appended
 
 
+def _init_step(
+    client: ArtifactoryClient, repos: list[str] | None
+) -> int:
+    """One AQL request per repo, printing the repo name as it goes.
+
+    Session-level retries handle transient connection drops. A per-repo
+    try/except catches anything that still fails after retries so one
+    bad repo doesn't abort the remaining ones; failures are listed at
+    the end.
+    """
+    if repos is None:
+        all_repos = client.list_repositories()
+        repo_keys = [r.get("key") for r in all_repos if r.get("key")]
+        if not repo_keys:
+            print("  no repos visible to this token.")
+            return 0
+    else:
+        repo_keys = list(repos)
+
+    conn = _db_connect()
+    t0 = time.time()
+    total_appended = 0
+    skipped = 0
+    failed: list[tuple[str, str]] = []
+    width = len(str(len(repo_keys)))
+    try:
+        for i, repo in enumerate(repo_keys, 1):
+            prefix = f"[{i:>{width}}/{len(repo_keys)}]"
+            indent = " " * (len(prefix) + 1)
+            print(f"{prefix} {repo} …", flush=True)
+            try:
+                items = client.aql(_aql_query([repo]))
+                artifact_rows, location_rows, skip = _build_rows(items)
+                with conn:
+                    _insert_batch(conn, artifact_rows, location_rows)
+                total_appended += len(artifact_rows)
+                skipped += skip
+                print(
+                    f"{indent}{len(artifact_rows):,} files appended "
+                    f"({len(items):,} received)",
+                    flush=True,
+                )
+            except Exception as exc:
+                # One repo died — remember and move on. The commit on
+                # previous repos has already landed thanks to per-repo
+                # transactions.
+                summary = f"{type(exc).__name__}: {exc}"
+                failed.append((repo, summary))
+                print(f"{indent}FAILED — {summary}", file=sys.stderr, flush=True)
+
+        with conn:
+            _write_meta(conn)
+        _finalize(conn, t0, skipped)
+        if failed:
+            print(f"\n{len(failed)} repo(s) failed and were skipped:",
+                  file=sys.stderr)
+            for repo, msg in failed:
+                print(f"  {repo}: {msg}", file=sys.stderr)
+            print(
+                "Re-run with -R to retry just those repos, e.g.:\n"
+                "  jartify-locate --init --status=step "
+                + " ".join(f"-R {r}" for r, _ in failed[:3])
+                + ("" if len(failed) <= 3 else " …"),
+                file=sys.stderr,
+            )
+    finally:
+        conn.close()
+    return total_appended
+
+
 def _init_index(
     client: ArtifactoryClient,
     repos: list[str] | None,
@@ -296,6 +366,8 @@ def _init_index(
     print(f"Fetching artifact index for {scope} via AQL…", flush=True)
     if status == "progress":
         return _init_paginated(client, repos)
+    if status == "step":
+        return _init_step(client, repos)
     return _init_single_shot(client, repos)
 
 
@@ -314,11 +386,13 @@ def _glob_to_like(pattern: str) -> str:
 
 
 _JOIN_SELECT = (
-    "SELECT l.repo, l.path, a.sha256, a.filename "
+    "SELECT l.repo, l.path, a.sha256, a.filename, a.size, a.created, a.modified "
     "FROM locations l "
     "JOIN artifacts a ON a.sha256 = l.sha256 AND a.filename = l.filename"
 )
 
+_ROW_KEYS = ("repo", "path", "sha256", "filename", "size", "created", "modified")
+
 
 def _search_glob(conn, pattern: str | None, repos: list[str] | None, limit: int):
     """Pattern of None lists every (file, location) row."""
@@ -350,7 +424,7 @@ def _search_fuzzy(conn, query: str, repos: list[str] | None, limit: int):
     out = []
     for row in conn.execute(sql, params):
         if rx.search(row[3]):
-            out.append(row[:3])
+            out.append(row)
             if len(out) >= limit:
                 break
     return out
@@ -374,6 +448,26 @@ def _print_rows(rows) -> None:
         print(fmt.format(*row).rstrip())
 
 
+def _print_json(rows) -> None:
+    print(json.dumps([dict(zip(_ROW_KEYS, r)) for r in rows], indent=2))
+
+
+_EPILOG = """\
+examples:
+  jartify-locate --init                      build the index (fast, single commit)
+  jartify-locate --init --status=progress    paginated AQL with a live progress bar
+  jartify-locate --init --status=step        one AQL per repo, prints each repo name
+  jartify-locate --init --all                scan every visible repo, ignore filters
+  jartify-locate --init -R pypi-local        refresh just one repo
+  jartify-locate                             list every indexed file
+  jartify-locate '*.json'                    glob
+  jartify-locate requests                    substring (no wildcards)
+  jartify-locate --fuzzy foojsn              subsequence match
+  jartify-locate --all --json                dump every indexed file as JSON
+  jartify-locate --db                        show index path + row counts
+"""
+
+
 def _build_parser() -> argparse.ArgumentParser:
     p = argparse.ArgumentParser(
         prog="jartify-locate",
@@ -381,6 +475,8 @@ def _build_parser() -> argparse.ArgumentParser:
             "locate(1)-style search over an offline SQLite index of your "
             "Artifactory. Run with --init first to build the index."
         ),
+        epilog=_EPILOG,
+        formatter_class=argparse.RawDescriptionHelpFormatter,
     )
     p.add_argument(
         "pattern",
@@ -399,16 +495,20 @@ def _build_parser() -> argparse.ArgumentParser:
                         "ARTIFACTORY_REPOSITORIES, and the yaml config.")
     p.add_argument("--limit", type=int, default=500,
                    help="Max rows to print or fuzzy-scan (default 500).")
+    p.add_argument("--json", action="store_true",
+                   help="Emit JSON (every column: repo, path, sha256, filename, "
+                        "size, created, modified) instead of the aligned table.")
     p.add_argument("--db", action="store_true",
                    help="Print the index path and a one-line summary, then exit.")
     p.add_argument("--insecure", action="store_true",
                    help="Skip TLS cert verification during --init.")
     p.add_argument(
         "--status",
-        choices=("off", "progress"),
+        choices=("off", "progress", "step"),
         default="off",
-        help="Progress display during --init. 'progress' paginates the AQL "
-             "query and renders a live bar + count (default: off).",
+        help="Progress display during --init. 'progress' paginates AQL and "
+             "renders a live bar; 'step' runs one AQL per repo and prints "
+             "each repo name as it goes (default: off).",
     )
     p.add_argument("--version", action="version", version=f"jartify {__version__}")
     return p
@@ -500,7 +600,10 @@ def main(argv: list[str] | None = None) -> int:
     finally:
         conn.close()
 
-    _print_rows(rows)
+    if args.json:
+        _print_json(rows)
+    else:
+        _print_rows(rows)
     return 0 if rows else 1
 
 

{jartify-0.2.2 → jartify-0.2.4}/src/jartify.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jartify
-Version: 0.2.2
+Version: 0.2.4
 Summary: TUI and CLI for searching JFrog Artifactory artifacts (version, filename, sha256)
 Author-email: Jakob Holst <code@jakobholst.dk>
 License: MIT
@@ -134,6 +134,9 @@ jartify-locate --init
 # commits so Ctrl+C keeps everything already indexed):
 jartify-locate --init --status=progress
 
+# Or one AQL per repo, printing the repo name as it goes (commits per repo):
+jartify-locate --init --status=step
+
 # Then search locally:
 jartify-locate                       # list everything (respects --repo / --limit)
 jartify-locate '*.json'              # glob

jartify-0.2.2/src/jartify/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.2"