cometapi-cli 0.3.5__tar.gz → 0.3.6__tar.gz

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/AGENTS.md

@@ -354,7 +354,6 @@ These options apply to **every** command via the root Typer callback.
 | `--end` | — | `str` | `None` | End date (`YYYY-MM-DD`, ISO 8601, or Unix timestamp) |
 | `--group` | `-g` | `str` | `None` | Filter by API key group |
 | `--request-id` | — | `str` | `None` | Look up one request by `X-Cometapi-Request-Id` |
-| `--request-id-max-pages` | — | `int` | `10` | Fallback pages to scan when direct request-ID lookup is unavailable |
 | `--page` | `-p` | `int` | `1` | Page number |
 | `--limit` | `-l` | `int` | `20` | Results per page |
 | `--export` | — | flag | `false` | Export logs as server-side CSV to stdout |
@@ -377,7 +376,7 @@ Invalid `--type` values produce an error message with valid options and exit cod
 
 **Behavior:**
 - Without `--search` or `--export`: calls `client.list_logs(page=, page_size=, log_type=, model_name=, token_name=, start_timestamp=, end_timestamp=, group=)` — paginated, `data.items`.
-- With `--request-id`: first calls `client.list_logs(..., request_id=)` and verifies an exact match. If the backend ignores `request_id`, falls back to scanning up to `--request-id-max-pages` pages; timestamp-shaped CometAPI request IDs are narrowed to the inferred local request day unless `--start`/`--end` were provided.
+- With `--request-id`: calls `client.lookup_log(request_id=, ...)`, which uses `/api/log` and verifies an exact match. It does not scan `/api/log/self` pages because that backend endpoint does not currently apply `request_id` filtering.
 - With `--search`: calls `client.search_logs(keyword=)` — flat `data` list, ignores other filter flags.
 - With `--export`: calls `client.export_logs(...)` — writes server-side CSV bytes to stdout. Honors `--model`, `--token-name`, `--type`, `--start`, `--end`, `--group`. Pipe-friendly (no Rich formatting).
 

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/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.3.6] — 2026-06-17
+
+### Fixed
+
+- `logs --request-id` now uses the indexed operator log endpoint (`/api/log`) and
+  performs exactly one exact-match lookup. The CLI no longer falls back to scanning
+  `/api/log/self` pages because that backend endpoint currently ignores `request_id`.
+
 ## [0.3.5] — 2026-06-17
 
 ### Fixed

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cometapi-cli
-Version: 0.3.5
+Version: 0.3.6
 Summary: CometAPI CLI — official command-line interface for the CometAPI AI gateway
 Project-URL: Homepage, https://pypi.org/project/cometapi-cli/
 Project-URL: Documentation, https://apidoc.cometapi.com/libraries/cli/overview
@@ -156,9 +156,9 @@ cometapi logs --type consume --start 2026-06-01 --json
 cometapi logs --request-id 20260617165550885561292gJBlzjtp
 ```
 
-`logs --request-id` first asks the backend for that exact request ID. If the installed
-backend does not support direct request-ID filtering yet, the CLI falls back to scanning
-a bounded number of log pages. Use `--request-id-max-pages` to widen that fallback scan.
+`logs --request-id` performs one indexed lookup against the operator log endpoint and
+accepts only an exact `request_id` match. The CLI does not scan fallback log pages,
+because the self-log endpoint does not currently apply `request_id` filtering.
 
 ## Models
 

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/README.md

@@ -120,9 +120,9 @@ cometapi logs --type consume --start 2026-06-01 --json
 cometapi logs --request-id 20260617165550885561292gJBlzjtp
 ```
 
-`logs --request-id` first asks the backend for that exact request ID. If the installed
-backend does not support direct request-ID filtering yet, the CLI falls back to scanning
-a bounded number of log pages. Use `--request-id-max-pages` to widen that fallback scan.
+`logs --request-id` performs one indexed lookup against the operator log endpoint and
+accepts only an exact `request_id` match. The CLI does not scan fallback log pages,
+because the self-log endpoint does not currently apply `request_id` filtering.
 
 ## Models
 

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/docs/commands/logs.md

@@ -18,7 +18,6 @@ cometapi logs [OPTIONS]
 | `--end` | — | string | — | End date (see [Date Formats](#date-formats)) |
 | `--group` | `-g` | string | — | Filter by API key group |
 | `--request-id` | — | string | — | Look up cost by request ID (from `X-Cometapi-Request-Id` header) |
-| `--request-id-max-pages` | — | int | `10` | Fallback pages to scan when direct request-ID lookup is unavailable |
 | `--detail` | — | flag | `false` | Show extended columns (request ID, pricing ratios) |
 | `--page` | `-p` | int | `1` | Page number |
 | `--limit` | `-l` | int | `20` | Results per page |
@@ -166,18 +165,11 @@ cometapi logs --request-id req-abc-123 --json
 
 Lookup behavior:
 
-1. The CLI first asks the backend for `request_id=req-abc-123` and accepts only an exact
+1. The CLI asks the operator log endpoint for `request_id=req-abc-123` and accepts only an exact
    `request_id` match.
-2. If the backend does not return an exact match, the CLI falls back to scanning recent
-   log pages. Timestamp-shaped CometAPI request IDs are narrowed to the inferred local
-   request day unless you provide `--start` or `--end`.
-3. The fallback scan is bounded by `--request-id-max-pages` (default: `10`) so a slow log
-   endpoint does not appear to hang indefinitely.
-
-```bash
-# Widen fallback scanning when direct lookup is unavailable
-cometapi logs --request-id req-abc-123 --request-id-max-pages 25
-```
+2. The lookup uses `/api/log`, which requires an operations/admin access token.
+3. The CLI does not scan fallback pages. The self-log endpoint does not currently apply
+   `request_id` filtering, so scanning it would waste backend resources.
 
 Output shows a request detail card:
 
@@ -329,6 +321,26 @@ GET /api/log/self
 }
 ```
 
+### Exact Request ID Lookup
+
+```
+GET /api/log
+```
+
+The CLI uses this operations/admin endpoint for `--request-id` because it applies
+`request_id` as an indexed backend filter. The personal log list endpoint
+(`/api/log/self`) does not currently apply `request_id` filtering.
+
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `request_id` | string | Exact request ID from `X-Cometapi-Request-Id` |
+| `type` | int | Optional log type code |
+| `model_name` | string | Optional model filter |
+| `token_name` | string | Optional token/API key name filter |
+| `group` | string | Optional API key group filter |
+| `start_timestamp` | int | Optional start time |
+| `end_timestamp` | int | Optional end time |
+
 ### Log Response Fields
 
 | Field | Type | Description |

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/pyproject.toml

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

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/src/cometapi_cli/__init__.py

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

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/src/cometapi_cli/client.py

@@ -161,7 +161,6 @@ class CometClient(openai.OpenAI):
         start_timestamp: int | None = None,
         end_timestamp: int | None = None,
         group: str | None = None,
-        request_id: str | None = None,
     ) -> dict:
         """List the user's usage logs (requires access token)."""
         params: dict[str, Any] = {"p": page, "page_size": page_size}
@@ -177,10 +176,35 @@ class CometClient(openai.OpenAI):
             params["end_timestamp"] = end_timestamp
         if group:
             params["group"] = group
-        if request_id:
-            params["request_id"] = request_id
         return self._account_request("GET", "/api/log/self", params=params)
 
+    def lookup_log(
+        self,
+        *,
+        request_id: str,
+        log_type: int | None = None,
+        model_name: str | None = None,
+        token_name: str | None = None,
+        start_timestamp: int | None = None,
+        end_timestamp: int | None = None,
+        group: str | None = None,
+    ) -> dict:
+        """Look up one usage log by request ID using the indexed operator endpoint."""
+        params: dict[str, Any] = {"p": 1, "page_size": 1, "request_id": request_id}
+        if log_type is not None:
+            params["type"] = log_type
+        if model_name:
+            params["model_name"] = model_name
+        if token_name:
+            params["token_name"] = token_name
+        if start_timestamp is not None:
+            params["start_timestamp"] = start_timestamp
+        if end_timestamp is not None:
+            params["end_timestamp"] = end_timestamp
+        if group:
+            params["group"] = group
+        return self._account_request("GET", "/api/log/", params=params)
+
     def search_logs(self, keyword: str) -> dict:
         """Search usage logs by keyword (requires access token)."""
         return self._account_request("GET", "/api/log/self/search", params={"keyword": keyword})

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/src/cometapi_cli/commands/logs.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import json as _json
 import sys
-from datetime import datetime, time, timedelta, timezone
 from typing import Annotated
 
 import typer
@@ -32,9 +31,6 @@ LOG_TYPE_MAP = {
 }
 
 _LOG_TYPE_NAMES = {v: k for k, v in LOG_TYPE_MAP.items()}
-REQUEST_ID_PAGE_SIZE = 100
-REQUEST_ID_DEFAULT_MAX_PAGES = 10
-REQUEST_ID_LOCAL_TZ = timezone(timedelta(hours=8))
 
 
 def _parse_other(other_raw: str | None) -> dict:
@@ -48,21 +44,6 @@ def _parse_other(other_raw: str | None) -> dict:
         return {}
 
 
-def _request_id_date_window(request_id: str) -> tuple[int, int] | None:
-    """Infer the local request day from a CometAPI request ID prefix."""
-    prefix = request_id[:14]
-    if len(prefix) != 14 or not prefix.isdigit():
-        return None
-    try:
-        local_dt = datetime.strptime(prefix, "%Y%m%d%H%M%S").replace(tzinfo=REQUEST_ID_LOCAL_TZ)
-    except ValueError:
-        return None
-
-    local_day_start = datetime.combine(local_dt.date(), time.min, tzinfo=REQUEST_ID_LOCAL_TZ)
-    local_day_end = local_day_start + timedelta(days=1) - timedelta(seconds=1)
-    return int(local_day_start.timestamp()), int(local_day_end.timestamp())
-
-
 def _exact_request_id_match(items: list, request_id: str) -> dict | None:
     for item in items:
         if isinstance(item, dict) and item.get("request_id") == request_id:
@@ -80,59 +61,18 @@ def _lookup_log_by_id(
     start_timestamp: int | None = None,
     end_timestamp: int | None = None,
     group: str | None = None,
-    max_pages: int = REQUEST_ID_DEFAULT_MAX_PAGES,
-) -> tuple[dict | None, dict]:
-    """Look up a log entry by request ID, using server filtering before fallback scans."""
-    meta = {
-        "used_server_filter": False,
-        "used_inferred_window": False,
-        "scanned_pages": 0,
-        "max_pages": max_pages,
-    }
-
-    # Older backends may ignore request_id, so verify the returned item matches
-    # before trusting this direct lookup.
-    resp = client.list_logs(  # type: ignore[union-attr]
-        page=1,
-        page_size=REQUEST_ID_PAGE_SIZE,
+) -> dict | None:
+    """Look up a log entry by request ID without falling back to page scans."""
+    resp = client.lookup_log(  # type: ignore[union-attr]
+        request_id=request_id,
         log_type=log_type,
         model_name=model_name,
         token_name=token_name,
         start_timestamp=start_timestamp,
         end_timestamp=end_timestamp,
         group=group,
-        request_id=request_id,
     )
-    meta["used_server_filter"] = True
-    if match := _exact_request_id_match(extract_items(resp), request_id):
-        return match, meta
-
-    scan_start = start_timestamp
-    scan_end = end_timestamp
-    if scan_start is None and scan_end is None:
-        inferred = _request_id_date_window(request_id)
-        if inferred:
-            scan_start, scan_end = inferred
-            meta["used_inferred_window"] = True
-
-    for pg in range(1, max_pages + 1):
-        resp = client.list_logs(  # type: ignore[union-attr]
-            page=pg,
-            page_size=REQUEST_ID_PAGE_SIZE,
-            log_type=log_type,
-            model_name=model_name,
-            token_name=token_name,
-            start_timestamp=scan_start,
-            end_timestamp=scan_end,
-            group=group,
-        )
-        meta["scanned_pages"] = pg
-        items = extract_items(resp)
-        if not items:
-            break
-        if match := _exact_request_id_match(items, request_id):
-            return match, meta
-    return None, meta
+    return _exact_request_id_match(extract_items(resp), request_id)
 
 
 def _build_log_record(log: dict) -> dict:
@@ -284,14 +224,6 @@ def logs(
         str | None,
         typer.Option("--request-id", help="Look up cost by request ID (X-Cometapi-Request-Id header)."),
     ] = None,
-    request_id_max_pages: Annotated[
-        int,
-        typer.Option(
-            "--request-id-max-pages",
-            min=1,
-            help="Fallback pages to scan when direct request-ID lookup is unavailable.",
-        ),
-    ] = REQUEST_ID_DEFAULT_MAX_PAGES,
     detail: Annotated[
         bool,
         typer.Option("--detail", help="Show extended columns (request ID, pricing ratios)."),
@@ -325,7 +257,7 @@ def logs(
         if log_type:
             type_int = LOG_TYPE_MAP.get(log_type.lower())
 
-        log_entry, lookup_meta = _lookup_log_by_id(
+        log_entry = _lookup_log_by_id(
             client,
             request_id=request_id,
             log_type=type_int,
@@ -334,22 +266,15 @@ def logs(
             start_timestamp=start_ts,
             end_timestamp=end_ts,
             group=group,
-            max_pages=request_id_max_pages,
         )
 
         if log_entry is None:
-            if lookup_meta["used_inferred_window"]:
-                scan_note = (
-                    f"Then scanned {lookup_meta['scanned_pages']} page(s) in the request ID's "
-                    "inferred local date window."
-                )
-            else:
-                scan_note = f"Then scanned {lookup_meta['scanned_pages']} fallback page(s)."
             err_console.print(
                 f"[red]No log found for request_id=[/]{request_id}\n"
-                "[dim]Tried direct request-id lookup first. "
-                f"{scan_note} Increase --request-id-max-pages or narrow with --start/--end "
-                "if the backend does not support direct request-id filtering.[/]"
+                "[dim]Tried one indexed lookup against /api/log with request_id. "
+                "No fallback page scan was performed because /api/log/self does not "
+                "currently apply request_id filtering. Use an operations/admin access token "
+                "or update the backend self-log endpoint to support request_id filtering.[/]"
             )
             raise typer.Exit(code=1)
 
@@ -399,7 +324,6 @@ def logs(
         start_timestamp=start_ts,
         end_timestamp=end_ts,
         group=group,
-        request_id=None,
     )
 
     data = extract_items(resp)

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/tests/conftest.py

@@ -200,6 +200,37 @@ def mock_client():
             ],
         }
     }
+    client.lookup_log.return_value = {
+        "data": {
+            "page": 1,
+            "page_size": 1,
+            "total": 1,
+            "items": [
+                {
+                    "id": 100,
+                    "created_at": 1700100000,
+                    "type": 2,
+                    "model_name": "gpt-5.4",
+                    "token_name": "Production Key",
+                    "username": "google_9550",
+                    "user_id": 9550,
+                    "ip": "203.0.113.7",
+                    "quota": 150,
+                    "prompt_tokens": 120,
+                    "completion_tokens": 45,
+                    "use_time": 1,
+                    "is_stream": True,
+                    "request_id": "req-abc-001",
+                    "response_id": "chatcmpl-xyz-001",
+                    "other": (
+                        '{"model_ratio":0.625,"completion_ratio":8,"group_ratio":0.8,'
+                        '"model_price":-1,"frt":120,"total_ms":1200,'
+                        '"request_path":"/v1/chat/completions"}'
+                    ),
+                },
+            ],
+        }
+    }
     client.search_logs.return_value = {
         "data": [
             {

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/tests/test_logs.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import json
-from datetime import datetime, timezone
 
 
 class TestLogsTable:
@@ -29,7 +28,6 @@ class TestLogsTable:
             page=1, page_size=20, log_type=None,
             model_name="gpt-5.4", token_name=None,
             start_timestamp=None, end_timestamp=None, group=None,
-            request_id=None,
         )
 
     def test_logs_filter_type(self, cli_runner, patched_client):
@@ -39,7 +37,6 @@ class TestLogsTable:
             page=1, page_size=20, log_type=2,
             model_name=None, token_name=None,
             start_timestamp=None, end_timestamp=None, group=None,
-            request_id=None,
         )
 
     def test_logs_filter_token_name(self, cli_runner, patched_client):
@@ -49,7 +46,6 @@ class TestLogsTable:
             page=1, page_size=20, log_type=None,
             model_name=None, token_name="prod",
             start_timestamp=None, end_timestamp=None, group=None,
-            request_id=None,
         )
 
     def test_logs_invalid_type(self, cli_runner, patched_client):
@@ -63,7 +59,6 @@ class TestLogsTable:
             page=3, page_size=50, log_type=None,
             model_name=None, token_name=None,
             start_timestamp=None, end_timestamp=None, group=None,
-            request_id=None,
         )
 
     def test_logs_filter_start_date(self, cli_runner, patched_client):
@@ -73,7 +68,6 @@ class TestLogsTable:
             page=1, page_size=20, log_type=None,
             model_name=None, token_name=None,
             start_timestamp=1705276800, end_timestamp=None, group=None,
-            request_id=None,
         )
 
     def test_logs_filter_end_date(self, cli_runner, patched_client):
@@ -83,7 +77,6 @@ class TestLogsTable:
             page=1, page_size=20, log_type=None,
             model_name=None, token_name=None,
             start_timestamp=None, end_timestamp=1706659200, group=None,
-            request_id=None,
         )
 
     def test_logs_filter_date_range(self, cli_runner, patched_client):
@@ -93,7 +86,6 @@ class TestLogsTable:
             page=1, page_size=20, log_type=None,
             model_name=None, token_name=None,
             start_timestamp=1705276800, end_timestamp=1706659200, group=None,
-            request_id=None,
         )
 
     def test_logs_filter_unix_timestamp(self, cli_runner, patched_client):
@@ -103,7 +95,6 @@ class TestLogsTable:
             page=1, page_size=20, log_type=None,
             model_name=None, token_name=None,
             start_timestamp=1705276800, end_timestamp=None, group=None,
-            request_id=None,
         )
 
     def test_logs_invalid_date(self, cli_runner, patched_client):
@@ -117,7 +108,6 @@ class TestLogsTable:
             page=1, page_size=20, log_type=None,
             model_name=None, token_name=None,
             start_timestamp=None, end_timestamp=None, group="default",
-            request_id=None,
         )
 
     def test_logs_all_filters(self, cli_runner, patched_client):
@@ -131,7 +121,6 @@ class TestLogsTable:
             page=1, page_size=20, log_type=2,
             model_name="gpt-5.4", token_name=None,
             start_timestamp=1705276800, end_timestamp=1706659200, group="default",
-            request_id=None,
         )
 
     def test_logs_export(self, cli_runner, patched_client):
@@ -190,8 +179,8 @@ class TestLogsRequestId:
         # Should show the full log: model, tokens, cost, pricing ratios
         assert "gpt-5.4" in result.output
         assert "$0.0003" in result.output  # 150 / 500_000
-        patched_client.list_logs.assert_called_once_with(
-            page=1, page_size=100, log_type=None,
+        patched_client.lookup_log.assert_called_once_with(
+            log_type=None,
             model_name=None, token_name=None,
             start_timestamp=None, end_timestamp=None, group=None,
             request_id="req-abc-001",
@@ -219,7 +208,8 @@ class TestLogsRequestId:
     def test_logs_request_id_not_found(self, cli_runner, patched_client):
         result = cli_runner("logs", "--request-id", "nonexistent-id")
         assert result.exit_code != 0
-        assert "Tried direct request-id lookup first" in result.output
+        assert "No fallback" in result.output
+        assert "self-log" in result.output
 
     def test_logs_request_id_with_export_conflict(self, cli_runner, patched_client):
         result = cli_runner("logs", "--request-id", "req-abc-001", "--export")
@@ -228,17 +218,17 @@ class TestLogsRequestId:
     def test_logs_request_id_with_type_filter(self, cli_runner, patched_client):
         result = cli_runner("logs", "--request-id", "req-abc-001", "--type", "consume")
         assert result.exit_code == 0
-        patched_client.list_logs.assert_called_once_with(
-            page=1, page_size=100, log_type=2,
+        patched_client.lookup_log.assert_called_once_with(
+            log_type=2,
             model_name=None, token_name=None,
             start_timestamp=None, end_timestamp=None, group=None,
             request_id="req-abc-001",
         )
 
-    def test_logs_request_id_direct_lookup_ignores_non_matching_backend_item(
+    def test_logs_request_id_lookup_ignores_non_matching_backend_item(
         self, cli_runner, patched_client
     ):
-        direct_ignored = {
+        patched_client.lookup_log.return_value = {
             "data": {
                 "items": [
                     {
@@ -250,39 +240,12 @@ class TestLogsRequestId:
                 ]
             }
         }
-        patched_client.list_logs.side_effect = [direct_ignored, patched_client.list_logs.return_value]
 
         result = cli_runner("logs", "--request-id", "req-abc-001")
 
-        assert result.exit_code == 0
-        assert patched_client.list_logs.call_count == 2
-        first_call = patched_client.list_logs.call_args_list[0]
-        fallback_call = patched_client.list_logs.call_args_list[1]
-        assert first_call.kwargs["request_id"] == "req-abc-001"
-        assert "request_id" not in fallback_call.kwargs
-
-    def test_logs_request_id_fallback_uses_inferred_date_window(self, cli_runner, patched_client):
-        patched_client.list_logs.return_value = {"data": {"items": []}}
-
-        result = cli_runner("logs", "--request-id", "20260617165550885561292gJBlzjtp")
-
-        assert result.exit_code != 0
-        fallback_call = patched_client.list_logs.call_args_list[1]
-        expected_start = int(datetime(2026, 6, 16, 16, 0, tzinfo=timezone.utc).timestamp())
-        expected_end = int(datetime(2026, 6, 17, 15, 59, 59, tzinfo=timezone.utc).timestamp())
-        assert fallback_call.kwargs["start_timestamp"] == expected_start
-        assert fallback_call.kwargs["end_timestamp"] == expected_end
-
-    def test_logs_request_id_max_pages_controls_fallback_scan(self, cli_runner, patched_client):
-        patched_client.list_logs.return_value = {"data": {"items": [{"request_id": "other"}]}}
-
-        result = cli_runner(
-            "logs", "--request-id", "not-a-timestamp-id", "--request-id-max-pages", "2"
-        )
-
         assert result.exit_code != 0
-        # 1 direct request plus 2 fallback pages.
-        assert patched_client.list_logs.call_count == 3
+        patched_client.lookup_log.assert_called_once()
+        patched_client.list_logs.assert_not_called()
 
 
 class TestLogsDetail:

{cometapi_cli-0.3.5 → cometapi_cli-0.3.6}/uv.lock

@@ -66,7 +66,7 @@ wheels = [
 
 [[package]]
 name = "cometapi-cli"
-version = "0.3.5"
+version = "0.3.6"
 source = { editable = "." }
 dependencies = [
     { name = "click" },