accli 2.1.0__tar.gz → 2.1.1__tar.gz

{accli-2.1.0 → accli-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accli
-Version: 2.1.0
+Version: 2.1.1
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)
@@ -29,7 +29,7 @@ Project-URL: Bug Tracker, https://github.com/iiasa/accli/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: urllib3>=1.26.5
@@ -137,19 +137,19 @@ Usage: accli [OPTIONS] COMMAND [ARGS]...
 List root jobs, newest first, with each job's type (`standalone`, `children`, `callback` or `children+callback`), its own status and the status of its whole graph:
 
 ```bash
-accli jobs                        # latest 10 in the last project used
-accli jobs -p my-project -n 50
-accli jobs -s failed              # graphs with a failed job
-accli jobs -s processing,error --all
+accli jobs my-project                       # latest 10
+accli jobs my-project -n 50
+accli jobs my-project -s failed             # graphs with a failed job
+accli jobs my-project -s processing,error
 ```
 
 `--status` filters on the graph status: `processing` (or `active`), `error` (or `failed`) and `done`. A standalone job counts by its own status.
 
-Show a job's status and details. For a job holding children or callbacks, Graph status covers the jobs below it (the same as GRAPH in `accli jobs`) and each one is listed; any job also links to the pipeline it is part of. Read a job's output with `accli logs <job>`:
+Show a job's status and details. For a job holding children or callbacks, Graph status covers the jobs below it (the same as GRAPH in `accli jobs`) and each one is listed; any job also links to the pipeline it is part of. Read a job's output with `accli logs <project> <job>`:
 
 ```bash
-accli job 1234
-accli job 1234 --json
+accli job my-project 1234
+accli job my-project 1234 --json
 ```
 
 ---

{accli-2.1.0 → accli-2.1.1}/README.md

@@ -93,19 +93,19 @@ Usage: accli [OPTIONS] COMMAND [ARGS]...
 List root jobs, newest first, with each job's type (`standalone`, `children`, `callback` or `children+callback`), its own status and the status of its whole graph:
 
 ```bash
-accli jobs                        # latest 10 in the last project used
-accli jobs -p my-project -n 50
-accli jobs -s failed              # graphs with a failed job
-accli jobs -s processing,error --all
+accli jobs my-project                       # latest 10
+accli jobs my-project -n 50
+accli jobs my-project -s failed             # graphs with a failed job
+accli jobs my-project -s processing,error
 ```
 
 `--status` filters on the graph status: `processing` (or `active`), `error` (or `failed`) and `done`. A standalone job counts by its own status.
 
-Show a job's status and details. For a job holding children or callbacks, Graph status covers the jobs below it (the same as GRAPH in `accli jobs`) and each one is listed; any job also links to the pipeline it is part of. Read a job's output with `accli logs <job>`:
+Show a job's status and details. For a job holding children or callbacks, Graph status covers the jobs below it (the same as GRAPH in `accli jobs`) and each one is listed; any job also links to the pipeline it is part of. Read a job's output with `accli logs <project> <job>`:
 
 ```bash
-accli job 1234
-accli job 1234 --json
+accli job my-project 1234
+accli job my-project 1234 --json
 ```
 
 ---

{accli-2.1.0 → accli-2.1.1}/accli/_version.py

@@ -1,3 +1,3 @@
 # Please strictly put double quote to use this info for git tag 
 # Read a developer guide for git tag command with regex
-VERSION = "v2.1.0"
+VERSION = "v2.1.1"

{accli-2.1.0 → accli-2.1.1}/accli/cli.py

