From e27b38c3cd97a6cb27d15a5245ae0ad9e6f9dd71 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:39:27 -0700 Subject: [PATCH] chore: speakeasy sdk regeneration - Generate (#13) * ci: regenerated with OpenAPI Doc 1.0.0, Speakeay CLI 1.30.1 * ci: regenerated with OpenAPI Doc 1.0.0, Speakeay CLI 1.31.1 * ci: regenerated with OpenAPI Doc 1.0.0, Speakeay CLI 1.32.0 * ci: regenerated with OpenAPI Doc 1.0.0, Speakeay CLI 1.33.2 * ci: regenerated with OpenAPI Doc 1.0.0, Speakeay CLI 1.34.0 * ci: regenerated with OpenAPI Doc 1.0.0, Speakeay CLI 1.35.0 --------- Co-authored-by: speakeasybot --- README.md | 2 +- RELEASES.md | 50 +++++++++++++++- USAGE.md | 2 +- docs/hightouch/README.md | 50 ++++++++-------- files.gen | 8 +-- gen.yaml | 6 +- setup.py | 2 +- src/hightouch/models/operations/__init__.py | 2 +- .../models/operations/createdestination.py | 4 +- .../models/operations/createmodel.py | 4 +- .../models/operations/createsource.py | 4 +- src/hightouch/models/operations/createsync.py | 4 +- .../models/operations/listdestination.py | 4 +- src/hightouch/models/operations/listmodel.py | 4 +- src/hightouch/models/operations/listsource.py | 4 +- src/hightouch/models/operations/listsync.py | 4 +- .../models/operations/listsyncruns.py | 4 +- .../models/operations/updatedestination.py | 4 +- .../models/operations/updatemodel.py | 4 +- .../models/operations/updatesource.py | 4 +- src/hightouch/models/operations/updatesync.py | 4 +- src/hightouch/models/shared/__init__.py | 10 ++-- ...ererror_enum.py => internalservererror.py} | 2 +- src/hightouch/models/shared/interval.py | 4 +- .../{intervalunit_enum.py => intervalunit.py} | 2 +- src/hightouch/models/shared/sync.py | 4 +- src/hightouch/models/shared/syncrun.py | 4 +- ...syncrunstatus_enum.py => syncrunstatus.py} | 2 +- .../{syncstatus_enum.py => syncstatus.py} | 2 +- .../models/shared/validateerrorjson.py | 4 +- src/hightouch/sdk.py | 58 +++++++++---------- src/hightouch/utils/utils.py | 18 +++--- 32 files changed, 166 insertions(+), 118 deletions(-) rename src/hightouch/models/shared/{internalservererror_enum.py => internalservererror.py} (83%) rename src/hightouch/models/shared/{intervalunit_enum.py => intervalunit.py} (85%) rename src/hightouch/models/shared/{syncrunstatus_enum.py => syncrunstatus.py} (91%) rename src/hightouch/models/shared/{syncstatus_enum.py => syncstatus.py} (92%) diff --git a/README.md b/README.md index fca6935..5796fc7 100755 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ req = shared.DestinationCreate( ) res = s.create_destination(req, operations.CreateDestinationSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.create_destination_200_application_json_any_of is not None: diff --git a/RELEASES.md b/RELEASES.md index 8e477ac..41e3503 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -358,4 +358,52 @@ Based on: - OpenAPI Doc 1.0.0 https://api.hightouch.io/api/swagger.json - Speakeasy CLI 1.30.0 https://github.com/speakeasy-api/speakeasy ### Releases -- [PyPI v1.26.0] https://pypi.org/project/hightouch/1.26.0 - . \ No newline at end of file +- [PyPI v1.26.0] https://pypi.org/project/hightouch/1.26.0 - . + +## 2023-05-12 01:09:27 +### Changes +Based on: +- OpenAPI Doc 1.0.0 https://api.hightouch.io/api/swagger.json +- Speakeasy CLI 1.30.1 https://github.com/speakeasy-api/speakeasy +### Releases +- [PyPI v1.26.1] https://pypi.org/project/hightouch/1.26.1 - . + +## 2023-05-13 01:06:54 +### Changes +Based on: +- OpenAPI Doc 1.0.0 https://api.hightouch.io/api/swagger.json +- Speakeasy CLI 1.31.1 https://github.com/speakeasy-api/speakeasy +### Releases +- [PyPI v1.27.0] https://pypi.org/project/hightouch/1.27.0 - . + +## 2023-05-16 01:10:24 +### Changes +Based on: +- OpenAPI Doc 1.0.0 https://api.hightouch.io/api/swagger.json +- Speakeasy CLI 1.32.0 https://github.com/speakeasy-api/speakeasy +### Releases +- [PyPI v1.28.0] https://pypi.org/project/hightouch/1.28.0 - . + +## 2023-05-17 01:11:56 +### Changes +Based on: +- OpenAPI Doc 1.0.0 https://api.hightouch.io/api/swagger.json +- Speakeasy CLI 1.33.2 https://github.com/speakeasy-api/speakeasy +### Releases +- [PyPI v1.29.0] https://pypi.org/project/hightouch/1.29.0 - . + +## 2023-05-18 01:09:08 +### Changes +Based on: +- OpenAPI Doc 1.0.0 https://api.hightouch.io/api/swagger.json +- Speakeasy CLI 1.34.0 https://github.com/speakeasy-api/speakeasy +### Releases +- [PyPI v1.30.0] https://pypi.org/project/hightouch/1.30.0 - . + +## 2023-05-19 01:10:44 +### Changes +Based on: +- OpenAPI Doc 1.0.0 https://api.hightouch.io/api/swagger.json +- Speakeasy CLI 1.35.0 https://github.com/speakeasy-api/speakeasy +### Releases +- [PyPI v1.31.0] https://pypi.org/project/hightouch/1.31.0 - . \ No newline at end of file diff --git a/USAGE.md b/USAGE.md index ad140ca..83c3f57 100755 --- a/USAGE.md +++ b/USAGE.md @@ -17,7 +17,7 @@ req = shared.DestinationCreate( ) res = s.create_destination(req, operations.CreateDestinationSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.create_destination_200_application_json_any_of is not None: diff --git a/docs/hightouch/README.md b/docs/hightouch/README.md index fafd2ce..4142a87 100755 --- a/docs/hightouch/README.md +++ b/docs/hightouch/README.md @@ -51,7 +51,7 @@ req = shared.DestinationCreate( ) res = s.hightouch.create_destination(req, operations.CreateDestinationSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.create_destination_200_application_json_any_of is not None: @@ -98,7 +98,7 @@ req = shared.ModelCreate( ) res = s.hightouch.create_model(req, operations.CreateModelSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.create_model_200_application_json_any_of is not None: @@ -129,7 +129,7 @@ req = shared.SourceCreate( ) res = s.hightouch.create_source(req, operations.CreateSourceSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.create_source_200_application_json_any_of is not None: @@ -178,7 +178,7 @@ req = shared.SyncCreate( ) res = s.hightouch.create_sync(req, operations.CreateSyncSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.create_sync_200_application_json_any_of is not None: @@ -202,7 +202,7 @@ req = operations.GetDestinationRequest( ) res = s.hightouch.get_destination(req, operations.GetDestinationSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.destination is not None: @@ -226,7 +226,7 @@ req = operations.GetModelRequest( ) res = s.hightouch.get_model(req, operations.GetModelSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.model is not None: @@ -250,7 +250,7 @@ req = operations.GetSourceRequest( ) res = s.hightouch.get_source(req, operations.GetSourceSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.source is not None: @@ -274,7 +274,7 @@ req = operations.GetSyncRequest( ) res = s.hightouch.get_sync(req, operations.GetSyncSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.sync is not None: @@ -297,12 +297,12 @@ req = operations.ListDestinationRequest( limit=4499.5, name='Sheryl Kertzmann', offset=992.8, - order_by=operations.ListDestinationOrderByEnum.ID, + order_by=operations.ListDestinationOrderBy.ID, slug='reiciendis', ) res = s.hightouch.list_destination(req, operations.ListDestinationSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.list_destination_200_application_json_object is not None: @@ -325,12 +325,12 @@ req = operations.ListModelRequest( limit=6667.67, name='Cameron Dach', offset=1289.26, - order_by=operations.ListModelOrderByEnum.CREATED_AT, + order_by=operations.ListModelOrderBy.CREATED_AT, slug='enim', ) res = s.hightouch.list_model(req, operations.ListModelSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.list_model_200_application_json_object is not None: @@ -353,12 +353,12 @@ req = operations.ListSourceRequest( limit=6078.31, name='Ms. Cathy Marks', offset=9883.74, - order_by=operations.ListSourceOrderByEnum.UPDATED_AT, + order_by=operations.ListSourceOrderBy.UPDATED_AT, slug='architecto', ) res = s.hightouch.list_source(req, operations.ListSourceSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.list_source_200_application_json_object is not None: @@ -384,12 +384,12 @@ req = operations.ListSyncRequest( limit=9953, model_id=6531.08, offset=5818.5, - order_by=operations.ListSyncOrderByEnum.NAME, + order_by=operations.ListSyncOrderBy.NAME, slug='commodi', ) res = s.hightouch.list_sync(req, operations.ListSyncSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.list_sync_200_application_json_object is not None: @@ -414,14 +414,14 @@ req = operations.ListSyncRunsRequest( before=dateutil.parser.isoparse('2022-05-18T10:03:04.921Z'), limit=1589.69, offset=3380.07, - order_by=operations.ListSyncRunsOrderByEnum.ID, + order_by=operations.ListSyncRunsOrderBy.ID, run_id=6747.52, sync_id=6563.3, within=3172.02, ) res = s.hightouch.list_sync_runs(req, operations.ListSyncRunsSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.list_sync_runs_200_application_json_object is not None: @@ -451,7 +451,7 @@ req = operations.TriggerRunRequest( ) res = s.hightouch.trigger_run(req, operations.TriggerRunSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.trigger_run_output is not None: @@ -480,7 +480,7 @@ req = shared.TriggerRunCustomInput( ) res = s.hightouch.trigger_run_custom(req, operations.TriggerRunCustomSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.trigger_run_custom_200_application_json_any_of is not None: @@ -515,7 +515,7 @@ req = operations.UpdateDestinationRequest( ) res = s.hightouch.update_destination(req, operations.UpdateDestinationSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.update_destination_200_application_json_any_of is not None: @@ -564,7 +564,7 @@ req = operations.UpdateModelRequest( ) res = s.hightouch.update_model(req, operations.UpdateModelSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.update_model_200_application_json_any_of is not None: @@ -596,7 +596,7 @@ req = operations.UpdateSourceRequest( ) res = s.hightouch.update_source(req, operations.UpdateSourceSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.update_source_200_application_json_any_of is not None: @@ -627,7 +627,7 @@ req = operations.UpdateSyncRequest( schedule=shared.IntervalSchedule( interval=shared.Interval( quantity=9292.97, - unit=shared.IntervalUnitEnum.HOUR, + unit=shared.IntervalUnit.HOUR, ), ), type='enim', @@ -637,7 +637,7 @@ req = operations.UpdateSyncRequest( ) res = s.hightouch.update_sync(req, operations.UpdateSyncSecurity( - bearer_auth="Bearer YOUR_BEARER_TOKEN_HERE", + bearer_auth="YOUR_BEARER_TOKEN_HERE", )) if res.update_sync_200_application_json_any_of is not None: diff --git a/files.gen b/files.gen index 11f3756..851d1be 100755 --- a/files.gen +++ b/files.gen @@ -27,7 +27,7 @@ src/hightouch/models/operations/updatesource.py src/hightouch/models/operations/updatesync.py src/hightouch/models/operations/__init__.py src/hightouch/models/shared/validateerrorjson.py -src/hightouch/models/shared/internalservererror_enum.py +src/hightouch/models/shared/internalservererror.py src/hightouch/models/shared/destination.py src/hightouch/models/shared/destinationcreate.py src/hightouch/models/shared/model.py @@ -35,17 +35,17 @@ src/hightouch/models/shared/modelcreate.py src/hightouch/models/shared/source.py src/hightouch/models/shared/sourcecreate.py src/hightouch/models/shared/sync.py -src/hightouch/models/shared/syncstatus_enum.py +src/hightouch/models/shared/syncstatus.py src/hightouch/models/shared/intervalschedule.py src/hightouch/models/shared/interval.py -src/hightouch/models/shared/intervalunit_enum.py +src/hightouch/models/shared/intervalunit.py src/hightouch/models/shared/cronschedule.py src/hightouch/models/shared/visualcronschedule.py src/hightouch/models/shared/record_day_boolean_or_undefined_.py src/hightouch/models/shared/dbtschedule.py src/hightouch/models/shared/synccreate.py src/hightouch/models/shared/syncrun.py -src/hightouch/models/shared/syncrunstatus_enum.py +src/hightouch/models/shared/syncrunstatus.py src/hightouch/models/shared/triggerrunoutput.py src/hightouch/models/shared/triggerruninput.py src/hightouch/models/shared/triggerruncustominput.py diff --git a/gen.yaml b/gen.yaml index b4cf3a5..f19d1c5 100644 --- a/gen.yaml +++ b/gen.yaml @@ -2,15 +2,15 @@ configVersion: 1.0.0 management: docChecksum: aa7996b16bd1ba46707b0b981b12068e docVersion: 1.0.0 - speakeasyVersion: 1.30.0 + speakeasyVersion: 1.35.0 generation: telemetryEnabled: true sdkClassName: hightouch sdkFlattening: false python: - version: 1.26.0 + version: 1.31.0 author: Speakeasy - maxMethodParms: 4 description: Python SDK for Hightouch API maxMethodParams: 0 + maxMethodParms: 4 packageName: hightouch diff --git a/setup.py b/setup.py index be97b74..f64efea 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setuptools.setup( name="hightouch", - version="1.26.0", + version="1.31.0", author="Speakeasy", description="Python SDK for Hightouch API", long_description=long_description, diff --git a/src/hightouch/models/operations/__init__.py b/src/hightouch/models/operations/__init__.py index 3996dfc..14fa8fe 100755 --- a/src/hightouch/models/operations/__init__.py +++ b/src/hightouch/models/operations/__init__.py @@ -20,4 +20,4 @@ from .updatesource import * from .updatesync import * -__all__ = ["CreateDestinationResponse","CreateDestinationSecurity","CreateModelResponse","CreateModelSecurity","CreateSourceResponse","CreateSourceSecurity","CreateSyncResponse","CreateSyncSecurity","GetDestinationRequest","GetDestinationResponse","GetDestinationSecurity","GetModelRequest","GetModelResponse","GetModelSecurity","GetSourceRequest","GetSourceResponse","GetSourceSecurity","GetSyncRequest","GetSyncResponse","GetSyncSecurity","ListDestination200ApplicationJSON","ListDestinationOrderByEnum","ListDestinationRequest","ListDestinationResponse","ListDestinationSecurity","ListModel200ApplicationJSON","ListModelOrderByEnum","ListModelRequest","ListModelResponse","ListModelSecurity","ListSource200ApplicationJSON","ListSourceOrderByEnum","ListSourceRequest","ListSourceResponse","ListSourceSecurity","ListSync200ApplicationJSON","ListSyncOrderByEnum","ListSyncRequest","ListSyncResponse","ListSyncRuns200ApplicationJSON","ListSyncRunsOrderByEnum","ListSyncRunsRequest","ListSyncRunsResponse","ListSyncRunsSecurity","ListSyncSecurity","TriggerRunCustomResponse","TriggerRunCustomSecurity","TriggerRunRequest","TriggerRunResponse","TriggerRunSecurity","UpdateDestinationRequest","UpdateDestinationResponse","UpdateDestinationSecurity","UpdateModelRequest","UpdateModelResponse","UpdateModelSecurity","UpdateSourceRequest","UpdateSourceResponse","UpdateSourceSecurity","UpdateSyncRequest","UpdateSyncResponse","UpdateSyncSecurity"] +__all__ = ["CreateDestinationResponse","CreateDestinationSecurity","CreateModelResponse","CreateModelSecurity","CreateSourceResponse","CreateSourceSecurity","CreateSyncResponse","CreateSyncSecurity","GetDestinationRequest","GetDestinationResponse","GetDestinationSecurity","GetModelRequest","GetModelResponse","GetModelSecurity","GetSourceRequest","GetSourceResponse","GetSourceSecurity","GetSyncRequest","GetSyncResponse","GetSyncSecurity","ListDestination200ApplicationJSON","ListDestinationOrderBy","ListDestinationRequest","ListDestinationResponse","ListDestinationSecurity","ListModel200ApplicationJSON","ListModelOrderBy","ListModelRequest","ListModelResponse","ListModelSecurity","ListSource200ApplicationJSON","ListSourceOrderBy","ListSourceRequest","ListSourceResponse","ListSourceSecurity","ListSync200ApplicationJSON","ListSyncOrderBy","ListSyncRequest","ListSyncResponse","ListSyncRuns200ApplicationJSON","ListSyncRunsOrderBy","ListSyncRunsRequest","ListSyncRunsResponse","ListSyncRunsSecurity","ListSyncSecurity","TriggerRunCustomResponse","TriggerRunCustomSecurity","TriggerRunRequest","TriggerRunResponse","TriggerRunSecurity","UpdateDestinationRequest","UpdateDestinationResponse","UpdateDestinationSecurity","UpdateModelRequest","UpdateModelResponse","UpdateModelSecurity","UpdateSourceRequest","UpdateSourceResponse","UpdateSourceSecurity","UpdateSyncRequest","UpdateSyncResponse","UpdateSyncSecurity"] diff --git a/src/hightouch/models/operations/createdestination.py b/src/hightouch/models/operations/createdestination.py index 1fa78ec..3ce5366 100755 --- a/src/hightouch/models/operations/createdestination.py +++ b/src/hightouch/models/operations/createdestination.py @@ -3,7 +3,7 @@ from __future__ import annotations import dataclasses import requests as requests_http -from ..shared import internalservererror_enum as shared_internalservererror_enum +from ..shared import internalservererror as shared_internalservererror from ..shared import validateerrorjson as shared_validateerrorjson from typing import Any, Optional @@ -21,7 +21,7 @@ class CreateDestinationResponse: status_code: int = dataclasses.field() create_destination_200_application_json_any_of: Optional[Any] = dataclasses.field(default=None) r"""Ok""" - internal_server_error: Optional[shared_internalservererror_enum.InternalServerErrorEnum] = dataclasses.field(default=None) + internal_server_error: Optional[shared_internalservererror.InternalServerError] = dataclasses.field(default=None) r"""Something went wrong""" raw_response: Optional[requests_http.Response] = dataclasses.field(default=None) validate_error_json: Optional[shared_validateerrorjson.ValidateErrorJSON] = dataclasses.field(default=None) diff --git a/src/hightouch/models/operations/createmodel.py b/src/hightouch/models/operations/createmodel.py index 0c2a58c..dfa4693 100755 --- a/src/hightouch/models/operations/createmodel.py +++ b/src/hightouch/models/operations/createmodel.py @@ -3,7 +3,7 @@ from __future__ import annotations import dataclasses import requests as requests_http -from ..shared import internalservererror_enum as shared_internalservererror_enum +from ..shared import internalservererror as shared_internalservererror from ..shared import validateerrorjson as shared_validateerrorjson from typing import Any, Optional @@ -21,7 +21,7 @@ class CreateModelResponse: status_code: int = dataclasses.field() create_model_200_application_json_any_of: Optional[Any] = dataclasses.field(default=None) r"""Ok""" - internal_server_error: Optional[shared_internalservererror_enum.InternalServerErrorEnum] = dataclasses.field(default=None) + internal_server_error: Optional[shared_internalservererror.InternalServerError] = dataclasses.field(default=None) r"""Something went wrong""" raw_response: Optional[requests_http.Response] = dataclasses.field(default=None) validate_error_json: Optional[shared_validateerrorjson.ValidateErrorJSON] = dataclasses.field(default=None) diff --git a/src/hightouch/models/operations/createsource.py b/src/hightouch/models/operations/createsource.py index 15d9b6e..cb77ee2 100755 --- a/src/hightouch/models/operations/createsource.py +++ b/src/hightouch/models/operations/createsource.py @@ -3,7 +3,7 @@ from __future__ import annotations import dataclasses import requests as requests_http -from ..shared import internalservererror_enum as shared_internalservererror_enum +from ..shared import internalservererror as shared_internalservererror from ..shared import validateerrorjson as shared_validateerrorjson from typing import Any, Optional @@ -21,7 +21,7 @@ class CreateSourceResponse: status_code: int = dataclasses.field() create_source_200_application_json_any_of: Optional[Any] = dataclasses.field(default=None) r"""Ok""" - internal_server_error: Optional[shared_internalservererror_enum.InternalServerErrorEnum] = dataclasses.field(default=None) + internal_server_error: Optional[shared_internalservererror.InternalServerError] = dataclasses.field(default=None) r"""Something went wrong""" raw_response: Optional[requests_http.Response] = dataclasses.field(default=None) validate_error_json: Optional[shared_validateerrorjson.ValidateErrorJSON] = dataclasses.field(default=None) diff --git a/src/hightouch/models/operations/createsync.py b/src/hightouch/models/operations/createsync.py index f60726f..41631f6 100755 --- a/src/hightouch/models/operations/createsync.py +++ b/src/hightouch/models/operations/createsync.py @@ -3,7 +3,7 @@ from __future__ import annotations import dataclasses import requests as requests_http -from ..shared import internalservererror_enum as shared_internalservererror_enum +from ..shared import internalservererror as shared_internalservererror from ..shared import validateerrorjson as shared_validateerrorjson from typing import Any, Optional @@ -21,7 +21,7 @@ class CreateSyncResponse: status_code: int = dataclasses.field() create_sync_200_application_json_any_of: Optional[Any] = dataclasses.field(default=None) r"""Ok""" - internal_server_error: Optional[shared_internalservererror_enum.InternalServerErrorEnum] = dataclasses.field(default=None) + internal_server_error: Optional[shared_internalservererror.InternalServerError] = dataclasses.field(default=None) r"""Something went wrong""" raw_response: Optional[requests_http.Response] = dataclasses.field(default=None) validate_error_json: Optional[shared_validateerrorjson.ValidateErrorJSON] = dataclasses.field(default=None) diff --git a/src/hightouch/models/operations/listdestination.py b/src/hightouch/models/operations/listdestination.py index 459a6cc..732ba38 100755 --- a/src/hightouch/models/operations/listdestination.py +++ b/src/hightouch/models/operations/listdestination.py @@ -16,7 +16,7 @@ class ListDestinationSecurity: bearer_auth: str = dataclasses.field(metadata={'security': { 'scheme': True, 'type': 'http', 'sub_type': 'bearer', 'field_name': 'Authorization' }}) -class ListDestinationOrderByEnum(str, Enum): +class ListDestinationOrderBy(str, Enum): r"""Order the returned destinations""" ID = 'id' NAME = 'name' @@ -34,7 +34,7 @@ class ListDestinationRequest: r"""Filter based on the destination's name""" offset: Optional[float] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'offset', 'style': 'form', 'explode': True }}) r"""set the offset on results (for pagination)""" - order_by: Optional[ListDestinationOrderByEnum] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) + order_by: Optional[ListDestinationOrderBy] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) r"""Order the returned destinations""" slug: Optional[str] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'slug', 'style': 'form', 'explode': True }}) r"""Filter based on destination's slug""" diff --git a/src/hightouch/models/operations/listmodel.py b/src/hightouch/models/operations/listmodel.py index e30ea84..69eb4a5 100755 --- a/src/hightouch/models/operations/listmodel.py +++ b/src/hightouch/models/operations/listmodel.py @@ -16,7 +16,7 @@ class ListModelSecurity: bearer_auth: str = dataclasses.field(metadata={'security': { 'scheme': True, 'type': 'http', 'sub_type': 'bearer', 'field_name': 'Authorization' }}) -class ListModelOrderByEnum(str, Enum): +class ListModelOrderBy(str, Enum): r"""specify the order""" ID = 'id' NAME = 'name' @@ -34,7 +34,7 @@ class ListModelRequest: r"""filter based on name""" offset: Optional[float] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'offset', 'style': 'form', 'explode': True }}) r"""set the offset on results (for pagination)""" - order_by: Optional[ListModelOrderByEnum] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) + order_by: Optional[ListModelOrderBy] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) r"""specify the order""" slug: Optional[str] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'slug', 'style': 'form', 'explode': True }}) r"""filter based on slug""" diff --git a/src/hightouch/models/operations/listsource.py b/src/hightouch/models/operations/listsource.py index 2ec68b8..7eebe35 100755 --- a/src/hightouch/models/operations/listsource.py +++ b/src/hightouch/models/operations/listsource.py @@ -15,7 +15,7 @@ class ListSourceSecurity: bearer_auth: str = dataclasses.field(metadata={'security': { 'scheme': True, 'type': 'http', 'sub_type': 'bearer', 'field_name': 'Authorization' }}) -class ListSourceOrderByEnum(str, Enum): +class ListSourceOrderBy(str, Enum): r"""specify the order""" ID = 'id' NAME = 'name' @@ -33,7 +33,7 @@ class ListSourceRequest: r"""filter based on name""" offset: Optional[float] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'offset', 'style': 'form', 'explode': True }}) r"""set the offset on results (for pagination)""" - order_by: Optional[ListSourceOrderByEnum] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) + order_by: Optional[ListSourceOrderBy] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) r"""specify the order""" slug: Optional[str] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'slug', 'style': 'form', 'explode': True }}) r"""filter based on slug""" diff --git a/src/hightouch/models/operations/listsync.py b/src/hightouch/models/operations/listsync.py index 86a96e5..f2496c7 100755 --- a/src/hightouch/models/operations/listsync.py +++ b/src/hightouch/models/operations/listsync.py @@ -17,7 +17,7 @@ class ListSyncSecurity: bearer_auth: str = dataclasses.field(metadata={'security': { 'scheme': True, 'type': 'http', 'sub_type': 'bearer', 'field_name': 'Authorization' }}) -class ListSyncOrderByEnum(str, Enum): +class ListSyncOrderBy(str, Enum): r"""specify the order""" ID = 'id' NAME = 'name' @@ -39,7 +39,7 @@ class ListSyncRequest: r"""filter based on modelId""" offset: Optional[float] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'offset', 'style': 'form', 'explode': True }}) r"""set the offset on results (for pagination)""" - order_by: Optional[ListSyncOrderByEnum] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) + order_by: Optional[ListSyncOrderBy] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) r"""specify the order""" slug: Optional[str] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'slug', 'style': 'form', 'explode': True }}) r"""filter based on slug""" diff --git a/src/hightouch/models/operations/listsyncruns.py b/src/hightouch/models/operations/listsyncruns.py index f4c6826..7b0c845 100755 --- a/src/hightouch/models/operations/listsyncruns.py +++ b/src/hightouch/models/operations/listsyncruns.py @@ -17,7 +17,7 @@ class ListSyncRunsSecurity: bearer_auth: str = dataclasses.field(metadata={'security': { 'scheme': True, 'type': 'http', 'sub_type': 'bearer', 'field_name': 'Authorization' }}) -class ListSyncRunsOrderByEnum(str, Enum): +class ListSyncRunsOrderBy(str, Enum): r"""specify the order""" ID = 'id' CREATED_AT = 'createdAt' @@ -37,7 +37,7 @@ class ListSyncRunsRequest: r"""limit the number of objects returned (default is 5)""" offset: Optional[float] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'offset', 'style': 'form', 'explode': True }}) r"""set the offset on results (for pagination)""" - order_by: Optional[ListSyncRunsOrderByEnum] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) + order_by: Optional[ListSyncRunsOrderBy] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'orderBy', 'style': 'form', 'explode': True }}) r"""specify the order""" run_id: Optional[float] = dataclasses.field(default=None, metadata={'query_param': { 'field_name': 'runId', 'style': 'form', 'explode': True }}) r"""query for specific run id""" diff --git a/src/hightouch/models/operations/updatedestination.py b/src/hightouch/models/operations/updatedestination.py index 1bfe3ab..c675ce7 100755 --- a/src/hightouch/models/operations/updatedestination.py +++ b/src/hightouch/models/operations/updatedestination.py @@ -4,7 +4,7 @@ import dataclasses import requests as requests_http from ..shared import destinationupdate as shared_destinationupdate -from ..shared import internalservererror_enum as shared_internalservererror_enum +from ..shared import internalservererror as shared_internalservererror from ..shared import validateerrorjson as shared_validateerrorjson from typing import Any, Optional @@ -28,7 +28,7 @@ class UpdateDestinationResponse: content_type: str = dataclasses.field() status_code: int = dataclasses.field() - internal_server_error: Optional[shared_internalservererror_enum.InternalServerErrorEnum] = dataclasses.field(default=None) + internal_server_error: Optional[shared_internalservererror.InternalServerError] = dataclasses.field(default=None) r"""Something went wrong""" raw_response: Optional[requests_http.Response] = dataclasses.field(default=None) update_destination_200_application_json_any_of: Optional[Any] = dataclasses.field(default=None) diff --git a/src/hightouch/models/operations/updatemodel.py b/src/hightouch/models/operations/updatemodel.py index 3aa9143..eceea2f 100755 --- a/src/hightouch/models/operations/updatemodel.py +++ b/src/hightouch/models/operations/updatemodel.py @@ -3,7 +3,7 @@ from __future__ import annotations import dataclasses import requests as requests_http -from ..shared import internalservererror_enum as shared_internalservererror_enum +from ..shared import internalservererror as shared_internalservererror from ..shared import modelupdate as shared_modelupdate from ..shared import validateerrorjson as shared_validateerrorjson from typing import Any, Optional @@ -28,7 +28,7 @@ class UpdateModelResponse: content_type: str = dataclasses.field() status_code: int = dataclasses.field() - internal_server_error: Optional[shared_internalservererror_enum.InternalServerErrorEnum] = dataclasses.field(default=None) + internal_server_error: Optional[shared_internalservererror.InternalServerError] = dataclasses.field(default=None) r"""Something went wrong""" raw_response: Optional[requests_http.Response] = dataclasses.field(default=None) update_model_200_application_json_any_of: Optional[Any] = dataclasses.field(default=None) diff --git a/src/hightouch/models/operations/updatesource.py b/src/hightouch/models/operations/updatesource.py index 4b7d53d..f019fd7 100755 --- a/src/hightouch/models/operations/updatesource.py +++ b/src/hightouch/models/operations/updatesource.py @@ -3,7 +3,7 @@ from __future__ import annotations import dataclasses import requests as requests_http -from ..shared import internalservererror_enum as shared_internalservererror_enum +from ..shared import internalservererror as shared_internalservererror from ..shared import sourceupdate as shared_sourceupdate from ..shared import validateerrorjson as shared_validateerrorjson from typing import Any, Optional @@ -28,7 +28,7 @@ class UpdateSourceResponse: content_type: str = dataclasses.field() status_code: int = dataclasses.field() - internal_server_error: Optional[shared_internalservererror_enum.InternalServerErrorEnum] = dataclasses.field(default=None) + internal_server_error: Optional[shared_internalservererror.InternalServerError] = dataclasses.field(default=None) r"""Something went wrong""" raw_response: Optional[requests_http.Response] = dataclasses.field(default=None) update_source_200_application_json_any_of: Optional[Any] = dataclasses.field(default=None) diff --git a/src/hightouch/models/operations/updatesync.py b/src/hightouch/models/operations/updatesync.py index 6dcfd58..00c1d40 100755 --- a/src/hightouch/models/operations/updatesync.py +++ b/src/hightouch/models/operations/updatesync.py @@ -3,7 +3,7 @@ from __future__ import annotations import dataclasses import requests as requests_http -from ..shared import internalservererror_enum as shared_internalservererror_enum +from ..shared import internalservererror as shared_internalservererror from ..shared import syncupdate as shared_syncupdate from ..shared import validateerrorjson as shared_validateerrorjson from typing import Any, Optional @@ -28,7 +28,7 @@ class UpdateSyncResponse: content_type: str = dataclasses.field() status_code: int = dataclasses.field() - internal_server_error: Optional[shared_internalservererror_enum.InternalServerErrorEnum] = dataclasses.field(default=None) + internal_server_error: Optional[shared_internalservererror.InternalServerError] = dataclasses.field(default=None) r"""Something went wrong""" raw_response: Optional[requests_http.Response] = dataclasses.field(default=None) update_sync_200_application_json_any_of: Optional[Any] = dataclasses.field(default=None) diff --git a/src/hightouch/models/shared/__init__.py b/src/hightouch/models/shared/__init__.py index dfbb268..0e9561c 100755 --- a/src/hightouch/models/shared/__init__.py +++ b/src/hightouch/models/shared/__init__.py @@ -5,10 +5,10 @@ from .destination import * from .destinationcreate import * from .destinationupdate import * -from .internalservererror_enum import * +from .internalservererror import * from .interval import * from .intervalschedule import * -from .intervalunit_enum import * +from .intervalunit import * from .model import * from .modelcreate import * from .modelupdate import * @@ -19,8 +19,8 @@ from .sync import * from .synccreate import * from .syncrun import * -from .syncrunstatus_enum import * -from .syncstatus_enum import * +from .syncrunstatus import * +from .syncstatus import * from .syncupdate import * from .triggerruncustominput import * from .triggerruninput import * @@ -28,4 +28,4 @@ from .validateerrorjson import * from .visualcronschedule import * -__all__ = ["CronSchedule","DBTSchedule","DBTScheduleAccount","DBTScheduleJob","Destination","DestinationCreate","DestinationUpdate","InternalServerErrorEnum","Interval","IntervalSchedule","IntervalUnitEnum","Model","ModelCreate","ModelCreateCustom","ModelCreateDbt","ModelCreateRaw","ModelCreateTable","ModelCreateVisual","ModelCustom","ModelDbt","ModelRaw","ModelTable","ModelUpdate","ModelUpdateCustom","ModelUpdateDbt","ModelUpdateRaw","ModelUpdateTable","ModelUpdateVisual","ModelVisual","RecordDayBooleanOrUndefined","Source","SourceCreate","SourceUpdate","Sync","SyncCreate","SyncCreateSchedule","SyncRun","SyncRunFailedRows","SyncRunPlannedRows","SyncRunStatusEnum","SyncRunSuccessfulRows","SyncSchedule","SyncStatusEnum","SyncUpdate","SyncUpdateSchedule","TriggerRunCustomInput","TriggerRunInput","TriggerRunOutput","ValidateErrorJSON","ValidateErrorJSONMessageEnum","VisualCronSchedule","VisualCronScheduleExpressions"] +__all__ = ["CronSchedule","DBTSchedule","DBTScheduleAccount","DBTScheduleJob","Destination","DestinationCreate","DestinationUpdate","InternalServerError","Interval","IntervalSchedule","IntervalUnit","Model","ModelCreate","ModelCreateCustom","ModelCreateDbt","ModelCreateRaw","ModelCreateTable","ModelCreateVisual","ModelCustom","ModelDbt","ModelRaw","ModelTable","ModelUpdate","ModelUpdateCustom","ModelUpdateDbt","ModelUpdateRaw","ModelUpdateTable","ModelUpdateVisual","ModelVisual","RecordDayBooleanOrUndefined","Source","SourceCreate","SourceUpdate","Sync","SyncCreate","SyncCreateSchedule","SyncRun","SyncRunFailedRows","SyncRunPlannedRows","SyncRunStatus","SyncRunSuccessfulRows","SyncSchedule","SyncStatus","SyncUpdate","SyncUpdateSchedule","TriggerRunCustomInput","TriggerRunInput","TriggerRunOutput","ValidateErrorJSON","ValidateErrorJSONMessage","VisualCronSchedule","VisualCronScheduleExpressions"] diff --git a/src/hightouch/models/shared/internalservererror_enum.py b/src/hightouch/models/shared/internalservererror.py similarity index 83% rename from src/hightouch/models/shared/internalservererror_enum.py rename to src/hightouch/models/shared/internalservererror.py index 4e0cc7f..f83bd77 100755 --- a/src/hightouch/models/shared/internalservererror_enum.py +++ b/src/hightouch/models/shared/internalservererror.py @@ -3,6 +3,6 @@ from __future__ import annotations from enum import Enum -class InternalServerErrorEnum(str, Enum): +class InternalServerError(str, Enum): r"""Something went wrong""" INTERNAL_SERVER_ERROR = 'Internal Server Error' diff --git a/src/hightouch/models/shared/interval.py b/src/hightouch/models/shared/interval.py index 3f29ca4..325820a 100755 --- a/src/hightouch/models/shared/interval.py +++ b/src/hightouch/models/shared/interval.py @@ -2,7 +2,7 @@ from __future__ import annotations import dataclasses -from ..shared import intervalunit_enum as shared_intervalunit_enum +from ..shared import intervalunit as shared_intervalunit from dataclasses_json import Undefined, dataclass_json from hightouch import utils @@ -12,5 +12,5 @@ class Interval: quantity: float = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('quantity') }}) - unit: shared_intervalunit_enum.IntervalUnitEnum = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('unit') }}) + unit: shared_intervalunit.IntervalUnit = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('unit') }}) \ No newline at end of file diff --git a/src/hightouch/models/shared/intervalunit_enum.py b/src/hightouch/models/shared/intervalunit.py similarity index 85% rename from src/hightouch/models/shared/intervalunit_enum.py rename to src/hightouch/models/shared/intervalunit.py index 73e45bd..ad199cf 100755 --- a/src/hightouch/models/shared/intervalunit_enum.py +++ b/src/hightouch/models/shared/intervalunit.py @@ -3,7 +3,7 @@ from __future__ import annotations from enum import Enum -class IntervalUnitEnum(str, Enum): +class IntervalUnit(str, Enum): MINUTE = 'minute' HOUR = 'hour' DAY = 'day' diff --git a/src/hightouch/models/shared/sync.py b/src/hightouch/models/shared/sync.py index 6fb16a7..0e82c31 100755 --- a/src/hightouch/models/shared/sync.py +++ b/src/hightouch/models/shared/sync.py @@ -3,7 +3,7 @@ from __future__ import annotations import dataclasses import dateutil.parser -from ..shared import syncstatus_enum as shared_syncstatus_enum +from ..shared import syncstatus as shared_syncstatus from dataclasses_json import Undefined, dataclass_json from datetime import datetime from hightouch import utils @@ -75,7 +75,7 @@ class Sync: """ slug: str = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('slug') }}) r"""The sync's slug""" - status: shared_syncstatus_enum.SyncStatusEnum = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('status') }}) + status: shared_syncstatus.SyncStatus = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('status') }}) updated_at: datetime = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('updatedAt'), 'encoder': utils.datetimeisoformat(False), 'decoder': dateutil.parser.isoparse, 'mm_field': fields.DateTime(format='iso') }}) r"""The timestamp when the sync was last updated""" workspace_id: str = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('workspaceId') }}) diff --git a/src/hightouch/models/shared/syncrun.py b/src/hightouch/models/shared/syncrun.py index 31c6e5f..127ee8b 100755 --- a/src/hightouch/models/shared/syncrun.py +++ b/src/hightouch/models/shared/syncrun.py @@ -3,7 +3,7 @@ from __future__ import annotations import dataclasses import dateutil.parser -from ..shared import syncrunstatus_enum as shared_syncrunstatus_enum +from ..shared import syncrunstatus as shared_syncrunstatus from dataclasses_json import Undefined, dataclass_json from datetime import datetime from hightouch import utils @@ -92,7 +92,7 @@ class SyncRun: r"""The number of rows in the query.""" started_at: datetime = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('startedAt'), 'encoder': utils.datetimeisoformat(False), 'decoder': dateutil.parser.isoparse, 'mm_field': fields.DateTime(format='iso') }}) r"""The timestamp when the sync run started""" - status: shared_syncrunstatus_enum.SyncRunStatusEnum = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('status') }}) + status: shared_syncrunstatus.SyncRunStatus = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('status') }}) r"""The status of sync runs""" successful_rows: SyncRunSuccessfulRows = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('successfulRows') }}) r"""The number of rows that were successfully processed by the destination.""" diff --git a/src/hightouch/models/shared/syncrunstatus_enum.py b/src/hightouch/models/shared/syncrunstatus.py similarity index 91% rename from src/hightouch/models/shared/syncrunstatus_enum.py rename to src/hightouch/models/shared/syncrunstatus.py index c7f8404..c8b572c 100755 --- a/src/hightouch/models/shared/syncrunstatus_enum.py +++ b/src/hightouch/models/shared/syncrunstatus.py @@ -3,7 +3,7 @@ from __future__ import annotations from enum import Enum -class SyncRunStatusEnum(str, Enum): +class SyncRunStatus(str, Enum): r"""The status of sync runs""" CANCELLED = 'cancelled' FAILED = 'failed' diff --git a/src/hightouch/models/shared/syncstatus_enum.py b/src/hightouch/models/shared/syncstatus.py similarity index 92% rename from src/hightouch/models/shared/syncstatus_enum.py rename to src/hightouch/models/shared/syncstatus.py index 543c9cb..9671f70 100755 --- a/src/hightouch/models/shared/syncstatus_enum.py +++ b/src/hightouch/models/shared/syncstatus.py @@ -3,7 +3,7 @@ from __future__ import annotations from enum import Enum -class SyncStatusEnum(str, Enum): +class SyncStatus(str, Enum): DISABLED = 'disabled' PENDING = 'pending' CANCELLED = 'cancelled' diff --git a/src/hightouch/models/shared/validateerrorjson.py b/src/hightouch/models/shared/validateerrorjson.py index 22ea3b1..1db97c8 100755 --- a/src/hightouch/models/shared/validateerrorjson.py +++ b/src/hightouch/models/shared/validateerrorjson.py @@ -7,7 +7,7 @@ from hightouch import utils from typing import Any -class ValidateErrorJSONMessageEnum(str, Enum): +class ValidateErrorJSONMessage(str, Enum): VALIDATION_FAILED = 'Validation failed' @@ -17,5 +17,5 @@ class ValidateErrorJSON: r"""Validation Failed""" details: dict[str, Any] = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('details') }}) - message: ValidateErrorJSONMessageEnum = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('message') }}) + message: ValidateErrorJSONMessage = dataclasses.field(metadata={'dataclasses_json': { 'letter_case': utils.get_field_name('message') }}) \ No newline at end of file diff --git a/src/hightouch/sdk.py b/src/hightouch/sdk.py index 629c38b..26dddf0 100755 --- a/src/hightouch/sdk.py +++ b/src/hightouch/sdk.py @@ -17,8 +17,8 @@ class Hightouch: _security_client: requests_http.Session _server_url: str = SERVERS[0] _language: str = "python" - _sdk_version: str = "1.26.0" - _gen_version: str = "2.26.3" + _sdk_version: str = "1.31.0" + _gen_version: str = "2.31.0" def __init__(self, server_url: str = None, @@ -60,13 +60,13 @@ def create_destination(self, request: shared.DestinationCreate, security: operat base_url = self._server_url url = base_url.removesuffix('/') + '/destinations' - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "request", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type if data is None and form is None: raise Exception('request body is required') + headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -88,7 +88,7 @@ def create_destination(self, request: shared.DestinationCreate, security: operat res.validate_error_json = out elif http_res.status_code == 500: if utils.match_content_type(content_type, 'application/json'): - out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerErrorEnum]) + out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerError]) res.internal_server_error = out return res @@ -101,13 +101,13 @@ def create_model(self, request: shared.ModelCreate, security: operations.CreateM base_url = self._server_url url = base_url.removesuffix('/') + '/models' - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "request", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type if data is None and form is None: raise Exception('request body is required') + headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -129,7 +129,7 @@ def create_model(self, request: shared.ModelCreate, security: operations.CreateM res.validate_error_json = out elif http_res.status_code == 500: if utils.match_content_type(content_type, 'application/json'): - out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerErrorEnum]) + out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerError]) res.internal_server_error = out return res @@ -142,13 +142,13 @@ def create_source(self, request: shared.SourceCreate, security: operations.Creat base_url = self._server_url url = base_url.removesuffix('/') + '/sources' - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "request", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type if data is None and form is None: raise Exception('request body is required') + headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -170,7 +170,7 @@ def create_source(self, request: shared.SourceCreate, security: operations.Creat res.validate_error_json = out elif http_res.status_code == 500: if utils.match_content_type(content_type, 'application/json'): - out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerErrorEnum]) + out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerError]) res.internal_server_error = out return res @@ -183,13 +183,13 @@ def create_sync(self, request: shared.SyncCreate, security: operations.CreateSyn base_url = self._server_url url = base_url.removesuffix('/') + '/syncs' - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "request", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type if data is None and form is None: raise Exception('request body is required') + headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -211,7 +211,7 @@ def create_sync(self, request: shared.SyncCreate, security: operations.CreateSyn res.validate_error_json = out elif http_res.status_code == 500: if utils.match_content_type(content_type, 'application/json'): - out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerErrorEnum]) + out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerError]) res.internal_server_error = out return res @@ -224,8 +224,8 @@ def get_destination(self, request: operations.GetDestinationRequest, security: o base_url = self._server_url url = utils.generate_url(operations.GetDestinationRequest, base_url, '/destinations/{destinationId}', request) - headers = {} + headers['Accept'] = 'application/json' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -252,8 +252,8 @@ def get_model(self, request: operations.GetModelRequest, security: operations.Ge base_url = self._server_url url = utils.generate_url(operations.GetModelRequest, base_url, '/models/{modelId}', request) - headers = {} + headers['Accept'] = 'application/json' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -280,8 +280,8 @@ def get_source(self, request: operations.GetSourceRequest, security: operations. base_url = self._server_url url = utils.generate_url(operations.GetSourceRequest, base_url, '/sources/{sourceId}', request) - headers = {} + headers['Accept'] = 'application/json;q=1, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -312,8 +312,8 @@ def get_sync(self, request: operations.GetSyncRequest, security: operations.GetS base_url = self._server_url url = utils.generate_url(operations.GetSyncRequest, base_url, '/syncs/{syncId}', request) - headers = {} + headers['Accept'] = 'application/json' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -340,9 +340,9 @@ def list_destination(self, request: operations.ListDestinationRequest, security: base_url = self._server_url url = base_url.removesuffix('/') + '/destinations' - headers = {} query_params = utils.get_query_params(operations.ListDestinationRequest, request) + headers['Accept'] = 'application/json;q=1, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -373,9 +373,9 @@ def list_model(self, request: operations.ListModelRequest, security: operations. base_url = self._server_url url = base_url.removesuffix('/') + '/models' - headers = {} query_params = utils.get_query_params(operations.ListModelRequest, request) + headers['Accept'] = 'application/json;q=1, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -406,9 +406,9 @@ def list_source(self, request: operations.ListSourceRequest, security: operation base_url = self._server_url url = base_url.removesuffix('/') + '/sources' - headers = {} query_params = utils.get_query_params(operations.ListSourceRequest, request) + headers['Accept'] = 'application/json' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -435,9 +435,9 @@ def list_sync(self, request: operations.ListSyncRequest, security: operations.Li base_url = self._server_url url = base_url.removesuffix('/') + '/syncs' - headers = {} query_params = utils.get_query_params(operations.ListSyncRequest, request) + headers['Accept'] = 'application/json;q=1, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -468,9 +468,9 @@ def list_sync_runs(self, request: operations.ListSyncRunsRequest, security: oper base_url = self._server_url url = utils.generate_url(operations.ListSyncRunsRequest, base_url, '/syncs/{syncId}/runs', request) - headers = {} query_params = utils.get_query_params(operations.ListSyncRunsRequest, request) + headers['Accept'] = 'application/json;q=1, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -504,11 +504,11 @@ def trigger_run(self, request: operations.TriggerRunRequest, security: operation base_url = self._server_url url = utils.generate_url(operations.TriggerRunRequest, base_url, '/syncs/{syncId}/trigger', request) - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "trigger_run_input", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type + headers['Accept'] = 'application/json;q=1, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -542,13 +542,13 @@ def trigger_run_custom(self, request: shared.TriggerRunCustomInput, security: op base_url = self._server_url url = base_url.removesuffix('/') + '/syncs/trigger' - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "request", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type if data is None and form is None: raise Exception('request body is required') + headers['Accept'] = 'application/json;q=1, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -581,13 +581,13 @@ def update_destination(self, request: operations.UpdateDestinationRequest, secur base_url = self._server_url url = utils.generate_url(operations.UpdateDestinationRequest, base_url, '/destinations/{destinationId}', request) - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "destination_update", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type if data is None and form is None: raise Exception('request body is required') + headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -609,7 +609,7 @@ def update_destination(self, request: operations.UpdateDestinationRequest, secur res.validate_error_json = out elif http_res.status_code == 500: if utils.match_content_type(content_type, 'application/json'): - out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerErrorEnum]) + out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerError]) res.internal_server_error = out return res @@ -624,13 +624,13 @@ def update_model(self, request: operations.UpdateModelRequest, security: operati base_url = self._server_url url = utils.generate_url(operations.UpdateModelRequest, base_url, '/models/{modelId}', request) - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "model_update", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type if data is None and form is None: raise Exception('request body is required') + headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -652,7 +652,7 @@ def update_model(self, request: operations.UpdateModelRequest, security: operati res.validate_error_json = out elif http_res.status_code == 500: if utils.match_content_type(content_type, 'application/json'): - out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerErrorEnum]) + out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerError]) res.internal_server_error = out return res @@ -667,13 +667,13 @@ def update_source(self, request: operations.UpdateSourceRequest, security: opera base_url = self._server_url url = utils.generate_url(operations.UpdateSourceRequest, base_url, '/sources/{sourceId}', request) - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "source_update", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type if data is None and form is None: raise Exception('request body is required') + headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -695,7 +695,7 @@ def update_source(self, request: operations.UpdateSourceRequest, security: opera res.validate_error_json = out elif http_res.status_code == 500: if utils.match_content_type(content_type, 'application/json'): - out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerErrorEnum]) + out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerError]) res.internal_server_error = out return res @@ -710,13 +710,13 @@ def update_sync(self, request: operations.UpdateSyncRequest, security: operation base_url = self._server_url url = utils.generate_url(operations.UpdateSyncRequest, base_url, '/syncs/{syncId}', request) - headers = {} req_content_type, data, form = utils.serialize_request_body(request, "sync_update", 'json') if req_content_type not in ('multipart/form-data', 'multipart/mixed'): headers['content-type'] = req_content_type if data is None and form is None: raise Exception('request body is required') + headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0' headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}' client = utils.configure_security_client(self._client, security) @@ -738,7 +738,7 @@ def update_sync(self, request: operations.UpdateSyncRequest, security: operation res.validate_error_json = out elif http_res.status_code == 500: if utils.match_content_type(content_type, 'application/json'): - out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerErrorEnum]) + out = utils.unmarshal_json(http_res.text, Optional[shared.InternalServerError]) res.internal_server_error = out return res diff --git a/src/hightouch/utils/utils.py b/src/hightouch/utils/utils.py index a8b0d8f..6b39ecf 100755 --- a/src/hightouch/utils/utils.py +++ b/src/hightouch/utils/utils.py @@ -112,7 +112,7 @@ def _parse_security_scheme_value(client: SecurityClient, scheme_metadata: dict, client.client.headers[header_name] = value elif scheme_type == 'http': if sub_type == 'bearer': - client.client.headers[header_name] = value + client.client.headers[header_name] = value.lower().startswith('bearer ') and value or f'Bearer {value}' else: raise Exception('not supported') else: @@ -376,9 +376,9 @@ def _get_query_param_field_name(obj_field: Field) -> str: return obj_param_metadata.get("field_name", obj_field.name) -def _get_delimited_query_params(metadata: dict, field_name: str, obj: any, array_delimiter: str) -> dict[ +def _get_delimited_query_params(metadata: dict, field_name: str, obj: any, delimiter: str) -> dict[ str, list[str]]: - return _populate_form(field_name, metadata.get("explode", True), obj, _get_query_param_field_name, array_delimiter) + return _populate_form(field_name, metadata.get("explode", True), obj, _get_query_param_field_name, delimiter) SERIALIZATION_METHOD_TO_CONTENT_TYPE = { @@ -548,7 +548,7 @@ def _get_form_field_name(obj_field: Field) -> str: return obj_param_metadata.get("field_name", obj_field.name) -def _populate_form(field_name: str, explode: boolean, obj: any, get_field_name_func: Callable, array_delimiter: str) -> \ +def _populate_form(field_name: str, explode: boolean, obj: any, get_field_name_func: Callable, delimiter: str) -> \ dict[str, list[str]]: params: dict[str, list[str]] = {} @@ -572,10 +572,10 @@ def _populate_form(field_name: str, explode: boolean, obj: any, get_field_name_f params[obj_field_name] = [_val_to_string(val)] else: items.append( - f'{obj_field_name},{_val_to_string(val)}') + f'{obj_field_name}{delimiter}{_val_to_string(val)}') if len(items) > 0: - params[field_name] = [','.join(items)] + params[field_name] = [delimiter.join(items)] elif isinstance(obj, dict): items = [] for key, value in obj.items(): @@ -585,10 +585,10 @@ def _populate_form(field_name: str, explode: boolean, obj: any, get_field_name_f if explode: params[key] = _val_to_string(value) else: - items.append(f'{key},{_val_to_string(value)}') + items.append(f'{key}{delimiter}{_val_to_string(value)}') if len(items) > 0: - params[field_name] = [','.join(items)] + params[field_name] = [delimiter.join(items)] elif isinstance(obj, list): items = [] @@ -604,7 +604,7 @@ def _populate_form(field_name: str, explode: boolean, obj: any, get_field_name_f items.append(_val_to_string(value)) if len(items) > 0: - params[field_name] = [array_delimiter.join([str(item) for item in items])] + params[field_name] = [delimiter.join([str(item) for item in items])] else: params[field_name] = [_val_to_string(obj)]