athena-intelligence 0.1.83__py3-none-any.whl → 0.1.85__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (55) hide show
  1. athena/__init__.py +2 -0
  2. athena/chain/client.py +17 -8
  3. athena/client.py +91 -4
  4. athena/core/__init__.py +4 -1
  5. athena/core/client_wrapper.py +1 -1
  6. athena/core/pydantic_utilities.py +16 -0
  7. athena/core/query_encoder.py +33 -0
  8. athena/dataset/client.py +27 -22
  9. athena/message/client.py +17 -8
  10. athena/query/client.py +9 -4
  11. athena/report/client.py +9 -4
  12. athena/search/client.py +9 -4
  13. athena/snippet/client.py +35 -26
  14. athena/tools/client.py +246 -78
  15. athena/types/__init__.py +2 -0
  16. athena/types/athena_document_v_2_out.py +29 -0
  17. athena/types/convert_pdf_to_sheet_out.py +7 -3
  18. athena/types/data_frame_parsing_error.py +7 -3
  19. athena/types/data_frame_request_out.py +7 -3
  20. athena/types/data_frame_unknown_format_error.py +7 -3
  21. athena/types/dataset.py +7 -3
  22. athena/types/document.py +7 -3
  23. athena/types/excecute_tool_first_workflow_out.py +7 -3
  24. athena/types/file_data_response.py +7 -3
  25. athena/types/file_fetch_error.py +7 -3
  26. athena/types/filter_model.py +7 -3
  27. athena/types/firecrawl_scrape_url_data_reponse_dto.py +7 -3
  28. athena/types/firecrawl_scrape_url_metadata.py +7 -3
  29. athena/types/get_datasets_response.py +7 -3
  30. athena/types/get_snippet_out.py +7 -3
  31. athena/types/get_snippets_response.py +7 -3
  32. athena/types/http_validation_error.py +7 -3
  33. athena/types/langchain_documents_request_out.py +7 -3
  34. athena/types/map_reduce_chain_out.py +7 -3
  35. athena/types/message_out.py +7 -3
  36. athena/types/message_out_dto.py +7 -3
  37. athena/types/publish_formats.py +7 -3
  38. athena/types/query_model.py +8 -3
  39. athena/types/report.py +7 -3
  40. athena/types/researcher_out.py +7 -3
  41. athena/types/semantic_query_out.py +7 -3
  42. athena/types/snippet.py +7 -3
  43. athena/types/sql_results.py +7 -3
  44. athena/types/structured_parse_result.py +7 -3
  45. athena/types/time_dimension_model.py +7 -3
  46. athena/types/upload_documents_out.py +7 -3
  47. athena/types/url_result.py +7 -3
  48. athena/types/validation_error.py +7 -3
  49. athena/types/workflow_status_out.py +7 -3
  50. athena/upload/client.py +9 -4
  51. athena/workflow/client.py +9 -4
  52. {athena_intelligence-0.1.83.dist-info → athena_intelligence-0.1.85.dist-info}/METADATA +12 -2
  53. athena_intelligence-0.1.85.dist-info/RECORD +92 -0
  54. athena_intelligence-0.1.83.dist-info/RECORD +0 -90
  55. {athena_intelligence-0.1.83.dist-info → athena_intelligence-0.1.85.dist-info}/WHEEL +0 -0
athena/types/document.py CHANGED
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class Document(pydantic_v1.BaseModel):
@@ -21,8 +21,12 @@ class Document(pydantic_v1.BaseModel):
21
21
  return super().json(**kwargs_with_defaults)
22
22
 
23
23
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
24
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
25
- return super().dict(**kwargs_with_defaults)
24
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
25
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
26
+
27
+ return deep_union_pydantic_dicts(
28
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
29
+ )
26
30
 
27
31
  class Config:
28
32
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class ExcecuteToolFirstWorkflowOut(pydantic_v1.BaseModel):
@@ -15,8 +15,12 @@ class ExcecuteToolFirstWorkflowOut(pydantic_v1.BaseModel):
15
15
  return super().json(**kwargs_with_defaults)
16
16
 
17
17
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
18
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
- return super().dict(**kwargs_with_defaults)
18
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
20
+
21
+ return deep_union_pydantic_dicts(
22
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
23
+ )
20
24
 
