discolike-cli 0.2.0__tar.gz → 0.3.0__tar.gz

{discolike_cli-0.2.0 → discolike_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: discolike-cli
-Version: 0.2.0
+Version: 0.3.0
 Summary: Official CLI for the DiscoLike API
 Project-URL: Homepage, https://www.discolike.com
 Project-URL: Documentation, https://docs.discolike.com
@@ -25,7 +25,7 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
-Requires-Dist: discolike==0.2.0
+Requires-Dist: discolike==0.3.0
 Requires-Dist: rich>=13.0
 Requires-Dist: typer>=0.12
 Description-Content-Type: text/markdown
@@ -54,7 +54,7 @@ Requires Python 3.10+. Installing this package gives you the `discolike` command
 discolike auth login
 ```
 
-Prompts for an API key (or pass `--api-key`) and verifies it against your account. Create a key at [app.discolike.com/account/management/keys](https://app.discolike.com/account/management/keys). You can also set `DISCOLIKE_API_KEY` in the environment instead.
+Opens your browser to log in (add `--no-browser` to print the URL instead, `--port` to pin the loopback port when forwarding over SSH). To use an API key instead, pass `--api-key KEY` or `--method api_key` to be prompted; create a key at [app.discolike.com/account/management/keys](https://app.discolike.com/account/management/keys). You can also set `DISCOLIKE_API_KEY` in the environment instead.
 
 ## Quickstart
 

{discolike_cli-0.2.0 → discolike_cli-0.3.0}/README.md

@@ -22,7 +22,7 @@ Requires Python 3.10+. Installing this package gives you the `discolike` command
 discolike auth login
 ```
 
-Prompts for an API key (or pass `--api-key`) and verifies it against your account. Create a key at [app.discolike.com/account/management/keys](https://app.discolike.com/account/management/keys). You can also set `DISCOLIKE_API_KEY` in the environment instead.
+Opens your browser to log in (add `--no-browser` to print the URL instead, `--port` to pin the loopback port when forwarding over SSH). To use an API key instead, pass `--api-key KEY` or `--method api_key` to be prompted; create a key at [app.discolike.com/account/management/keys](https://app.discolike.com/account/management/keys). You can also set `DISCOLIKE_API_KEY` in the environment instead.
 
 ## Quickstart
 

{discolike_cli-0.2.0 → discolike_cli-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "discolike-cli"
-version = "0.2.0"
+version = "0.3.0"
 description = "Official CLI for the DiscoLike API"
 readme = "README.md"
 license = "MIT"
@@ -12,7 +12,7 @@ license-files = ["LICENSE"]
 requires-python = ">=3.10"
 authors = [{ name = "DiscoLike", email = "support@discolike.com" }]
 dependencies = [
-  "discolike==0.2.0",
+  "discolike==0.3.0",
   "typer>=0.12",
   "rich>=13.0",
 ]

discolike_cli-0.3.0/src/discolike_cli/_loopback.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+import threading
+from http import HTTPStatus
+from http.server import BaseHTTPRequestHandler
+from http.server import HTTPServer
+from urllib.parse import parse_qs
+from urllib.parse import urlparse
+
+LOOPBACK_HOST = "127.0.0.1"
+CALLBACK_PATH = "/callback"
+CALLBACK_HTML = "<!doctype html><title>DiscoLike</title><p>Login complete. You can close this window.</p>"
+
+
+class _LoopbackServer(HTTPServer):
+    def __init__(self, *, host: str, port: int) -> None:
+        super().__init__((host, port), _CallbackHandler)
+        self.query: dict[str, str] = {}
+        self.received = threading.Event()
+
+
+class _CallbackHandler(BaseHTTPRequestHandler):
+    server: _LoopbackServer
+
+    def do_GET(self) -> None:
+        parsed = urlparse(self.path)
+        if parsed.path != CALLBACK_PATH:
+            self.send_error(HTTPStatus.NOT_FOUND)
+            return
+        self.server.query = {key: values[0] for key, values in parse_qs(parsed.query).items()}
+        body = CALLBACK_HTML.encode()
+        self.send_response(HTTPStatus.OK)
+        self.send_header("Content-Type", "text/html; charset=utf-8")
+        self.send_header("Content-Length", str(len(body)))
+        self.end_headers()
+        self.wfile.write(body)
+        self.server.received.set()
+
+    def log_message(self, format: str, *args: object) -> None:  # noqa: A002 -- BaseHTTPRequestHandler signature
+        _ = (format, args)
+
+
+class CallbackServer:
+    """Loopback redirect target for the authorization-code flow; serves on a daemon thread."""
+
+    def __init__(self, *, port: int) -> None:
+        self._server = _LoopbackServer(host=LOOPBACK_HOST, port=port)
+        self._thread = threading.Thread(target=self._server.serve_forever, daemon=True)
+
+    @property
+    def redirect_uri(self) -> str:
+        return f"http://{LOOPBACK_HOST}:{self._server.server_port}{CALLBACK_PATH}"
+
+    def wait(self, *, timeout: float) -> dict[str, str] | None:
+        return self._server.query if self._server.received.wait(timeout) else None
+
+    def __enter__(self) -> CallbackServer:
+        self._thread.start()
+        return self
+
+    def __exit__(self, *exc_info: object) -> None:
+        self._server.shutdown()
+        self._server.server_close()

{discolike_cli-0.2.0 → discolike_cli-0.3.0}/src/discolike_cli/_output.py

@@ -3,12 +3,15 @@ from __future__ import annotations
 import functools
 import json
 import sys
+import types
+import typing
 from collections.abc import Callable
 from typing import Any
 from typing import ParamSpec
 from typing import Protocol
 from typing import TypeVar
 
+import pydantic
 import typer
 from rich.console import Console
 from rich.table import Table
@@ -24,6 +27,8 @@ from discolike._models import DiscolikeModel
 
 P = ParamSpec("P")
 R = TypeVar("R")
+RequestT = TypeVar("RequestT", bound=pydantic.BaseModel)
+UNION_ORIGINS = (typing.Union, types.UnionType)
 
 EXIT_CODES: dict[type, int] = {
     ValidationError: 2,
@@ -117,11 +122,27 @@ def fail(exc: DiscolikeError) -> typer.Exit:
     return typer.Exit(code=EXIT_CODES.get(type(exc), DEFAULT_EXIT_CODE))
 
 
-def call_typed(fn: Callable[..., R], **kwargs: Any) -> R:  # noqa: ANN401 -- forwarded to a typed SDK method signature
-    try:
-        return fn(**kwargs)
-    except TypeError as exc:
-        raise typer.BadParameter(str(exc)) from exc
+def _accepts_list(model: type[pydantic.BaseModel], name: str) -> bool:
+    field = model.model_fields.get(name)
+    if field is None:
+        return False
+    annotation = field.annotation
+    members = typing.get_args(annotation) if typing.get_origin(annotation) in UNION_ORIGINS else (annotation,)
+    return any(typing.get_origin(member) is list for member in members)
+
+
+def build_request(model: type[RequestT], kwargs: dict[str, Any]) -> RequestT:
+    # --param KEY=VALUE yields a bare string; the API reads one value for a list param as a one-element list.
+    return model.model_validate(
+        {
+            key: [value] if isinstance(value, str) and _accepts_list(model, key) else value
+            for key, value in kwargs.items()
+        }
+    )
+
+
+def _validation_message(exc: pydantic.ValidationError) -> str:
+    return "; ".join(f"{'.'.join(str(part) for part in error['loc'])}: {error['msg']}" for error in exc.errors())
 
 
 def handle_errors(fn: Callable[P, R]) -> Callable[P, R]:
@@ -129,6 +150,8 @@ def handle_errors(fn: Callable[P, R]) -> Callable[P, R]:
     def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
         try:
             return fn(*args, **kwargs)
+        except pydantic.ValidationError as exc:
+            raise fail(ValidationError(_validation_message(exc))) from exc
         except DiscolikeError as exc:
             raise fail(exc) from exc
 

discolike_cli-0.3.0/src/discolike_cli/auth.py

@@ -0,0 +1,285 @@
+from __future__ import annotations
+
+import json
+import secrets
+import sys
+import webbrowser
+from datetime import datetime
+from datetime import timezone
+from typing import Any
+from typing import NoReturn
+from urllib.parse import urlparse
+
+import httpx2
+import typer
+
+from discolike._config import AUTH_METHOD_API_KEY
+from discolike._config import AUTH_METHOD_OAUTH
+from discolike._config import DEFAULT_BASE_URL
+from discolike._config import KEYS_URL
+from discolike._config import NO_CREDENTIAL_MESSAGE
+from discolike._config import delete_credential
+from discolike._config import delete_oauth_client
+from discolike._config import load_credential
+from discolike._config import load_oauth_client
+from discolike._config import save_config
+from discolike._config import save_credential
+from discolike._config import save_oauth_client
+from discolike._credentials import OAuthClientRegistration
+from discolike._credentials import OAuthCredential
+from discolike._exceptions import AuthenticationError
+from discolike._oauth import AuthServerMetadata
+from discolike._oauth import OAuthError
+from discolike._oauth import build_authorization_url
+from discolike._oauth import discover
+from discolike._oauth import exchange_code
+from discolike._oauth import pkce_pair
+from discolike._oauth import register_client
+from discolike_cli._loopback import CallbackServer
+from discolike_cli._output import emit
+from discolike_cli._output import handle_errors
+
+app = typer.Typer(help="Manage credentials: log in (browser or API key), check status, log out.")
+
+MASKED_VISIBLE_CHARS = 4
+LOGIN_TIMEOUT_SECONDS = 180.0
+OAUTH_HTTP_TIMEOUT_SECONDS = 30.0
+STATE_BYTES = 16
+RANDOM_PORT = 0
+
+SOURCE_OPTION = "option"
+SOURCE_ENV = "env"
+SOURCE_CONFIG = "config"
+
+LOGIN_METHODS = (AUTH_METHOD_OAUTH, AUTH_METHOD_API_KEY)
+DEAD_CLIENT_ERRORS = frozenset({"invalid_client", "unauthorized_client"})
+
+
+class _DeadClientError(Exception):
+    """The authorization server no longer recognises the registered client_id."""
+
+
+def _mask(key: str) -> str:
+    return "…" + key[-MASKED_VISIBLE_CHARS:]
+
+
+def _iso(epoch_seconds: float) -> str:
+    return datetime.fromtimestamp(epoch_seconds, tz=timezone.utc).isoformat()
+
+
+def _global_key_source(ctx: typer.Context) -> str:
+    # typer vendors click without re-exporting ParameterSource, so match on the enum member name.
+    source = ctx.find_root().get_parameter_source("api_key")
+    return SOURCE_ENV if source is not None and source.name == "ENVIRONMENT" else SOURCE_OPTION
+
+
+def _verify(ctx: typer.Context, **kwargs: Any) -> None:  # noqa: ANN401 -- forwarded verbatim to build_client
+    from discolike_cli.main import build_client
+
+    base_url = ctx.obj.get("base_url")
+    if base_url is not None:
+        kwargs["base_url"] = base_url
+    build_client(**kwargs).account.usage()
+
+
+def _abort_login(message: str) -> NoReturn:
+    print(json.dumps({"error": "LoginError", "message": message}), file=sys.stderr)
+    raise typer.Exit(code=1)
+
+
+def _registered_port(registration: OAuthClientRegistration) -> int:
+    return int(urlparse(registration.redirect_uri).port or RANDOM_PORT)
+
+
+def _reusable_registration(*, issuer: str, port: int) -> OAuthClientRegistration | None:
+    stored = load_oauth_client()
+    if stored is None or stored.issuer != issuer:
+        return None
+    if port != RANDOM_PORT and _registered_port(stored) != port:
+        return None
+    return stored
+
+
+def _bind_stored_port(registration: OAuthClientRegistration) -> CallbackServer | None:
+    try:
+        return CallbackServer(port=_registered_port(registration))
+    except OSError:
+        return None
+
+
+def _register_or_reuse(
+    metadata: AuthServerMetadata, *, port: int, http: httpx2.Client
+) -> tuple[CallbackServer, OAuthClientRegistration, bool]:
+    # PropelAuth matches the redirect URI literally (port included) and remembers consent per client_id,
+    # so a stored registration is only worth reusing when its exact port can be bound again.
+    stored = _reusable_registration(issuer=metadata.issuer, port=port)
+    if stored is not None:
+        server = _bind_stored_port(stored)
+        if server is not None:
+            return server, stored, True
+    server = CallbackServer(port=port)
+    client_id = register_client(metadata, redirect_uris=[server.redirect_uri], client=http)
+    registration = OAuthClientRegistration(
+        client_id=client_id, redirect_uri=server.redirect_uri, issuer=metadata.issuer
+    )
+    save_oauth_client(registration)
+    return server, registration, False
+
+
+def _authorize(
+    metadata: AuthServerMetadata,
+    registration: OAuthClientRegistration,
+    server: CallbackServer,
+    *,
+    resource: str,
+    open_browser: bool,
+    http: httpx2.Client,
+) -> OAuthCredential:
+    verifier, challenge = pkce_pair()
+    state = secrets.token_urlsafe(STATE_BYTES)
+    url = build_authorization_url(
+        metadata,
+        client_id=registration.client_id,
+        redirect_uri=registration.redirect_uri,
+        code_challenge=challenge,
+        state=state,
+        resource=resource,
+    )
+    print(f"Open this URL in your browser to log in:\n{url}", file=sys.stderr)
+    if open_browser and not webbrowser.open(url):
+        print("Could not open a browser; open the URL above manually.", file=sys.stderr)
+    callback = server.wait(timeout=LOGIN_TIMEOUT_SECONDS)
+    if callback is None:
+        _abort_login(f"Timed out after {LOGIN_TIMEOUT_SECONDS:.0f}s waiting for the browser login")
+    if callback.get("state") != state:
+        _abort_login("Invalid OAuth callback (state mismatch)")
+    if "error" in callback:
+        message = f"Authorization failed: {callback.get('error_description') or callback['error']}"
+        if callback["error"] in DEAD_CLIENT_ERRORS:
+            raise _DeadClientError(message)
+        _abort_login(message)
+    if "code" not in callback:
+        _abort_login("Invalid OAuth callback (missing code)")
+    try:
+        return exchange_code(
+            metadata,
+            client_id=registration.client_id,
+            code=callback["code"],
+            code_verifier=verifier,
+            redirect_uri=registration.redirect_uri,
+            resource=resource,
+            client=http,
+        )
+    except OAuthError as exc:
+        if exc.error in DEAD_CLIENT_ERRORS:
+            raise _DeadClientError(f"Token exchange failed: {exc}") from exc
+        raise
+
+
+def _oauth_login(ctx: typer.Context, *, open_browser: bool, port: int) -> OAuthCredential:
+    base_url = str(ctx.obj.get("base_url") or DEFAULT_BASE_URL).rstrip("/")
+    with httpx2.Client(timeout=OAUTH_HTTP_TIMEOUT_SECONDS) as http:
+        metadata = discover(base_url, client=http)
+        server, registration, reused = _register_or_reuse(metadata, port=port, http=http)
+        try:
+            with server:
+                return _authorize(
+                    metadata, registration, server, resource=base_url, open_browser=open_browser, http=http
+                )
+        except _DeadClientError as exc:
+            if not reused:
+                _abort_login(str(exc))
+        delete_oauth_client()
+        server, registration, _ = _register_or_reuse(metadata, port=port, http=http)
+        try:
+            with server:
+                return _authorize(
+                    metadata, registration, server, resource=base_url, open_browser=open_browser, http=http
+                )
+        except _DeadClientError as exc:
+            _abort_login(str(exc))
+
+
+def _api_key_login(ctx: typer.Context, *, api_key: str | None) -> None:
+    # An ambient DISCOLIKE_API_KEY must not silently become the saved key; only an explicit flag may.
+    passed_globally = ctx.obj.get("api_key") if _global_key_source(ctx) == SOURCE_OPTION else None
+    key = api_key or passed_globally or typer.prompt("API key", hide_input=True)
+    _verify(ctx, api_key=key)
+    save_config({"auth_method": AUTH_METHOD_API_KEY, "api_key": key})
+    print(json.dumps({"logged_in": True, "source": AUTH_METHOD_API_KEY}), file=sys.stderr)
+
+
+@app.command()
+@handle_errors
+def login(
+    ctx: typer.Context,
+    api_key: str | None = typer.Option(
+        None, help=f"Log in with an API key instead of the browser. Create one at {KEYS_URL}."
+    ),
+    method: str = typer.Option(
+        AUTH_METHOD_OAUTH,
+        "--method",
+        help="oauth (browser login, default) or api_key (prompts for a key unless --api-key is given).",
+    ),
+    no_browser: bool = typer.Option(False, "--no-browser", help="Print the login URL instead of opening a browser."),
+    port: int = typer.Option(
+        RANDOM_PORT, "--port", help="Fixed loopback port for the browser redirect (default: random; use with SSH)."
+    ),
+) -> None:
+    """Log in via the browser (OAuth) or with an API key, verify, and save to the local config file."""
+    if method not in LOGIN_METHODS:
+        raise typer.BadParameter(f"must be one of {', '.join(LOGIN_METHODS)}", param_hint="--method")
+    global_key_passed = ctx.obj.get("api_key") is not None and _global_key_source(ctx) == SOURCE_OPTION
+    if api_key or global_key_passed or method == AUTH_METHOD_API_KEY:
+        _api_key_login(ctx, api_key=api_key)
+        return
+    credential = _oauth_login(ctx, open_browser=not no_browser, port=port)
+    _verify(ctx, auth=credential)
+    save_credential(credential)
+    print(
+        json.dumps({"logged_in": True, "method": AUTH_METHOD_OAUTH, "expires_at": _iso(credential.expires_at)}),
+        file=sys.stderr,
+    )
+
+
+@app.command()
+@handle_errors
+def status(ctx: typer.Context) -> None:
+    """Show which credential is in use (option, env, or config) and verify it against the API."""
+    key = ctx.obj.get("api_key")
+    if key:
+        _verify(ctx, api_key=str(key))
+        emit(
+            {
+                "source": _global_key_source(ctx),
+                "method": AUTH_METHOD_API_KEY,
+                "api_key": _mask(str(key)),
+                "valid": True,
+            }
+        )
+        return
+    credential = load_credential()
+    if credential is None:
+        raise AuthenticationError(NO_CREDENTIAL_MESSAGE)
+    if isinstance(credential, OAuthCredential):
+        _verify(ctx)
+        emit(
+            {
+                "source": SOURCE_CONFIG,
+                "method": AUTH_METHOD_OAUTH,
+                "expires_at": _iso(credential.expires_at),
+                "expired": credential.expires_within(0),
+                "valid": True,
+            }
+        )
+        return
+    _verify(ctx, api_key=credential.api_key)
+    emit({"source": SOURCE_CONFIG, "method": AUTH_METHOD_API_KEY, "api_key": _mask(credential.api_key), "valid": True})
+
+
+@app.command()
+@handle_errors
+def logout() -> None:
+    """Delete saved credentials from the local config file (the registered OAuth client is kept)."""
+    delete_credential()
+    emit({"logged_out": True})

{discolike_cli-0.2.0 → discolike_cli-0.3.0}/src/discolike_cli/company.py

@@ -2,8 +2,18 @@ from __future__ import annotations
 
 import typer
 
+from discolike.requests import CompaniesDataParams
+from discolike.requests import CompaniesExtractParams
+from discolike.requests import CompaniesGrowthParams
+from discolike.requests import CompaniesPublicLinksParams
+from discolike.requests import CompaniesRedirectsParams
+from discolike.requests import CompaniesScoreParams
+from discolike.requests import CompaniesSubsidiariesParams
+from discolike.requests import CompaniesVendorsParams
+from discolike_cli._output import build_request
 from discolike_cli._output import emit
 from discolike_cli._output import handle_errors
+from discolike_cli.discover import _merge_params
 
 FORMAT_HELP = "Output format: json or table (table auto-selected on a TTY; falls back to JSON for non-tabular data)."
 DOMAIN_HELP = "Company domain, e.g. stripe.com"
@@ -24,7 +34,9 @@ def data(
     """Full company profile (firmographics) for a domain."""
     from discolike_cli.main import get_client
 
-    emit(get_client(ctx).companies.data(domain=domain), fmt=fmt)
+    emit(
+        get_client(ctx).companies.data(build_request(CompaniesDataParams, _merge_params(None, domain=domain))), fmt=fmt
+    )
 
 
 @app.command()
@@ -37,7 +49,10 @@ def score(
     """Company score for a domain."""
     from discolike_cli.main import get_client
 
-    emit(get_client(ctx).companies.score(domain=domain), fmt=fmt)
+    emit(
+        get_client(ctx).companies.score(build_request(CompaniesScoreParams, _merge_params(None, domain=domain))),
+        fmt=fmt,
+    )
 
 
 @app.command()
@@ -50,7 +65,10 @@ def growth(
     """Growth signals for a domain."""
     from discolike_cli.main import get_client
 
-    emit(get_client(ctx).companies.growth(domain=domain), fmt=fmt)
+    emit(
+        get_client(ctx).companies.growth(build_request(CompaniesGrowthParams, _merge_params(None, domain=domain))),
+        fmt=fmt,
+    )
 
 
 @app.command()
@@ -64,7 +82,8 @@ def redirects(
     """Domain redirects for a company domain."""
     from discolike_cli.main import get_client
 
-    emit(get_client(ctx).companies.redirects(domain=domain, match=match), fmt=fmt)
+    request = build_request(CompaniesRedirectsParams, _merge_params(None, domain=domain, match=match))
+    emit(get_client(ctx).companies.redirects(request), fmt=fmt)
 
 
 @app.command()
@@ -78,7 +97,8 @@ def vendors(
     """Vendors associated with a company domain."""
     from discolike_cli.main import get_client
 
-    emit(get_client(ctx).companies.vendors(domain=domain, match=match), fmt=fmt)
+    request = build_request(CompaniesVendorsParams, _merge_params(None, domain=domain, match=match))
+    emit(get_client(ctx).companies.vendors(request), fmt=fmt)
 
 
 @app.command()
@@ -92,7 +112,8 @@ def subsidiaries(
     """Subsidiaries of a company domain."""
     from discolike_cli.main import get_client
 
-    emit(get_client(ctx).companies.subsidiaries(domain=domain, match=match), fmt=fmt)
+    request = build_request(CompaniesSubsidiariesParams, _merge_params(None, domain=domain, match=match))
+    emit(get_client(ctx).companies.subsidiaries(request), fmt=fmt)
 
 
 @app.command(name="public-links")
@@ -106,7 +127,8 @@ def public_links(
     """Public profile links for a domain from a given source."""
     from discolike_cli.main import get_client
 
-    emit(get_client(ctx).companies.public_links(domain=domain, source=source), fmt=fmt)
+    request = build_request(CompaniesPublicLinksParams, _merge_params(None, domain=domain, source=source))
+    emit(get_client(ctx).companies.public_links(request), fmt=fmt)
 
 
 @handle_errors
@@ -118,4 +140,6 @@ def extract_command(
     """Extract page content from a URL."""
     from discolike_cli.main import get_client
 
-    emit(get_client(ctx).companies.extract(url=url), fmt=fmt)
+    emit(
+        get_client(ctx).companies.extract(build_request(CompaniesExtractParams, _merge_params(None, url=url))), fmt=fmt
+    )

{discolike_cli-0.2.0 → discolike_cli-0.3.0}/src/discolike_cli/contacts.py

@@ -5,7 +5,14 @@ import pathlib
 
 import typer
 
-from discolike_cli._output import call_typed
+from discolike.requests import BulkContactMatchRequest
+from discolike.requests import ContactFilters
+from discolike.requests import ContactGenerateRequest
+from discolike.requests import ContactsCountParams
+from discolike.requests import ContactsLookupParams
+from discolike.requests import ContactsMatchParams
+from discolike.requests import ContactsSearchParams
+from discolike_cli._output import build_request
 from discolike_cli._output import emit
 from discolike_cli._output import handle_errors
 from discolike_cli._output import run_job
@@ -77,7 +84,7 @@ def search_command(
         max_records=max_records,
         offset=offset,
     )
-    emit(call_typed(get_client(ctx).contacts.search, **kwargs), fmt=fmt)
+    emit(get_client(ctx).contacts.search(build_request(ContactsSearchParams, kwargs)), fmt=fmt)
 
 
 @app.command("count")
@@ -129,7 +136,7 @@ def count_command(
         has_email=has_email,
         jobstart_date=jobstart_date,
     )
-    emit(call_typed(get_client(ctx).contacts.count, **kwargs), fmt=fmt)
+    emit(get_client(ctx).contacts.count(build_request(ContactsCountParams, kwargs)), fmt=fmt)
 
 
 @app.command("lookup")
@@ -144,7 +151,10 @@ def lookup_command(
     """Look up a single contact by persona ID, LinkedIn URL, or email."""
     from discolike_cli.main import get_client
 
-    emit(get_client(ctx).contacts.lookup(persona_id=persona_id, linkedin=linkedin, email=email), fmt=fmt)
+    request = build_request(
+        ContactsLookupParams, _merge_params(None, persona_id=persona_id, linkedin=linkedin, email=email)
+    )
+    emit(get_client(ctx).contacts.lookup(request), fmt=fmt)
 
 
 @app.command("match")
@@ -161,16 +171,13 @@ def match_command(
     """Match a person name to contact records."""
     from discolike_cli.main import get_client
 
-    emit(
-        get_client(ctx).contacts.match(
-            name=name,
-            company_name=company_name,
-            domain=domain,
-            person_country=person_country,
-            limit=limit,
+    request = build_request(
+        ContactsMatchParams,
+        _merge_params(
+            None, name=name, company_name=company_name, domain=domain, person_country=person_country, limit=limit
         ),
-        fmt=fmt,
     )
+    emit(get_client(ctx).contacts.match(request), fmt=fmt)
 
 
 @app.command("bulk-match")
@@ -198,8 +205,8 @@ def bulk_match_command(
     if not isinstance(queries, list):
         raise typer.BadParameter("--queries-file must contain a JSON array of objects")
 
-    job = get_client(ctx).contacts.bulk_match(queries=queries, enrich=enrich, limit=limit)
-    run_job(job, wait=wait, timeout=timeout, fmt=fmt)
+    request = build_request(BulkContactMatchRequest, _merge_params(None, queries=queries, enrich=enrich, limit=limit))
+    run_job(get_client(ctx).contacts.bulk_match(request), wait=wait, timeout=timeout, fmt=fmt)
 
 
 @app.command("discover")
@@ -267,7 +274,7 @@ def discover_command(
         include_search_contacts=include_search_contacts,
         consensus=consensus,
     )
-    emit(call_typed(get_client(ctx).contacts.discover, **kwargs), fmt=fmt)
+    emit(get_client(ctx).contacts.discover(build_request(ContactFilters, kwargs)), fmt=fmt)
 
 
 @app.command("generate")
@@ -297,14 +304,18 @@ def generate_command(
     """Generate contacts for target domains from an ICP description (async job)."""
     from discolike_cli.main import get_client
 
-    job = get_client(ctx).contacts.generate(
-        icp_text=icp_text,
-        domains=domain,
-        context_mode=context_mode,
-        integration_id=integration_id,
-        search_provider_id=search_provider_id,
-        search_context_size=search_context_size,
-        max_contacts_per_domain=max_contacts_per_domain,
-        max_company_records=max_company_records,
+    request = build_request(
+        ContactGenerateRequest,
+        _merge_params(
+            None,
+            icp_text=icp_text,
+            domains=domain,
+            context_mode=context_mode,
+            integration_id=integration_id,
+            search_provider_id=search_provider_id,
+            search_context_size=search_context_size,
+            max_contacts_per_domain=max_contacts_per_domain,
+            max_company_records=max_company_records,
+        ),
     )
-    run_job(job, wait=wait, timeout=timeout, fmt=fmt)
+    run_job(get_client(ctx).contacts.generate(request), wait=wait, timeout=timeout, fmt=fmt)