codex-lb 0.3.1__py3-none-any.whl → 0.5.0__py3-none-any.whl

app/modules/usage/updater.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 
 import logging
 import math
-from collections import Counter
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Mapping, Protocol
 
 from app.core.auth.refresh import RefreshError
@@ -14,8 +13,7 @@ from app.core.usage.models import UsagePayload
 from app.core.utils.request_id import get_request_id
 from app.core.utils.time import utcnow
 from app.db.models import Account, AccountStatus, UsageHistory
-from app.modules.accounts.auth_manager import AuthManager
-from app.modules.accounts.repository import AccountsRepository
+from app.modules.accounts.auth_manager import AccountsRepositoryPort, AuthManager
 
 logger = logging.getLogger(__name__)
 
@@ -41,7 +39,7 @@ class UsageUpdater:
     def __init__(
         self,
         usage_repo: UsageRepositoryPort,
-        accounts_repo: AccountsRepository | None = None,
+        accounts_repo: AccountsRepositoryPort | None = None,
     ) -> None:
         self._usage_repo = usage_repo
         self._encryptor = TokenEncryptor()
@@ -56,7 +54,6 @@ class UsageUpdater:
         if not settings.usage_refresh_enabled:
             return
 
-        shared_chatgpt_account_ids = _shared_chatgpt_account_ids(accounts)
         now = utcnow()
         interval = settings.usage_refresh_interval_seconds
         for account in accounts:
@@ -65,16 +62,11 @@ class UsageUpdater:
             latest = latest_usage.get(account.id)
             if latest and (now - latest.recorded_at).total_seconds() < interval:
                 continue
-            usage_account_id = (
-                None
-                if account.chatgpt_account_id and account.chatgpt_account_id in shared_chatgpt_account_ids
-                else account.chatgpt_account_id
-            )
             # NOTE: AsyncSession is not safe for concurrent use. Run sequentially
             # within the request-scoped session to avoid PK collisions and
             # flush-time warnings (SAWarning: Session.add during flush).
             try:
-                await self._refresh_account(account, usage_account_id=usage_account_id)
+                await self._refresh_account(account, usage_account_id=account.chatgpt_account_id)
             except Exception as exc:
                 logger.warning(
                     "Usage refresh failed account_id=%s request_id=%s error=%s",
@@ -88,12 +80,16 @@ class UsageUpdater:
 
     async def _refresh_account(self, account: Account, *, usage_account_id: str | None) -> None:
         access_token = self._encryptor.decrypt(account.access_token_encrypted)
+        payload: UsagePayload | None = None
         try:
             payload = await fetch_usage(
                 access_token=access_token,
                 account_id=usage_account_id,
             )
         except UsageFetchError as exc:
+            if _should_deactivate_for_usage_error(exc.status_code):
+                await self._deactivate_for_client_error(account, exc)
+                return
             if exc.status_code != 401 or not self._auth_manager:
                 return
             try:
@@ -106,25 +102,32 @@ class UsageUpdater:
                     access_token=access_token,
                     account_id=usage_account_id,
                 )
-            except UsageFetchError:
+            except UsageFetchError as retry_exc:
+                if _should_deactivate_for_usage_error(retry_exc.status_code):
+                    await self._deactivate_for_client_error(account, retry_exc)
                 return
 
+        if payload is None:
+            return
+
         rate_limit = payload.rate_limit
-        primary = rate_limit.primary_window if rate_limit else None
+        if rate_limit is None:
+            return
+
+        primary = rate_limit.primary_window
+        secondary = rate_limit.secondary_window
         credits_has, credits_unlimited, credits_balance = _credits_snapshot(payload)
