impreza-cli 0.6.0__tar.gz → 0.7.0__tar.gz

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: impreza-cli
-Version: 0.6.0
+Version: 0.7.0
 Summary: Official command-line interface for the Impreza Host public REST API
 Author-email: Impreza Host <support@imprezahost.com>
 License: MIT
@@ -23,7 +23,7 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: impreza-sdk<0.7,>=0.6.0
+Requires-Dist: impreza-sdk<0.8,>=0.7.0
 Requires-Dist: typer>=0.12
 Requires-Dist: rich>=13.7
 Requires-Dist: click>=8.0
@@ -227,23 +227,33 @@ equivalent) and `impreza <TAB>` should suggest resource groups,
 
 ## Tor
 
-Inherited from the SDK. Three knobs:
+Four knobs, from the most persistent to the most one-off:
 
 ```bash
-# Per-context override at create time
-impreza context create offshore \
-  --key imp_... --secret ... \
-  # No --proxy flag yet; for now, set IMPREZA_USE_TOR before invoking
+# Persisted at context creation (writes [settings] use_tor=true)
+impreza context create offshore --key imp_... --secret ... --via-tor
+
+# Explicit SOCKS5 proxy instead (wins over use_tor; works for any
+# SOCKS5, not just Tor)
+impreza context create offshore --key imp_... --secret ...   --proxy socks5://127.0.0.1:9050
+
+# One-shot global flag on any command
+impreza --via-tor account info
 
 # Env var, picked up by the SDK transparently
 IMPREZA_USE_TOR=1 impreza account info
-
-# Programmatic via the SDK (Python users skip the CLI for this)
 ```
 
+All four route through the local Tor daemon's SOCKS5 port with remote
+DNS (no local lookup of the API hostname). Because exit nodes rotate,
+set the API key's IP factor to `tofu` or `keyonly` in the client area —
+`whitelist` cannot work without a stable egress IP. When the account
+uses the API's `.onion` mirror, the IP factor sees a stable loopback
+instead.
+
 The SDK's `auto_tor=True` path (probe Tor, fall back to clearnet)
-isn't surfaced through the CLI yet — coming in a future release
-alongside the `--via-tor` shortcut.
+isn't surfaced through the CLI yet — it is a fail-open convenience,
+which is the wrong default here.
 
 ## Error handling
 

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/README.md

@@ -185,23 +185,33 @@ equivalent) and `impreza <TAB>` should suggest resource groups,
 
 ## Tor
 
-Inherited from the SDK. Three knobs:
+Four knobs, from the most persistent to the most one-off:
 
 ```bash
-# Per-context override at create time
-impreza context create offshore \
-  --key imp_... --secret ... \
-  # No --proxy flag yet; for now, set IMPREZA_USE_TOR before invoking
+# Persisted at context creation (writes [settings] use_tor=true)
+impreza context create offshore --key imp_... --secret ... --via-tor
+
+# Explicit SOCKS5 proxy instead (wins over use_tor; works for any
+# SOCKS5, not just Tor)
+impreza context create offshore --key imp_... --secret ...   --proxy socks5://127.0.0.1:9050
+
+# One-shot global flag on any command
+impreza --via-tor account info
 
 # Env var, picked up by the SDK transparently
 IMPREZA_USE_TOR=1 impreza account info
-
-# Programmatic via the SDK (Python users skip the CLI for this)
 ```
 
+All four route through the local Tor daemon's SOCKS5 port with remote
+DNS (no local lookup of the API hostname). Because exit nodes rotate,
+set the API key's IP factor to `tofu` or `keyonly` in the client area —
+`whitelist` cannot work without a stable egress IP. When the account
+uses the API's `.onion` mirror, the IP factor sees a stable loopback
+instead.
+
 The SDK's `auto_tor=True` path (probe Tor, fall back to clearnet)
-isn't surfaced through the CLI yet — coming in a future release
-alongside the `--via-tor` shortcut.
+isn't surfaced through the CLI yet — it is a fail-open convenience,
+which is the wrong default here.
 
 ## Error handling
 

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/impreza_cli/commands/context.py

@@ -88,6 +88,18 @@ def create(
         help="Optional default output format for this context.",
         case_sensitive=False,
     ),
+    via_tor: bool = typer.Option(
+        False,
+        "--via-tor",
+        help="Route API calls through the local Tor daemon "
+        "(sets [settings] use_tor=true, CLI-wide).",
+    ),
+    proxy: str | None = typer.Option(
+        None,
+        "--proxy",
+        help="Explicit SOCKS5 proxy, e.g. socks5://127.0.0.1:9050 "
+        "(sets [settings] proxy, CLI-wide; wins over use_tor).",
+    ),
     overwrite: bool = typer.Option(
         False,
         "--overwrite",
@@ -108,6 +120,12 @@ def create(
         )
     except (ContextAlreadyExists, InvalidContextName) as exc:
         _exit_on_config_error(exc)
+
+    if via_tor or proxy:
+        if via_tor:
+            cfg.settings.use_tor = True
+        if proxy:
+            cfg.settings.proxy = proxy
     cfg.save()
 
     is_default = cfg.default_context == name

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/impreza_cli/config.py

@@ -167,6 +167,7 @@ class _Settings:
 
     poll_interval: float | None = None
     use_tor: bool | None = None
+    proxy: str | None = None
 
     def to_toml_dict(self) -> dict[str, Any]:
         body: dict[str, Any] = {}
@@ -174,6 +175,8 @@ class _Settings:
             body["poll_interval"] = self.poll_interval
         if self.use_tor is not None:
             body["use_tor"] = self.use_tor
+        if self.proxy is not None:
+            body["proxy"] = self.proxy
         return body
 
 
@@ -267,6 +270,9 @@ class Config:
             tor = settings_raw.get("use_tor")
             if isinstance(tor, bool):
                 settings.use_tor = tor
+            proxy = settings_raw.get("proxy")
+            if isinstance(proxy, str) and proxy:
+                settings.proxy = proxy
 
         default_context = raw.get("default_context")
         if not isinstance(default_context, str):

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/impreza_cli/main.py

@@ -62,6 +62,15 @@ def _root(
         "-c",
         help="Override the default context for this invocation.",
     ),
+    via_tor: bool = typer.Option(
+        False,
+        "--via-tor",
+        help=(
+            "Route this invocation through the local Tor daemon "
+            "(SOCKS5 127.0.0.1:9050). Overrides [settings] use_tor once; "
+            "persist it with `impreza context create --via-tor`."
+        ),
+    ),
     output: OutputFormat | None = typer.Option(
         None,
         "--output",
@@ -78,7 +87,7 @@ def _root(
     Global flags ``--context`` and ``--output`` apply to every
     subcommand and are inherited via Typer's context object.
     """
-    ctx.obj = GlobalState(context_override=context, output=output)
+    ctx.obj = GlobalState(context_override=context, output=output, via_tor=via_tor)
 
 
 # ── Subcommand mounts ────────────────────────────────────────────────

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/impreza_cli/sdk.py

@@ -69,10 +69,13 @@ def make_client(
     if ctx.base_url:
         kwargs["base_url"] = ctx.base_url
 
-    # Tor preference comes from the [settings] block (CLI-wide). A
-    # future per-context override (one VPN context, one clearnet, etc.)
+    # Tor/proxy preference: an explicit [settings] proxy wins; then the
+    # one-shot global --via-tor flag; then the CLI-wide use_tor setting.
+    # A future per-context override (one VPN context, one clearnet, etc.)
     # would slot in here without touching callers.
-    if cfg.settings.use_tor:
+    if cfg.settings.proxy:
+        kwargs["proxy"] = cfg.settings.proxy
+    elif state.via_tor or cfg.settings.use_tor:
         kwargs["use_tor"] = True
 
     return Client(**kwargs)

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/impreza_cli/state.py

@@ -31,6 +31,11 @@ class GlobalState:
     #: ``None`` means "use the config file's ``default_context``".
     context_override: str | None = None
 
+    #: One-shot Tor routing selected via the global ``--via-tor`` flag.
+    #: Overrides the config file's ``[settings] use_tor`` for this
+    #: invocation only; ``None``/False means "follow the config".
+    via_tor: bool = False
+
     #: Default output format selected via the global ``--output`` flag.
     #: Per-command ``--output`` flags can override this on a single
     #: invocation; ``None`` here means "no preference, fall back to

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/impreza_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: impreza-cli
-Version: 0.6.0
+Version: 0.7.0
 Summary: Official command-line interface for the Impreza Host public REST API
 Author-email: Impreza Host <support@imprezahost.com>
 License: MIT
@@ -23,7 +23,7 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: impreza-sdk<0.7,>=0.6.0
+Requires-Dist: impreza-sdk<0.8,>=0.7.0
 Requires-Dist: typer>=0.12
 Requires-Dist: rich>=13.7
 Requires-Dist: click>=8.0
@@ -227,23 +227,33 @@ equivalent) and `impreza <TAB>` should suggest resource groups,
 
 ## Tor
 
-Inherited from the SDK. Three knobs:
+Four knobs, from the most persistent to the most one-off:
 
 ```bash
-# Per-context override at create time
-impreza context create offshore \
-  --key imp_... --secret ... \
-  # No --proxy flag yet; for now, set IMPREZA_USE_TOR before invoking
+# Persisted at context creation (writes [settings] use_tor=true)
+impreza context create offshore --key imp_... --secret ... --via-tor
+
+# Explicit SOCKS5 proxy instead (wins over use_tor; works for any
+# SOCKS5, not just Tor)
+impreza context create offshore --key imp_... --secret ...   --proxy socks5://127.0.0.1:9050
+
+# One-shot global flag on any command
+impreza --via-tor account info
 
 # Env var, picked up by the SDK transparently
 IMPREZA_USE_TOR=1 impreza account info
-
-# Programmatic via the SDK (Python users skip the CLI for this)
 ```
 
+All four route through the local Tor daemon's SOCKS5 port with remote
+DNS (no local lookup of the API hostname). Because exit nodes rotate,
+set the API key's IP factor to `tofu` or `keyonly` in the client area —
+`whitelist` cannot work without a stable egress IP. When the account
+uses the API's `.onion` mirror, the IP factor sees a stable loopback
+instead.
+
 The SDK's `auto_tor=True` path (probe Tor, fall back to clearnet)
-isn't surfaced through the CLI yet — coming in a future release
-alongside the `--via-tor` shortcut.
+isn't surfaced through the CLI yet — it is a fail-open convenience,
+which is the wrong default here.
 
 ## Error handling
 

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/impreza_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-impreza-sdk<0.7,>=0.6.0
+impreza-sdk<0.8,>=0.7.0
 typer>=0.12
 rich>=13.7
 click>=8.0

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
     # breaking (see CHANGELOG). Raise BOTH bounds in the same commit that
     # makes the CLI depend on a newer SDK feature, or this stops
     # protecting anything.
-    "impreza-sdk>=0.6.0,<0.7",
+    "impreza-sdk>=0.7.0,<0.8",
     "typer>=0.12",
     "rich>=13.7",
     # Declared explicitly because `config.py` imports click directly, for

{impreza_cli-0.6.0 → impreza_cli-0.7.0}/tests/test_context_commands.py

@@ -16,6 +16,8 @@ from typer.testing import CliRunner
 
 from impreza_cli.config import Config
 from impreza_cli.main import app
+from impreza_cli.sdk import make_client
+from impreza_cli.state import GlobalState
 
 # Click 8.2+ removed `mix_stderr` from CliRunner — stderr is always
 # captured separately now via result.stderr.
@@ -322,3 +324,117 @@ def test_full_lifecycle(isolated_config: Path, output_fmt: str) -> None:
         assert result.exit_code == 0
         assert "work" in result.stdout
         assert "personal" not in result.stdout
+
+
+# ── Tor / proxy flags ─────────────────────────────────
+
+
+def test_create_via_tor_sets_use_tor_setting(isolated_config: Path) -> None:
+    result = runner.invoke(
+        app,
+        [
+            "context", "create", "tor",
+            "--key", _FAKE_KEY, "--secret", _FAKE_SECRET, "--via-tor",
+        ],
+    )
+    assert result.exit_code == 0
+    cfg = Config.load(isolated_config)
+    assert cfg.settings.use_tor is True
+    assert cfg.settings.proxy is None
+
+
+def test_create_with_proxy_sets_proxy_setting(isolated_config: Path) -> None:
+    result = runner.invoke(
+        app,
+        [
+            "context", "create", "tor",
+            "--key", _FAKE_KEY, "--secret", _FAKE_SECRET,
+            "--proxy", "socks5://127.0.0.1:9050",
+        ],
+    )
+    assert result.exit_code == 0
+    cfg = Config.load(isolated_config)
+    assert cfg.settings.proxy == "socks5://127.0.0.1:9050"
+    assert cfg.settings.use_tor is None  # proxy wins; use_tor untouched
+
+
+def test_create_without_tor_flags_leaves_settings_empty(
+    isolated_config: Path,
+) -> None:
+    result = runner.invoke(
+        app,
+        ["context", "create", "plain", "--key", _FAKE_KEY, "--secret", _FAKE_SECRET],
+    )
+    assert result.exit_code == 0
+    cfg = Config.load(isolated_config)
+    assert cfg.settings.use_tor is None
+    assert cfg.settings.proxy is None
+
+
+def _capture_client_kwargs(monkeypatch: pytest.MonkeyPatch) -> dict[str, object]:
+    captured: dict[str, object] = {}
+
+    class _FakeClient:
+        def __init__(self, **kwargs: object) -> None:
+            captured.update(kwargs)
+
+    monkeypatch.setattr("impreza_cli.sdk.Client", _FakeClient)
+    return captured
+
+
+def test_make_client_proxy_setting_wins(
+    isolated_config: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    runner.invoke(
+        app,
+        [
+            "context", "create", "tor",
+            "--key", _FAKE_KEY, "--secret", _FAKE_SECRET,
+            "--via-tor", "--proxy", "socks5://127.0.0.1:9150",
+        ],
+    )
+    captured = _capture_client_kwargs(monkeypatch)
+    make_client(GlobalState())
+    assert captured.get("proxy") == "socks5://127.0.0.1:9150"
+    assert "use_tor" not in captured
+
+
+def test_make_client_use_tor_from_settings(
+    isolated_config: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    runner.invoke(
+        app,
+        [
+            "context", "create", "tor",
+            "--key", _FAKE_KEY, "--secret", _FAKE_SECRET, "--via-tor",
+        ],
+    )
+    captured = _capture_client_kwargs(monkeypatch)
+    make_client(GlobalState())
+    assert captured.get("use_tor") is True
+    assert "proxy" not in captured
+
+
+def test_make_client_global_via_tor_flag(
+    isolated_config: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    runner.invoke(
+        app,
+        ["context", "create", "plain", "--key", _FAKE_KEY, "--secret", _FAKE_SECRET],
+    )
+    captured = _capture_client_kwargs(monkeypatch)
+    make_client(GlobalState(via_tor=True))
+    assert captured.get("use_tor") is True
+
+
+def test_make_client_clearnet_default(
+    isolated_config: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    runner.invoke(
+        app,
+        ["context", "create", "plain", "--key", _FAKE_KEY, "--secret", _FAKE_SECRET],
+    )
+    captured = _capture_client_kwargs(monkeypatch)
+    make_client(GlobalState())
+    assert "use_tor" not in captured
+    assert "proxy" not in captured