chore: output register_usage response in logs.

Author: JGoutin

pyproject.toml

@@ -50,7 +50,7 @@ lint = [
     "stdapi[opentelemetry, uvicorn]",
     "mypy",
     "ruff",
-    "types-aioboto3[bedrock, bedrock-runtime, polly, comprehend, s3, transcribe, translate]",
+    "types-aioboto3[bedrock, bedrock-runtime, polly, comprehend, s3, transcribe, translate, meteringmarketplace]",
     "types-PyYAML",
 ]
 docs = [

stdapi/main.py

@@ -81,6 +81,7 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None]:
                     register(),
                 )
                 auth_enabled = results[0]
+                register_usage_response = results[-1]
                 unavailable_models = results[1][1]
                 update_unified_models_collections()
             start_event = EventLog(
@@ -91,6 +92,8 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None]:
                 server_version=SERVER_FULL_VERSION,
                 server_start_time_ms=(time_ns() - start) // 1000000,
             )
+            if register_usage_response:
+                start_event["register_usage_response"] = register_usage_response
             if not auth_enabled:
                 start_event.setdefault("server_warnings", []).append(
                     "SECURITY risk: Authentication is not enabled "

stdapi/metering.py

@@ -1,5 +1,7 @@
 """AWS Marketplace Metering."""
 
+from typing import TYPE_CHECKING
+
 from botocore.exceptions import ClientError as _ClientError
 
 from stdapi.aws import CONFIG, REGION, SESSION
@@ -10,6 +12,11 @@
 )
 from stdapi.server import SERVER_ID, SERVER_VERSION
 
+if TYPE_CHECKING:
+    from types_aiobotocore_meteringmarketplace.type_defs import (
+        RegisterUsageResultTypeDef,
+    )
+
 PRODUCT_CODE = ""
 LICENCE_INFO = (
     {"name": "Commercial License", "url": "https://stdapi.ai/commercial_license"}
@@ -23,7 +30,7 @@
 SERVER_FULL_VERSION = f"{SERVER_VERSION}+{'p' if PRODUCT_CODE else 'c'}"
 
 
-async def register() -> None:
+async def register() -> "RegisterUsageResultTypeDef | None":
     """Register AWS Marketplace for the current host.
 
     For ECS, EKS & Fargate hosts running hourly billed products.
@@ -38,7 +45,7 @@ async def register() -> None:
             "meteringmarketplace", config=CONFIG, region_name=REGION
         ) as metering:
             try:
-                await metering.register_usage(
+                return await metering.register_usage(
                     ProductCode=PRODUCT_CODE,
                     PublicKeyVersion=product_public_key_version,
                     Nonce=SERVER_ID,
@@ -81,3 +88,4 @@ async def register() -> None:
                 if exc_type:
                     raise exc_type(exc_msg) from None
                 raise  # pragma: no cover
+    return None

stdapi/monitoring.py

@@ -17,6 +17,9 @@
 
 if TYPE_CHECKING:
     from pydantic.main import IncEx
+    from types_aiobotocore_meteringmarketplace.type_defs import (
+        RegisterUsageResultTypeDef,
+    )
 
     from stdapi.monitoring_otel import OpenTelemetryManager
 
@@ -48,6 +51,7 @@ class EventLog(TypedDict):
     # "start" type
     server_start_time_ms: NotRequired[int]
     server_warnings: NotRequired[list[JsonValue]]
+    register_usage_response: "NotRequired[RegisterUsageResultTypeDef]"
 
     # "stop" type
     server_uptime_ms: NotRequired[int]

stdapi/server.py

@@ -12,7 +12,7 @@
 SERVER_NAME = f"{gethostname()}-{getpid()}-{SERVER_ID}"
 
 #: Server version
-SERVER_VERSION = "1.0.2"
+SERVER_VERSION = "1.0.3"
 
 #: Server user agent
 USER_AGENT = f"stdapi.ai/{SERVER_VERSION}/{SERVER_ID}"