-        primary_window_minutes = _window_minutes(primary.limit_window_seconds) if primary else None
-        secondary = rate_limit.secondary_window if rate_limit else None
-        secondary_window_minutes = _window_minutes(secondary.limit_window_seconds) if secondary else None
+        now_epoch = _now_epoch()
 
         if primary and primary.used_percent is not None:
             await self._usage_repo.add_entry(
                 account_id=account.id,
-                used_percent=primary.used_percent,
+                used_percent=float(primary.used_percent),
                 input_tokens=None,
                 output_tokens=None,
                 window="primary",
-                reset_at=primary.reset_at,
-                window_minutes=primary_window_minutes,
+                reset_at=_reset_at(primary.reset_at, primary.reset_after_seconds, now_epoch),
+                window_minutes=_window_minutes(primary.limit_window_seconds),
                 credits_has=credits_has,
                 credits_unlimited=credits_unlimited,
                 credits_balance=credits_balance,
@@ -133,14 +136,29 @@ class UsageUpdater:
         if secondary and secondary.used_percent is not None:
             await self._usage_repo.add_entry(
                 account_id=account.id,
-                used_percent=secondary.used_percent,
+                used_percent=float(secondary.used_percent),
                 input_tokens=None,
                 output_tokens=None,
                 window="secondary",
-                reset_at=secondary.reset_at,
-                window_minutes=secondary_window_minutes,
+                reset_at=_reset_at(secondary.reset_at, secondary.reset_after_seconds, now_epoch),
+                window_minutes=_window_minutes(secondary.limit_window_seconds),
             )
 
+    async def _deactivate_for_client_error(self, account: Account, exc: UsageFetchError) -> None:
+        if not self._auth_manager:
+            return
+        reason = f"Usage API error: HTTP {exc.status_code} - {exc.message}"
+        logger.warning(
+            "Deactivating account due to client error account_id=%s status=%s message=%s request_id=%s",
+            account.id,
+            exc.status_code,
+            exc.message,
+            get_request_id(),
+        )
+        await self._auth_manager._repo.update_status(account.id, AccountStatus.DEACTIVATED, reason)
+        account.status = AccountStatus.DEACTIVATED
+        account.deactivation_reason = reason
+
 
 def _credits_snapshot(payload: UsagePayload) -> tuple[bool | None, bool | None, float | None]:
     credits = payload.credits
@@ -171,6 +189,20 @@ def _window_minutes(limit_seconds: int | None) -> int | None:
     return max(1, math.ceil(limit_seconds / 60))
 
 
-def _shared_chatgpt_account_ids(accounts: list[Account]) -> set[str]:
-    counts = Counter(account.chatgpt_account_id for account in accounts if account.chatgpt_account_id)
-    return {account_id for account_id, count in counts.items() if count > 1}
+def _now_epoch() -> int:
+    return int(utcnow().replace(tzinfo=timezone.utc).timestamp())
+
+
+def _reset_at(reset_at: int | None, reset_after_seconds: int | None, now_epoch: int) -> int | None:
+    if reset_at is not None:
+        return int(reset_at)
+    if reset_after_seconds is None:
+        return None
+    return now_epoch + max(0, int(reset_after_seconds))
+
+
+_DEACTIVATING_USAGE_STATUS_CODES = {402, 403, 404}
+
+
+def _should_deactivate_for_usage_error(status_code: int) -> bool:
+    return status_code in _DEACTIVATING_USAGE_STATUS_CODES

app/static/index.css

@@ -90,6 +90,14 @@ body {
   -webkit-font-smoothing: antialiased;
 }
 
+body[data-theme="dark"] {
+  color-scheme: dark;
+}
+
+body[data-theme="light"] {
+  color-scheme: light;
+}
+
 .app-shell {
   display: flex;
   flex-direction: column;
@@ -424,6 +432,11 @@ body {
   color: var(--status-error-text);
 }
 
+.status-pill.error {
+  background: var(--status-error-bg);
+  color: var(--status-error-text);
+}
+
 .status-pill.deactivated,
 .status-pill.paused {
   background: var(--status-paused-bg);
@@ -585,6 +598,306 @@ body {
   background: var(--accent-primary-hover);
 }
 
+.controls-toolbar {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+  margin-bottom: 16px;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.controls-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  align-items: center;
+}
+
+.filter-input {
+  background: var(--bg-surface);
+  border: 1px solid var(--border-subtle);
+  color: var(--text-main);
+  padding: 8px 12px;
+  border-radius: 6px;
+  font-size: 13px;
+  outline: none;
+  min-width: 120px;
+}
+
+.filter-input:focus {
+  border-color: var(--accent-primary);
+}
+
+.filter-select {
+  background: var(--bg-surface);
+  border: 1px solid var(--border-subtle);
+  color: var(--text-main);
+  padding: 8px 32px 8px 12px;
+  border-radius: 6px;
+  font-size: 13px;
+  outline: none;
+  -webkit-appearance: none;
+  appearance: none;
+  background-image: url("data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%2358A6FF%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E");
+  background-repeat: no-repeat;
+  background-position: right 10px top 50%;
+  background-size: 10px auto;
+}
+
+.filter-select[multiple] {
+  padding-right: 12px;
+  background-image: none;
+}
+
+.filter-select option {
+  background: var(--bg-surface);
+  color: var(--text-main);
+}
+
+.single-select {
+  position: relative;
+}
+
+.single-select-trigger {
+  display: inline-flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  min-width: 120px;
+  cursor: pointer;
+  position: relative;
+  background-image: none;
+}
+
+.single-select-trigger::after {
+  content: "";
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  width: 10px;
+  height: 10px;
+  background-image: url("data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%2358A6FF%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E");
+  background-repeat: no-repeat;
+  background-size: contain;
+  transform: translateY(-50%) rotate(0deg);
+  transition: transform 0.25s ease;
+}
+
+.single-select-trigger[aria-expanded="true"] {
+  border-color: var(--accent-primary);
+  box-shadow: 0 0 0 1px var(--accent-primary);
+}
+
+.single-select-trigger[aria-expanded="true"]::after {
+  transform: translateY(-50%) rotate(180deg);
+}
+
+.single-select-menu {
+  position: absolute;
+  top: calc(100% + 8px);
+  left: 0;
+  z-index: 50;
+  width: max-content;
+  min-width: 140px;
+  padding: 8px;
+  padding-top: 12px;
+  border-radius: 10px;
+  border: 1px solid var(--border-subtle);
+  background: var(--bg-panel);
+  box-shadow: var(--shadow-md);
+}
+
+.single-select-menu::before {
+  content: "";
+  position: absolute;
+  top: -6px;
+  left: 16px;
+  width: 10px;
+  height: 10px;
+  background: var(--bg-panel);
+  border-left: 1px solid var(--border-subtle);
+  border-top: 1px solid var(--border-subtle);
+  transform: rotate(45deg);
+}
+
+.single-select-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 8px 10px;
+  border-radius: 8px;
+  cursor: pointer;
+  user-select: none;
+  color: var(--text-main);
+  font-size: 13px;
+}
+
+.single-select-item:hover {
+  background: var(--bg-list-hover);
+}
+
+.single-select-item.is-selected {
+  background: var(--bg-list-selected);
+}
+
+.single-select-item input[type="radio"] {
+  display: none;
+}
+
+.multi-select {
+  position: relative;
+}
+
+.multi-select-trigger {
+  display: inline-flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  min-width: 180px;
+  cursor: pointer;
+  position: relative;
+  background-image: none;
+}
+
+.multi-select-trigger::after {
+  content: "";
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  width: 10px;
+  height: 10px;
+  background-image: url("data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%2358A6FF%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E");
+  background-repeat: no-repeat;
+  background-size: contain;
+  transform: translateY(-50%) rotate(0deg);
+  transition: transform 0.25s ease;
+}
+
+.multi-select-trigger:disabled {
+  opacity: 0.7;
+  cursor: not-allowed;
+}
+
+.multi-select-trigger[aria-expanded="true"] {
+  border-color: var(--accent-primary);
+  box-shadow: 0 0 0 1px var(--accent-primary);
+}
+
+.multi-select-trigger[aria-expanded="true"]::after {
+  transform: translateY(-50%) rotate(180deg);
+}
+
+
+.multi-select-menu {
+  position: absolute;
+  top: calc(100% + 8px);
+  left: 0;
+  z-index: 50;
+  width: max-content;
+  min-width: 220px;
+  max-width: 360px;
+  padding: 8px;
+  padding-top: 12px;
+  border-radius: 10px;
+  border: 1px solid var(--border-subtle);
+  background: var(--bg-panel);
+  box-shadow: var(--shadow-md);
+  overflow: visible;
+}
+
+.multi-select-scroller {
+  max-height: 280px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  /* Add padding to ensure scrollbar doesn't overlap content tightly if needed, 
+     but we removed padding from parent. Wait, parent has padding 8px. 
+     The scroller is inside. */
+}
+
+.multi-select-menu::before {
+  content: "";
+  position: absolute;
+  top: -6px;
+  left: 16px;
+  width: 10px;
+  height: 10px;
+  background: var(--bg-panel);
+  border-left: 1px solid var(--border-subtle);
+  border-top: 1px solid var(--border-subtle);
+  transform: rotate(45deg);
+}
+
+.multi-select-actions {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 6px;
+}
+
+.multi-select-action {
+  background: transparent;
+  border: 1px solid var(--border-subtle);
+  color: var(--text-muted);
+  padding: 6px 10px;
+  border-radius: 8px;
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.multi-select-action:hover {
+  border-color: var(--border-strong);
+  color: var(--text-main);
+}
+
+.multi-select-item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 8px 10px;
+  border-radius: 8px;
+  cursor: pointer;
+  user-select: none;
+}
+
+.multi-select-item:hover {
+  background: var(--bg-list-hover);
+}
+
+.multi-select-item input[type="checkbox"] {
+  accent-color: var(--accent-primary);
+}
+
+.multi-select-label {
+  color: var(--text-main);
+  font-size: 13px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 280px;
+}
+
+.filter-apply {
+  font-size: 13px;
+  padding: 8px 12px;
+  border-radius: 6px;
+  border: 1px solid var(--accent-primary);
+  background: var(--accent-primary);
+  color: var(--accent-primary-text);
+  cursor: pointer;
+  font-weight: 500;
+  transition: all 0.2s;
+}
+
+.filter-apply:hover {
+  border-color: var(--accent-primary-hover);
+  background: var(--accent-primary-hover);
+}
+
+.filter-apply:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
 .table-wrap {
   width: 100%;
   overflow-x: auto;
@@ -592,6 +905,18 @@ body {
   border-radius: 8px;
 }
 
+.table-wrap--requests th,
+.table-wrap--requests td {
+  text-align: center;
+}
+
+.table-wrap--requests td:nth-child(2),
+.table-wrap--requests td:nth-child(5) {
+  text-align: left;
+}
+
+
+
 table {
   width: 100%;
   border-collapse: collapse;
@@ -606,6 +931,56 @@ table {
   text-overflow: ellipsis;
 }
 
+.error-cell {
+  display: flex;
+  align-items: flex-start;
+  gap: 6px;
+  min-width: 0;
+}
+
+.error-cell.placeholder {
+  justify-content: center;
+}
+
+.error-cell.placeholder .error-text {
+  text-align: center;
+}
+
+.error-text {
+  flex: 1;
+  min-width: 0;
+}
+
+.error-text.truncated {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.cell-error {
+  vertical-align: middle;
+}
+
+.error-toggle {
+  background: transparent;
+  border: none;
+  color: var(--accent-primary);
+  font-size: 11px;
+  padding: 0;
+  cursor: pointer;
+  white-space: nowrap;
+  margin-top: 3px;
+  font-weight: 500;
+  line-height: 1.2;
+  min-width: 32px;
+  text-align: left;
+  flex-shrink: 0;
+}
+
+.error-toggle:hover {
+  text-decoration: underline;
+}
+
 /* ... existing styles ... */
 
 .list-actions .searchbox button {
@@ -641,12 +1016,14 @@ th {
   font-size: 12px;
   text-transform: uppercase;
   border-bottom: 1px solid var(--border-subtle);
+  vertical-align: middle;
 }
 
 td {
-  padding: 14px 20px;
+  padding: 12px 20px;
   border-bottom: 1px solid var(--border-subtle);
   color: var(--text-main);
+  vertical-align: middle;
 }
 
 tr:last-child td {