cometapi-cli 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

cometapi_cli/__init__.py

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

cometapi_cli/commands/balance.py

@@ -7,28 +7,50 @@ from typing import Annotated
 import typer
 
 from ..config import get_client
+from ..console import err_console
 from ..errors import handle_errors
 from ..formatters import OutputFormat, output, resolve_format
 
+BALANCE_SOURCE_ALIASES = {
+    "account": "account",
+    "key": "key",
+    "token": "key",
+}
+
+
+def _normalize_balance_source(source: str | None) -> str | None:
+    if source is None:
+        return None
+
+    normalized = BALANCE_SOURCE_ALIASES.get(source.lower())
+    if normalized is not None:
+        return normalized
+
+    err_console.print(f"[red]Invalid source:[/] {source}. Valid sources: account, key")
+    raise typer.Exit(code=2)
+
 
 @handle_errors
 def balance(
     ctx: typer.Context,
     source: Annotated[
         str | None,
-        typer.Option("--source", "-s", help="Data source: 'account' (full account) or 'token' (current API key)."),
+        typer.Option("--source", "-s", help="Data source: 'account' (full account) or 'key' (current API key)."),
+    ] = None,
+    output_format: Annotated[
+        OutputFormat | None,
+        typer.Option("--format", "-f", help="Output format (table, json, yaml, csv, markdown)."),
     ] = 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:
     """Show your CometAPI account balance.
 
     By default shows account-level balance (requires access token), falling back
-    to per-token billing stats. Use --source to force a specific view.
+    to per-key billing stats. Use --source to force a specific view.
     """
     fmt = resolve_format(ctx, json_output, output_format)
     client = get_client()
-    raw = client.get_balance(source=source)
+    raw = client.get_balance(source=_normalize_balance_source(source))
 
     # For JSON output, pass raw data for maximum information
     if fmt == OutputFormat.JSON:

cometapi_cli/commands/models.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import re
+from functools import cmp_to_key
 from typing import Annotated
 
 import typer
@@ -10,13 +12,63 @@ 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,
+    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."""
@@ -24,15 +76,14 @@ def models(
     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"],
-    )
+    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]
 
@@ -40,5 +91,5 @@ def models(
         rows,
         fmt,
         title=f"Available Models ({len(rows)})",
-        columns={"id": "cyan", "owned_by": "green"},
+        columns={"id": "cyan"},
     )

{cometapi_cli-0.2.0.dist-info → cometapi_cli-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cometapi-cli
-Version: 0.2.0
+Version: 0.2.2
 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.dist-info → cometapi_cli-0.2.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cometapi_cli/__init__.py,sha256=bzbn6erL2EJHZufQyz5Vv_9VOwVD8K54C2ZgpQX7oBQ,92
+cometapi_cli/__init__.py,sha256=YoHkL8RaBOgm8zi4mJO3F2ywNNSkk26kuGB8cjLLRrE,92
 cometapi_cli/app.py,sha256=tFrkyfVVBYkjOA9zXP72bZ1csHI9HBnGF-Z4_4EkXkE,2784
 cometapi_cli/client.py,sha256=4JkMSrjWwAQV8tmlwplZQ75gzt3zHno8ASKLgMCpYkU,9658
 cometapi_cli/config.py,sha256=oJXQidKCOsKNYPnE8OfLLoOfsv0MSZEDICB6VShJRSA,3307
@@ -9,19 +9,19 @@ cometapi_cli/formatters.py,sha256=QrXpsQHRYiJ49Rwz_7dOMoKxCcnRPumZMrxH21ZQaMw,45
 cometapi_cli/main.py,sha256=4NmO8MAAc_H30hahT6VNrdGdlaFlQ99AixKcRV5iDXE,168
 cometapi_cli/commands/__init__.py,sha256=mihzLmD4ADkH9WnCBP2p1fn95lU3GyzTliAJ1XL5Ngg,29
 cometapi_cli/commands/account.py,sha256=yGIY5iQeB4j1bISMUOqnvjcuD9HTd7VcWSvSFB6fAfo,1257
-cometapi_cli/commands/balance.py,sha256=GUOdbfDV0u9h23XG3pqRf_tl3mUxWGl781b9eep4Rxc,1833
+cometapi_cli/commands/balance.py,sha256=BT96WTt2I7dCLBlAkZMX4KYliqC5C7QCXKNWCbXwldw,2353
 cometapi_cli/commands/chat.py,sha256=5VuNOF7O3vjD0f8eD0faZ3xL2IFnSa2BNadxencoPJk,3937
 cometapi_cli/commands/chat_repl.py,sha256=b9lkYnbbaOb0AlSpRcq3wWHmnhtTXvaqeJiUImsMEBY,8176
 cometapi_cli/commands/config_cmd.py,sha256=JU4ZS8ur2Sq1MjMZKaGLaI1TdM3CAUDE45qsKDOxD_8,8528
 cometapi_cli/commands/doctor.py,sha256=EPcezrf64yzgYrzOdp_7tvfNM6hE2NBDzgMgO-O0Dnw,5337
 cometapi_cli/commands/logs.py,sha256=9J7oT9KbCCGeD_zO9fwWj7g5QjaoT8qqJF_e81jGPX4,10310
-cometapi_cli/commands/models.py,sha256=kW8rJHfzymW28ZR_RA1Oi1z0Sh-p9KeSNR7gdfDo6VE,1332
+cometapi_cli/commands/models.py,sha256=wtnZp0RqUE6HH2ZsZr6OYtHDwzUPIOcJBBxXWKOQ-Ig,2875
 cometapi_cli/commands/repl.py,sha256=b5z1jmEXOsCrb6fwEUyv-IKot929NIPQQAbA1uas1D4,4283
 cometapi_cli/commands/stats.py,sha256=6ULBb7rX5Q0yWuIxtYLataNPoJ_SkU3Y4RovgdVyROs,1388
 cometapi_cli/commands/tasks.py,sha256=TW_Jgli7iyfIoHNyufbViAUMIieMNfsD8DMHt5mQA8Q,4625
 cometapi_cli/commands/tokens.py,sha256=9KHer9MQOZvm_Ybxnhjb5_TtGgKyv3MtI5lqsHy-Qxg,3019
-cometapi_cli-0.2.0.dist-info/METADATA,sha256=t3nT4TDZvKlNPCJfEpmyDqScunDm2glcPGH0srjergI,8123
-cometapi_cli-0.2.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-cometapi_cli-0.2.0.dist-info/entry_points.txt,sha256=xoiE2ZVNNWXTq0JRBtzC8hJ2JkdKuaBNz_fEd8OJpLs,50
-cometapi_cli-0.2.0.dist-info/licenses/LICENSE,sha256=-rBwHQzkmLbty07abmGvQvsRrvDeEQUkPDhNJfTcjdE,1065
-cometapi_cli-0.2.0.dist-info/RECORD,,
+cometapi_cli-0.2.2.dist-info/METADATA,sha256=Aveuc9r_GBg70ue7jZL4j1P6hkyFKTKruBQXa3kCk48,8624
+cometapi_cli-0.2.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+cometapi_cli-0.2.2.dist-info/entry_points.txt,sha256=xoiE2ZVNNWXTq0JRBtzC8hJ2JkdKuaBNz_fEd8OJpLs,50
+cometapi_cli-0.2.2.dist-info/licenses/LICENSE,sha256=-rBwHQzkmLbty07abmGvQvsRrvDeEQUkPDhNJfTcjdE,1065
+cometapi_cli-0.2.2.dist-info/RECORD,,