Move the external API into its own router

Auth logic isn't shared between the clients anyway, so co-locating them is confusing since you can't use the same clients to call both. This also makes the codegen clients less verbose.

client-libs/python/openpipe/api_client/api/default/api_report.py

@@ -5,13 +5,13 @@ import httpx
 
 from ... import errors
 from ...client import AuthenticatedClient, Client
-from ...models.external_api_report_json_body import ExternalApiReportJsonBody
+from ...models.report_json_body import ReportJsonBody
 from ...types import Response
 
 
 def _get_kwargs(
     *,
-    json_body: ExternalApiReportJsonBody,
+    json_body: ReportJsonBody,
 ) -> Dict[str, Any]:
     pass
 
@@ -19,7 +19,7 @@ def _get_kwargs(
 
     return {
         "method": "post",
-        "url": "/v1/report",
+        "url": "/report",
         "json": json_json_body,
     }
 
@@ -45,12 +45,12 @@ def _build_response(*, client: Union[AuthenticatedClient, Client], response: htt
 def sync_detailed(
     *,
     client: AuthenticatedClient,
-    json_body: ExternalApiReportJsonBody,
+    json_body: ReportJsonBody,
 ) -> Response[Any]:
     """Report an API call
 
     Args:
-        json_body (ExternalApiReportJsonBody):
+        json_body (ReportJsonBody):
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -74,12 +74,12 @@ def sync_detailed(
 async def asyncio_detailed(
     *,
     client: AuthenticatedClient,
-    json_body: ExternalApiReportJsonBody,
+    json_body: ReportJsonBody,
 ) -> Response[Any]:
     """Report an API call
 
     Args:
-        json_body (ExternalApiReportJsonBody):
+        json_body (ReportJsonBody):
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.

client-libs/python/openpipe/api_client/api/default/check_cache.py

@@ -5,14 +5,14 @@ import httpx
 
 from ... import errors
 from ...client import AuthenticatedClient, Client
-from ...models.external_api_check_cache_json_body import ExternalApiCheckCacheJsonBody
-from ...models.external_api_check_cache_response_200 import ExternalApiCheckCacheResponse200
+from ...models.check_cache_json_body import CheckCacheJsonBody
+from ...models.check_cache_response_200 import CheckCacheResponse200
 from ...types import Response
 
 
 def _get_kwargs(
     *,
-    json_body: ExternalApiCheckCacheJsonBody,
+    json_body: CheckCacheJsonBody,
 ) -> Dict[str, Any]:
     pass
 
@@ -20,16 +20,16 @@ def _get_kwargs(
 
     return {
         "method": "post",
-        "url": "/v1/check-cache",
+        "url": "/check-cache",
         "json": json_json_body,
     }
 
 
 def _parse_response(
     *, client: Union[AuthenticatedClient, Client], response: httpx.Response
-) -> Optional[ExternalApiCheckCacheResponse200]:
+) -> Optional[CheckCacheResponse200]:
     if response.status_code == HTTPStatus.OK:
-        response_200 = ExternalApiCheckCacheResponse200.from_dict(response.json())
+        response_200 = CheckCacheResponse200.from_dict(response.json())
 
         return response_200
     if client.raise_on_unexpected_status:
@@ -40,7 +40,7 @@ def _parse_response(
 
 def _build_response(
     *, client: Union[AuthenticatedClient, Client], response: httpx.Response
-) -> Response[ExternalApiCheckCacheResponse200]:
+) -> Response[CheckCacheResponse200]:
     return Response(
         status_code=HTTPStatus(response.status_code),
         content=response.content,
@@ -52,19 +52,19 @@ def _build_response(
 def sync_detailed(
     *,
     client: AuthenticatedClient,
-    json_body: ExternalApiCheckCacheJsonBody,
-) -> Response[ExternalApiCheckCacheResponse200]:
+    json_body: CheckCacheJsonBody,
+) -> Response[CheckCacheResponse200]:
     """Check if a prompt is cached
 
     Args:
-        json_body (ExternalApiCheckCacheJsonBody):
+        json_body (CheckCacheJsonBody):
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Response[ExternalApiCheckCacheResponse200]
+        Response[CheckCacheResponse200]
     """
 
     kwargs = _get_kwargs(
@@ -81,19 +81,19 @@ def sync_detailed(
 def sync(
     *,
     client: AuthenticatedClient,
-    json_body: ExternalApiCheckCacheJsonBody,
-) -> Optional[ExternalApiCheckCacheResponse200]:
+    json_body: CheckCacheJsonBody,
+) -> Optional[CheckCacheResponse200]:
     """Check if a prompt is cached
 
     Args:
-        json_body (ExternalApiCheckCacheJsonBody):
+        json_body (CheckCacheJsonBody):
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        ExternalApiCheckCacheResponse200
+        CheckCacheResponse200
     """
 
     return sync_detailed(
@@ -105,19 +105,19 @@ def sync(
 async def asyncio_detailed(
     *,
     client: AuthenticatedClient,
-    json_body: ExternalApiCheckCacheJsonBody,
-) -> Response[ExternalApiCheckCacheResponse200]:
+    json_body: CheckCacheJsonBody,
+) -> Response[CheckCacheResponse200]:
     """Check if a prompt is cached
 
     Args:
-        json_body (ExternalApiCheckCacheJsonBody):
+        json_body (CheckCacheJsonBody):
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Response[ExternalApiCheckCacheResponse200]
+        Response[CheckCacheResponse200]
     """
 
     kwargs = _get_kwargs(
@@ -132,19 +132,19 @@ async def asyncio_detailed(
 async def asyncio(
     *,
     client: AuthenticatedClient,
-    json_body: ExternalApiCheckCacheJsonBody,
-) -> Optional[ExternalApiCheckCacheResponse200]:
+    json_body: CheckCacheJsonBody,
+) -> Optional[CheckCacheResponse200]:
     """Check if a prompt is cached
 
     Args:
-        json_body (ExternalApiCheckCacheJsonBody):
+        json_body (CheckCacheJsonBody):
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        ExternalApiCheckCacheResponse200
+        CheckCacheResponse200
     """
 
     return (

client-libs/python/openpipe/api_client/models/__init__.py

@@ -1,15 +1,15 @@
 """ Contains all the data models used in inputs/outputs """
 
-from .external_api_check_cache_json_body import ExternalApiCheckCacheJsonBody
-from .external_api_check_cache_json_body_tags import ExternalApiCheckCacheJsonBodyTags
-from .external_api_check_cache_response_200 import ExternalApiCheckCacheResponse200
-from .external_api_report_json_body import ExternalApiReportJsonBody
-from .external_api_report_json_body_tags import ExternalApiReportJsonBodyTags
+from .check_cache_json_body import CheckCacheJsonBody
+from .check_cache_json_body_tags import CheckCacheJsonBodyTags
+from .check_cache_response_200 import CheckCacheResponse200
+from .report_json_body import ReportJsonBody
+from .report_json_body_tags import ReportJsonBodyTags
 
 __all__ = (
-    "ExternalApiCheckCacheJsonBody",
-    "ExternalApiCheckCacheJsonBodyTags",
-    "ExternalApiCheckCacheResponse200",
-    "ExternalApiReportJsonBody",
-    "ExternalApiReportJsonBodyTags",
+    "CheckCacheJsonBody",
+    "CheckCacheJsonBodyTags",
+    "CheckCacheResponse200",
+    "ReportJsonBody",
+    "ReportJsonBodyTags",
 )

client-libs/python/openpipe/api_client/models/check_cache_json_body.py

@@ -5,25 +5,25 @@ from attrs import define
 from ..types import UNSET, Unset
 
 if TYPE_CHECKING:
-    from ..models.external_api_check_cache_json_body_tags import ExternalApiCheckCacheJsonBodyTags
+    from ..models.check_cache_json_body_tags import CheckCacheJsonBodyTags
 
 
-T = TypeVar("T", bound="ExternalApiCheckCacheJsonBody")
+T = TypeVar("T", bound="CheckCacheJsonBody")
 
 
 @define
-class ExternalApiCheckCacheJsonBody:
+class CheckCacheJsonBody:
     """
     Attributes:
         requested_at (float): Unix timestamp in milliseconds
         req_payload (Union[Unset, Any]): JSON-encoded request payload
-        tags (Union[Unset, ExternalApiCheckCacheJsonBodyTags]): Extra tags to attach to the call for filtering. Eg {
-            "userId": "123", "promptId": "populate-title" }
+        tags (Union[Unset, CheckCacheJsonBodyTags]): Extra tags to attach to the call for filtering. Eg { "userId":
+            "123", "promptId": "populate-title" }
     """
 
     requested_at: float
     req_payload: Union[Unset, Any] = UNSET
-    tags: Union[Unset, "ExternalApiCheckCacheJsonBodyTags"] = UNSET
+    tags: Union[Unset, "CheckCacheJsonBodyTags"] = UNSET
 
     def to_dict(self) -> Dict[str, Any]:
         requested_at = self.requested_at
@@ -47,7 +47,7 @@ class ExternalApiCheckCacheJsonBody:
 
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
-        from ..models.external_api_check_cache_json_body_tags import ExternalApiCheckCacheJsonBodyTags
+        from ..models.check_cache_json_body_tags import CheckCacheJsonBodyTags
 
         d = src_dict.copy()
         requested_at = d.pop("requestedAt")
@@ -55,16 +55,16 @@ class ExternalApiCheckCacheJsonBody:
         req_payload = d.pop("reqPayload", UNSET)
 
         _tags = d.pop("tags", UNSET)
-        tags: Union[Unset, ExternalApiCheckCacheJsonBodyTags]
+        tags: Union[Unset, CheckCacheJsonBodyTags]
         if isinstance(_tags, Unset):
             tags = UNSET
         else:
-            tags = ExternalApiCheckCacheJsonBodyTags.from_dict(_tags)
+            tags = CheckCacheJsonBodyTags.from_dict(_tags)
 
-        external_api_check_cache_json_body = cls(
+        check_cache_json_body = cls(
             requested_at=requested_at,
             req_payload=req_payload,
             tags=tags,
         )
 
-        return external_api_check_cache_json_body
+        return check_cache_json_body

client-libs/python/openpipe/api_client/models/check_cache_json_body_tags.py

@@ -2,11 +2,11 @@ from typing import Any, Dict, List, Type, TypeVar
 
 from attrs import define, field
 
-T = TypeVar("T", bound="ExternalApiReportJsonBodyTags")
+T = TypeVar("T", bound="CheckCacheJsonBodyTags")
 
 
 @define
-class ExternalApiReportJsonBodyTags:
+class CheckCacheJsonBodyTags:
     """Extra tags to attach to the call for filtering. Eg { "userId": "123", "promptId": "populate-title" }"""
 
     additional_properties: Dict[str, str] = field(init=False, factory=dict)
@@ -21,10 +21,10 @@ class ExternalApiReportJsonBodyTags:
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
-        external_api_report_json_body_tags = cls()
+        check_cache_json_body_tags = cls()
 
-        external_api_report_json_body_tags.additional_properties = d
-        return external_api_report_json_body_tags
+        check_cache_json_body_tags.additional_properties = d
+        return check_cache_json_body_tags
 
     @property
     def additional_keys(self) -> List[str]:

client-libs/python/openpipe/api_client/models/check_cache_response_200.py

@@ -4,11 +4,11 @@ from attrs import define
 
 from ..types import UNSET, Unset
 
-T = TypeVar("T", bound="ExternalApiCheckCacheResponse200")
+T = TypeVar("T", bound="CheckCacheResponse200")
 
 
 @define
-class ExternalApiCheckCacheResponse200:
+class CheckCacheResponse200:
     """
     Attributes:
         resp_payload (Union[Unset, Any]): JSON-encoded response payload
@@ -31,8 +31,8 @@ class ExternalApiCheckCacheResponse200:
         d = src_dict.copy()
         resp_payload = d.pop("respPayload", UNSET)
 
-        external_api_check_cache_response_200 = cls(
+        check_cache_response_200 = cls(
             resp_payload=resp_payload,
         )
 
-        return external_api_check_cache_response_200
+        return check_cache_response_200

client-libs/python/openpipe/api_client/models/report_json_body.py

@@ -5,14 +5,14 @@ from attrs import define
 from ..types import UNSET, Unset
 
 if TYPE_CHECKING:
-    from ..models.external_api_report_json_body_tags import ExternalApiReportJsonBodyTags
+    from ..models.report_json_body_tags import ReportJsonBodyTags
 
 
-T = TypeVar("T", bound="ExternalApiReportJsonBody")
+T = TypeVar("T", bound="ReportJsonBody")
 
 
 @define
-class ExternalApiReportJsonBody:
+class ReportJsonBody:
     """
     Attributes:
         requested_at (float): Unix timestamp in milliseconds
@@ -21,8 +21,8 @@ class ExternalApiReportJsonBody:
         resp_payload (Union[Unset, Any]): JSON-encoded response payload
         status_code (Union[Unset, float]): HTTP status code of response
         error_message (Union[Unset, str]): User-friendly error message
-        tags (Union[Unset, ExternalApiReportJsonBodyTags]): Extra tags to attach to the call for filtering. Eg {
-            "userId": "123", "promptId": "populate-title" }
+        tags (Union[Unset, ReportJsonBodyTags]): Extra tags to attach to the call for filtering. Eg { "userId": "123",
+            "promptId": "populate-title" }
     """
 
     requested_at: float
@@ -31,7 +31,7 @@ class ExternalApiReportJsonBody:
     resp_payload: Union[Unset, Any] = UNSET
     status_code: Union[Unset, float] = UNSET
     error_message: Union[Unset, str] = UNSET
-    tags: Union[Unset, "ExternalApiReportJsonBodyTags"] = UNSET
+    tags: Union[Unset, "ReportJsonBodyTags"] = UNSET
 
     def to_dict(self) -> Dict[str, Any]:
         requested_at = self.requested_at
@@ -66,7 +66,7 @@ class ExternalApiReportJsonBody:
 
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
-        from ..models.external_api_report_json_body_tags import ExternalApiReportJsonBodyTags
+        from ..models.report_json_body_tags import ReportJsonBodyTags
 
         d = src_dict.copy()
         requested_at = d.pop("requestedAt")
@@ -82,13 +82,13 @@ class ExternalApiReportJsonBody:
         error_message = d.pop("errorMessage", UNSET)
 
         _tags = d.pop("tags", UNSET)
-        tags: Union[Unset, ExternalApiReportJsonBodyTags]
+        tags: Union[Unset, ReportJsonBodyTags]
         if isinstance(_tags, Unset):
             tags = UNSET
         else:
-            tags = ExternalApiReportJsonBodyTags.from_dict(_tags)
+            tags = ReportJsonBodyTags.from_dict(_tags)
 
-        external_api_report_json_body = cls(
+        report_json_body = cls(
             requested_at=requested_at,
             received_at=received_at,
             req_payload=req_payload,
@@ -98,4 +98,4 @@ class ExternalApiReportJsonBody:
             tags=tags,
         )
 
-        return external_api_report_json_body
+        return report_json_body

client-libs/python/openpipe/api_client/models/report_json_body_tags.py

@@ -2,11 +2,11 @@ from typing import Any, Dict, List, Type, TypeVar
 
 from attrs import define, field
 
-T = TypeVar("T", bound="ExternalApiCheckCacheJsonBodyTags")
+T = TypeVar("T", bound="ReportJsonBodyTags")
 
 
 @define
-class ExternalApiCheckCacheJsonBodyTags:
+class ReportJsonBodyTags:
     """Extra tags to attach to the call for filtering. Eg { "userId": "123", "promptId": "populate-title" }"""
 
     additional_properties: Dict[str, str] = field(init=False, factory=dict)
@@ -21,10 +21,10 @@ class ExternalApiCheckCacheJsonBodyTags:
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
-        external_api_check_cache_json_body_tags = cls()
+        report_json_body_tags = cls()
 
-        external_api_check_cache_json_body_tags.additional_properties = d
-        return external_api_check_cache_json_body_tags
+        report_json_body_tags.additional_properties = d
+        return report_json_body_tags
 
     @property
     def additional_keys(self) -> List[str]:

client-libs/python/openpipe/shared.py

@@ -1,10 +1,10 @@
 from openpipe.api_client.api.default import (
-    external_api_report,
-    external_api_check_cache,
+    api_report,
+    check_cache,
 )
 from openpipe.api_client.client import AuthenticatedClient
-from openpipe.api_client.models.external_api_report_json_body_tags import (
-    ExternalApiReportJsonBodyTags,
+from openpipe.api_client.models.report_json_body_tags import (
+    ReportJsonBodyTags,
 )
 import toml
 import time
@@ -21,7 +21,7 @@ def _get_tags(openpipe_options):
     tags["$sdk"] = "python"
     tags["$sdk_version"] = version
 
-    return ExternalApiReportJsonBodyTags.from_dict(tags)
+    return ReportJsonBodyTags.from_dict(tags)
 
 
 def _should_check_cache(openpipe_options):
@@ -31,7 +31,7 @@ def _should_check_cache(openpipe_options):
 
 
 def _process_cache_payload(
-    payload: external_api_check_cache.ExternalApiCheckCacheResponse200,
+    payload: check_cache.CheckCacheResponse200,
 ):
     if not payload or not payload.resp_payload:
         return None
@@ -47,9 +47,9 @@ def maybe_check_cache(
     if not _should_check_cache(openpipe_options):
         return None
     try:
-        payload = external_api_check_cache.sync(
+        payload = check_cache.sync(
             client=configured_client,
-            json_body=external_api_check_cache.ExternalApiCheckCacheJsonBody(
+            json_body=check_cache.CheckCacheJsonBody(
                 req_payload=req_payload,
                 requested_at=int(time.time() * 1000),
                 tags=_get_tags(openpipe_options),
@@ -72,9 +72,9 @@ async def maybe_check_cache_async(
         return None
 
     try:
-        payload = await external_api_check_cache.asyncio(
+        payload = await check_cache.asyncio(
             client=configured_client,
-            json_body=external_api_check_cache.ExternalApiCheckCacheJsonBody(
+            json_body=check_cache.CheckCacheJsonBody(
                 req_payload=req_payload,
                 requested_at=int(time.time() * 1000),
                 tags=_get_tags(openpipe_options),
@@ -94,9 +94,9 @@ def report(
     **kwargs,
 ):
     try:
-        external_api_report.sync_detailed(
+        api_report.sync_detailed(
             client=configured_client,
-            json_body=external_api_report.ExternalApiReportJsonBody(
+            json_body=api_report.ReportJsonBody(
                 **kwargs,
                 tags=_get_tags(openpipe_options),
             ),
@@ -112,9 +112,9 @@ async def report_async(
     **kwargs,
 ):
     try:
-        await external_api_report.asyncio_detailed(
+        await api_report.asyncio_detailed(
             client=configured_client,
-            json_body=external_api_report.ExternalApiReportJsonBody(
+            json_body=api_report.ReportJsonBody(
                 **kwargs,
                 tags=_get_tags(openpipe_options),
             ),