Log search results to S3 and expose in admin

Author: yongchoooon

app/api/routes_admin.py

@@ -76,6 +76,7 @@ def _render_template(name: str, **replacements: str) -> str:
 
 _LOG_TYPES = {
     "ai_agent": "openai_ai_agent_usage/",
+    "search": "search_usage/",
     "variants": "variants_openai_usage/",
     "debug": "simulation_debug/",
 }
@@ -166,6 +167,27 @@ def _parse_variants_log(payload: Dict[str, Any]) -> Dict[str, Any]:
     }
 
 
+def _parse_search_log(payload: Dict[str, Any]) -> Dict[str, Any]:
+    query = payload.get("query") or {}
+    result_counts = payload.get("result_counts") or {}
+    total_results = (
+        (result_counts.get("image_top") or 0)
+        + (result_counts.get("image_misc") or 0)
+        + (result_counts.get("text_top") or 0)
+        + (result_counts.get("text_misc") or 0)
+    )
+    return {
+        "timestamp": payload.get("timestamp") or "",
+        "search_id": payload.get("search_id") or "",
+        "query_text": query.get("text") or "",
+        "goods_classes": ", ".join(query.get("goods_classes") or []),
+        "group_codes": ", ".join(query.get("group_codes") or []),
+        "total_results": total_results,
+        "client_ip": payload.get("client_ip") or "",
+        "user_agent": payload.get("user_agent") or "",
+    }
+
+
 def _parse_debug_key(key: str) -> Dict[str, Any]:
     filename = key.split("/")[-1]
     run_tag = ""
@@ -296,6 +318,17 @@ def admin_logs(request: Request, type: str) -> JSONResponse:
                     **parsed,
                 }
             )
+        elif type == "search":
+            parsed = _parse_search_log(payload)
+            items.append(
+                {
+                    "key": obj["key"],
+                    "last_modified": obj["last_modified"].isoformat()
+                    if obj.get("last_modified")
+                    else "",
+                    **parsed,
+                }
+            )
 
     note = ""
     if truncated:
@@ -304,7 +337,7 @@ def admin_logs(request: Request, type: str) -> JSONResponse:
     return JSONResponse(
         {
             "items": items,
-            "total_cost_usd": total_cost,
+            "total_cost_usd": total_cost if type in {"ai_agent", "variants"} else 0,
             "note": note,
         }
     )

app/services/worker_bridge.py

@@ -3,9 +3,13 @@
 from __future__ import annotations
 
 import base64
+import json
 import logging
 import time
 import uuid
+import threading
+from dataclasses import asdict
+from datetime import datetime
 from typing import Any, Dict, List, Optional
 
 from app.schemas.search import (
@@ -19,6 +23,7 @@
 )
 from app.services.s3_storage import ImageRef, ImageTransferError, build_image_ref
 from app.services.request_meta import get_request_meta
