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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: discolike-cli
-Version: 0.6.1
+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.1
+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.1 → discolike_cli-0.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "discolike-cli"
-version = "0.6.1"
+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.1",
+  "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.1 → 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.1 → 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.1 → 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] = {}