cometapi-cli 0.2.0__tar.gz → 0.2.1__tar.gz

{cometapi_cli-0.2.0 → cometapi_cli-0.2.1}/AGENTS.md

@@ -189,9 +189,9 @@ These options apply to **every** command via the root Typer callback.
 | `--format` | `-f` | `OutputFormat` | inherits global | Per-command output format override |
 | `--json` | — | flag | `false` | Output as JSON |
 
-**Behavior:** Fetches all models via `client.models.list()`, sorts alphabetically by `id`, applies `--search` filter, then `--limit` truncation.
+**Behavior:** Fetches all models via `client.models.list()`, applies `--search`, sorts model IDs in descending natural/version-aware order so newer variants surface first, then applies `--limit`.
 
-**Table columns:** `id` (cyan), `owned_by` (green).
+**Table columns:** `id` (cyan).
 
 ---
 

{cometapi_cli-0.2.0 → cometapi_cli-0.2.1}/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.1] — 2026-04-14
+
+### Changed
+
+- `models` now sorts model IDs in descending natural/version-aware order so newer GPT variants appear first in filtered output.
+- `models` output now only includes the model `id`; the unrelated `owned_by` field is no longer shown in table, JSON, YAML, CSV, or Markdown output.
+- README links were cleaned up for the next PyPI publish: duplicate License heading removed, homepage link kept on `www`, and tracked credential links use UTM parameters.
+
 ## [0.2.0] — 2026-04-13
 
 ### Added