+from app.services.log_storage import upload_text, s3_logs_enabled
 from app.services.worker_registry import (
     WorkerDisconnectedError,
     WorkerTimeoutError,
@@ -32,6 +37,79 @@
 logger = logging.getLogger(__name__)
 
 
+def _upload_text_async(key_suffix: str, text: str, content_type: str) -> None:
+    thread = threading.Thread(
+        target=upload_text,
+        args=(key_suffix, text, content_type),
+        daemon=True,
+    )
+    thread.start()
+
+
+def _serialize_result(result: SearchResult) -> Dict[str, Any]:
+    payload = asdict(result)
+    return {
+        "trademark_id": payload.get("trademark_id") or "",
+        "title": payload.get("title") or "",
+        "status": payload.get("status") or "",
+        "class_codes": payload.get("class_codes") or [],
+        "app_no": payload.get("app_no") or "",
+        "image_sim": float(payload.get("image_sim") or 0.0),
+        "text_sim": float(payload.get("text_sim") or 0.0),
+        "thumb_url": payload.get("thumb_url"),
+        "doi": payload.get("doi"),
+        "image_path": payload.get("image_path"),
+        "goods_services": payload.get("goods_services"),
+    }
+
+
+def _build_search_log_payload(
+    req: SearchRequest,
+    response: SearchResponse,
+    *,
+    job_id: str,
+    worker_id: str,
+    elapsed_ms: int,
+) -> Dict[str, Any]:
+    meta = get_request_meta()
+    query = response.query
+    payload = {
+        "timestamp": datetime.utcnow().isoformat(),
+        "search_id": response.search_id or "",
+        "job_id": job_id,
+        "worker_id": worker_id,
+        "elapsed_ms": elapsed_ms,
+        "query": {
+            "text": query.text,
+            "language": req.language,
+            "goods_classes": list(query.goods_classes or []),
+            "group_codes": list(query.group_codes or []),
+            "variants": list(query.variants or []),
+            "k": query.k,
+            "use_llm_variants": bool(req.use_llm_variants),
+            "debug": bool(req.debug),
+        },
+        "result_counts": {
+            "image_top": len(response.image_top or []),
+            "image_misc": len(response.image_misc or []),
+            "text_top": len(response.text_top or []),
+            "text_misc": len(response.text_misc or []),
+        },
+        "image_top": [_serialize_result(item) for item in response.image_top or []],
+        "image_misc": [_serialize_result(item) for item in response.image_misc or []],
+        "text_top": [_serialize_result(item) for item in response.text_top or []],
+        "text_misc": [_serialize_result(item) for item in response.text_misc or []],
+        "client_id": meta.client_id if meta else "",
+        "client_ip": meta.client_ip if meta else "",
+        "user_agent": meta.user_agent if meta else "",
+        "request_id": meta.request_id if meta else "",
+        "origin": meta.origin if meta else "",
+        "referer": meta.referer if meta else "",
+        "accept_language": meta.accept_language if meta else "",
+    }
+    return payload
+
+
 class WorkerSearchError(Exception):
     """Base search error when using desktop worker."""
 
@@ -298,4 +376,21 @@ async def run_worker_search(req: SearchRequest) -> SearchResponse:
         worker_id,
         elapsed_ms,
     )
+    if s3_logs_enabled():
+        try:
+            payload = _build_search_log_payload(
+                req,
+                response,
+                job_id=job_id,
+                worker_id=worker_id,
+                elapsed_ms=elapsed_ms,
+            )
+            date_tag = datetime.utcnow().strftime("%Y/%m/%d")
+            _upload_text_async(
+                f"search_usage/{date_tag}/{uuid.uuid4().hex}.json",
+                json.dumps(payload, ensure_ascii=False),
+                content_type="application/json",
+            )
+        except Exception:
+            logger.exception("Failed to enqueue search log upload")
     return response

app/templates/admin_home.html

