update infini-gram api client (#260)

Updated `openapi-python-client` to latest and regenerated the API
client. Some small changes to attribution_service to handle new types.
Depends on allenai/infinigram-api#97

Author: mtblanton

src/attribution/attribution_service.py

@@ -2,6 +2,7 @@
 from dataclasses import dataclass, field
 from typing import Annotated, Self, cast
 
+from flask import current_app
 from pydantic import AfterValidator, Field
 from rank_bm25 import BM25Okapi  # type: ignore
 from werkzeug import exceptions
@@ -23,9 +24,8 @@
 from src.attribution.infini_gram_api_client.models.available_infini_gram_index_id import (
     AvailableInfiniGramIndexId,
 )
-from src.attribution.infini_gram_api_client.models.http_validation_error import (
-    HTTPValidationError,
-)
+from src.attribution.infini_gram_api_client.models.problem import Problem
+from src.attribution.infini_gram_api_client.models.request_validation_error import RequestValidationError
 from src.config.get_config import cfg
 from src.util.pii_regex import does_contain_pii
 
@@ -196,10 +196,25 @@ def get_attribution(
         msg = f"Something went wrong when calling the infini-gram API: {e.status_code} {e.content.decode()}"
         raise exceptions.BadGateway(msg) from e
 
-    if isinstance(attribution_response, HTTPValidationError):
+    if isinstance(attribution_response, RequestValidationError):
+        current_app.logger.error(
+            "Validation error from infini-gram %s, errors %s",
+            attribution_response.title,
+            str(attribution_response.errors),
+        )
         # validation error handling
         raise exceptions.InternalServerError(
-            description=f"infini-gram API reported a validation error: {attribution_response.detail}\nThis is likely an error in olmo-api."
+            description=f"infini-gram API reported a validation error: {attribution_response.title}\nThis is likely an error in olmo-api."
+        )
+
+    if isinstance(attribution_response, Problem):
+        current_app.logger.error(
+            "Problem from infini-gram %s, detail %s",
+            attribution_response.title,
+            str(attribution_response.detail),
+        )
+        raise exceptions.InternalServerError(
+            description=f"infini-gram API reported an error: {attribution_response.title}"
         )
 
     if attribution_response is None:

src/attribution/infini_gram_api_client/api/default/count_index_count_get.py

@@ -1,14 +1,14 @@
 from http import HTTPStatus
-from typing import Any
+from typing import Any, Optional, Union
 
 import httpx
 
-from src.attribution.infini_gram_api_client import errors
-from src.attribution.infini_gram_api_client.client import AuthenticatedClient, Client
-from src.attribution.infini_gram_api_client.models.available_infini_gram_index_id import AvailableInfiniGramIndexId
-from src.attribution.infini_gram_api_client.models.http_validation_error import HTTPValidationError
-from src.attribution.infini_gram_api_client.models.infini_gram_count_response import InfiniGramCountResponse
-from src.attribution.infini_gram_api_client.types import UNSET, Response
+from ... import errors
+from ...client import AuthenticatedClient, Client
+from ...models.available_infini_gram_index_id import AvailableInfiniGramIndexId
+from ...models.infini_gram_count_response import InfiniGramCountResponse
+from ...models.request_validation_error import RequestValidationError
+from ...types import UNSET, Response
 
 
 def _get_kwargs(
@@ -32,22 +32,25 @@ def _get_kwargs(
 
 
 def _parse_response(
-    *, client: AuthenticatedClient | Client, response: httpx.Response
-) -> HTTPValidationError | InfiniGramCountResponse | None:
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Optional[Union[InfiniGramCountResponse, RequestValidationError]]:
     if response.status_code == 200:
-        return InfiniGramCountResponse.from_dict(response.json())
+        response_200 = InfiniGramCountResponse.from_dict(response.json())
 
+        return response_200
     if response.status_code == 422:
-        return HTTPValidationError.from_dict(response.json())
+        response_422 = RequestValidationError.from_dict(response.json())
 
+        return response_422
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
-    return None
+    else:
+        return None
 
 
 def _build_response(
-    *, client: AuthenticatedClient | Client, response: httpx.Response
-) -> Response[HTTPValidationError | InfiniGramCountResponse]:
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Response[Union[InfiniGramCountResponse, RequestValidationError]]:
     return Response(
         status_code=HTTPStatus(response.status_code),
         content=response.content,
@@ -59,9 +62,9 @@ def _build_response(
 def sync_detailed(
     index: AvailableInfiniGramIndexId,
     *,
-    client: AuthenticatedClient | Client,
+    client: Union[AuthenticatedClient, Client],
     query: str,
-) -> Response[HTTPValidationError | InfiniGramCountResponse]:
+) -> Response[Union[InfiniGramCountResponse, RequestValidationError]]:
     """Count
 
     Args:
@@ -73,7 +76,7 @@ def sync_detailed(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Response[Union[HTTPValidationError, InfiniGramCountResponse]]
+        Response[Union[InfiniGramCountResponse, RequestValidationError]]
     """
 
     kwargs = _get_kwargs(
@@ -91,9 +94,9 @@ def sync_detailed(
 def sync(
     index: AvailableInfiniGramIndexId,
     *,
-    client: AuthenticatedClient | Client,
+    client: Union[AuthenticatedClient, Client],
     query: str,
-) -> HTTPValidationError | InfiniGramCountResponse | None:
+) -> Optional[Union[InfiniGramCountResponse, RequestValidationError]]:
     """Count
 
     Args:
@@ -105,7 +108,7 @@ def sync(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Union[HTTPValidationError, InfiniGramCountResponse]
+        Union[InfiniGramCountResponse, RequestValidationError]
     """
 
     return sync_detailed(
@@ -118,9 +121,9 @@ def sync(
 async def asyncio_detailed(
     index: AvailableInfiniGramIndexId,
     *,
-    client: AuthenticatedClient | Client,
+    client: Union[AuthenticatedClient, Client],
     query: str,
-) -> Response[HTTPValidationError | InfiniGramCountResponse]:
+) -> Response[Union[InfiniGramCountResponse, RequestValidationError]]:
     """Count
 
     Args:
@@ -132,7 +135,7 @@ async def asyncio_detailed(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Response[Union[HTTPValidationError, InfiniGramCountResponse]]
+        Response[Union[InfiniGramCountResponse, RequestValidationError]]
     """
 
     kwargs = _get_kwargs(
@@ -148,9 +151,9 @@ async def asyncio_detailed(
 async def asyncio(
     index: AvailableInfiniGramIndexId,
     *,
-    client: AuthenticatedClient | Client,
+    client: Union[AuthenticatedClient, Client],
     query: str,
-) -> HTTPValidationError | InfiniGramCountResponse | None:
+) -> Optional[Union[InfiniGramCountResponse, RequestValidationError]]:
     """Count
 
     Args:
@@ -162,7 +165,7 @@ async def asyncio(
         httpx.TimeoutException: If the request takes longer than Client.timeout.
 
     Returns:
-        Union[HTTPValidationError, InfiniGramCountResponse]
+        Union[InfiniGramCountResponse, RequestValidationError]
     """
 
     return (

src/attribution/infini_gram_api_client/api/default/get_available_indexes_indexes_get.py

@@ -1,12 +1,12 @@
 from http import HTTPStatus
-from typing import Any
+from typing import Any, Optional, Union
 
 import httpx
 
-from src.attribution.infini_gram_api_client import errors
-from src.attribution.infini_gram_api_client.client import AuthenticatedClient, Client
-from src.attribution.infini_gram_api_client.models.available_infini_gram_index_id import AvailableInfiniGramIndexId
-from src.attribution.infini_gram_api_client.types import Response
+from ... import errors
+from ...client import AuthenticatedClient, Client
+from ...models.available_infini_gram_index_id import AvailableInfiniGramIndexId
+from ...types import Response
 
 
 def _get_kwargs() -> dict[str, Any]:
@@ -19,8 +19,8 @@ def _get_kwargs() -> dict[str, Any]:
 
 
 def _parse_response(
-    *, client: AuthenticatedClient | Client, response: httpx.Response
-) -> list[AvailableInfiniGramIndexId] | None:
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Optional[list[AvailableInfiniGramIndexId]]:
     if response.status_code == 200:
         response_200 = []
         _response_200 = response.json()
@@ -32,11 +32,12 @@ def _parse_response(
         return response_200
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
-    return None
+    else:
+        return None
 
 
 def _build_response(
-    *, client: AuthenticatedClient | Client, response: httpx.Response
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
 ) -> Response[list[AvailableInfiniGramIndexId]]:
     return Response(
         status_code=HTTPStatus(response.status_code),
@@ -48,7 +49,7 @@ def _build_response(
 
 def sync_detailed(
     *,
-    client: AuthenticatedClient | Client,
+    client: Union[AuthenticatedClient, Client],
 ) -> Response[list[AvailableInfiniGramIndexId]]:
     """Get Available Indexes
 
@@ -71,8 +72,8 @@ def sync_detailed(
 
 def sync(
     *,
-    client: AuthenticatedClient | Client,
-) -> list[AvailableInfiniGramIndexId] | None:
+    client: Union[AuthenticatedClient, Client],
+) -> Optional[list[AvailableInfiniGramIndexId]]:
     """Get Available Indexes
 
     Raises:
@@ -90,7 +91,7 @@ def sync(
 
 async def asyncio_detailed(
     *,
-    client: AuthenticatedClient | Client,
+    client: Union[AuthenticatedClient, Client],
 ) -> Response[list[AvailableInfiniGramIndexId]]:
     """Get Available Indexes
 
@@ -111,8 +112,8 @@ async def asyncio_detailed(
 
 async def asyncio(
     *,
-    client: AuthenticatedClient | Client,
-) -> list[AvailableInfiniGramIndexId] | None:
+    client: Union[AuthenticatedClient, Client],
+) -> Optional[list[AvailableInfiniGramIndexId]]:
     """Get Available Indexes
 
     Raises: