unique-search-proxy 2026.44.0.dev14__tar.gz → 2026.46.0.dev0__tar.gz

unique_search_proxy-2026.44.0.dev14/README.md → unique_search_proxy-2026.46.0.dev0/PKG-INFO

@@ -1,3 +1,31 @@
+Metadata-Version: 2.3
+Name: unique-search-proxy
+Version: 2026.46.0.dev0
+Summary: Web Search Proxy implementation
+Author: ThePhilAz
+Author-email: ThePhilAz <rami.azouz@philico.com>
+Requires-Dist: aiohttp>=3.14.1,<4
+Requires-Dist: fastapi>=0.133.0,<1.0.0
+Requires-Dist: starlette>=1.3.1,<2.0.0
+Requires-Dist: uvicorn[standard]>=0.32.0,<1.0.0
+Requires-Dist: pydantic>=2.12.5,<3.0.0
+Requires-Dist: httpx>=0.28.0,<0.29.0
+Requires-Dist: python-dotenv>=1.2.1,<2.0.0
+Requires-Dist: pydantic-settings>=2.12.0,<3.0.0
+Requires-Dist: markdownify>=0.14.1,<1
+Requires-Dist: azure-ai-projects>=2.3,<3
+Requires-Dist: azure-identity>=1.25.0,<2
+Requires-Dist: azure-core>=1.36.0,<2
+Requires-Dist: certifi>=2025.11.12,<2027
+Requires-Dist: google-genai>=1.73.0,<2
+Requires-Dist: google-auth>=2.43.0,<3
+Requires-Dist: jinja2>=3.1.6,<4
+Requires-Dist: unique-toolkit[monitoring]>=2026.46.0.dev0,<2026.46.0rc0
+Requires-Dist: unique-search-proxy-core>=2026.46.0.dev0,<2026.46.0rc0
+Requires-Dist: openai>=1.105.0,<3
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+
 # unique-search-proxy (client)
 
 Part of [Unique Search Proxy](../README.md) · PyPI: `unique-search-proxy` · Helm: `unique-search-proxy`
