discolike-cli 0.6.0__tar.gz → 0.6.2__tar.gz

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: discolike-cli
-Version: 0.6.0
+Version: 0.6.2
 Summary: Official CLI for the DiscoLike API
 Project-URL: Homepage, https://www.discolike.com
 Project-URL: Documentation, https://docs.discolike.com
@@ -21,10 +21,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
-Requires-Dist: discolike==0.6.0
+Requires-Dist: discolike==0.6.2
 Requires-Dist: rich>=13.0
 Requires-Dist: typer<0.28,>=0.26.1
 Description-Content-Type: text/markdown

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "discolike-cli"
-version = "0.6.0"
+version = "0.6.2"
 description = "Official CLI for the DiscoLike API"
 readme = "README.md"
 license = "MIT"
@@ -12,7 +12,7 @@ license-files = ["LICENSE"]
 requires-python = ">=3.11"
 authors = [{ name = "DiscoLike", email = "support@discolike.com" }]
 dependencies = [
-  "discolike==0.6.0",
+  "discolike==0.6.2",
   "typer>=0.26.1,<0.28",
   "rich>=13.0",
 ]
@@ -25,6 +25,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: 3.14",
+  "Programming Language :: Python :: 3.15",
   "Programming Language :: Python :: 3 :: Only",
   "Operating System :: OS Independent",
   "Environment :: Console",

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/src/discolike_cli/_output.py

@@ -20,6 +20,7 @@ from discolike._config import NO_CREDENTIAL_MESSAGE
 from discolike._exceptions import APIConnectionError
 from discolike._exceptions import AuthenticationError
 from discolike._exceptions import DiscolikeError
+from discolike._exceptions import InsufficientBalanceError
 from discolike._exceptions import JobFailedError
 from discolike._exceptions import JobTimeoutError
 from discolike._exceptions import NotFoundError