@@ -228,9 +228,8 @@ LOG_POLL_SECONDS = 5
 
 @app.command()
 def logs(
+        project_slug: Annotated[str, typer.Argument(help="Unique Accelerator project slug.")],
         job_id: Annotated[int, typer.Argument(help="Job ID.")],
-        project_slug: Annotated[
-            str, typer.Option(..., '-p', help="Project slug. Defaults to the last project used.")] = None,
         follow: Annotated[
             bool, typer.Option(..., '--follow', '-f', help="Keep printing new lines until the job finishes.")] = False,
         source: Annotated[
@@ -241,17 +240,7 @@ def logs(
         show_time: Annotated[bool, typer.Option('--time/--no-time', help="Show the time of each line.")] = True,
 ):
     """Print a job's merged log: executor output, scheduler output and cluster events."""
-    project_slug = project_slug or get_project_slug()
-    if not project_slug:
-        print("[bold red]ERROR: No project selected. Pass one with -p.[/bold red]")
-        raise typer.Exit(1)
-
-    _, access_token, _ = exchange_refresh_token(project_slug)
-    service = AcceleratorTerminalCliProjectService(
-        user_token=access_token,
-        server_url=get_server_url(),
-        verify_cert=(not ACCLI_DEBUG)
-    )
+    service = _cli_service_for(project_slug)
     sources = ",".join(source) if source else None
     limit = 100 if whole else None
 
@@ -297,19 +286,16 @@ def logs(
 
 
 def _cli_service_for(project_slug):
-    """Resolve the project (or the last one used) and return (slug, service)."""
-    project_slug = project_slug or get_project_slug()
-    if not project_slug:
-        print("[bold red]ERROR: No project selected. Pass one with -p.[/bold red]")
-        raise typer.Exit(1)
-
+    """Check the project exists and is accessible (as `mount` does), then return a CLI service for it."""
+    server_url = get_server_url()
+    validate_project_slug(server_url, project_slug)
+    # The token from validation is cached in memory, so this exchange makes no extra request.
     _, access_token, _ = exchange_refresh_token(project_slug)
-    service = AcceleratorTerminalCliProjectService(
+    return AcceleratorTerminalCliProjectService(
         user_token=access_token,
-        server_url=get_server_url(),
+        server_url=server_url,
         verify_cert=(not ACCLI_DEBUG)
     )
-    return project_slug, service
 
 
 def _api_error_detail(err):
@@ -321,8 +307,7 @@ def _api_error_detail(err):
 
 @app.command()
 def jobs(
-        project_slug: Annotated[
-            str, typer.Option(..., '-p', help="Project slug. Defaults to the last project used.")] = None,
+        project_slug: Annotated[str, typer.Argument(help="Unique Accelerator project slug.")],
         status: Annotated[
             List[str], typer.Option(
                 ..., '--status', '-s',
@@ -330,35 +315,25 @@ def jobs(
                     "Only jobs whose graph has this status: processing (or active), error (or failed), done. "
                     "A standalone job counts by its own status. Repeatable or comma separated."
                 ))] = None,
-        limit: Annotated[int, typer.Option(..., '--limit', '-n', help="How many jobs to show.")] = 10,
-        whole: Annotated[bool, typer.Option(..., '--all', help="Show every matching job, not only the latest.")] = False,
+        limit: Annotated[
+            int, typer.Option(..., '--limit', '-n', min=1, max=200, help="How many jobs to show, up to 200.")] = 10,
         as_json: Annotated[bool, typer.Option(..., '--json', help="Print the raw JSON.")] = False,
 ):
     """List root jobs (newest first) with their type and status.
 
     TYPE is standalone, children, callback or children+callback. GRAPH is the status
     of everything below the root job, and what --status filters on. See a job's
-    status and everything it holds with `accli job <job>`.
+    status and everything it holds with `accli job <project> <job>`.
     """
-    project_slug, service = _cli_service_for(project_slug)
+    service = _cli_service_for(project_slug)
     status_filter = ",".join(t.strip() for s in (status or []) for t in s.split(",") if t.strip()) or None
-    page_size = 10 if whole else min(limit, 200)
 
-    results, count, cursor = [], 0, None
     try:
-        while True:
-            page = service.list_root_jobs(project_slug, limit=page_size, cursor=cursor, status=status_filter)
-            results += page["results"]
-            count = page["count"]
-            cursor = page.get("next_cursor")
-            if not cursor or (not whole and len(results) >= limit):
-                break
+        page = service.list_root_jobs(project_slug, limit=limit, status=status_filter)
     except AccAPIError as err:
         print(f"[bold red]ERROR: {_api_error_detail(err)}[/bold red]")
         raise typer.Exit(1)
-
-    if not whole:
-        results = results[:limit]
+    results, count = page["results"], page["count"]
 
     if as_json:
         typer.echo(json.dumps(dict(count=count, results=results), indent=2, default=str))
@@ -370,22 +345,21 @@ def jobs(
 
     print(job_views.root_jobs_table(results))
     if count > len(results):
-        print(f"[dim]Showing {len(results)} of {count} jobs. Use -n or --all to see more.[/dim]")
+        print(f"[dim]Showing {len(results)} of {count} jobs. Use -n to see more.[/dim]")
 
 
 @app.command()
 def job(
+        project_slug: Annotated[str, typer.Argument(help="Unique Accelerator project slug.")],
         job_id: Annotated[int, typer.Argument(help="Job ID: a single job, or one holding children and callbacks.")],
-        project_slug: Annotated[
-            str, typer.Option(..., '-p', help="Project slug. Defaults to the last project used.")] = None,
         as_json: Annotated[bool, typer.Option(..., '--json', help="Print the raw JSON.")] = False,
 ):
     """Show a job's status and details. For a job holding children or callbacks, Graph status
     covers the jobs below it, the same as GRAPH in `accli jobs`, and each one is listed.
 
-    See a job's output with `accli logs <job>`.
+    See a job's output with `accli logs <project> <job>`.
     """
-    project_slug, service = _cli_service_for(project_slug)
+    service = _cli_service_for(project_slug)
     try:
         job_graph = service.get_job_graph(project_slug, job_id)
     except AccAPIError as err:
@@ -396,7 +370,7 @@ def job(
         typer.echo(json.dumps(job_graph, indent=2, default=str))
         return
 
-    title, details = job_views.job_details(job_graph, job_id)
+    title, details = job_views.job_details(job_graph, job_id, project_slug)
     print(title)
     print(details)
     if len(job_views.subtree(job_graph, job_id)) > 1:

{accli-2.1.0 → accli-2.1.1}/accli/gui.py

@@ -272,11 +272,12 @@ class AccliGuiApp(tk.Tk):
             self.server_entry.configure(state=tk.NORMAL)
             self.status_bar_val.set("Session Status: Disconnected")
             
+        debug_status = "Enabled ($env:ACCLI_DEBUG='1')" if os.environ.get("ACCLI_DEBUG") else "Disabled"
         details = [
             f"Server URL:     {server_url}",
             f"Session Status: {'Connected / Logged In' if logged_in else 'Not Logged In'}",
             f"Token DB Path:  {db_path}",
-            f"Debug Mode:     {'Enabled ($env:ACCLI_DEBUG=\"1\")' if os.environ.get('ACCLI_DEBUG') else 'Disabled'}"
+            f"Debug Mode:     {debug_status}"
         ]
         self.conn_details_txt.configure(state=tk.NORMAL)
         self.conn_details_txt.delete("1.0", tk.END)

{accli-2.1.0 → accli-2.1.1}/accli/job_views.py

@@ -170,7 +170,7 @@ def _own_status(job):
     return text
 
 
-def job_details(graph, job_id):
+def job_details(graph, job_id, project_slug):
     """Key/value block for one job. Graph status covers the jobs below it, when it has any."""
     job = next(j for j in graph["jobs"] if j["id"] == job_id)
     jobs = subtree(graph, job_id)
@@ -199,10 +199,10 @@ def job_details(graph, job_id):
         part_of.append("  ")
         part_of.append_text(status_text(graph["graph_status"]))
         part_of.append(f"  {len(graph['jobs'])} jobs  ", style="dim")
-        part_of.append(f"accli job {root['id']}", style="cyan")
+        part_of.append(f"accli job {project_slug} {root['id']}", style="cyan")
         table.add_row("Part of", part_of)
 
-    table.add_row("Logs", Text(f"accli logs {job['id']}", style="cyan"))
+    table.add_row("Logs", Text(f"accli logs {project_slug} {job['id']}", style="cyan"))
 
     title = Text()
     title.append(f"Job #{job['id']}", style="bold")

{accli-2.1.0 → accli-2.1.1}/accli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accli
-Version: 2.1.0
+Version: 2.1.1
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)
@@ -29,7 +29,7 @@ Project-URL: Bug Tracker, https://github.com/iiasa/accli/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: urllib3>=1.26.5
@@ -137,19 +137,19 @@ Usage: accli [OPTIONS] COMMAND [ARGS]...
 List root jobs, newest first, with each job's type (`standalone`, `children`, `callback` or `children+callback`), its own status and the status of its whole graph:
 
 ```bash
-accli jobs                        # latest 10 in the last project used
-accli jobs -p my-project -n 50
-accli jobs -s failed              # graphs with a failed job
-accli jobs -s processing,error --all
+accli jobs my-project                       # latest 10
+accli jobs my-project -n 50
+accli jobs my-project -s failed             # graphs with a failed job
+accli jobs my-project -s processing,error
 ```
 
 `--status` filters on the graph status: `processing` (or `active`), `error` (or `failed`) and `done`. A standalone job counts by its own status.
 
-Show a job's status and details. For a job holding children or callbacks, Graph status covers the jobs below it (the same as GRAPH in `accli jobs`) and each one is listed; any job also links to the pipeline it is part of. Read a job's output with `accli logs <job>`:
+Show a job's status and details. For a job holding children or callbacks, Graph status covers the jobs below it (the same as GRAPH in `accli jobs`) and each one is listed; any job also links to the pipeline it is part of. Read a job's output with `accli logs <project> <job>`:
 
 ```bash
-accli job 1234
-accli job 1234 --json
+accli job my-project 1234
+accli job my-project 1234 --json
 ```
 
 ---

{accli-2.1.0 → accli-2.1.1}/pyproject.toml

@@ -11,7 +11,7 @@ authors = [
 description = "IIASA Accelerator Client"
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 dependencies = [
     "urllib3>=1.26.5",        # 2.0.7 is recent, but 1.26.5+ is widely compatible
     "typer[all]>=0.4.0",      # 0.4.0+ is stable and has most features

{accli-2.1.0 → accli-2.1.1}/tests/test_jobs_commands.py

@@ -1,6 +1,8 @@
 """`accli jobs` and `accli job` against a fake API."""
 import json
 
+import pytest
+
 from typer.testing import CliRunner
 
 from accli import cli
@@ -31,11 +33,12 @@ class FakeService:
         return self.graph
 
 
-def run(monkeypatch, service, *args, exit_code=0):
+def run(monkeypatch, service, command, *args, exit_code=0):
     monkeypatch.setattr(cli, "exchange_refresh_token", lambda slug: ("", "token", 0))
+    monkeypatch.setattr(cli, "validate_project_slug", lambda server_url, slug: None)
     monkeypatch.setattr(cli, "get_server_url", lambda: "https://acc.example")
     monkeypatch.setattr(cli, "AcceleratorTerminalCliProjectService", lambda **kw: service)
-    result = CliRunner().invoke(cli.app, [*args, "-p", "demo"], env={"COLUMNS": "200"})
+    result = CliRunner().invoke(cli.app, [command, "demo", *args], env={"COLUMNS": "200"})
     assert result.exit_code == exit_code, result.output
     return result.output
 
@@ -48,7 +51,7 @@ def test_jobs_lists_types_and_joins_status_filters(monkeypatch):
     ])])
     output = run(monkeypatch, service, "jobs", "-s", "error,processing", "--status", "done", "-n", "3")
 
-    assert service.calls == [dict(limit=3, cursor=None, status="error,processing,done")]
+    assert service.calls == [dict(limit=3, status="error,processing,done")]
     rows = {line.split()[0]: line for line in output.splitlines() if line.strip()[:1].isdigit()}
     assert "children+callback" in rows["3"] and "PROCESSING" in rows["3"]
     assert "standalone" in rows["2"] and "ERROR" in rows["2"]
@@ -56,15 +59,17 @@ def test_jobs_lists_types_and_joins_status_filters(monkeypatch):
     assert "Showing" not in output
 
 
-def test_jobs_all_follows_cursor(monkeypatch):
-    service = FakeService([
-        dict(count=2, next_cursor="c1", results=[job(2, "b")]),
-        dict(count=2, next_cursor=None, results=[job(1, "a")]),
-    ])
-    output = json.loads(run(monkeypatch, service, "jobs", "--all", "--json"))
+def test_jobs_fetches_one_page_and_points_to_n(monkeypatch):
+    service = FakeService([dict(count=25, next_cursor="c1", results=[job(2, "b"), job(1, "a")])])
+    output = run(monkeypatch, service, "jobs")
+
+    assert service.calls == [dict(limit=10, status=None)]
+    assert "Showing 2 of 25 jobs. Use -n to see more." in output
 
-    assert [j["id"] for j in output["results"]] == [2, 1]
-    assert service.calls[1]["cursor"] == "c1"
+
+def test_jobs_requires_project(monkeypatch):
+    result = CliRunner().invoke(cli.app, ["jobs"])
+    assert result.exit_code != 0 and "Missing argument 'project_slug'" in result.output
 
 
 def test_jobs_shows_api_error(monkeypatch):
@@ -96,8 +101,8 @@ def test_leaf_job_shows_only_its_own_status(monkeypatch):
     assert output.startswith("Job #13  after a")
     assert "Status    DONE" in output and "Graph status" not in output
     assert "callback after #11" in output
-    assert "Part of   #10 root  ERROR  5 jobs  accli job 10" in output
-    assert "accli logs 13" in output
+    assert "Part of   #10 root  ERROR  5 jobs  accli job demo 10" in output
+    assert "accli logs demo 13" in output
     assert "Jobs in" not in output
 
 
@@ -138,3 +143,18 @@ def test_graph_status_leaves_out_the_job_itself(monkeypatch):
     output = run(monkeypatch, FakeService(graph=graph), "job", "1")
     assert "Status        KILLED" in output
     assert "Graph status  DONE  1 jobs below: 1 DONE" in output
+
+
+def test_commands_validate_the_project_first(monkeypatch):
+    checked = []
+
+    def validate(server_url, slug):
+        checked.append((server_url, slug))
+        raise cli.typer.Exit(1)
+
+    monkeypatch.setattr(cli, "get_server_url", lambda: "https://acc.example")
+    monkeypatch.setattr(cli, "validate_project_slug", validate)
+    monkeypatch.setattr(cli, "AcceleratorTerminalCliProjectService", lambda **kw: pytest.fail("API called"))
+    for args in (["jobs", "nope"], ["job", "nope", "1"], ["logs", "nope", "1"]):
+        assert CliRunner().invoke(cli.app, args).exit_code == 1
+    assert checked == [("https://acc.example", "nope")] * 3

{accli-2.1.0 → accli-2.1.1}/tests/test_logs_command.py

@@ -36,10 +36,11 @@ def chunk(seq, url, end):
 def run(monkeypatch, pages, *args):
     service = FakeService(pages)
     monkeypatch.setattr(cli, "exchange_refresh_token", lambda slug: ("", "token", 0))
+    monkeypatch.setattr(cli, "validate_project_slug", lambda server_url, slug: None)
     monkeypatch.setattr(cli, "get_server_url", lambda: "https://acc.example")
     monkeypatch.setattr(cli, "AcceleratorTerminalCliProjectService", lambda **kw: service)
     monkeypatch.setattr(cli.time, "sleep", lambda s: None)
-    result = CliRunner().invoke(cli.app, ["logs", "42", "-p", "demo", "--no-time", *args])
+    result = CliRunner().invoke(cli.app, ["logs", "demo", "42", "--no-time", *args])
     assert result.exit_code == 0, result.output
     return result.output.splitlines(), service
 
@@ -65,3 +66,4 @@ def test_without_follow_prints_partial_line_once(monkeypatch):
 
     assert [line.split(None, 1)[1] for line in output] == ["starting", "downloading 4"]
     assert len(service.calls) == 1
+