{cometapi_cli-0.2.0 → cometapi_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cometapi-cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: CometAPI CLI — official command-line interface for the CometAPI AI gateway
 Project-URL: Homepage, https://github.com/cometapi-dev/cometapi-cli
 Project-URL: Repository, https://github.com/cometapi-dev/cometapi-cli
@@ -42,7 +42,7 @@ Description-Content-Type: text/markdown
 [![Python](https://img.shields.io/pypi/pyversions/cometapi-cli)](https://pypi.org/project/cometapi-cli/)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 
-> **Official command-line interface for [CometAPI](https://cometapi.com)** — 500+ AI Model API, All In One API.
+> **Official command-line interface for [CometAPI](https://www.cometapi.com/?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=homepage)** — 500+ AI Model API, All In One API.
 
 Access 500+ AI models at low cost, directly from the terminal. Chat, search models, check usage, and manage your account — all through a single API key.
 
@@ -59,7 +59,7 @@ pipx install cometapi-cli    # isolated environment
 uv tool install cometapi-cli  # uv
 ```
 
-**Prerequisites**: Python 3.10+ · [Get your API key](https://www.cometapi.com/console/token)
+**Prerequisites**: Python 3.10+ · [CometAPI Key](https://www.cometapi.com/console/token?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=prerequisites)
 
 ## Quick Start
 
@@ -77,8 +77,8 @@ cometapi models --search gpt --limit 10
 Or configure manually:
 
 ```bash
-export COMETAPI_KEY="your-api-key"               # https://www.cometapi.com/console/token
-export COMETAPI_ACCESS_TOKEN="your-access-token"  # https://www.cometapi.com/console/personal (optional)
+export COMETAPI_KEY="your-api-key"               # https://www.cometapi.com/console/token?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=env-api-key
+export COMETAPI_ACCESS_TOKEN="your-access-token"  # https://www.cometapi.com/console/personal?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=env-access-token (optional)
 ```
 
 ## Commands
@@ -226,7 +226,7 @@ pytest -v
 - API keys and access tokens are **never** logged or displayed in full — only the last 4 characters are shown
 - Config files are stored with restrictive permissions (`0600`)
 - Credentials should **never** be committed to version control
-- Create credentials at: [API Key](https://www.cometapi.com/console/token) · [Access Token](https://www.cometapi.com/console/personal)
+- Create credentials at: [API Key](https://www.cometapi.com/console/token?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=security-api-key) · [Access Token](https://www.cometapi.com/console/personal?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=security-access-token)
 - **Disclaimer**: You are responsible for all usage and charges incurred with your API keys
 
 ## Troubleshooting
@@ -244,7 +244,3 @@ Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines
 ## License
 
 This project is licensed under the [MIT License](LICENSE).
-
-## License
-
-MIT

{cometapi_cli-0.2.0 → cometapi_cli-0.2.1}/README.md

@@ -4,7 +4,7 @@
 [![Python](https://img.shields.io/pypi/pyversions/cometapi-cli)](https://pypi.org/project/cometapi-cli/)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 
-> **Official command-line interface for [CometAPI](https://cometapi.com)** — 500+ AI Model API, All In One API.
+> **Official command-line interface for [CometAPI](https://www.cometapi.com/?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=homepage)** — 500+ AI Model API, All In One API.
 
 Access 500+ AI models at low cost, directly from the terminal. Chat, search models, check usage, and manage your account — all through a single API key.
 
@@ -21,7 +21,7 @@ pipx install cometapi-cli    # isolated environment
 uv tool install cometapi-cli  # uv
 ```
 
-**Prerequisites**: Python 3.10+ · [Get your API key](https://www.cometapi.com/console/token)
+**Prerequisites**: Python 3.10+ · [CometAPI Key](https://www.cometapi.com/console/token?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=prerequisites)
 
 ## Quick Start
 
@@ -39,8 +39,8 @@ cometapi models --search gpt --limit 10
 Or configure manually:
 
 ```bash
-export COMETAPI_KEY="your-api-key"               # https://www.cometapi.com/console/token
-export COMETAPI_ACCESS_TOKEN="your-access-token"  # https://www.cometapi.com/console/personal (optional)
+export COMETAPI_KEY="your-api-key"               # https://www.cometapi.com/console/token?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=env-api-key
+export COMETAPI_ACCESS_TOKEN="your-access-token"  # https://www.cometapi.com/console/personal?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=env-access-token (optional)
 ```
 
 ## Commands
@@ -188,7 +188,7 @@ pytest -v
 - API keys and access tokens are **never** logged or displayed in full — only the last 4 characters are shown
 - Config files are stored with restrictive permissions (`0600`)
 - Credentials should **never** be committed to version control
-- Create credentials at: [API Key](https://www.cometapi.com/console/token) · [Access Token](https://www.cometapi.com/console/personal)
+- Create credentials at: [API Key](https://www.cometapi.com/console/token?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=security-api-key) · [Access Token](https://www.cometapi.com/console/personal?utm_source=cometapi-cli&utm_medium=readme&utm_campaign=oss&utm_content=security-access-token)
 - **Disclaimer**: You are responsible for all usage and charges incurred with your API keys
 
 ## Troubleshooting
@@ -206,7 +206,3 @@ Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines
 ## License
 
 This project is licensed under the [MIT License](LICENSE).
-
-## License
-
-MIT

{cometapi_cli-0.2.0 → cometapi_cli-0.2.1}/docs/commands/models.md

@@ -22,7 +22,7 @@ Requires `COMETAPI_KEY`. Access token is not needed.
 
 ## Behavior
 
-- Results are sorted alphabetically by model ID.
+- Results are sorted in descending natural/version-aware order so newer model IDs surface first.
 - `--search` performs a case-insensitive substring match on the model `id` field.
 - `--limit` is applied after filtering and sorting.
 
@@ -31,7 +31,6 @@ Requires `COMETAPI_KEY`. Access token is not needed.
 | Column | Description |
 |--------|-------------|
 | `id` | Model identifier (e.g., `gpt-5.4`, `claude-sonnet-4-6`) |
-| `owned_by` | Model provider (e.g., `openai`, `anthropic`) |
 
 ## Examples
 

{cometapi_cli-0.2.0 → cometapi_cli-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cometapi-cli"
-version = "0.2.0"
+version = "0.2.1"
 description = "CometAPI CLI — official command-line interface for the CometAPI AI gateway"
 readme = "README.md"
 license = { text = "MIT" }

{cometapi_cli-0.2.0 → cometapi_cli-0.2.1}/src/cometapi_cli/__init__.py

@@ -1,3 +1,3 @@
 """CometAPI CLI — professional terminal interface for CometAPI."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"

cometapi_cli-0.2.1/src/cometapi_cli/commands/models.py

@@ -0,0 +1,95 @@
+"""Models command."""
+
+from __future__ import annotations
+
+import re
+from functools import cmp_to_key
+from typing import Annotated
+
+import typer
+
+from ..config import get_client
+from ..errors import handle_errors
+from ..formatters import OutputFormat, output, resolve_format
+
+_MODEL_TOKEN_RE = re.compile(r"[a-z]+|\d+")
+
+
+def _tokenize_model_id(model_id: str) -> list[str | int]:
+    tokens: list[str | int] = []
+    for segment in re.split(r"[-.]+", model_id.lower()):
+        if not segment:
+            continue
+        for part in _MODEL_TOKEN_RE.findall(segment):
+            tokens.append(int(part) if part.isdigit() else part)
+    return tokens
+
+
+def _compare_model_ids(left: str, right: str) -> int:
+    left_tokens = _tokenize_model_id(left)
+    right_tokens = _tokenize_model_id(right)
+
+    for left_token, right_token in zip(left_tokens, right_tokens):
+        if left_token == right_token:
+            continue
+
+        if isinstance(left_token, int) and isinstance(right_token, int):
+            return -1 if left_token > right_token else 1
+
+        if isinstance(left_token, int):
+            return -1
+        if isinstance(right_token, int):
+            return 1
+
+        return -1 if left_token > right_token else 1
+
+    if len(left_tokens) == len(right_tokens):
+        if left.lower() == right.lower():
+            return 0
+        return -1 if left.lower() > right.lower() else 1
+
+    if len(left_tokens) < len(right_tokens):
+        next_token = right_tokens[len(left_tokens)]
+        return 1 if isinstance(next_token, int) else -1
+
+    next_token = left_tokens[len(right_tokens)]
+    return -1 if isinstance(next_token, int) else 1
+
+
+def _compare_model_rows(left: dict[str, str], right: dict[str, str]) -> int:
+    return _compare_model_ids(left["id"], right["id"])
+
+
+@handle_errors
+def models(
+    ctx: typer.Context,
+    search: Annotated[str | None, typer.Option("--search", "-s", help="Filter models by name.")] = None,
+    limit: Annotated[int | None, typer.Option("--limit", "-l", help="Max number of models to show.")] = None,
+    output_format: Annotated[
+        OutputFormat | None,
+        typer.Option("--format", "-f", help="Output format (table, json, yaml, csv, markdown)."),
+    ] = None,
+    json_output: Annotated[bool, typer.Option("--json", help="Output as JSON.")] = False,
+) -> None:
+    """List available models."""
+    fmt = resolve_format(ctx, json_output, output_format)
+    client = get_client()
+    result = client.models.list()
+
+    rows = [{"id": m.id} for m in result]
+
+    if search:
+        term = search.lower()
+        rows = [r for r in rows if term in r["id"].lower()]
+
+    rows = sorted(rows, key=cmp_to_key(_compare_model_rows))
+
+    if limit and limit > 0:
+        rows = rows[:limit]
+
+    output(
+        rows,
+        fmt,
+        title=f"Available Models ({len(rows)})",
+        columns={"id": "cyan"},
+    )

{cometapi_cli-0.2.0 → cometapi_cli-0.2.1}/tests/test_models.py

@@ -4,20 +4,21 @@ from __future__ import annotations
 
 import json
 
+from tests.conftest import _make_models_response
+
 
 def test_models_json(cli_runner, patched_client):
     result = cli_runner("models", "--json")
     assert result.exit_code == 0
     data = json.loads(result.output)
-    assert isinstance(data, list)
-    assert len(data) == 3
-    assert data[0]["id"] == "claude-sonnet-4-6"  # sorted alphabetically
+    assert data == [{"id": "gpt-5.4"}, {"id": "gpt-5.4-mini"}, {"id": "claude-sonnet-4-6"}]
 
 
 def test_models_table(cli_runner, patched_client):
     result = cli_runner("models")
     assert result.exit_code == 0
     assert "gpt-5.4" in result.output
+    assert "Owned By" not in result.output
 
 
 def test_models_search(cli_runner, patched_client):
@@ -27,6 +28,16 @@ def test_models_search(cli_runner, patched_client):
     assert all("gpt" in m["id"] for m in data)
 
 
+def test_models_search_prioritizes_newest_versions(cli_runner, patched_client):
+    patched_client.models.list.return_value = _make_models_response(
+        ["gpt-3.5-turbo", "gpt-5-mini", "gpt-5", "gpt-5.4-mini", "gpt-4.1", "gpt-5.4"]
+    )
+    result = cli_runner("models", "--search", "gpt", "--limit", "5", "--json")
+    assert result.exit_code == 0
+    data = json.loads(result.output)
+    assert [model["id"] for model in data] == ["gpt-5.4", "gpt-5.4-mini", "gpt-5", "gpt-5-mini", "gpt-4.1"]
+
+
 def test_models_limit(cli_runner, patched_client):
     result = cli_runner("models", "--limit", "1", "--json")
     assert result.exit_code == 0
@@ -43,4 +54,4 @@ def test_models_yaml(cli_runner, patched_client):
 def test_models_csv(cli_runner, patched_client):
     result = cli_runner("--format", "csv", "models")
     assert result.exit_code == 0
-    assert "id,owned_by" in result.output
+    assert result.output.splitlines()[0] == "id"

{cometapi_cli-0.2.0 → cometapi_cli-0.2.1}/uv.lock

@@ -66,7 +66,7 @@ wheels = [
 
 [[package]]
 name = "cometapi-cli"
-version = "0.1.0"
+version = "0.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "openai" },

cometapi_cli-0.2.0/src/cometapi_cli/commands/models.py

@@ -1,44 +0,0 @@
-"""Models command."""
-
-from __future__ import annotations
-
-from typing import Annotated
-
-import typer
-
-from ..config import get_client
-from ..errors import handle_errors
-from ..formatters import OutputFormat, output, resolve_format
-
-
-@handle_errors
-def models(
-    ctx: typer.Context,
-    search: Annotated[str | None, typer.Option("--search", "-s", help="Filter models by name.")] = None,
-    limit: Annotated[int | None, typer.Option("--limit", "-l", help="Max number of models to show.")] = None,
-    output_format: Annotated[OutputFormat | None, typer.Option("--format", "-f", help="Output format (table, json, yaml, csv, markdown).")] = None,
-    json_output: Annotated[bool, typer.Option("--json", help="Output as JSON.")] = False,
-) -> None:
-    """List available models."""
-    fmt = resolve_format(ctx, json_output, output_format)
-    client = get_client()
-    result = client.models.list()
-
-    rows = sorted(
-        [{"id": m.id, "owned_by": m.owned_by} for m in result],
-        key=lambda r: r["id"],
-    )
-
-    if search:
-        term = search.lower()
-        rows = [r for r in rows if term in r["id"].lower()]
-
-    if limit and limit > 0:
-        rows = rows[:limit]
-
-    output(
-        rows,
-        fmt,
-        title=f"Available Models ({len(rows)})",
-        columns={"id": "cyan", "owned_by": "green"},
-    )