@@ -9,7 +9,7 @@
       body { font-family: system-ui, sans-serif; background:#f6f8fc; margin:0; padding:2rem; overflow-x:hidden; }
       header { display:flex; justify-content:space-between; align-items:center; margin-bottom:1.5rem; }
       h1 { margin:0; }
-      .section { background:#fff; padding:1.5rem; border-radius:16px; box-shadow:0 8px 24px rgba(15,23,42,0.08); margin-bottom:1.5rem; overflow-x:auto; }
+      .section { background:#fff; padding:1.5rem; border-radius:16px; box-shadow:0 8px 24px rgba(15,23,42,0.08); margin-bottom:1.5rem; overflow-x:auto; -webkit-overflow-scrolling:touch; overscroll-behavior-x:contain; }
       .section h2 { margin:0; font-size:1.1rem; }
       .section-header { display:flex; justify-content:space-between; align-items:flex-end; gap:1rem; margin-bottom:0.75rem; }
       .summary { color:#475569; font-size:0.9rem; }
@@ -31,6 +31,10 @@
       .page-btn { border:1px solid #e2e8f0; background:#fff; color:#0f172a; padding:0.25rem 0.55rem; border-radius:8px; cursor:pointer; font-size:0.85rem; }
       .page-btn.is-active { background:#1d4ed8; color:#fff; border-color:#1d4ed8; }
       .page-btn:disabled { cursor:default; opacity:0.4; }
+      @media (max-width: 1024px) {
+        body { padding:1rem; }
+        .section { padding:1rem; }
+      }
       @media (max-width: 768px) {
         body { padding:0.5rem; }
         .section { padding:0.6rem; border-radius:12px; }
@@ -73,6 +77,32 @@ <h2>시뮬레이션 AI Agent 로그</h2>
       <div class="summary muted" id="ai-note"></div>
     </section>
 
+    <section class="section">
+      <div class="section-header">
+        <h2>검색 로그</h2>
+        <div class="summary" id="search-summary">총 {count}건</div>
+      </div>
+      <table>
+        <thead>
+          <tr>
+            <th class="sortable narrow" data-table="search" data-key="timestamp">시간<span class="sort-indicator"></span></th>
+            <th class="narrow">search_id</th>
+            <th>검색어</th>
+            <th>상품류</th>
+            <th>유사군</th>
+            <th class="narrow">결과 수</th>
+            <th>IP</th>
+            <th class="col-user-agent">user_agent</th>
+          </tr>
+        </thead>
+        <tbody id="search-table">
+          <tr><td colspan="8" class="muted">로딩 중...</td></tr>
+        </tbody>
+      </table>
+      <div class="pagination" id="search-pagination"></div>
+      <div class="summary muted" id="search-note"></div>
+    </section>
+
     <section class="section">
       <div class="section-header">
         <h2>LLM 유사어 로그</h2>
@@ -148,6 +178,7 @@ <h2>시뮬레이션 내용 로그</h2>
 
       const state = {
         ai: { items: [], total_cost_usd: 0, sortKey: "last_modified", sortDir: "desc", page: 1 },
+        search: { items: [], sortKey: "timestamp", sortDir: "desc", page: 1 },
         variants: { items: [], total_cost_usd: 0, sortKey: "timestamp", sortDir: "desc", page: 1 },
         debug: { items: [], sortKey: "last_modified", sortDir: "desc", page: 1 },
       };
@@ -209,6 +240,7 @@ <h2>시뮬레이션 내용 로그</h2>
             if (!Number.isFinite(next) || next < 1 || next > totalPages) return;
             st.page = next;
             if (tableKey === "ai") renderAiAgent();
+            if (tableKey === "search") renderSearch();
             if (tableKey === "variants") renderVariants();
             if (tableKey === "debug") renderDebug();
           });
@@ -258,6 +290,38 @@ <h2>시뮬레이션 내용 로그</h2>
         updateSortIndicators("ai");
       };
 
+      const renderSearch = () => {
+        const body = document.getElementById("search-table");
+        body.innerHTML = "";
+        const sorted = sortItems(state.search.items, state.search.sortKey, state.search.sortDir);
+        const items = paginateItems(sorted, state.search.page);
+        if (!items.length) {
+          body.innerHTML = '<tr><td colspan="8" class="muted">데이터가 없습니다.</td></tr>';
+          return;
+        }
+        items.forEach((item) => {
+          const row = document.createElement("tr");
+          row.classList.add("clickable");
+          row.innerHTML = `
+            <td class="narrow">${formatDate(item.timestamp)}</td>
+            <td class="narrow">${item.search_id || "-"}</td>
+            <td>${item.query_text || "-"}</td>
+            <td>${item.goods_classes || "-"}</td>
+            <td>${item.group_codes || "-"}</td>
+            <td class="narrow">${item.total_results ?? "-"}</td>
+            <td>${item.client_ip || "-"}</td>
+            <td class="col-user-agent">${item.user_agent || "-"}</td>
+          `;
+          row.addEventListener("click", () => toggleDetail(row, item.key, 8));
+          body.appendChild(row);
+        });
+        document.getElementById("search-summary").textContent =
+          `총 ${state.search.items.length}건`;
+        document.getElementById("search-note").textContent = state.search.note || "";
+        renderPagination("search-pagination", "search");
+        updateSortIndicators("search");
+      };
+
       const renderVariants = () => {
         const body = document.getElementById("variants-table");
         body.innerHTML = "";
@@ -350,6 +414,7 @@ <h2>시뮬레이션 내용 로그</h2>
             }
             st.page = 1;
             if (table === "ai") renderAiAgent();
+            if (table === "search") renderSearch();
             if (table === "variants") renderVariants();
             if (table === "debug") renderDebug();
           });
@@ -367,6 +432,15 @@ <h2>시뮬레이션 내용 로그</h2>
           document.getElementById("ai-table").innerHTML =
             `<tr><td colspan="7" class="muted">불러오기 실패</td></tr>`;
         }
+        try {
+          const data = await fetchLogs("search");
+          state.search.items = data.items || [];
+          state.search.note = data.note || "";
+          renderSearch();
+        } catch (err) {
+          document.getElementById("search-table").innerHTML =
+            `<tr><td colspan="8" class="muted">불러오기 실패</td></tr>`;
+        }
         try {
           const data = await fetchLogs("variants");
           state.variants.items = data.items || [];