@@ -38,6 +39,7 @@ EXIT_CODES: dict[type, int] = {
     ValidationError: 2,
     AuthenticationError: 3,
     PlanAccessError: 3,
+    InsufficientBalanceError: 3,
     RateLimitError: 4,
     APIConnectionError: 5,
     NotFoundError: 6,
@@ -51,6 +53,7 @@ ERROR_CODES: dict[type, str] = {
     ValidationError: "validation_error",
     AuthenticationError: "auth_invalid",
     PlanAccessError: "plan_access",
+    InsufficientBalanceError: "insufficient_balance",
     RateLimitError: "rate_limited",
     APIConnectionError: "network_error",
     NotFoundError: "not_found",
@@ -150,6 +153,9 @@ def fail(exc: DiscolikeError) -> typer.Exit:
     }
     if isinstance(exc, RateLimitError) and exc.retry_after is not None:
         payload["retry_after"] = exc.retry_after
+    if isinstance(exc, InsufficientBalanceError):
+        payload["max_affordable_records"] = exc.max_affordable_records
+        payload["remaining_usd"] = exc.remaining_usd
     print(json.dumps(payload), file=sys.stderr)
     return typer.Exit(code=exit_code)
 

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/src/discolike_cli/bulk.py

@@ -40,6 +40,8 @@ from discolike_cli._output import handle_errors
 from discolike_cli.discover import DOMAINS_FILE_HELP
 from discolike_cli.discover import PARAM_HELP
 from discolike_cli.discover import PARAMS_FILE_HELP
+from discolike_cli.discover import RELEVANCE_HELP
+from discolike_cli.discover import VARIANCE_HELP
 from discolike_cli.discover import _merge_params
 
 T = TypeVar("T")
@@ -157,9 +159,8 @@ def companies_command(
     state: list[str] | None = typer.Option(None, help="State or region filter (repeatable)."),
     employee_range: str | None = typer.Option(None, help="Employee count range filter."),
     revenue_range: str | None = typer.Option(None, help="Revenue range filter."),
-    variance: str | None = typer.Option(
-        None, help="Result diversity: LOW, MID_LOW, MEDIUM, MID_HIGH, HIGH, UNRESTRICTED."
-    ),
+    relevance: str | None = typer.Option(None, help=RELEVANCE_HELP),
+    variance: str | None = typer.Option(None, help=VARIANCE_HELP),
     exclusion_query_id: list[str] | None = typer.Option(None, help=EXCLUSION_QUERY_ID_HELP),
     param: list[str] | None = typer.Option(None, "--param", help=PARAM_HELP),
     params_file: pathlib.Path | None = typer.Option(None, help=PARAMS_FILE_HELP),
@@ -186,6 +187,7 @@ def companies_command(
             state=state,
             employee_range=employee_range,
             revenue_range=revenue_range,
+            relevance=relevance,
             variance=variance,
         ),
         COMPANIES_MANAGED,

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/src/discolike_cli/discover.py

@@ -43,6 +43,11 @@ LANGUAGE_HELP = "Filter by site language as an ISO 639-1 code, e.g. en, de, pb,
 NEGATE_LANGUAGE_HELP = "Exclude this site language (repeatable); same values as --language."
 EXCLUDE_LEADGEN_HELP = "Exclude suspected lead generation sites (on by default)."
 COUNT_EXCLUDE_LEADGEN_HELP = "Exclude suspected lead generation sites (off by default for count)."
+RELEVANCE_HELP = (
+    "Where the list stops, by estimated ICP fit: MAX_RELEVANCE (tightest), BALANCED, MAX_COVERAGE (longest). "
+    "Omit for no automatic stop."
+)
+VARIANCE_HELP = "Deprecated, mapped onto --relevance by the API; use --relevance."
 
 
 def _parse_param(raw: str) -> tuple[str, str | list[str]]:
@@ -104,11 +109,10 @@ def discover_command(
     min_digital_footprint: int | None = typer.Option(None, help="Minimum digital footprint score."),
     max_digital_footprint: int | None = typer.Option(None, help="Maximum digital footprint score."),
     min_similarity: int | None = typer.Option(None, help="Minimum similarity score to include (0-99)."),
-    variance: str | None = typer.Option(
-        None, help="Result diversity control: LOW, MID_LOW, MEDIUM, MID_HIGH, HIGH, UNRESTRICTED."
-    ),
+    relevance: str | None = typer.Option(None, help=RELEVANCE_HELP),
+    variance: str | None = typer.Option(None, help=VARIANCE_HELP),
     consensus: int | None = typer.Option(
-        None, help="Number of top results for the consensus search vector (1-20); higher reduces specificity."
+        None, help="Deprecated, no-op. Discover applies consensus itself to single-domain lookalike searches."
     ),
     redirect: bool | None = typer.Option(None, "--redirect/--no-redirect", help=REDIRECT_HELP),
     exclude_leadgen: bool | None = typer.Option(
@@ -118,7 +122,7 @@ def discover_command(
         None, "--retrieval/--no-retrieval", help="Enable page data retrieval using the Extract API."
     ),
     enhanced: bool | None = typer.Option(
-        None, "--enhanced/--no-enhanced", help="Enable AI-powered result enhancement for improved relevance."
+        None, "--enhanced/--no-enhanced", help="Deprecated, no-op. Discover no longer adds AI-suggested domains."
     ),
     include_search_domains: bool | None = typer.Option(
         None,
@@ -186,6 +190,7 @@ def discover_command(
             min_digital_footprint=min_digital_footprint,
             max_digital_footprint=max_digital_footprint,
             min_similarity=min_similarity,
+            relevance=relevance,
             variance=variance,
             consensus=consensus,
             redirect=redirect,

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/src/discolike_cli/providers.py

@@ -1,5 +1,8 @@
 from __future__ import annotations
 
+from urllib.parse import parse_qsl
+from urllib.parse import urlencode
+
 import typer
 
 from discolike.requests import LLMProviderCreateRequest
@@ -15,6 +18,23 @@ FORMAT_HELP = "Output format: json or table (table auto-selected on a TTY; falls
 search_providers_app = typer.Typer(help="Manage BYOK web search provider integrations (Tavily, Serper, etc.).")
 llm_providers_app = typer.Typer(help="Manage BYOK LLM provider integrations (OpenAI, Anthropic, custom endpoints).")
 
+LLM_PROVIDER_HELP = "LLM provider key, e.g. openai, anthropic, bedrock, snowflake, watsonx, or custom."
+REGION_HELP = (
+    "Provider region: an AWS region for bedrock and bedrock_mantle, a watsonx region (us-south, eu-de, ...) "
+    "for watsonx. `discogen models` lists them under provider_regions."
+)
+ACCOUNT_HELP = "Snowflake account identifier, e.g. orgname-accountname (snowflake only)."
+PROJECT_HELP = "watsonx project ID (watsonx only)."
+
+
+def _with_model_settings(model_name: str, *, region: str | None, account: str | None, project: str | None) -> str:
+    """The API reads provider settings from model_name after "#", e.g. "<model>#region=us-east-1"."""
+    flags = {key: value for key, value in (("region", region), ("account", account), ("project", project)) if value}
+    if not flags:
+        return model_name
+    base, _, existing = model_name.partition("#")
+    return f"{base}#{urlencode(dict(parse_qsl(existing)) | flags)}"
+
 
 @search_providers_app.command("list")
 @handle_errors
@@ -149,10 +169,13 @@ def llm_list_command(
 def llm_create_command(
     ctx: typer.Context,
     name: str = typer.Option(..., "--name", help="User-friendly name for the integration."),
-    provider: str = typer.Option(..., "--provider", help="LLM provider name: openai, anthropic, or custom."),
+    provider: str = typer.Option(..., "--provider", help=LLM_PROVIDER_HELP),
     api_key: str = typer.Option(..., "--api-key", help="API key for the provider."),
     model_name: str = typer.Option(..., "--model-name", help="Default model name for this integration."),
     base_url: str | None = typer.Option(None, "--base-url", help="Endpoint URL (required for the custom provider)."),
+    region: str | None = typer.Option(None, "--region", help=REGION_HELP),
+    account: str | None = typer.Option(None, "--account", help=ACCOUNT_HELP),
+    project: str | None = typer.Option(None, "--project", help=PROJECT_HELP),
 ) -> None:
     """Create an LLM provider integration."""
     from discolike_cli.main import get_client
@@ -160,7 +183,12 @@ def llm_create_command(
     request = build_request(
         LLMProviderCreateRequest,
         _merge_params(
-            None, integration_name=name, provider=provider, api_key=api_key, model_name=model_name, base_url=base_url
+            None,
+            integration_name=name,
+            provider=provider,
+            api_key=api_key,
+            model_name=_with_model_settings(model_name, region=region, account=account, project=project),
+            base_url=base_url,
         ),
     )
     emit(get_client(ctx).llm_providers.create(request))
@@ -185,10 +213,13 @@ def llm_update_command(
     ctx: typer.Context,
     integration_id: str = typer.Argument(..., help="ID of the LLM provider integration to update."),
     name: str = typer.Option(..., "--name", help="User-friendly name for the integration."),
-    provider: str = typer.Option(..., "--provider", help="LLM provider name: openai, anthropic, or custom."),
+    provider: str = typer.Option(..., "--provider", help=LLM_PROVIDER_HELP),
     model_name: str = typer.Option(..., "--model-name", help="Default model name for this integration."),
     api_key: str | None = typer.Option(None, "--api-key", help="New API key (omit to keep the stored key)."),
     base_url: str | None = typer.Option(None, "--base-url", help="Endpoint URL (required for the custom provider)."),
+    region: str | None = typer.Option(None, "--region", help=REGION_HELP),
+    account: str | None = typer.Option(None, "--account", help=ACCOUNT_HELP),
+    project: str | None = typer.Option(None, "--project", help=PROJECT_HELP),
 ) -> None:
     """Update an LLM provider integration."""
     from discolike_cli.main import get_client
@@ -196,7 +227,13 @@ def llm_update_command(
     request = build_request(
         LLMProviderUpdateRequest,
         {
-            **_merge_params(None, integration_name=name, provider=provider, model_name=model_name, base_url=base_url),
+            **_merge_params(
+                None,
+                integration_name=name,
+                provider=provider,
+                model_name=_with_model_settings(model_name, region=region, account=account, project=project),
+                base_url=base_url,
+            ),
             "api_key": api_key,
         },
     )
@@ -233,10 +270,13 @@ def llm_set_default_command(
 def llm_test_connection_command(
     ctx: typer.Context,
     name: str = typer.Option("cli-test", "--name", help="Name to label the test configuration."),
-    provider: str = typer.Option(..., "--provider", help="LLM provider name: openai, anthropic, or custom."),
+    provider: str = typer.Option(..., "--provider", help=LLM_PROVIDER_HELP),
     api_key: str = typer.Option(..., "--api-key", help="API key for the provider."),
     model_name: str = typer.Option(..., "--model-name", help="Model name to test against."),
     base_url: str | None = typer.Option(None, "--base-url", help="Endpoint URL (required for the custom provider)."),
+    region: str | None = typer.Option(None, "--region", help=REGION_HELP),
+    account: str | None = typer.Option(None, "--account", help=ACCOUNT_HELP),
+    project: str | None = typer.Option(None, "--project", help=PROJECT_HELP),
 ) -> None:
     """Test a provider configuration before saving it."""
     from discolike_cli.main import get_client
@@ -244,7 +284,12 @@ def llm_test_connection_command(
     request = build_request(
         LLMProviderCreateRequest,
         _merge_params(
-            None, integration_name=name, provider=provider, api_key=api_key, model_name=model_name, base_url=base_url
+            None,
+            integration_name=name,
+            provider=provider,
+            api_key=api_key,
+            model_name=_with_model_settings(model_name, region=region, account=account, project=project),
+            base_url=base_url,
         ),
     )
     emit(get_client(ctx).llm_providers.test_connection(request))

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/tests/test_bulk_cli.py

@@ -280,7 +280,7 @@ def test_bulk_companies_takes_params_file_and_drops_managed_keys(
     install_build_client: Callable[[Handler], None], tmp_path: Path
 ) -> None:
     form = tmp_path / "form.json"
-    form.write_text(json.dumps({"country": ["US"], "variance": "MID_HIGH", "max_records": 5, "offset": 99}))
+    form.write_text(json.dumps({"country": ["US"], "relevance": "MAX_COVERAGE", "max_records": 5, "offset": 99}))
     recorder = Recorder(discover=[[]], queries_exclusion_list=[{"query_id": "q"}])
     install_build_client(recorder)
     result = runner.invoke(
@@ -292,6 +292,8 @@ def test_bulk_companies_takes_params_file_and_drops_managed_keys(
             str(form),
             "--param",
             "consensus=3",
+            "--relevance",
+            "BALANCED",
             "--variance",
             "LOW",
             "--out",
@@ -302,6 +304,7 @@ def test_bulk_companies_takes_params_file_and_drops_managed_keys(
     assert result.exit_code == 0, result.output
     params = recorder.params("/v1/discover")[0]
     assert params.get_list("country") == ["US"]
+    assert params.get("relevance") == "BALANCED"
     assert params.get("variance") == "LOW"
     assert params.get("consensus") == "3"
     assert params.get("max_records") == "10000"
@@ -316,7 +319,7 @@ def test_bulk_companies_validates_before_first_call(
     recorder = Recorder(discover=[[]])
     install_build_client(recorder)
     result = runner.invoke(
-        app, ["bulk", "companies", "--variance", "BOGUS", "--out", str(tmp_path / "c.csv"), *NO_LIMIT]
+        app, ["bulk", "companies", "--relevance", "BOGUS", "--out", str(tmp_path / "c.csv"), *NO_LIMIT]
     )
     assert result.exit_code == 2
     assert "ValidationError" in result.output

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/tests/test_discogen_cli.py

@@ -314,7 +314,10 @@ def test_discogen_models_hits_models_endpoint(install_build_client: Callable[[Ha
     install_build_client(handler)
     result = runner.invoke(app, ["discogen", "models"])
     assert result.exit_code == 0, result.output
-    assert json.loads(result.stdout) == {"models": {"openai": [{"name": "gpt-5.4", "supports_web_search": False}]}}
+    assert json.loads(result.stdout) == {
+        "models": {"openai": [{"name": "gpt-5.4", "supports_web_search": False}]},
+        "provider_regions": {},
+    }
 
 
 def test_discogen_status_default_family_discogen(install_build_client: Callable[[Handler], None]) -> None:

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/tests/test_discover.py

@@ -146,6 +146,8 @@ def test_discover_forwards_every_new_flag(install_build_client: Callable[[Handle
             "2020-01-01",
             "--min-similarity",
             "40",
+            "--relevance",
+            "MAX_RELEVANCE",
             "--variance",
             "MEDIUM",
             "--consensus",
@@ -171,6 +173,7 @@ def test_discover_forwards_every_new_flag(install_build_client: Callable[[Handle
     assert params.get_list("negate_social") == ["tiktok"]
     assert params.get("start_date") == "2020-01-01"
     assert params.get("min_similarity") == "40"
+    assert params.get("relevance") == "MAX_RELEVANCE"
     assert params.get("variance") == "MEDIUM"
     assert params.get("consensus") == "3"
     assert params.get("redirect") == "true"
@@ -183,9 +186,9 @@ def test_discover_forwards_every_new_flag(install_build_client: Callable[[Handle
     assert params.get_list("inclusion_query_id") == ["q1"]
 
 
-def test_discover_rejects_invalid_variance(install_build_client: Callable[[Handler], None]) -> None:
+def test_discover_rejects_invalid_relevance(install_build_client: Callable[[Handler], None]) -> None:
     install_build_client(_discover_ok)
-    result = runner.invoke(app, ["discover", "--variance", "BOGUS"])
+    result = runner.invoke(app, ["discover", "--relevance", "BOGUS"])
     assert result.exit_code == 2
 
 

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/tests/test_file_inputs_cli.py

@@ -120,17 +120,17 @@ def test_discover_params_file_under_param_under_flags(
     install_build_client: Callable[[Handler], None], tmp_path: Path
 ) -> None:
     form = tmp_path / "form.json"
-    form.write_text(json.dumps({"country": ["US"], "variance": "LOW", "min_similarity": 10, "consensus": 3}))
+    form.write_text(json.dumps({"country": ["US"], "relevance": "MAX_COVERAGE", "min_similarity": 10, "consensus": 3}))
     captured: dict[str, Any] = {}
     install_build_client(_capture_json(captured, []))
     result = runner.invoke(
         app,
-        ["discover", "--params-file", str(form), "--param", "min_similarity=50", "--variance", "HIGH"],
+        ["discover", "--params-file", str(form), "--param", "min_similarity=50", "--relevance", "BALANCED"],
     )
     assert result.exit_code == 0, result.output
     params = captured["params"]
     assert params.get_list("country") == ["US"]
-    assert params.get("variance") == "HIGH"
+    assert params.get("relevance") == "BALANCED"
     assert params.get("min_similarity") == "50"
     assert params.get("consensus") == "3"
 
@@ -139,7 +139,7 @@ def test_discover_params_file_is_validated_locally(
     install_build_client: Callable[[Handler], None], tmp_path: Path
 ) -> None:
     form = tmp_path / "form.json"
-    form.write_text(json.dumps({"variance": "BOGUS"}))
+    form.write_text(json.dumps({"relevance": "BOGUS"}))
     calls: list[str] = []
 
     def handler(request: httpx2.Request) -> httpx2.Response:

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/tests/test_output.py

@@ -11,6 +11,7 @@ import typer
 from discolike import APIConnectionError
 from discolike import AuthenticationError
 from discolike import DiscolikeError
+from discolike import InsufficientBalanceError
 from discolike import JobFailedError
 from discolike import JobTimeoutError
 from discolike import NotFoundError
@@ -154,6 +155,7 @@ def test_emit_table_flag_falls_back_to_json_when_no_scalar_columns(capsys: pytes
         (ValidationError("bad input"), 2),
         (AuthenticationError("no key"), 3),
         (RateLimitError("slow down", retry_after=3), 4),
+        (InsufficientBalanceError("too costly", max_affordable_records=10), 3),
         (ServerError("boom"), 1),
     ],
 )
@@ -186,6 +188,18 @@ def test_fail_rate_limit_includes_retry_after(capsys: pytest.CaptureFixture[str]
     assert payload["retry_after"] == 3.5
 
 
+def test_fail_insufficient_balance_includes_max_affordable_records(capsys: pytest.CaptureFixture[str]) -> None:
+    exc = InsufficientBalanceError(
+        "too costly", status_code=403, max_affordable_records=60, remaining_usd=3.0, requested_records=250
+    )
+    result = fail(exc)
+    assert result.exit_code == 3
+    payload = json.loads(capsys.readouterr().err)
+    assert payload["code"] == "insufficient_balance"
+    assert payload["max_affordable_records"] == 60
+    assert payload["remaining_usd"] == 3.0
+
+
 def test_fail_rate_limit_without_retry_after_omits_key(capsys: pytest.CaptureFixture[str]) -> None:
     exc = RateLimitError("slow down", status_code=429, retry_after=None)
     fail(exc)

{discolike_cli-0.6.0 → discolike_cli-0.6.2}/tests/test_providers_cli.py

@@ -138,6 +138,71 @@ def test_llm_providers_create_posts_json(install_build_client: Callable[[Handler
     }
 
 
+def test_llm_providers_create_appends_provider_settings_to_model_name(
+    install_build_client: Callable[[Handler], None],
+) -> None:
+    captured: dict[str, dict[str, str]] = {}
+
+    def handler(request: httpx2.Request) -> httpx2.Response:
+        captured["body"] = json.loads(request.content)
+        return httpx2.Response(200, json={"message": "created", "integration_id": "llm1"})
+
+    install_build_client(handler)
+    result = runner.invoke(
+        app,
+        [
+            "llm-providers",
+            "create",
+            "--name",
+            "watsonx",
+            "--provider",
+            "watsonx",
+            "--api-key",
+            "ibm-key",
+            "--model-name",
+            "watsonx/ibm/granite-3-8b-instruct",
+            "--region",
+            "eu-de",
+            "--project",
+            "11111111-2222-3333-4444-555555555555",
+        ],
+    )
+    assert result.exit_code == 0, result.output
+    assert captured["body"]["model_name"] == (
+        "watsonx/ibm/granite-3-8b-instruct#region=eu-de&project=11111111-2222-3333-4444-555555555555"
+    )
+
+
+def test_llm_providers_update_flags_override_an_existing_settings_suffix(
+    install_build_client: Callable[[Handler], None],
+) -> None:
+    captured: dict[str, dict[str, str]] = {}
+
+    def handler(request: httpx2.Request) -> httpx2.Response:
+        captured["body"] = json.loads(request.content)
+        return httpx2.Response(200, json={"message": "updated"})
+
+    install_build_client(handler)
+    result = runner.invoke(
+        app,
+        [
+            "llm-providers",
+            "update",
+            "llm1",
+            "--name",
+            "watsonx",
+            "--provider",
+            "watsonx",
+            "--model-name",
+            "watsonx/ibm/granite-3-8b-instruct#region=us-south&project=p1",
+            "--region",
+            "eu-de",
+        ],
+    )
+    assert result.exit_code == 0, result.output
+    assert captured["body"]["model_name"] == "watsonx/ibm/granite-3-8b-instruct#region=eu-de&project=p1"
+
+
 def test_llm_providers_update_keeps_null_api_key(install_build_client: Callable[[Handler], None]) -> None:
     captured: dict[str, object] = {}