mixpeek 0.6.7__py3-none-any.whl → 0.6.8__py3-none-any.whl

mixpeek/storage/client.py

@@ -7,6 +7,7 @@ from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError
 from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pydantic_utilities import pydantic_v1
 from ..core.remove_none_from_dict import remove_none_from_dict
 from ..core.request_options import RequestOptions
 from ..errors.bad_request_error import BadRequestError
@@ -19,11 +20,6 @@ from ..types.error_response import ErrorResponse
 from ..types.http_validation_error import HttpValidationError
 from .sample.client import AsyncSampleClient, SampleClient
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
-
 
 class StorageClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
@@ -65,19 +61,21 @@ class StorageClient:
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(typing.Any, _response.json())  # type: ignore
         if _response.status_code == 400:
-            raise BadRequestError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise BadRequestError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 401:
-            raise UnauthorizedError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise UnauthorizedError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 403:
-            raise ForbiddenError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise ForbiddenError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 404:
-            raise NotFoundError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise NotFoundError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         if _response.status_code == 500:
-            raise InternalServerError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise InternalServerError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         try:
             _response_json = _response.json()
         except JSONDecodeError:
@@ -125,19 +123,21 @@ class AsyncStorageClient:
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(typing.Any, _response.json())  # type: ignore
         if _response.status_code == 400:
-            raise BadRequestError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise BadRequestError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 401:
-            raise UnauthorizedError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise UnauthorizedError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 403:
-            raise ForbiddenError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise ForbiddenError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 404:
-            raise NotFoundError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise NotFoundError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         if _response.status_code == 500:
-            raise InternalServerError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise InternalServerError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         try:
             _response_json = _response.json()
         except JSONDecodeError:

mixpeek/storage/sample/client.py

@@ -7,6 +7,7 @@ from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError
 from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pydantic_utilities import pydantic_v1
 from ...core.remove_none_from_dict import remove_none_from_dict
 from ...core.request_options import RequestOptions
 from ...errors.bad_request_error import BadRequestError
@@ -18,11 +19,6 @@ from ...errors.unprocessable_entity_error import UnprocessableEntityError
 from ...types.error_response import ErrorResponse
 from ...types.http_validation_error import HttpValidationError
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
-
 
 class SampleClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
@@ -69,19 +65,21 @@ class SampleClient:
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(typing.Any, _response.json())  # type: ignore
         if _response.status_code == 400:
-            raise BadRequestError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise BadRequestError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 401:
-            raise UnauthorizedError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise UnauthorizedError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 403:
-            raise ForbiddenError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise ForbiddenError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 404:
-            raise NotFoundError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise NotFoundError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         if _response.status_code == 500:
-            raise InternalServerError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise InternalServerError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         try:
             _response_json = _response.json()
         except JSONDecodeError:
@@ -132,19 +130,21 @@ class SampleClient:
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(typing.Any, _response.json())  # type: ignore
         if _response.status_code == 400:
-            raise BadRequestError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise BadRequestError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 401:
-            raise UnauthorizedError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise UnauthorizedError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 403:
-            raise ForbiddenError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise ForbiddenError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 404:
-            raise NotFoundError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise NotFoundError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         if _response.status_code == 500:
-            raise InternalServerError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise InternalServerError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         try:
             _response_json = _response.json()
         except JSONDecodeError:
@@ -199,19 +199,21 @@ class AsyncSampleClient:
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(typing.Any, _response.json())  # type: ignore
         if _response.status_code == 400:
-            raise BadRequestError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise BadRequestError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 401:
-            raise UnauthorizedError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise UnauthorizedError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 403:
-            raise ForbiddenError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise ForbiddenError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 404:
-            raise NotFoundError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise NotFoundError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         if _response.status_code == 500:
-            raise InternalServerError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise InternalServerError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         try:
             _response_json = _response.json()
         except JSONDecodeError:
@@ -262,19 +264,21 @@ class AsyncSampleClient:
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(typing.Any, _response.json())  # type: ignore
         if _response.status_code == 400:
-            raise BadRequestError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise BadRequestError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 401:
-            raise UnauthorizedError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise UnauthorizedError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 403:
-            raise ForbiddenError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise ForbiddenError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 404:
-            raise NotFoundError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise NotFoundError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         if _response.status_code == 500:
-            raise InternalServerError(pydantic.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
+            raise InternalServerError(pydantic_v1.parse_obj_as(ErrorResponse, _response.json()))  # type: ignore
         try:
             _response_json = _response.json()
         except JSONDecodeError:

mixpeek/types/api_key.py

@@ -4,14 +4,10 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class ApiKey(pydantic.BaseModel):
+class ApiKey(pydantic_v1.BaseModel):
     key: typing.Optional[str] = None
     name: typing.Optional[str] = None
     created_at: typing.Optional[dt.datetime] = None
@@ -27,5 +23,5 @@ class ApiKey(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/audio_params.py

@@ -4,14 +4,10 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class AudioParams(pydantic.BaseModel):
+class AudioParams(pydantic_v1.BaseModel):
     interval_range: typing.Optional[int] = None
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -25,5 +21,5 @@ class AudioParams(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/configs_response.py

@@ -4,25 +4,21 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class ConfigsResponse(pydantic.BaseModel):
-    dimensions: int = pydantic.Field()
+class ConfigsResponse(pydantic_v1.BaseModel):
+    dimensions: int = pydantic_v1.Field()
     """
     The dimensions of the processed data.
     """
 
-    elapsed_time: float = pydantic.Field()
+    elapsed_time: float = pydantic_v1.Field()
     """
     The time taken to process the data.
     """
 
-    token_size: int = pydantic.Field()
+    token_size: int = pydantic_v1.Field()
     """
     The size of the tokens in the processed data.
     """
@@ -38,5 +34,5 @@ class ConfigsResponse(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/connection.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .connection_engine import ConnectionEngine
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class Connection(pydantic.BaseModel):
+class Connection(pydantic_v1.BaseModel):
     engine: ConnectionEngine
     host: str
     port: typing.Optional[int] = None
@@ -32,5 +28,5 @@ class Connection(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/csv_params.py

@@ -4,14 +4,10 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class CsvParams(pydantic.BaseModel):
+class CsvParams(pydantic_v1.BaseModel):
     include_header: typing.Optional[bool] = None
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -25,5 +21,5 @@ class CsvParams(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/destination.py

@@ -4,25 +4,21 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class Destination(pydantic.BaseModel):
-    collection: str = pydantic.Field()
+class Destination(pydantic_v1.BaseModel):
+    collection: str = pydantic_v1.Field()
     """
     The collection name
     """
 
-    field: str = pydantic.Field()
+    field: str = pydantic_v1.Field()
     """
     The field name
     """
 
-    embedding: str = pydantic.Field()
+    embedding: str = pydantic_v1.Field()
     """
     The embedding
     """
@@ -38,5 +34,5 @@ class Destination(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/embedding_response.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class EmbeddingResponse(pydantic.BaseModel):
-    embedding: typing.List[float] = pydantic.Field()
+class EmbeddingResponse(pydantic_v1.BaseModel):
+    embedding: typing.List[float] = pydantic_v1.Field()
     """
     The embedding of the processed data.
     """
@@ -30,5 +26,5 @@ class EmbeddingResponse(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/error_message.py

@@ -4,14 +4,10 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class ErrorMessage(pydantic.BaseModel):
+class ErrorMessage(pydantic_v1.BaseModel):
     msg: str
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -25,5 +21,5 @@ class ErrorMessage(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/error_response.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .error_message import ErrorMessage
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class ErrorResponse(pydantic.BaseModel):
+class ErrorResponse(pydantic_v1.BaseModel):
     detail: typing.Optional[typing.List[ErrorMessage]] = None
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -26,5 +22,5 @@ class ErrorResponse(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/extract_response.py

@@ -4,16 +4,12 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class ExtractResponse(pydantic.BaseModel):
+class ExtractResponse(pydantic_v1.BaseModel):
     output: typing.Any
-    metadata: typing.Dict[str, typing.Any] = pydantic.Field()
+    metadata: typing.Dict[str, typing.Any] = pydantic_v1.Field()
     """
     Metadata related to the extraction process.
     """
@@ -31,5 +27,5 @@ class ExtractResponse(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/generation_response.py

@@ -4,16 +4,12 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .metadata import Metadata
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class GenerationResponse(pydantic.BaseModel):
-    response: typing.Dict[str, typing.Any] = pydantic.Field()
+class GenerationResponse(pydantic_v1.BaseModel):
+    response: typing.Dict[str, typing.Any] = pydantic_v1.Field()
     """
     The response from the generation.
     """
@@ -32,5 +28,5 @@ class GenerationResponse(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/html_params.py

@@ -4,14 +4,10 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class HtmlParams(pydantic.BaseModel):
+class HtmlParams(pydantic_v1.BaseModel):
     skip_headers_and_footers: typing.Optional[bool] = None
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -25,5 +21,5 @@ class HtmlParams(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/http_validation_error.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .validation_error import ValidationError
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class HttpValidationError(pydantic.BaseModel):
+class HttpValidationError(pydantic_v1.BaseModel):
     detail: typing.Optional[typing.List[ValidationError]] = None
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -26,5 +22,5 @@ class HttpValidationError(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/image_params.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class ImageParams(pydantic.BaseModel):
-    strategy: typing.Optional[str] = pydantic.Field(default=None)
+class ImageParams(pydantic_v1.BaseModel):
+    strategy: typing.Optional[str] = pydantic_v1.Field(default=None)
     """
     The strategy to use for parsing the image. Valid strategies are 'ocr', 'object', and 'auto'.
     """
@@ -28,5 +24,5 @@ class ImageParams(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/message.py

@@ -4,20 +4,16 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class Message(pydantic.BaseModel):
-    role: str = pydantic.Field()
+class Message(pydantic_v1.BaseModel):
+    role: str = pydantic_v1.Field()
     """
     The role of the message sender.
     """
 
-    content: str = pydantic.Field()
+    content: str = pydantic_v1.Field()
     """
     The content of the message.
     """
@@ -33,5 +29,5 @@ class Message(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

mixpeek/types/metadata.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .model import Model
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class Metadata(pydantic.BaseModel):
+class Metadata(pydantic_v1.BaseModel):
     total_tokens: typing.Optional[int] = None
     generation_id: typing.Optional[str] = None
     model: typing.Optional[Model] = None
@@ -28,5 +24,5 @@ class Metadata(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
-        extra = pydantic.Extra.allow
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}