21
25
  class Config:
22
26
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class FileDataResponse(pydantic_v1.BaseModel):
@@ -22,8 +22,12 @@ class FileDataResponse(pydantic_v1.BaseModel):
22
22
  return super().json(**kwargs_with_defaults)
23
23
 
24
24
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
25
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
26
- return super().dict(**kwargs_with_defaults)
25
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
26
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
27
+
28
+ return deep_union_pydantic_dicts(
29
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
30
+ )
27
31
 
28
32
  class Config:
29
33
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class FileFetchError(pydantic_v1.BaseModel):
@@ -16,8 +16,12 @@ class FileFetchError(pydantic_v1.BaseModel):
16
16
  return super().json(**kwargs_with_defaults)
17
17
 
18
18
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
19
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
20
- return super().dict(**kwargs_with_defaults)
19
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
20
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
21
+
22
+ return deep_union_pydantic_dicts(
23
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
24
+ )
21
25
 
22
26
  class Config:
23
27
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
  from .filter_operator import FilterOperator
9
9
 
10
10
 
@@ -18,8 +18,12 @@ class FilterModel(pydantic_v1.BaseModel):
18
18
  return super().json(**kwargs_with_defaults)
19
19
 
20
20
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
21
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
- return super().dict(**kwargs_with_defaults)
21
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
23
+
24
+ return deep_union_pydantic_dicts(
25
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
26
+ )
23
27
 
24
28
  class Config:
25
29
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
  from .firecrawl_scrape_url_metadata import FirecrawlScrapeUrlMetadata
9
9
 
10
10
 
@@ -18,8 +18,12 @@ class FirecrawlScrapeUrlDataReponseDto(pydantic_v1.BaseModel):
18
18
  return super().json(**kwargs_with_defaults)
19
19
 
20
20
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
21
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
- return super().dict(**kwargs_with_defaults)
21
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
23
+
24
+ return deep_union_pydantic_dicts(
25
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
26
+ )
23
27
 
24
28
  class Config:
25
29
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class FirecrawlScrapeUrlMetadata(pydantic_v1.BaseModel):
@@ -18,8 +18,12 @@ class FirecrawlScrapeUrlMetadata(pydantic_v1.BaseModel):
18
18
  return super().json(**kwargs_with_defaults)
19
19
 
20
20
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
21
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
- return super().dict(**kwargs_with_defaults)
21
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
23
+
24
+ return deep_union_pydantic_dicts(
25
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
26
+ )
23
27
 
24
28
  class Config:
25
29
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
  from .dataset import Dataset
9
9
 
10
10
 
@@ -20,8 +20,12 @@ class GetDatasetsResponse(pydantic_v1.BaseModel):
20
20
  return super().json(**kwargs_with_defaults)
21
21
 
22
22
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
23
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
24
- return super().dict(**kwargs_with_defaults)
23
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
24
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
25
+
26
+ return deep_union_pydantic_dicts(
27
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
28
+ )
25
29
 
26
30
  class Config:
27
31
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class GetSnippetOut(pydantic_v1.BaseModel):
@@ -15,8 +15,12 @@ class GetSnippetOut(pydantic_v1.BaseModel):
15
15
  return super().json(**kwargs_with_defaults)
16
16
 
17
17
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
18
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
- return super().dict(**kwargs_with_defaults)
18
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
20
+
21
+ return deep_union_pydantic_dicts(
22
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
23
+ )
20
24
 
21
25
  class Config:
22
26
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
  from .snippet import Snippet
9
9
 
10
10
 
@@ -20,8 +20,12 @@ class GetSnippetsResponse(pydantic_v1.BaseModel):
20
20
  return super().json(**kwargs_with_defaults)
21
21
 
22
22
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
23
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
24
- return super().dict(**kwargs_with_defaults)
23
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
24
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
25
+
26
+ return deep_union_pydantic_dicts(
27
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
28
+ )
25
29
 
26
30
  class Config:
27
31
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
  from .validation_error import ValidationError
9
9
 
10
10
 
@@ -16,8 +16,12 @@ class HttpValidationError(pydantic_v1.BaseModel):
16
16
  return super().json(**kwargs_with_defaults)
17
17
 
18
18
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
19
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
20
- return super().dict(**kwargs_with_defaults)
19
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
20
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
21
+
22
+ return deep_union_pydantic_dicts(
23
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
24
+ )
21
25
 
22
26
  class Config:
23
27
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class LangchainDocumentsRequestOut(pydantic_v1.BaseModel):
@@ -15,8 +15,12 @@ class LangchainDocumentsRequestOut(pydantic_v1.BaseModel):
15
15
  return super().json(**kwargs_with_defaults)
16
16
 
17
17
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
18
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
- return super().dict(**kwargs_with_defaults)
18
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
20
+
21
+ return deep_union_pydantic_dicts(
22
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
23
+ )
20
24
 
21
25
  class Config:
22
26
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
  from .document import Document
9
9
 
10
10
 
@@ -18,8 +18,12 @@ class MapReduceChainOut(pydantic_v1.BaseModel):
18
18
  return super().json(**kwargs_with_defaults)
19
19
 
20
20
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
21
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
- return super().dict(**kwargs_with_defaults)
21
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
23
+
24
+ return deep_union_pydantic_dicts(
25
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
26
+ )
23
27
 
24
28
  class Config:
25
29
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class MessageOut(pydantic_v1.BaseModel):
@@ -15,8 +15,12 @@ class MessageOut(pydantic_v1.BaseModel):
15
15
  return super().json(**kwargs_with_defaults)
16
16
 
17
17
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
18
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
- return super().dict(**kwargs_with_defaults)
18
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
20
+
21
+ return deep_union_pydantic_dicts(
22
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
23
+ )
20
24
 
21
25
  class Config:
22
26
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
  from .status_enum import StatusEnum
9
9
 
10
10
 
@@ -21,8 +21,12 @@ class MessageOutDto(pydantic_v1.BaseModel):
21
21
  return super().json(**kwargs_with_defaults)
22
22
 
23
23
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
24
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
25
- return super().dict(**kwargs_with_defaults)
24
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
25
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
26
+
27
+ return deep_union_pydantic_dicts(
28
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
29
+ )
26
30
 
27
31
  class Config:
28
32
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class PublishFormats(pydantic_v1.BaseModel):
@@ -17,8 +17,12 @@ class PublishFormats(pydantic_v1.BaseModel):
17
17
  return super().json(**kwargs_with_defaults)
18
18
 
19
19
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
20
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
21
- return super().dict(**kwargs_with_defaults)
20
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
21
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
22
+
23
+ return deep_union_pydantic_dicts(
24
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
25
+ )
22
26
 
23
27
  class Config:
24
28
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
  from .filter_model import FilterModel
9
9
  from .time_dimension_model import TimeDimensionModel
10
10
 
@@ -16,6 +16,7 @@ class QueryModel(pydantic_v1.BaseModel):
16
16
  )
17
17
  dimensions: typing.Optional[typing.List[str]] = None
18
18
  filters: typing.Optional[typing.List[FilterModel]] = None
19
+ order: typing.Optional[typing.Dict[str, typing.Any]] = None
19
20
  limit: typing.Optional[int] = None
20
21
 
21
22
  def json(self, **kwargs: typing.Any) -> str:
@@ -23,8 +24,12 @@ class QueryModel(pydantic_v1.BaseModel):
23
24
  return super().json(**kwargs_with_defaults)
24
25
 
25
26
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
26
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
27
- return super().dict(**kwargs_with_defaults)
27
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
28
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
29
+
30
+ return deep_union_pydantic_dicts(
31
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
32
+ )
28
33
 
29
34
  class Config:
30
35
  frozen = True
athena/types/report.py CHANGED
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class Report(pydantic_v1.BaseModel):
@@ -18,8 +18,12 @@ class Report(pydantic_v1.BaseModel):
18
18
  return super().json(**kwargs_with_defaults)
19
19
 
20
20
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
21
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
- return super().dict(**kwargs_with_defaults)
21
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
22
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
23
+
24
+ return deep_union_pydantic_dicts(
25
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
26
+ )
23
27
 
24
28
  class Config:
25
29
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class ResearcherOut(pydantic_v1.BaseModel):
@@ -15,8 +15,12 @@ class ResearcherOut(pydantic_v1.BaseModel):
15
15
  return super().json(**kwargs_with_defaults)
16
16
 
17
17
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
18
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
- return super().dict(**kwargs_with_defaults)
18
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
20
+
21
+ return deep_union_pydantic_dicts(
22
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
23
+ )
20
24
 
21
25
  class Config:
22
26
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class SemanticQueryOut(pydantic_v1.BaseModel):
@@ -15,8 +15,12 @@ class SemanticQueryOut(pydantic_v1.BaseModel):
15
15
  return super().json(**kwargs_with_defaults)
16
16
 
17
17
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
18
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
- return super().dict(**kwargs_with_defaults)
18
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
20
+
21
+ return deep_union_pydantic_dicts(
22
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
23
+ )
20
24
 
21
25
  class Config:
22
26
  frozen = True
athena/types/snippet.py CHANGED
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class Snippet(pydantic_v1.BaseModel):
@@ -21,8 +21,12 @@ class Snippet(pydantic_v1.BaseModel):
21
21
  return super().json(**kwargs_with_defaults)
22
22
 
23
23
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
24
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
25
- return super().dict(**kwargs_with_defaults)
24
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
25
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
26
+
27
+ return deep_union_pydantic_dicts(
28
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
29
+ )
26
30
 
27
31
  class Config:
28
32
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class SqlResults(pydantic_v1.BaseModel):
@@ -15,8 +15,12 @@ class SqlResults(pydantic_v1.BaseModel):
15
15
  return super().json(**kwargs_with_defaults)
16
16
 
17
17
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
18
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
- return super().dict(**kwargs_with_defaults)
18
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
20
+
21
+ return deep_union_pydantic_dicts(
22
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
23
+ )
20
24
 
21
25
  class Config:
22
26
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class StructuredParseResult(pydantic_v1.BaseModel):
@@ -15,8 +15,12 @@ class StructuredParseResult(pydantic_v1.BaseModel):
15
15
  return super().json(**kwargs_with_defaults)
16
16
 
17
17
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
18
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
- return super().dict(**kwargs_with_defaults)
18
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
20
+
21
+ return deep_union_pydantic_dicts(
22
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
23
+ )
20
24
 
21
25
  class Config:
22
26
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class TimeDimensionModel(pydantic_v1.BaseModel):
@@ -17,8 +17,12 @@ class TimeDimensionModel(pydantic_v1.BaseModel):
17
17
  return super().json(**kwargs_with_defaults)
18
18
 
19
19
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
20
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
21
- return super().dict(**kwargs_with_defaults)
20
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
21
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
22
+
23
+ return deep_union_pydantic_dicts(
24
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
25
+ )
22
26
 
23
27
  class Config:
24
28
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
  from .file_data_response import FileDataResponse
9
9
 
10
10
 
@@ -17,8 +17,12 @@ class UploadDocumentsOut(pydantic_v1.BaseModel):
17
17
  return super().json(**kwargs_with_defaults)
18
18
 
19
19
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
20
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
21
- return super().dict(**kwargs_with_defaults)
20
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
21
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
22
+
23
+ return deep_union_pydantic_dicts(
24
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
25
+ )
22
26
 
23
27
  class Config:
24
28
  frozen = True
@@ -4,7 +4,7 @@ import datetime as dt
4
4
  import typing
5
5
 
6
6
  from ..core.datetime_utils import serialize_datetime
7
- from ..core.pydantic_utilities import pydantic_v1
7
+ from ..core.pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
8
8
 
9
9
 
10
10
  class UrlResult(pydantic_v1.BaseModel):
@@ -15,8 +15,12 @@ class UrlResult(pydantic_v1.BaseModel):
15
15
  return super().json(**kwargs_with_defaults)
16
16
 
17
17
  def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
18
- kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
- return super().dict(**kwargs_with_defaults)
18
+ kwargs_with_defaults_exclude_unset: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
19
+ kwargs_with_defaults_exclude_none: typing.Any = {"by_alias": True, "exclude_none": True, **kwargs}
20
+
21
+ return deep_union_pydantic_dicts(
22
+ super().dict(**kwargs_with_defaults_exclude_unset), super().dict(**kwargs_with_defaults_exclude_none)
23
+ )
20
24
 
21
25
  class Config:
22
26
  frozen = True