athena-intelligence 0.1.124__py3-none-any.whl → 0.1.126__py3-none-any.whl

athena/types/file_chunk_request_out.py

@@ -1,34 +1,24 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 from .document_chunk import DocumentChunk
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
 
 
-class FileChunkRequestOut(pydantic_v1.BaseModel):
+class FileChunkRequestOut(UniversalBaseModel):
     """
     Response model for a file chunk.
     """
 
     chunks: typing.Dict[str, typing.List[DocumentChunk]]
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/file_too_large_error.py

@@ -1,29 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import typing
+import pydantic
 
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 
-
-class FileTooLargeError(pydantic_v1.BaseModel):
+class FileTooLargeError(UniversalBaseModel):
     message: str
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/folder_response.py

@@ -1,14 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 from .asset_node import AssetNode
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
 
 
-class FolderResponse(pydantic_v1.BaseModel):
+class FolderResponse(UniversalBaseModel):
     """
     Combined response with tree data and visualization.
     """
@@ -16,20 +15,11 @@ class FolderResponse(pydantic_v1.BaseModel):
     structure_tree_ascii: str
     tree_data: typing.Dict[str, AssetNode]
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/general_agent_config.py

@@ -1,14 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 from .general_agent_config_enabled_tools_item import GeneralAgentConfigEnabledToolsItem
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
 
 
-class GeneralAgentConfig(pydantic_v1.BaseModel):
+class GeneralAgentConfig(UniversalBaseModel):
     """
     Configurable fields for the agent.
     """
@@ -17,20 +16,11 @@ class GeneralAgentConfig(pydantic_v1.BaseModel):
     knowledge_base_asset_ids: typing.Optional[typing.List[str]] = None
     system_prompt: typing.Optional[str] = None
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/general_agent_config_enabled_tools_item.py

@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-
 from .tool import Tool
 
 GeneralAgentConfigEnabledToolsItem = typing.Union[Tool, str]

athena/types/general_agent_request.py

@@ -1,38 +1,28 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
-import typing
-
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
+from ..core.pydantic_utilities import UniversalBaseModel
 from .general_agent_config import GeneralAgentConfig
+import typing
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class GeneralAgentRequest(pydantic_v1.BaseModel):
+class GeneralAgentRequest(UniversalBaseModel):
     """
     A chat request for the Athena SDK.
     """
 
     config: GeneralAgentConfig
-    messages: typing.List[typing.Any] = pydantic_v1.Field()
+    messages: typing.List[typing.Optional[typing.Any]] = pydantic.Field()
     """
     The messages to send to the agent. Each message should be a string (for text inputs) or a list of multimodal content parts.
     """
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/general_agent_response.py

@@ -1,33 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
 import typing
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
 
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 
-
-class GeneralAgentResponse(pydantic_v1.BaseModel):
+class GeneralAgentResponse(UniversalBaseModel):
     """
     The response from the agent.
     """
 
-    messages: typing.List[typing.Dict[str, typing.Any]]
-
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
+    messages: typing.List[typing.Dict[str, typing.Optional[typing.Any]]]
 
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/image_url_content.py

@@ -1,33 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
 import typing
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
 
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 
-
-class ImageUrlContent(pydantic_v1.BaseModel):
+class ImageUrlContent(UniversalBaseModel):
     """
     An image content item.
     """
 
     image_url: typing.Dict[str, str]
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/parent_folder_error.py

@@ -1,29 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import typing
+import pydantic
 
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 
-
-class ParentFolderError(pydantic_v1.BaseModel):
+class ParentFolderError(UniversalBaseModel):
     message: str
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/prompt_message.py

@@ -1,14 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
-import typing
-
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
+from ..core.pydantic_utilities import UniversalBaseModel
 from .type import Type
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import typing
+import pydantic
 
 
-class PromptMessage(pydantic_v1.BaseModel):
+class PromptMessage(UniversalBaseModel):
     """
     A message to use for the structured data extractor.
     """
@@ -16,20 +15,11 @@ class PromptMessage(pydantic_v1.BaseModel):
     content: str
     type: Type
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/research_agent_response.py

@@ -1,32 +1,22 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
 import typing
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 
-
-class ResearchAgentResponse(pydantic_v1.BaseModel):
-    findings: typing.Dict[str, typing.Any] = pydantic_v1.Field()
+class ResearchAgentResponse(UniversalBaseModel):
+    findings: typing.Dict[str, typing.Optional[typing.Any]] = pydantic.Field()
     """
     Research findings and compiled information
     """
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/save_asset_request_out.py

@@ -1,33 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import typing
+import pydantic
 
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 
-
-class SaveAssetRequestOut(pydantic_v1.BaseModel):
+class SaveAssetRequestOut(UniversalBaseModel):
     """
     Response model asset information representation.
     """
 
     asset_id: str
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/sql_agent_response.py

@@ -1,37 +1,27 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
 import typing
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 
-
-class SqlAgentResponse(pydantic_v1.BaseModel):
-    metadata: typing.Dict[str, typing.Any] = pydantic_v1.Field()
+class SqlAgentResponse(UniversalBaseModel):
+    metadata: typing.Dict[str, typing.Optional[typing.Any]] = pydantic.Field()
     """
     Additional metadata about the generated query
     """
 
-    query_asset_id: str = pydantic_v1.Field()
+    query_asset_id: str = pydantic.Field()
     """
     The asset ID of the generated SQL query object
     """
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

athena/types/structured_data_extractor_response.py

@@ -1,42 +1,32 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import datetime as dt
+from ..core.pydantic_utilities import UniversalBaseModel
 import typing
-
-from ..core.datetime_utils import serialize_datetime
-from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
 from .chunk_result import ChunkResult
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
-class StructuredDataExtractorResponse(pydantic_v1.BaseModel):
+class StructuredDataExtractorResponse(UniversalBaseModel):
     """
     The agent's response.
     """
 
-    chunk_by_chunk_data: typing.Optional[typing.List[ChunkResult]] = pydantic_v1.Field(default=None)
+    chunk_by_chunk_data: typing.Optional[typing.List[ChunkResult]] = pydantic.Field(default=None)
     """
-    The extracted structured data for each chunk. A list where each element is guaranteed to match `json_schema`.
+    The extracted structured data for each chunk.  A list where each element is guaranteed to match `json_schema`.
     """
 
-    reduced_data: typing.Optional[typing.Dict[str, typing.Any]] = pydantic_v1.Field(default=None)
+    reduced_data: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = pydantic.Field(default=None)
     """
-    If reduce is True, the reduced structured data, otherwise null. Guaranteed to match `json_schema`.
+    If reduce is True, the reduced structured data, otherwise null.  Guaranteed to match `json_schema`.
     """
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
-
-        return deep_union_pydantic_dicts(
-            super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
-        )
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
+    else:
 
-    class Config:
-        frozen = True
-        smart_union = True
-        extra = pydantic_v1.Extra.allow
-        json_encoders = {dt.datetime: serialize_datetime}
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow