cometapi-cli 0.3.5__py3-none-any.whl → 0.3.6__py3-none-any.whl

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/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/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.dist-info → cometapi_cli-0.3.6.dist-info}/METADATA

@@ -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.dist-info → cometapi_cli-0.3.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
-cometapi_cli/__init__.py,sha256=iWnDoeAexgv0uI8MY7FPkoyOJLyoPyoDgNeMvB6CIXw,92
+cometapi_cli/__init__.py,sha256=vXkHbUQYPVVuqrSa6Fz9KuR8AU-NkIpO2liuMYMO0Ow,92
 cometapi_cli/app.py,sha256=d2IZJabWmdZtPtFNOB4YiuSJ1GYvO0hgIOkjm4gQjxA,2948
 cometapi_cli/catalog.py,sha256=Pc0XGoskMEKIzfbU2H_0Yi8zecLzKl1ss8fd2mV7778,4929
-cometapi_cli/client.py,sha256=QBtQ1cvmwvwjpIYpzupC3BMNqxREhMoRnzgCZOeJnEE,9998
+cometapi_cli/client.py,sha256=zg0QEjDOxvZkkZ0XHXoiQ_A_yooDU1kokbIL61p_NmQ,10903
 cometapi_cli/config.py,sha256=oJXQidKCOsKNYPnE8OfLLoOfsv0MSZEDICB6VShJRSA,3307
 cometapi_cli/console.py,sha256=HFSU1gL9SDmwjBvgVgDraoaU50oTwCRpsAwYXYlVP9o,163
 cometapi_cli/constants.py,sha256=UPfU36fnRTl4JdcyjySQ0UEVign3i_UTNH9mQ-Gb4ls,1826
@@ -16,7 +16,7 @@ cometapi_cli/commands/chat.py,sha256=xQgsjFQ33kVRfSnU5t3fbahjZE8nmVSa_w8qUTPeacE
 cometapi_cli/commands/chat_repl.py,sha256=b9lkYnbbaOb0AlSpRcq3wWHmnhtTXvaqeJiUImsMEBY,8176
 cometapi_cli/commands/config_cmd.py,sha256=OqR0TuAq6gQXw8nJIt5AAv_Fk4zdfbg-KhNLuUsrEsU,8619
 cometapi_cli/commands/doctor.py,sha256=s9XzRIkF9FIMAWSc7b3c6v3g8Px9kb0k6WDucOrdXY8,5360
-cometapi_cli/commands/logs.py,sha256=__6Ft5TpBwVtRPTkFbmCjnriGfb1CBNGgGH_CWFmOeY,16082
+cometapi_cli/commands/logs.py,sha256=VxUND6YIbzN4K2u0FHnFh6nmbyD4Hs2OmSuamJmpmGw,13318
 cometapi_cli/commands/model.py,sha256=YyMRt6enCAZfxW_dVcNvdNgYSl-J4iOqPlSsv14nfJs,2654
 cometapi_cli/commands/models.py,sha256=1TQC8LJ6JASErkLG5XtaZyRrq4vr4sVWH7eo426FeNs,8824
 cometapi_cli/commands/repl.py,sha256=b5z1jmEXOsCrb6fwEUyv-IKot929NIPQQAbA1uas1D4,4283
@@ -24,8 +24,8 @@ cometapi_cli/commands/run.py,sha256=JQQ1DFSyJoD4pByLmhMht1-XhDDZpV94F0hshXL7hKY,
 cometapi_cli/commands/stats.py,sha256=bEVywsom7bm8AGKGWlgAWTFjOp4NTJxDk6YEEvECM6U,1411
 cometapi_cli/commands/tasks.py,sha256=NBKOKrDow52sVjoM0ezwS9IhVRltlqYLmpamoEUbAWA,4718
 cometapi_cli/commands/tokens.py,sha256=U0AI8T690NJxAKFBwrWrsr3izXIiB_PZ9avmwpdgM9A,3042
-cometapi_cli-0.3.5.dist-info/METADATA,sha256=QNozKU1kN57hrfCXF-fizdkmWE2IkqxkScqxIsoFWzU,10646
-cometapi_cli-0.3.5.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-cometapi_cli-0.3.5.dist-info/entry_points.txt,sha256=xoiE2ZVNNWXTq0JRBtzC8hJ2JkdKuaBNz_fEd8OJpLs,50
-cometapi_cli-0.3.5.dist-info/licenses/LICENSE,sha256=-rBwHQzkmLbty07abmGvQvsRrvDeEQUkPDhNJfTcjdE,1065
-cometapi_cli-0.3.5.dist-info/RECORD,,
+cometapi_cli-0.3.6.dist-info/METADATA,sha256=ykOW7C9QdwBX2anfx1S6q2vm4oQuI-rkZrwVDWAo0t0,10630
+cometapi_cli-0.3.6.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+cometapi_cli-0.3.6.dist-info/entry_points.txt,sha256=xoiE2ZVNNWXTq0JRBtzC8hJ2JkdKuaBNz_fEd8OJpLs,50
+cometapi_cli-0.3.6.dist-info/licenses/LICENSE,sha256=-rBwHQzkmLbty07abmGvQvsRrvDeEQUkPDhNJfTcjdE,1065
+cometapi_cli-0.3.6.dist-info/RECORD,,