@@ -96,6 +124,25 @@ Built-in providers register in `register_builtin_providers()` during `create_app
 
 OpenAPI spec: `openapi.json` (input for [SDK codegen](../unique_search_proxy_sdk/README.md)).
 
+### 4.1 Request context and usage
+
+`/v1/*` routes read these headers into a request context that prefixes every log line:
+
+| Header | Required | Use |
+|--------|----------|-----|
+| `x-unique-company-id`, `x-unique-user-id`, `x-unique-chat-id` | Yes (`REQUIRE_CONTEXT_HEADERS`, default `true`) | Tenant identity |
+| `x-unique-entry-point` | No, defaults to `unknown` | Where the request entered the platform (`chat_tool`, `public_api`, `conduct`, ...) |
+| `x-unique-message-id` | No | Reserved for analytics; recorded in the usage line only |
+| `x-service-id` | No, defaults to `unknown` | Calling service; logged as `caller=`, never enforced |
+
+A request whose company or user id is not numeric (`local`, blank, junk) is unattributed: it logs a warning and increments `unique_search_proxy_unattributed_requests_total{entry_point}`. Set `REJECT_UNATTRIBUTED_REQUESTS=true` to return 400 instead. `/v1/configuration/*` skips this check.
+
+`/v1/search`, `/v1/agent-search` (sync and stream) and `/v1/crawl` write one JSON usage line per request (`event="web_search_usage"`) and increment `unique_search_proxy_requests_total{company_id, entry_point, endpoint, provider, status}`. `company_id` is `unattributed` unless both ids are numeric. The line holds no query text or URLs.
+
+`units` is 1 per search or agent search. For a crawl it is the number of URLs that passed URL safety, so 0 when nothing reached the provider. Failed and timed-out requests keep their units, so filter on `status` when counting billable work. Search records also carry `fetch_size`, the number of results requested: Google and Brave page through results (10 and 20 per call), so one search unit can be several provider calls.
+
+The usage line goes through its own logger (`unique_search_proxy_core.usage`) with a bare message format, fixed at INFO, so Loki `| json` can parse it regardless of `LOG_LEVEL`. Nothing verifies these headers: any in-cluster caller can set them.
+
 ---
 
 ## 5. Providers
@@ -226,6 +273,7 @@ Settings use pydantic-settings with per-provider env vars. Copy `.env.example` t
 | Bing agent | `BING_AGENT_` | `BING_AGENT_ENDPOINT`, `BING_AGENT_BING_RESOURCE_CONNECTION_STRING`, optional `BING_AGENT_CLEANUP_ON_START`, `BING_AGENT_DEFAULT_MARKET` |
 | VertexAI agent | `VERTEXAI_AGENT_` | `VERTEXAI_AGENT_SERVICE_ACCOUNT_CREDENTIALS` (optional) |
 | HTTP client | `HTTP_CLIENT_` | `HTTP_CLIENT_PROXY_HOST`, `HTTP_CLIENT_POOL_TIMEOUT_SECONDS` |
+| Request context | (none) | `REQUIRE_CONTEXT_HEADERS`, `REJECT_UNATTRIBUTED_REQUESTS` |
 | Prometheus | `PROMETHEUS_` | `PROMETHEUS_ENABLED` |
 | URL safety | `URL_SAFETY_` | `URL_SAFETY_ENABLED` |
 | Container | (shell) | `HOST`, `PORT`, `WORKERS`, `LOG_LEVEL` |

unique_search_proxy-2026.44.0.dev14/PKG-INFO → unique_search_proxy-2026.46.0.dev0/README.md

@@ -1,31 +1,3 @@
-Metadata-Version: 2.3
-Name: unique-search-proxy
-Version: 2026.44.0.dev14
-Summary: Web Search Proxy implementation
-Author: ThePhilAz
-Author-email: ThePhilAz <rami.azouz@philico.com>
-Requires-Dist: aiohttp>=3.14.1,<4
-Requires-Dist: fastapi>=0.133.0,<1.0.0
-Requires-Dist: starlette>=1.3.1,<2.0.0
-Requires-Dist: uvicorn[standard]>=0.32.0,<1.0.0
-Requires-Dist: pydantic>=2.12.5,<3.0.0
-Requires-Dist: httpx>=0.28.0,<0.29.0
-Requires-Dist: python-dotenv>=1.2.1,<2.0.0
-Requires-Dist: pydantic-settings>=2.12.0,<3.0.0
-Requires-Dist: markdownify>=0.14.1,<1
-Requires-Dist: azure-ai-projects>=2.3,<3
-Requires-Dist: azure-identity>=1.25.0,<2
-Requires-Dist: azure-core>=1.36.0,<2
-Requires-Dist: certifi>=2025.11.12,<2027
-Requires-Dist: google-genai>=1.73.0,<2
-Requires-Dist: google-auth>=2.43.0,<3
-Requires-Dist: jinja2>=3.1.6,<4
-Requires-Dist: unique-toolkit[monitoring]>=2026.44.0.dev10,<2026.44.0rc0
-Requires-Dist: unique-search-proxy-core>=2026.44.0.dev10,<2026.44.0rc0
-Requires-Dist: openai>=1.105.0,<3
-Requires-Python: >=3.12
-Description-Content-Type: text/markdown
-
 # unique-search-proxy (client)
 
 Part of [Unique Search Proxy](../README.md) · PyPI: `unique-search-proxy` · Helm: `unique-search-proxy`
@@ -124,6 +96,25 @@ Built-in providers register in `register_builtin_providers()` during `create_app
 
 OpenAPI spec: `openapi.json` (input for [SDK codegen](../unique_search_proxy_sdk/README.md)).
 
+### 4.1 Request context and usage
+
+`/v1/*` routes read these headers into a request context that prefixes every log line:
+
+| Header | Required | Use |
+|--------|----------|-----|
+| `x-unique-company-id`, `x-unique-user-id`, `x-unique-chat-id` | Yes (`REQUIRE_CONTEXT_HEADERS`, default `true`) | Tenant identity |
+| `x-unique-entry-point` | No, defaults to `unknown` | Where the request entered the platform (`chat_tool`, `public_api`, `conduct`, ...) |
+| `x-unique-message-id` | No | Reserved for analytics; recorded in the usage line only |
+| `x-service-id` | No, defaults to `unknown` | Calling service; logged as `caller=`, never enforced |
+
+A request whose company or user id is not numeric (`local`, blank, junk) is unattributed: it logs a warning and increments `unique_search_proxy_unattributed_requests_total{entry_point}`. Set `REJECT_UNATTRIBUTED_REQUESTS=true` to return 400 instead. `/v1/configuration/*` skips this check.
+
+`/v1/search`, `/v1/agent-search` (sync and stream) and `/v1/crawl` write one JSON usage line per request (`event="web_search_usage"`) and increment `unique_search_proxy_requests_total{company_id, entry_point, endpoint, provider, status}`. `company_id` is `unattributed` unless both ids are numeric. The line holds no query text or URLs.
+
+`units` is 1 per search or agent search. For a crawl it is the number of URLs that passed URL safety, so 0 when nothing reached the provider. Failed and timed-out requests keep their units, so filter on `status` when counting billable work. Search records also carry `fetch_size`, the number of results requested: Google and Brave page through results (10 and 20 per call), so one search unit can be several provider calls.
+
+The usage line goes through its own logger (`unique_search_proxy_core.usage`) with a bare message format, fixed at INFO, so Loki `| json` can parse it regardless of `LOG_LEVEL`. Nothing verifies these headers: any in-cluster caller can set them.
+
 ---
 
 ## 5. Providers
@@ -254,6 +245,7 @@ Settings use pydantic-settings with per-provider env vars. Copy `.env.example` t
 | Bing agent | `BING_AGENT_` | `BING_AGENT_ENDPOINT`, `BING_AGENT_BING_RESOURCE_CONNECTION_STRING`, optional `BING_AGENT_CLEANUP_ON_START`, `BING_AGENT_DEFAULT_MARKET` |
 | VertexAI agent | `VERTEXAI_AGENT_` | `VERTEXAI_AGENT_SERVICE_ACCOUNT_CREDENTIALS` (optional) |
 | HTTP client | `HTTP_CLIENT_` | `HTTP_CLIENT_PROXY_HOST`, `HTTP_CLIENT_POOL_TIMEOUT_SECONDS` |
+| Request context | (none) | `REQUIRE_CONTEXT_HEADERS`, `REJECT_UNATTRIBUTED_REQUESTS` |
 | Prometheus | `PROMETHEUS_` | `PROMETHEUS_ENABLED` |
 | URL safety | `URL_SAFETY_` | `URL_SAFETY_ENABLED` |
 | Container | (shell) | `HOST`, `PORT`, `WORKERS`, `LOG_LEVEL` |

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique-search-proxy"
-version = "2026.44.0.dev14"
+version = "2026.46.0.dev0"
 description = "Web Search Proxy implementation"
 authors = [{ name = "ThePhilAz", email = "rami.azouz@philico.com" }]
 readme = "README.md"
@@ -22,8 +22,8 @@ dependencies = [
     "google-genai>=1.73.0,<2",
     "google-auth>=2.43.0,<3",
     "jinja2>=3.1.6,<4",
-    "unique-toolkit[monitoring]>=2026.44.0.dev10,<2026.44.0rc0",
-    "unique-search-proxy-core>=2026.44.0.dev10,<2026.44.0rc0",
+    "unique-toolkit[monitoring]>=2026.46.0.dev0,<2026.46.0rc0",
+    "unique-search-proxy-core>=2026.46.0.dev0,<2026.46.0rc0",
     "openai>=1.105.0,<3",
 ]
 

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/unique_search_proxy_client/web/api/v1/agent_search.py

@@ -32,6 +32,7 @@ from unique_search_proxy_client.web.monitoring.metrics import (
     record_agent_search_error,
     record_agent_search_success,
 )
+from unique_search_proxy_client.web.usage import record_request_usage
 
 router = APIRouter(tags=["agent-search"])
 _LOGGER = logging.getLogger(__name__)
@@ -79,6 +80,7 @@ async def agent_search(
     engine_id = engine.value if hasattr(engine, "value") else str(engine)
     timeout = body.timeout
     started = time.perf_counter()
+    succeeded = False
     _LOGGER.info(
         "agent-search start mode=sync engine=%s timeout=%ss",
         engine_id,
@@ -95,6 +97,7 @@ async def agent_search(
         )
         async with asyncio.timeout(timeout):
             result = await engine_service.search(body)
+        succeeded = True
     except TimeoutError as exc:
         record_agent_search_error(
             engine_id,
@@ -138,6 +141,14 @@ async def agent_search(
             (time.perf_counter() - started) * 1000,
         )
         raise
+    finally:
+        record_request_usage(
+            "agent_search",
+            engine_id,
+            units=1,
+            succeeded=succeeded,
+            started=started,
+        )
 
     duration = time.perf_counter() - started
     record_agent_search_success(engine_id, duration)
@@ -161,6 +172,7 @@ async def agent_search_stream(
     engine_id = engine.value if hasattr(engine, "value") else str(engine)
     timeout = body.timeout
     started = time.perf_counter()
+    succeeded = False
     _LOGGER.info(
         "agent-search start mode=stream engine=%s timeout=%ss",
         engine_id,
@@ -181,9 +193,23 @@ async def agent_search_stream(
             exc.code.value if hasattr(exc.code, "value") else str(exc.code),
             time.perf_counter() - started,
         )
+        record_request_usage(
+            "agent_search",
+            engine_id,
+            units=1,
+            succeeded=succeeded,
+            started=started,
+        )
         raise _agent_search_request_context(exc, engine_id=engine_id) from exc
     except Exception as exc:
         record_agent_search_error(engine_id, "INTERNAL_ERROR", 0.0)
+        record_request_usage(
+            "agent_search",
+            engine_id,
+            units=1,
+            succeeded=succeeded,
+            started=started,
+        )
         _LOGGER.exception(
             "agent-search setup error mode=stream engine=%s",
             engine_id,
@@ -194,11 +220,12 @@ async def agent_search_stream(
         ) from exc
 
     async def event_generator() -> AsyncIterator[str]:
-        nonlocal started
+        nonlocal started, succeeded
         try:
             async with asyncio.timeout(timeout):
                 async for event in engine_service.stream(body):
                     yield _format_sse_event(event)
+            succeeded = True
             record_agent_search_success(engine_id, time.perf_counter() - started)
             _LOGGER.info(
                 "agent-search success mode=stream engine=%s duration=%.0fms",
@@ -256,6 +283,14 @@ async def agent_search_stream(
                     engine_id=engine_id,
                 ),
             )
+        finally:
+            record_request_usage(
+                "agent_search",
+                engine_id,
+                units=1,
+                succeeded=succeeded,
+                started=started,
+            )
 
     return StreamingResponse(
         event_generator(),

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/unique_search_proxy_client/web/api/v1/context_headers.py

@@ -8,7 +8,9 @@ from fastapi import Header
 from unique_search_proxy_core.context import (
     CHAT_ID_HEADER,
     COMPANY_ID_HEADER,
+    ENTRY_POINT_HEADER,
     LOCAL_REQUEST_CONTEXT,
+    MESSAGE_ID_HEADER,
     USER_ID_HEADER,
 )
 
@@ -35,6 +37,20 @@ async def document_request_context_headers(
             description="Tenant chat or session identifier.",
         ),
     ] = LOCAL_REQUEST_CONTEXT.chat_id,
+    x_unique_entry_point: Annotated[
+        str,
+        Header(
+            alias=ENTRY_POINT_HEADER,
+            description="Service where the search entered the platform.",
+        ),
+    ] = LOCAL_REQUEST_CONTEXT.entry_point.value,
+    x_unique_message_id: Annotated[
+        str | None,
+        Header(
+            alias=MESSAGE_ID_HEADER,
+            description="Message identifier, reserved for analytics.",
+        ),
+    ] = None,
 ) -> None:
     """Declare context headers on /v1 routes for Swagger; enforcement is in middleware."""
     return None

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/unique_search_proxy_client/web/api/v1/crawl.py

@@ -40,6 +40,7 @@ from unique_search_proxy_client.web.monitoring.metrics import (
 from unique_search_proxy_client.web.settings.request_limits import (
     request_limits_settings,
 )
+from unique_search_proxy_client.web.usage import record_request_usage
 
 router = APIRouter(tags=["crawl"])
 _LOGGER = logging.getLogger(__name__)
@@ -96,6 +97,8 @@ async def crawl(
     crawler_id = body.crawler
     timeout = min(body.timeout, request_limits_settings.max_timeout_seconds)
     started = time.perf_counter()
+    succeeded = False
+    units = 0
     _LOGGER.info(
         "crawl start crawler=%s urls=%d timeout=%ss",
         crawler_id,
@@ -112,7 +115,9 @@ async def crawl(
                 body.urls,
                 redirect_http_client=client,
             )
+            units = len(gate.allowed_targets)
             if not gate.allowed_targets:
+                succeeded = True
                 duration = time.perf_counter() - started
                 record_crawl_success(
                     crawler_id,
@@ -155,6 +160,7 @@ async def crawl(
                 )
             else:
                 crawler_results = await crawler.crawl(crawl_body)
+        succeeded = True
     except TimeoutError as exc:
         record_crawl_error(
             crawler_id,
@@ -198,6 +204,14 @@ async def crawl(
             (time.perf_counter() - started) * 1000,
         )
         raise
+    finally:
+        record_request_usage(
+            "crawl",
+            crawler_id,
+            units=units,
+            succeeded=succeeded,
+            started=started,
+        )
 
     duration = time.perf_counter() - started
     record_crawl_success(crawler_id, len(body.urls), duration)

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/unique_search_proxy_client/web/api/v1/search.py

@@ -34,6 +34,7 @@ from unique_search_proxy_client.web.monitoring.metrics import (
 from unique_search_proxy_client.web.settings.request_limits import (
     request_limits_settings,
 )
+from unique_search_proxy_client.web.usage import record_request_usage
 
 router = APIRouter(tags=["search"])
 _LOGGER = logging.getLogger(__name__)
@@ -68,6 +69,7 @@ async def search(
     engine_id = engine.value if hasattr(engine, "value") else str(engine)
     timeout = min(body.timeout, request_limits_settings.max_timeout_seconds)
     started = time.perf_counter()
+    succeeded = False
     _LOGGER.info("search start engine=%s timeout=%ss", engine_id, timeout)
 
     try:
@@ -79,6 +81,7 @@ async def search(
         )
         async with asyncio.timeout(timeout):
             raw, curated = await engine.search(body)
+        succeeded = True
     except TimeoutError as exc:
         record_search_error(
             engine_id,
@@ -122,6 +125,16 @@ async def search(
             (time.perf_counter() - started) * 1000,
         )
         raise
+    finally:
+        record_request_usage(
+            "search",
+            engine_id,
+            # TODO(UN-24394): count provider pages fetched if billing needs exact call counts.
+            units=1,
+            fetch_size=body.fetch_size,
+            succeeded=succeeded,
+            started=started,
+        )
 
     duration = time.perf_counter() - started
     record_search_success(engine_id, duration)

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/unique_search_proxy_client/web/context.py

@@ -13,7 +13,13 @@ _REQUEST_CONTEXT: ContextVar[RequestContext] = ContextVar(
     default=LOCAL_REQUEST_CONTEXT,
 )
 
-_CONTEXT_FIELDS: Final[tuple[str, ...]] = ("company_id", "user_id", "chat_id")
+_CONTEXT_FIELDS: Final[tuple[str, ...]] = (
+    "company_id",
+    "user_id",
+    "chat_id",
+    "entry_point",
+    "caller",
+)
 
 
 def bind_request_context(context: RequestContext) -> Token[RequestContext]:

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/unique_search_proxy_client/web/logging_config.py

@@ -15,15 +15,18 @@ _APP_LOGGER_NAMES = (
     "unique_search_proxy_core",
 )
 
+_USAGE_LOGGER_NAME = "unique_search_proxy_core.usage"
+
 _CONTEXT_LOG_FORMAT = (
     "%(levelprefix)s "
     "company=%(company_id)s user=%(user_id)s chat=%(chat_id)s "
-    "%(message)s"
+    "entry=%(entry_point)s caller=%(caller)s %(message)s"
 )
 
 _ACCESS_CONTEXT_LOG_FORMAT = (
     "%(levelprefix)s "
     "company=%(company_id)s user=%(user_id)s chat=%(chat_id)s "
+    "entry=%(entry_point)s caller=%(caller)s "
     '%(client_addr)s - "%(request_line)s" %(status_code)s'
 )
 
@@ -50,6 +53,18 @@ def build_logging_config(log_level: str | None = None) -> dict[str, Any]:
             "level": level_name,
             "propagate": False,
         }
+    # The usage line is JSON for Loki ``| json``: no prefix, never filtered by level.
+    config["formatters"]["usage"] = {"format": "%(message)s"}
+    config["handlers"]["usage"] = {
+        "class": "logging.StreamHandler",
+        "formatter": "usage",
+        "stream": "ext://sys.stderr",
+    }
+    config["loggers"][_USAGE_LOGGER_NAME] = {
+        "handlers": ["usage"],
+        "level": "INFO",
+        "propagate": False,
+    }
     config["loggers"]["uvicorn"]["level"] = level_name
     config["loggers"]["uvicorn.error"]["level"] = level_name
     config["loggers"]["uvicorn.access"]["level"] = level_name

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/unique_search_proxy_client/web/middleware/context.py

@@ -1,16 +1,23 @@
 from __future__ import annotations
 
+import logging
+
 from starlette.types import ASGIApp, Receive, Scope, Send
 from unique_search_proxy_core.context import LOCAL_REQUEST_CONTEXT, RequestContext
-from unique_search_proxy_core.errors import ValidationProxyError
+from unique_search_proxy_core.errors import BadRequestProxyError, ValidationProxyError
 
 from unique_search_proxy_client.web.context import (
     bind_request_context,
     reset_request_context,
 )
 from unique_search_proxy_client.web.error_handlers import proxy_error_response
+from unique_search_proxy_client.web.monitoring.metrics import (
+    record_unattributed_request,
+)
 from unique_search_proxy_client.web.settings.app import app_settings
 
+_LOGGER = logging.getLogger(__name__)
+
 _CONTEXT_EXCLUDED_PATHS = frozenset(
     {
         "/",
@@ -23,6 +30,8 @@ _CONTEXT_EXCLUDED_PATHS = frozenset(
     }
 )
 
+_ATTRIBUTION_EXEMPT_PREFIX = "/v1/configuration/"
+
 
 def _headers_from_scope(scope: Scope) -> dict[str, str]:
     return {
@@ -78,6 +87,29 @@ class RequestContextMiddleware:
         )
         token = bind_request_context(context)
         try:
+            # Warn and count by default; reject only when the setting is on.
+            if not context.is_attributed and not path.startswith(
+                _ATTRIBUTION_EXEMPT_PREFIX
+            ):
+                invalid = context.invalid_identity_headers
+                record_unattributed_request(context.entry_point.value)
+                _LOGGER.warning("Unattributed request, invalid headers: %s", invalid)
+                if app_settings.reject_unattributed_requests:
+                    response = proxy_error_response(
+                        BadRequestProxyError(
+                            f"Invalid context headers: {', '.join(invalid)}",
+                            details=[
+                                {
+                                    "loc": ["header", header_name],
+                                    "msg": "Must be a numeric id",
+                                    "type": "invalid",
+                                }
+                                for header_name in invalid
+                            ],
+                        ),
+                    )
+                    await response(scope, receive, send)
+                    return
             await self.app(scope, receive, send)
         finally:
             reset_request_context(token)

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/unique_search_proxy_client/web/monitoring/metrics.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Iterable
 
+from unique_search_proxy_core.context import RequestContext
 from unique_toolkit.monitoring import MetricNamespace
 
 m = MetricNamespace("unique_search_proxy")
@@ -117,6 +118,17 @@ agent_search_errors_total = m.counter(
     ["engine", "error_code"],
 )
 
+requests_total = m.counter(
+    "requests_total",
+    "Requests that reached a handler (company_id is 'unattributed' without numeric ids)",
+    ["company_id", "entry_point", "endpoint", "provider", "status"],
+)
+unattributed_requests_total = m.counter(
+    "unattributed_requests_total",
+    "Requests without a numeric company and user id",
+    ["entry_point"],
+)
+
 proxy_errors_total = m.counter(
     "proxy_errors_total",
     "Top-level API errors returned to clients",
@@ -124,37 +136,23 @@ proxy_errors_total = m.counter(
 )
 
 
-def _metrics_enabled() -> bool:
-    from unique_search_proxy_client.web.settings.monitoring import prometheus_settings
-
-    return prometheus_settings.enabled
-
-
 def record_search_success(engine: str, duration_seconds: float) -> None:
-    if not _metrics_enabled():
-        return
     search_total.labels(engine=engine).inc()
     search_duration_seconds.labels(engine=engine).observe(duration_seconds)
 
 
 def record_search_error(engine: str, error_code: str, duration_seconds: float) -> None:
-    if not _metrics_enabled():
-        return
     search_errors_total.labels(engine=engine, error_code=error_code).inc()
     search_duration_seconds.labels(engine=engine).observe(duration_seconds)
 
 
 def record_crawl_success(crawler: str, url_count: int, duration_seconds: float) -> None:
-    if not _metrics_enabled():
-        return
     crawl_total.labels(crawler=crawler).inc()
     crawl_urls_total.labels(crawler=crawler).inc(url_count)
     crawl_duration_seconds.labels(crawler=crawler).observe(duration_seconds)
 
 
 def record_crawl_error(crawler: str, error_code: str, duration_seconds: float) -> None:
-    if not _metrics_enabled():
-        return
     crawl_errors_total.labels(crawler=crawler, error_code=error_code).inc()
     crawl_duration_seconds.labels(crawler=crawler).observe(duration_seconds)
 
@@ -171,8 +169,6 @@ def record_crawl_url_outcomes(
     ``http_status`` is the upstream HTTP status (e.g. ``"403"``) when the failure
     was an HTTP error or ``""`` when no HTTP response was received.
     """
-    if not _metrics_enabled():
-        return
     for outcome, error_code, http_status in outcomes:
         crawl_url_outcomes_total.labels(
             crawler=crawler,
@@ -183,20 +179,14 @@ def record_crawl_url_outcomes(
 
 
 def record_crawl_blocked(reason_category: str, count: int = 1) -> None:
-    if not _metrics_enabled():
-        return
     crawl_blocked_total.labels(reason_category=reason_category).inc(count)
 
 
 def set_url_safety_application_checks_enabled(enabled: bool) -> None:
-    if not _metrics_enabled():
-        return
     url_safety_application_checks_enabled.set(int(enabled))
 
 
 def record_agent_search_success(engine: str, duration_seconds: float) -> None:
-    if not _metrics_enabled():
-        return
     agent_search_total.labels(engine=engine).inc()
     agent_search_duration_seconds.labels(engine=engine).observe(duration_seconds)
 
@@ -206,13 +196,28 @@ def record_agent_search_error(
     error_code: str,
     duration_seconds: float,
 ) -> None:
-    if not _metrics_enabled():
-        return
     agent_search_errors_total.labels(engine=engine, error_code=error_code).inc()
     agent_search_duration_seconds.labels(engine=engine).observe(duration_seconds)
 
 
 def record_proxy_error(error_code: str) -> None:
-    if not _metrics_enabled():
-        return
     proxy_errors_total.labels(error_code=error_code).inc()
+
+
+def record_request(
+    context: RequestContext,
+    endpoint: str,
+    provider: str,
+    status: str,
+) -> None:
+    requests_total.labels(
+        company_id=context.company_id if context.is_attributed else "unattributed",
+        entry_point=context.entry_point.value,
+        endpoint=endpoint,
+        provider=provider,
+        status=status,
+    ).inc()
+
+
+def record_unattributed_request(entry_point: str) -> None:
+    unattributed_requests_total.labels(entry_point=entry_point).inc()

{unique_search_proxy-2026.44.0.dev14 → unique_search_proxy-2026.46.0.dev0}/unique_search_proxy_client/web/settings/app.py

@@ -15,6 +15,7 @@ APP_ENV_PREFIX = ""
 )
 class AppSettings(BaseSettings):
     require_context_headers: bool = True
+    reject_unattributed_requests: bool = False
     expose_docs: bool = False
 
 

unique_search_proxy-2026.46.0.dev0/unique_search_proxy_client/web/usage.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+import time
+from typing import Literal
+
+from unique_search_proxy_core.usage import UsageRecord, record_usage
+
+from unique_search_proxy_client.web.context import get_request_context
+from unique_search_proxy_client.web.monitoring.metrics import record_request
+
+
+def record_request_usage(
+    endpoint: Literal["search", "agent_search", "crawl"],
+    provider: str,
+    *,
+    units: int,
+    succeeded: bool,
+    started: float,
+    fetch_size: int | None = None,
+) -> None:
+    """Emit the usage log line and counter for the current request."""
+    context = get_request_context()
+    status = "success" if succeeded else "error"
+    record_usage(
+        UsageRecord(
+            company_id=context.company_id,
+            user_id=context.user_id,
+            chat_id=context.chat_id,
+            message_id=context.message_id,
+            entry_point=context.entry_point,
+            caller=context.caller,
+            endpoint=endpoint,
+            provider=provider,
+            units=units,
+            fetch_size=fetch_size,
+            status=status,
+            duration_ms=round((time.perf_counter() - started) * 1000),
+        ),
+    )
+    record_request(context, endpoint, provider, status)