diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 10e55f6..f7d9ffe 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -3,8 +3,8 @@ LICENSE.txt Makefile README.md -docs/AggregationByResourceAndMetric.md -docs/AggregationByResourceOrMetric.md +docs/AggregationByResourceAndMetricValue.md +docs/AggregationByResourceOrMetricValue.md docs/AggregationMethod.md docs/AggregationMethodOneOf.md docs/AggregationMethodOneOf1.md @@ -26,6 +26,7 @@ docs/ColumnDataSet.md docs/ColumnDataSetDataAxis.md docs/ColumnHeader.md docs/ColumnHeadersInner.md +docs/Data.md docs/DataAxisOption.md docs/DataSetAttributes.md docs/DataSetWindow.md @@ -33,7 +34,7 @@ docs/Datum.md docs/DefaultAggregation.md docs/DefaultInterpolation.md docs/DeleteResponse.md -docs/Embeddings.md +docs/EmbeddingsValue.md docs/ExecuteApi.md docs/FromOverride.md docs/GroupingInterval.md @@ -62,7 +63,7 @@ docs/InterpolationMethodOneOf7.md docs/InterpolationMethodOneOf8.md docs/InterpolationMethodOneOf9.md docs/InterpolationSpec.md -docs/Links.md +docs/LinksValue.md docs/LocationInner.md docs/ManageApi.md docs/Message.md @@ -71,7 +72,6 @@ docs/MessageLevel.md docs/MessageProperties.md docs/ObjectData.md docs/ObjectDataSet.md -docs/ObjectDataValue.md docs/Operation.md docs/QueriesListResponse.md docs/QueryDefinition.md @@ -122,8 +122,8 @@ test/api/status_api_test.py test/conftest.py test/openapi.py test/types/__init__.py -test/types/aggregation_by_resource_and_metric_stub.py -test/types/aggregation_by_resource_or_metric_stub.py +test/types/aggregation_by_resource_and_metric_value_stub.py +test/types/aggregation_by_resource_or_metric_value_stub.py test/types/aggregation_method_one_of1_stub.py test/types/aggregation_method_one_of2_stub.py test/types/aggregation_method_one_of3_stub.py @@ -148,11 +148,12 @@ test/types/column_headers_inner_stub.py test/types/data_axis_option_stub.py test/types/data_set_attributes_stub.py test/types/data_set_window_stub.py +test/types/data_stub.py test/types/datum_stub.py test/types/default_aggregation_stub.py test/types/default_interpolation_stub.py test/types/delete_response_stub.py -test/types/embeddings_stub.py +test/types/embeddings_value_stub.py test/types/from_override_stub.py test/types/grouping_interval_override_one_of_stub.py test/types/grouping_interval_override_stub.py @@ -180,7 +181,7 @@ test/types/interpolation_method_one_of_stub.py test/types/interpolation_method_stub.py test/types/interpolation_spec_stub.py test/types/interpolation_stub.py -test/types/links_stub.py +test/types/links_value_stub.py test/types/location_inner_stub.py test/types/message_arguments_stub.py test/types/message_level_stub.py @@ -188,7 +189,6 @@ test/types/message_properties_stub.py test/types/message_stub.py test/types/object_data_set_stub.py test/types/object_data_stub.py -test/types/object_data_value_stub.py test/types/queries_list_response_stub.py test/types/query_definition_stub.py test/types/query_entity_input_stub.py diff --git a/.openapi-generator/VERSION b/.openapi-generator/VERSION index 1985849..09a6d30 100644 --- a/.openapi-generator/VERSION +++ b/.openapi-generator/VERSION @@ -1 +1 @@ -7.7.0 +7.8.0 diff --git a/README.md b/README.md index c00c531..916c19f 100644 --- a/README.md +++ b/README.md @@ -84,8 +84,8 @@ Class | Method | HTTP request | Description ## Documentation For Models - - [AggregationByResourceAndMetric](docs/AggregationByResourceAndMetric.md) - - [AggregationByResourceOrMetric](docs/AggregationByResourceOrMetric.md) + - [AggregationByResourceAndMetricValue](docs/AggregationByResourceAndMetricValue.md) + - [AggregationByResourceOrMetricValue](docs/AggregationByResourceOrMetricValue.md) - [AggregationMethod](docs/AggregationMethod.md) - [AggregationMethodOneOf](docs/AggregationMethodOneOf.md) - [AggregationMethodOneOf1](docs/AggregationMethodOneOf1.md) @@ -107,6 +107,7 @@ Class | Method | HTTP request | Description - [ColumnDataSetDataAxis](docs/ColumnDataSetDataAxis.md) - [ColumnHeader](docs/ColumnHeader.md) - [ColumnHeadersInner](docs/ColumnHeadersInner.md) + - [Data](docs/Data.md) - [DataAxisOption](docs/DataAxisOption.md) - [DataSetAttributes](docs/DataSetAttributes.md) - [DataSetWindow](docs/DataSetWindow.md) @@ -114,7 +115,7 @@ Class | Method | HTTP request | Description - [DefaultAggregation](docs/DefaultAggregation.md) - [DefaultInterpolation](docs/DefaultInterpolation.md) - [DeleteResponse](docs/DeleteResponse.md) - - [Embeddings](docs/Embeddings.md) + - [EmbeddingsValue](docs/EmbeddingsValue.md) - [FromOverride](docs/FromOverride.md) - [GroupingInterval](docs/GroupingInterval.md) - [GroupingIntervalOverride](docs/GroupingIntervalOverride.md) @@ -142,7 +143,7 @@ Class | Method | HTTP request | Description - [InterpolationMethodOneOf8](docs/InterpolationMethodOneOf8.md) - [InterpolationMethodOneOf9](docs/InterpolationMethodOneOf9.md) - [InterpolationSpec](docs/InterpolationSpec.md) - - [Links](docs/Links.md) + - [LinksValue](docs/LinksValue.md) - [LocationInner](docs/LocationInner.md) - [Message](docs/Message.md) - [MessageArguments](docs/MessageArguments.md) @@ -150,7 +151,6 @@ Class | Method | HTTP request | Description - [MessageProperties](docs/MessageProperties.md) - [ObjectData](docs/ObjectData.md) - [ObjectDataSet](docs/ObjectDataSet.md) - - [ObjectDataValue](docs/ObjectDataValue.md) - [QueriesListResponse](docs/QueriesListResponse.md) - [QueryDefinition](docs/QueryDefinition.md) - [QueryEntityInput](docs/QueryEntityInput.md) diff --git a/docs/AggregationByResourceAndMetric.md b/docs/AggregationByResourceAndMetric.md deleted file mode 100644 index 573a1fb..0000000 --- a/docs/AggregationByResourceAndMetric.md +++ /dev/null @@ -1,28 +0,0 @@ -# AggregationByResourceAndMetric - - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -## Example - -```python -from waylay.services.queries.models.aggregation_by_resource_and_metric import AggregationByResourceAndMetric - -# TODO update the JSON string below -json = "{}" -# create an instance of AggregationByResourceAndMetric from a JSON string -aggregation_by_resource_and_metric_instance = AggregationByResourceAndMetric.from_json(json) -# print the JSON string representation of the object -print AggregationByResourceAndMetric.to_json() - -# convert the object into a dict -aggregation_by_resource_and_metric_dict = aggregation_by_resource_and_metric_instance.to_dict() -# create an instance of AggregationByResourceAndMetric from a dict -aggregation_by_resource_and_metric_form_dict = aggregation_by_resource_and_metric.from_dict(aggregation_by_resource_and_metric_dict) -``` -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - - diff --git a/docs/AggregationByResourceAndMetricValue.md b/docs/AggregationByResourceAndMetricValue.md new file mode 100644 index 0000000..3a1f41d --- /dev/null +++ b/docs/AggregationByResourceAndMetricValue.md @@ -0,0 +1,28 @@ +# AggregationByResourceAndMetricValue + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +## Example + +```python +from waylay.services.queries.models.aggregation_by_resource_and_metric_value import AggregationByResourceAndMetricValue + +# TODO update the JSON string below +json = "{}" +# create an instance of AggregationByResourceAndMetricValue from a JSON string +aggregation_by_resource_and_metric_value_instance = AggregationByResourceAndMetricValue.from_json(json) +# print the JSON string representation of the object +print AggregationByResourceAndMetricValue.to_json() + +# convert the object into a dict +aggregation_by_resource_and_metric_value_dict = aggregation_by_resource_and_metric_value_instance.to_dict() +# create an instance of AggregationByResourceAndMetricValue from a dict +aggregation_by_resource_and_metric_value_form_dict = aggregation_by_resource_and_metric_value.from_dict(aggregation_by_resource_and_metric_value_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/docs/AggregationByResourceOrMetric.md b/docs/AggregationByResourceOrMetric.md deleted file mode 100644 index 61fc31a..0000000 --- a/docs/AggregationByResourceOrMetric.md +++ /dev/null @@ -1,28 +0,0 @@ -# AggregationByResourceOrMetric - - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -## Example - -```python -from waylay.services.queries.models.aggregation_by_resource_or_metric import AggregationByResourceOrMetric - -# TODO update the JSON string below -json = "{}" -# create an instance of AggregationByResourceOrMetric from a JSON string -aggregation_by_resource_or_metric_instance = AggregationByResourceOrMetric.from_json(json) -# print the JSON string representation of the object -print AggregationByResourceOrMetric.to_json() - -# convert the object into a dict -aggregation_by_resource_or_metric_dict = aggregation_by_resource_or_metric_instance.to_dict() -# create an instance of AggregationByResourceOrMetric from a dict -aggregation_by_resource_or_metric_form_dict = aggregation_by_resource_or_metric.from_dict(aggregation_by_resource_or_metric_dict) -``` -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - - diff --git a/docs/AggregationByResourceOrMetricValue.md b/docs/AggregationByResourceOrMetricValue.md new file mode 100644 index 0000000..e72a913 --- /dev/null +++ b/docs/AggregationByResourceOrMetricValue.md @@ -0,0 +1,28 @@ +# AggregationByResourceOrMetricValue + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +## Example + +```python +from waylay.services.queries.models.aggregation_by_resource_or_metric_value import AggregationByResourceOrMetricValue + +# TODO update the JSON string below +json = "{}" +# create an instance of AggregationByResourceOrMetricValue from a JSON string +aggregation_by_resource_or_metric_value_instance = AggregationByResourceOrMetricValue.from_json(json) +# print the JSON string representation of the object +print AggregationByResourceOrMetricValue.to_json() + +# convert the object into a dict +aggregation_by_resource_or_metric_value_dict = aggregation_by_resource_or_metric_value_instance.to_dict() +# create an instance of AggregationByResourceOrMetricValue from a dict +aggregation_by_resource_or_metric_value_form_dict = aggregation_by_resource_or_metric_value.from_dict(aggregation_by_resource_or_metric_value_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/docs/Embeddings.md b/docs/Data.md similarity index 54% rename from docs/Embeddings.md rename to docs/Data.md index b6b3869..f13358b 100644 --- a/docs/Embeddings.md +++ b/docs/Data.md @@ -1,4 +1,4 @@ -# Embeddings +# Data ## Properties @@ -9,19 +9,19 @@ Name | Type | Description | Notes ## Example ```python -from waylay.services.queries.models.embeddings import Embeddings +from waylay.services.queries.models.data import Data # TODO update the JSON string below json = "{}" -# create an instance of Embeddings from a JSON string -embeddings_instance = Embeddings.from_json(json) +# create an instance of Data from a JSON string +data_instance = Data.from_json(json) # print the JSON string representation of the object -print Embeddings.to_json() +print Data.to_json() # convert the object into a dict -embeddings_dict = embeddings_instance.to_dict() -# create an instance of Embeddings from a dict -embeddings_form_dict = embeddings.from_dict(embeddings_dict) +data_dict = data_instance.to_dict() +# create an instance of Data from a dict +data_form_dict = data.from_dict(data_dict) ``` [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/DeleteResponse.md b/docs/DeleteResponse.md index 6d43743..fdad4a1 100644 --- a/docs/DeleteResponse.md +++ b/docs/DeleteResponse.md @@ -7,8 +7,8 @@ Confirmation of a delete request. Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **messages** | [**List[Message]**](Message.md) | | [optional] -**links** | [**Dict[str, Links]**](Links.md) | HAL links, indexed by link relation. | [optional] -**embeddings** | [**Dict[str, Embeddings]**](Embeddings.md) | Hal embeddings, indexed by relation. | [optional] +**links** | [**Dict[str, LinksValue]**](LinksValue.md) | HAL links, indexed by link relation. | [optional] +**embeddings** | [**Dict[str, EmbeddingsValue]**](EmbeddingsValue.md) | Hal embeddings, indexed by relation. | [optional] ## Example diff --git a/docs/EmbeddingsValue.md b/docs/EmbeddingsValue.md new file mode 100644 index 0000000..314e88c --- /dev/null +++ b/docs/EmbeddingsValue.md @@ -0,0 +1,28 @@ +# EmbeddingsValue + + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +## Example + +```python +from waylay.services.queries.models.embeddings_value import EmbeddingsValue + +# TODO update the JSON string below +json = "{}" +# create an instance of EmbeddingsValue from a JSON string +embeddings_value_instance = EmbeddingsValue.from_json(json) +# print the JSON string representation of the object +print EmbeddingsValue.to_json() + +# convert the object into a dict +embeddings_value_dict = embeddings_value_instance.to_dict() +# create an instance of EmbeddingsValue from a dict +embeddings_value_form_dict = embeddings_value.from_dict(embeddings_value_dict) +``` +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/docs/Links.md b/docs/LinksValue.md similarity index 63% rename from docs/Links.md rename to docs/LinksValue.md index ca4fe11..49fd32b 100644 --- a/docs/Links.md +++ b/docs/LinksValue.md @@ -1,4 +1,4 @@ -# Links +# LinksValue ## Properties @@ -12,19 +12,19 @@ Name | Type | Description | Notes ## Example ```python -from waylay.services.queries.models.links import Links +from waylay.services.queries.models.links_value import LinksValue # TODO update the JSON string below json = "{}" -# create an instance of Links from a JSON string -links_instance = Links.from_json(json) +# create an instance of LinksValue from a JSON string +links_value_instance = LinksValue.from_json(json) # print the JSON string representation of the object -print Links.to_json() +print LinksValue.to_json() # convert the object into a dict -links_dict = links_instance.to_dict() -# create an instance of Links from a dict -links_form_dict = links.from_dict(links_dict) +links_value_dict = links_value_instance.to_dict() +# create an instance of LinksValue from a dict +links_value_form_dict = links_value.from_dict(links_value_dict) ``` [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/ObjectDataValue.md b/docs/ObjectDataValue.md deleted file mode 100644 index 639218d..0000000 --- a/docs/ObjectDataValue.md +++ /dev/null @@ -1,28 +0,0 @@ -# ObjectDataValue - - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - -## Example - -```python -from waylay.services.queries.models.object_data_value import ObjectDataValue - -# TODO update the JSON string below -json = "{}" -# create an instance of ObjectDataValue from a JSON string -object_data_value_instance = ObjectDataValue.from_json(json) -# print the JSON string representation of the object -print ObjectDataValue.to_json() - -# convert the object into a dict -object_data_value_dict = object_data_value_instance.to_dict() -# create an instance of ObjectDataValue from a dict -object_data_value_form_dict = object_data_value.from_dict(object_data_value_dict) -``` -[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) - - diff --git a/requirements.txt b/requirements.txt index 85733e4..fb9ec43 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ pydantic ~= 2.6 typing-extensions ~= 4.9 -waylay-sdk-core ~= 0.2.3 +waylay-sdk-core ~= 0.2.4 diff --git a/test/api/__pycache__/__init__.cpython-311.pyc b/test/api/__pycache__/__init__.cpython-311.pyc index cbba788..469295b 100644 Binary files a/test/api/__pycache__/__init__.cpython-311.pyc and b/test/api/__pycache__/__init__.cpython-311.pyc differ diff --git a/test/api/__pycache__/execute_api_test.cpython-311-pytest-8.3.3.pyc b/test/api/__pycache__/execute_api_test.cpython-311-pytest-8.3.3.pyc new file mode 100644 index 0000000..f460069 Binary files /dev/null and b/test/api/__pycache__/execute_api_test.cpython-311-pytest-8.3.3.pyc differ diff --git a/test/api/__pycache__/manage_api_test.cpython-311-pytest-8.3.3.pyc b/test/api/__pycache__/manage_api_test.cpython-311-pytest-8.3.3.pyc new file mode 100644 index 0000000..6b3949b Binary files /dev/null and b/test/api/__pycache__/manage_api_test.cpython-311-pytest-8.3.3.pyc differ diff --git a/test/api/__pycache__/status_api_test.cpython-311-pytest-8.3.3.pyc b/test/api/__pycache__/status_api_test.cpython-311-pytest-8.3.3.pyc new file mode 100644 index 0000000..ef8c3d3 Binary files /dev/null and b/test/api/__pycache__/status_api_test.cpython-311-pytest-8.3.3.pyc differ diff --git a/test/openapi.py b/test/openapi.py index 23239bc..d9bac6c 100644 --- a/test/openapi.py +++ b/test/openapi.py @@ -29,13 +29,13 @@ def with_example_provider(dct): MODEL_DEFINITIONS = OPENAPI_SPEC["components"]["schemas"] -_aggregation_by_resource_and_metric_model_schema = json.loads( +_aggregation_by_resource_and_metric_value_model_schema = json.loads( r"""{ "anyOf" : [ { "title" : "Aggregation by Resource or Metric", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/Aggregation_by_Resource_or_Metric" + "$ref" : "#/components/schemas/Aggregation_by_Resource_or_Metric_value" }, "description" : "Aggregation methods specified per resource or metric.", "nullable" : true @@ -45,10 +45,10 @@ def with_example_provider(dct): object_hook=with_example_provider, ) MODEL_DEFINITIONS.update({ - "Aggregation_by_Resource_and_Metric": _aggregation_by_resource_and_metric_model_schema + "Aggregation_by_Resource_and_Metric_value": _aggregation_by_resource_and_metric_value_model_schema }) -_aggregation_by_resource_or_metric_model_schema = json.loads( +_aggregation_by_resource_or_metric_value_model_schema = json.loads( r"""{ "anyOf" : [ { "$ref" : "#/components/schemas/AggregationMethod" @@ -66,7 +66,7 @@ def with_example_provider(dct): object_hook=with_example_provider, ) MODEL_DEFINITIONS.update({ - "Aggregation_by_Resource_or_Metric": _aggregation_by_resource_or_metric_model_schema + "Aggregation_by_Resource_or_Metric_value": _aggregation_by_resource_or_metric_value_model_schema }) _aggregation_method_model_schema = json.loads( @@ -451,6 +451,22 @@ def with_example_provider(dct): ) MODEL_DEFINITIONS.update({"Column_Headers_inner": _column_headers_inner_model_schema}) +_data__model_schema = json.loads( + r"""{ + "title" : "Data ", + "oneOf" : [ { + "title" : "Hierarchical Data", + "type" : "object", + "description" : "Values for the series whose attributes corresponds with the key. Keyed by sub-levels." + }, { + "$ref" : "#/components/schemas/Datum" + } ] +} +""", + object_hook=with_example_provider, +) +MODEL_DEFINITIONS.update({"Data_": _data__model_schema}) + _data_axis_option_model_schema = json.loads( r"""{ "type" : "string", @@ -549,7 +565,7 @@ def with_example_provider(dct): "title" : "Aggregation by Resource or Metric", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/Aggregation_by_Resource_or_Metric" + "$ref" : "#/components/schemas/Aggregation_by_Resource_or_Metric_value" }, "description" : "Aggregation methods specified per resource or metric.", "nullable" : true @@ -557,7 +573,7 @@ def with_example_provider(dct): "title" : "Aggregation by Resource and Metric", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/Aggregation_by_Resource_and_Metric" + "$ref" : "#/components/schemas/Aggregation_by_Resource_and_Metric_value" }, "description" : "Aggregation methods specified per resource and metric.", "nullable" : true @@ -598,7 +614,7 @@ def with_example_provider(dct): "title" : " Links", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/_Links" + "$ref" : "#/components/schemas/_Links_value" }, "description" : "HAL links, indexed by link relation." }, @@ -606,7 +622,7 @@ def with_example_provider(dct): "title" : " Embeddings", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/_Embeddings" + "$ref" : "#/components/schemas/_Embeddings_value" }, "description" : "Hal embeddings, indexed by relation." } @@ -619,9 +635,9 @@ def with_example_provider(dct): ) MODEL_DEFINITIONS.update({"DeleteResponse": _delete_response_model_schema}) -_embeddings_model_schema = json.loads( +_embeddings_value_model_schema = json.loads( r"""{ - "title" : "_Embeddings", + "title" : "_Embeddings_value", "anyOf" : [ { "$ref" : "#/components/schemas/HALEmbedding" }, { @@ -634,7 +650,7 @@ def with_example_provider(dct): """, object_hook=with_example_provider, ) -MODEL_DEFINITIONS.update({"_Embeddings": _embeddings_model_schema}) +MODEL_DEFINITIONS.update({"_Embeddings_value": _embeddings_value_model_schema}) _from_override__model_schema = json.loads( r"""{ @@ -1083,9 +1099,9 @@ def with_example_provider(dct): ) MODEL_DEFINITIONS.update({"InterpolationSpec": _interpolation_spec_model_schema}) -_links_model_schema = json.loads( +_links_value_model_schema = json.loads( r"""{ - "title" : "_Links", + "title" : "_Links_value", "anyOf" : [ { "$ref" : "#/components/schemas/HALLink" }, { @@ -1098,7 +1114,7 @@ def with_example_provider(dct): """, object_hook=with_example_provider, ) -MODEL_DEFINITIONS.update({"_Links": _links_model_schema}) +MODEL_DEFINITIONS.update({"_Links_value": _links_value_model_schema}) _location_inner_model_schema = json.loads( r"""{ @@ -1232,7 +1248,7 @@ def with_example_provider(dct): } }, "additionalProperties" : { - "$ref" : "#/components/schemas/ObjectData_value" + "$ref" : "#/components/schemas/Data_" }, "description" : "Result data for a timestamp in object format." } @@ -1268,22 +1284,6 @@ def with_example_provider(dct): ) MODEL_DEFINITIONS.update({"ObjectDataSet": _object_data_set_model_schema}) -_object_data_value_model_schema = json.loads( - r"""{ - "title" : "Data ", - "oneOf" : [ { - "title" : "Hierarchical Data", - "type" : "object", - "description" : "Values for the series whose attributes corresponds with the key. Keyed by sub-levels." - }, { - "$ref" : "#/components/schemas/Datum" - } ] -} -""", - object_hook=with_example_provider, -) -MODEL_DEFINITIONS.update({"ObjectData_value": _object_data_value_model_schema}) - _queries_list_response_model_schema = json.loads( r"""{ "required" : [ "_links", "count", "limit", "offset", "queries" ], diff --git a/test/types/__pycache__/__init__.cpython-311.pyc b/test/types/__pycache__/__init__.cpython-311.pyc index 488821f..3ffd91e 100644 Binary files a/test/types/__pycache__/__init__.cpython-311.pyc and b/test/types/__pycache__/__init__.cpython-311.pyc differ diff --git a/test/types/__pycache__/aggregation_method_stub.cpython-311.pyc b/test/types/__pycache__/aggregation_method_stub.cpython-311.pyc index 73e7113..32767de 100644 Binary files a/test/types/__pycache__/aggregation_method_stub.cpython-311.pyc and b/test/types/__pycache__/aggregation_method_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/delete_response_stub.cpython-311.pyc b/test/types/__pycache__/delete_response_stub.cpython-311.pyc index 67e84ce..d5100f6 100644 Binary files a/test/types/__pycache__/delete_response_stub.cpython-311.pyc and b/test/types/__pycache__/delete_response_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/from_override_stub.cpython-311.pyc b/test/types/__pycache__/from_override_stub.cpython-311.pyc index 80c7584..bbfcff7 100644 Binary files a/test/types/__pycache__/from_override_stub.cpython-311.pyc and b/test/types/__pycache__/from_override_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/grouping_interval_override_stub.cpython-311.pyc b/test/types/__pycache__/grouping_interval_override_stub.cpython-311.pyc index e609b50..571905b 100644 Binary files a/test/types/__pycache__/grouping_interval_override_stub.cpython-311.pyc and b/test/types/__pycache__/grouping_interval_override_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/interpolation_stub.cpython-311.pyc b/test/types/__pycache__/interpolation_stub.cpython-311.pyc index c6e7180..f20d4c6 100644 Binary files a/test/types/__pycache__/interpolation_stub.cpython-311.pyc and b/test/types/__pycache__/interpolation_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/queries_list_response_stub.cpython-311.pyc b/test/types/__pycache__/queries_list_response_stub.cpython-311.pyc index a3649fe..a6955f7 100644 Binary files a/test/types/__pycache__/queries_list_response_stub.cpython-311.pyc and b/test/types/__pycache__/queries_list_response_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/query_definition_stub.cpython-311.pyc b/test/types/__pycache__/query_definition_stub.cpython-311.pyc index 92ce25c..95d6d5b 100644 Binary files a/test/types/__pycache__/query_definition_stub.cpython-311.pyc and b/test/types/__pycache__/query_definition_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/query_entity_input_stub.cpython-311.pyc b/test/types/__pycache__/query_entity_input_stub.cpython-311.pyc index 2c75ab9..f094ddb 100644 Binary files a/test/types/__pycache__/query_entity_input_stub.cpython-311.pyc and b/test/types/__pycache__/query_entity_input_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/query_input_stub.cpython-311.pyc b/test/types/__pycache__/query_input_stub.cpython-311.pyc index 10d968c..f05aaf3 100644 Binary files a/test/types/__pycache__/query_input_stub.cpython-311.pyc and b/test/types/__pycache__/query_input_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/query_response_stub.cpython-311.pyc b/test/types/__pycache__/query_response_stub.cpython-311.pyc index f7ab72b..8494853 100644 Binary files a/test/types/__pycache__/query_response_stub.cpython-311.pyc and b/test/types/__pycache__/query_response_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/query_result_stub.cpython-311.pyc b/test/types/__pycache__/query_result_stub.cpython-311.pyc index 8c9d5d7..03523a7 100644 Binary files a/test/types/__pycache__/query_result_stub.cpython-311.pyc and b/test/types/__pycache__/query_result_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/render1_stub.cpython-311.pyc b/test/types/__pycache__/render1_stub.cpython-311.pyc index b49bd21..b90e7b3 100644 Binary files a/test/types/__pycache__/render1_stub.cpython-311.pyc and b/test/types/__pycache__/render1_stub.cpython-311.pyc differ diff --git a/test/types/__pycache__/window_override_stub.cpython-311.pyc b/test/types/__pycache__/window_override_stub.cpython-311.pyc index b278f4b..06e6bd7 100644 Binary files a/test/types/__pycache__/window_override_stub.cpython-311.pyc and b/test/types/__pycache__/window_override_stub.cpython-311.pyc differ diff --git a/test/types/aggregation_by_resource_and_metric_stub.py b/test/types/aggregation_by_resource_and_metric_value_stub.py similarity index 62% rename from test/types/aggregation_by_resource_and_metric_stub.py rename to test/types/aggregation_by_resource_and_metric_value_stub.py index ca4d1b5..07229bd 100644 --- a/test/types/aggregation_by_resource_and_metric_stub.py +++ b/test/types/aggregation_by_resource_and_metric_value_stub.py @@ -16,22 +16,24 @@ from ..openapi import MODEL_DEFINITIONS, with_example_provider try: - from waylay.services.queries.models.aggregation_by_resource_and_metric import ( - AggregationByResourceAndMetric, + from waylay.services.queries.models.aggregation_by_resource_and_metric_value import ( + AggregationByResourceAndMetricValue, ) - AggregationByResourceAndMetricAdapter = TypeAdapter(AggregationByResourceAndMetric) + AggregationByResourceAndMetricValueAdapter = TypeAdapter( + AggregationByResourceAndMetricValue + ) MODELS_AVAILABLE = True except ImportError as exc: MODELS_AVAILABLE = False -aggregation_by_resource_and_metric_model_schema = json.loads( +aggregation_by_resource_and_metric_value_model_schema = json.loads( r"""{ "anyOf" : [ { "title" : "Aggregation by Resource or Metric", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/Aggregation_by_Resource_or_Metric" + "$ref" : "#/components/schemas/Aggregation_by_Resource_or_Metric_value" }, "description" : "Aggregation methods specified per resource or metric.", "nullable" : true @@ -40,38 +42,38 @@ """, object_hook=with_example_provider, ) -aggregation_by_resource_and_metric_model_schema.update({ +aggregation_by_resource_and_metric_value_model_schema.update({ "definitions": MODEL_DEFINITIONS }) -aggregation_by_resource_and_metric_faker = JSF( - aggregation_by_resource_and_metric_model_schema, allow_none_optionals=1 +aggregation_by_resource_and_metric_value_faker = JSF( + aggregation_by_resource_and_metric_value_model_schema, allow_none_optionals=1 ) -class AggregationByResourceAndMetricStub: - """AggregationByResourceAndMetric unit test stubs.""" +class AggregationByResourceAndMetricValueStub: + """AggregationByResourceAndMetricValue unit test stubs.""" @classmethod def create_json(cls): """Create a dict stub instance.""" - return aggregation_by_resource_and_metric_faker.generate( + return aggregation_by_resource_and_metric_value_faker.generate( use_defaults=True, use_examples=True ) @classmethod - def create_instance(cls) -> "AggregationByResourceAndMetric": - """Create AggregationByResourceAndMetric stub instance.""" + def create_instance(cls) -> "AggregationByResourceAndMetricValue": + """Create AggregationByResourceAndMetricValue stub instance.""" if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( - AggregationByResourceAndMetricAdapter.json_schema(), + AggregationByResourceAndMetricValueAdapter.json_schema(), allow_none_optionals=1, ) json = backup_faker.generate(use_defaults=True, use_examples=True) - return AggregationByResourceAndMetricAdapter.validate_python( + return AggregationByResourceAndMetricValueAdapter.validate_python( json, context={"skip_validation": True} ) diff --git a/test/types/aggregation_by_resource_or_metric_stub.py b/test/types/aggregation_by_resource_or_metric_value_stub.py similarity index 63% rename from test/types/aggregation_by_resource_or_metric_stub.py rename to test/types/aggregation_by_resource_or_metric_value_stub.py index ccd6b14..22188cd 100644 --- a/test/types/aggregation_by_resource_or_metric_stub.py +++ b/test/types/aggregation_by_resource_or_metric_value_stub.py @@ -16,16 +16,18 @@ from ..openapi import MODEL_DEFINITIONS, with_example_provider try: - from waylay.services.queries.models.aggregation_by_resource_or_metric import ( - AggregationByResourceOrMetric, + from waylay.services.queries.models.aggregation_by_resource_or_metric_value import ( + AggregationByResourceOrMetricValue, ) - AggregationByResourceOrMetricAdapter = TypeAdapter(AggregationByResourceOrMetric) + AggregationByResourceOrMetricValueAdapter = TypeAdapter( + AggregationByResourceOrMetricValue + ) MODELS_AVAILABLE = True except ImportError as exc: MODELS_AVAILABLE = False -aggregation_by_resource_or_metric_model_schema = json.loads( +aggregation_by_resource_or_metric_value_model_schema = json.loads( r"""{ "anyOf" : [ { "$ref" : "#/components/schemas/AggregationMethod" @@ -42,38 +44,38 @@ """, object_hook=with_example_provider, ) -aggregation_by_resource_or_metric_model_schema.update({ +aggregation_by_resource_or_metric_value_model_schema.update({ "definitions": MODEL_DEFINITIONS }) -aggregation_by_resource_or_metric_faker = JSF( - aggregation_by_resource_or_metric_model_schema, allow_none_optionals=1 +aggregation_by_resource_or_metric_value_faker = JSF( + aggregation_by_resource_or_metric_value_model_schema, allow_none_optionals=1 ) -class AggregationByResourceOrMetricStub: - """AggregationByResourceOrMetric unit test stubs.""" +class AggregationByResourceOrMetricValueStub: + """AggregationByResourceOrMetricValue unit test stubs.""" @classmethod def create_json(cls): """Create a dict stub instance.""" - return aggregation_by_resource_or_metric_faker.generate( + return aggregation_by_resource_or_metric_value_faker.generate( use_defaults=True, use_examples=True ) @classmethod - def create_instance(cls) -> "AggregationByResourceOrMetric": - """Create AggregationByResourceOrMetric stub instance.""" + def create_instance(cls) -> "AggregationByResourceOrMetricValue": + """Create AggregationByResourceOrMetricValue stub instance.""" if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( - AggregationByResourceOrMetricAdapter.json_schema(), + AggregationByResourceOrMetricValueAdapter.json_schema(), allow_none_optionals=1, ) json = backup_faker.generate(use_defaults=True, use_examples=True) - return AggregationByResourceOrMetricAdapter.validate_python( + return AggregationByResourceOrMetricValueAdapter.validate_python( json, context={"skip_validation": True} ) diff --git a/test/types/aggregation_method_one_of1_stub.py b/test/types/aggregation_method_one_of1_stub.py index 72a5f81..6e02fa0 100644 --- a/test/types/aggregation_method_one_of1_stub.py +++ b/test/types/aggregation_method_one_of1_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "AggregationMethodOneOf1": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodOneOf1Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregation_method_one_of2_stub.py b/test/types/aggregation_method_one_of2_stub.py index 1abb11a..1e6d067 100644 --- a/test/types/aggregation_method_one_of2_stub.py +++ b/test/types/aggregation_method_one_of2_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "AggregationMethodOneOf2": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodOneOf2Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregation_method_one_of3_stub.py b/test/types/aggregation_method_one_of3_stub.py index 880b45e..10351ed 100644 --- a/test/types/aggregation_method_one_of3_stub.py +++ b/test/types/aggregation_method_one_of3_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "AggregationMethodOneOf3": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodOneOf3Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregation_method_one_of4_stub.py b/test/types/aggregation_method_one_of4_stub.py index 40187cb..9143530 100644 --- a/test/types/aggregation_method_one_of4_stub.py +++ b/test/types/aggregation_method_one_of4_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "AggregationMethodOneOf4": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodOneOf4Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregation_method_one_of5_stub.py b/test/types/aggregation_method_one_of5_stub.py index 309932b..c78ef63 100644 --- a/test/types/aggregation_method_one_of5_stub.py +++ b/test/types/aggregation_method_one_of5_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "AggregationMethodOneOf5": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodOneOf5Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregation_method_one_of6_stub.py b/test/types/aggregation_method_one_of6_stub.py index 0cb80fe..b1d0e55 100644 --- a/test/types/aggregation_method_one_of6_stub.py +++ b/test/types/aggregation_method_one_of6_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "AggregationMethodOneOf6": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodOneOf6Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregation_method_one_of7_stub.py b/test/types/aggregation_method_one_of7_stub.py index 4de5489..c1b13e7 100644 --- a/test/types/aggregation_method_one_of7_stub.py +++ b/test/types/aggregation_method_one_of7_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "AggregationMethodOneOf7": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodOneOf7Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregation_method_one_of8_stub.py b/test/types/aggregation_method_one_of8_stub.py index ba8f966..3d25b2d 100644 --- a/test/types/aggregation_method_one_of8_stub.py +++ b/test/types/aggregation_method_one_of8_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "AggregationMethodOneOf8": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodOneOf8Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregation_method_one_of_stub.py b/test/types/aggregation_method_one_of_stub.py index 60561e6..6c0a523 100644 --- a/test/types/aggregation_method_one_of_stub.py +++ b/test/types/aggregation_method_one_of_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "AggregationMethodOneOf": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodOneOfAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregation_method_stub.py b/test/types/aggregation_method_stub.py index 4d5f54e..1544924 100644 --- a/test/types/aggregation_method_stub.py +++ b/test/types/aggregation_method_stub.py @@ -69,7 +69,7 @@ def create_instance(cls) -> "AggregationMethod": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationMethodAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/aggregations_inner_stub.py b/test/types/aggregations_inner_stub.py index 6d77087..21c4d99 100644 --- a/test/types/aggregations_inner_stub.py +++ b/test/types/aggregations_inner_stub.py @@ -51,7 +51,7 @@ def create_instance(cls) -> "AggregationsInner": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AggregationsInnerAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/align_at_stub.py b/test/types/align_at_stub.py index 3aecf35..38b601f 100644 --- a/test/types/align_at_stub.py +++ b/test/types/align_at_stub.py @@ -51,7 +51,7 @@ def create_instance(cls) -> "AlignAt": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(AlignAtAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/align_shift_stub.py b/test/types/align_shift_stub.py index 8534d66..6e72621 100644 --- a/test/types/align_shift_stub.py +++ b/test/types/align_shift_stub.py @@ -51,7 +51,7 @@ def create_instance(cls) -> "AlignShift": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(AlignShiftAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/alignment_grid_interval_stub.py b/test/types/alignment_grid_interval_stub.py index a8f4aa3..80162d6 100644 --- a/test/types/alignment_grid_interval_stub.py +++ b/test/types/alignment_grid_interval_stub.py @@ -67,7 +67,7 @@ def create_instance(cls) -> "AlignmentGridInterval": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AlignmentGridIntervalAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/alignment_stub.py b/test/types/alignment_stub.py index 90e1483..b171c54 100644 --- a/test/types/alignment_stub.py +++ b/test/types/alignment_stub.py @@ -65,7 +65,7 @@ def create_instance(cls) -> "Alignment": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(AlignmentAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/alignment_timezone_stub.py b/test/types/alignment_timezone_stub.py index 86b3a02..4938fbe 100644 --- a/test/types/alignment_timezone_stub.py +++ b/test/types/alignment_timezone_stub.py @@ -63,7 +63,7 @@ def create_instance(cls) -> "AlignmentTimezone": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( AlignmentTimezoneAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/cause_exception_stub.py b/test/types/cause_exception_stub.py index 50a9da4..4fafd58 100644 --- a/test/types/cause_exception_stub.py +++ b/test/types/cause_exception_stub.py @@ -69,7 +69,7 @@ def create_instance(cls) -> "CauseException": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( CauseExceptionAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/column_data_set_data_axis_stub.py b/test/types/column_data_set_data_axis_stub.py index cd85c8b..faef9cb 100644 --- a/test/types/column_data_set_data_axis_stub.py +++ b/test/types/column_data_set_data_axis_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "ColumnDataSetDataAxis": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( ColumnDataSetDataAxisAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/column_data_set_stub.py b/test/types/column_data_set_stub.py index 9e3d668..2273279 100644 --- a/test/types/column_data_set_stub.py +++ b/test/types/column_data_set_stub.py @@ -82,7 +82,7 @@ def create_instance(cls) -> "ColumnDataSet": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( ColumnDataSetAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/column_header_stub.py b/test/types/column_header_stub.py index ae011cc..971c7eb 100644 --- a/test/types/column_header_stub.py +++ b/test/types/column_header_stub.py @@ -66,7 +66,7 @@ def create_instance(cls) -> "ColumnHeader": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( ColumnHeaderAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/column_headers_inner_stub.py b/test/types/column_headers_inner_stub.py index bdf14a0..1a9758c 100644 --- a/test/types/column_headers_inner_stub.py +++ b/test/types/column_headers_inner_stub.py @@ -56,7 +56,7 @@ def create_instance(cls) -> "ColumnHeadersInner": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( ColumnHeadersInnerAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/data_axis_option_stub.py b/test/types/data_axis_option_stub.py index a362d11..3861f3a 100644 --- a/test/types/data_axis_option_stub.py +++ b/test/types/data_axis_option_stub.py @@ -51,7 +51,7 @@ def create_instance(cls) -> "DataAxisOption": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( DataAxisOptionAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/data_set_attributes_stub.py b/test/types/data_set_attributes_stub.py index 0258bc6..c1b363f 100644 --- a/test/types/data_set_attributes_stub.py +++ b/test/types/data_set_attributes_stub.py @@ -59,7 +59,7 @@ def create_instance(cls) -> "DataSetAttributes": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( DataSetAttributesAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/data_set_window_stub.py b/test/types/data_set_window_stub.py index 2558bef..682fbae 100644 --- a/test/types/data_set_window_stub.py +++ b/test/types/data_set_window_stub.py @@ -72,7 +72,7 @@ def create_instance(cls) -> "DataSetWindow": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( DataSetWindowAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/object_data_value_stub.py b/test/types/data_stub.py similarity index 58% rename from test/types/object_data_value_stub.py rename to test/types/data_stub.py index a260eed..7be8f96 100644 --- a/test/types/object_data_value_stub.py +++ b/test/types/data_stub.py @@ -16,14 +16,14 @@ from ..openapi import MODEL_DEFINITIONS, with_example_provider try: - from waylay.services.queries.models.object_data_value import ObjectDataValue + from waylay.services.queries.models.data import Data - ObjectDataValueAdapter = TypeAdapter(ObjectDataValue) + DataAdapter = TypeAdapter(Data) MODELS_AVAILABLE = True except ImportError as exc: MODELS_AVAILABLE = False -object_data_value_model_schema = json.loads( +data__model_schema = json.loads( r"""{ "title" : "Data ", "oneOf" : [ { @@ -37,31 +37,27 @@ """, object_hook=with_example_provider, ) -object_data_value_model_schema.update({"definitions": MODEL_DEFINITIONS}) +data__model_schema.update({"definitions": MODEL_DEFINITIONS}) -object_data_value_faker = JSF(object_data_value_model_schema, allow_none_optionals=1) +data__faker = JSF(data__model_schema, allow_none_optionals=1) -class ObjectDataValueStub: - """ObjectDataValue unit test stubs.""" +class DataStub: + """Data unit test stubs.""" @classmethod def create_json(cls): """Create a dict stub instance.""" - return object_data_value_faker.generate(use_defaults=True, use_examples=True) + return data__faker.generate(use_defaults=True, use_examples=True) @classmethod - def create_instance(cls) -> "ObjectDataValue": - """Create ObjectDataValue stub instance.""" + def create_instance(cls) -> "Data": + """Create Data stub instance.""" if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema - backup_faker = JSF( - ObjectDataValueAdapter.json_schema(), allow_none_optionals=1 - ) + backup_faker = JSF(DataAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) - return ObjectDataValueAdapter.validate_python( - json, context={"skip_validation": True} - ) + return DataAdapter.validate_python(json, context={"skip_validation": True}) diff --git a/test/types/datum_stub.py b/test/types/datum_stub.py index 1365a38..76d5826 100644 --- a/test/types/datum_stub.py +++ b/test/types/datum_stub.py @@ -60,7 +60,7 @@ def create_instance(cls) -> "Datum": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(DatumAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/default_aggregation_stub.py b/test/types/default_aggregation_stub.py index 6120d1f..78309f3 100644 --- a/test/types/default_aggregation_stub.py +++ b/test/types/default_aggregation_stub.py @@ -41,7 +41,7 @@ "title" : "Aggregation by Resource or Metric", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/Aggregation_by_Resource_or_Metric" + "$ref" : "#/components/schemas/Aggregation_by_Resource_or_Metric_value" }, "description" : "Aggregation methods specified per resource or metric.", "nullable" : true @@ -49,7 +49,7 @@ "title" : "Aggregation by Resource and Metric", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/Aggregation_by_Resource_and_Metric" + "$ref" : "#/components/schemas/Aggregation_by_Resource_and_Metric_value" }, "description" : "Aggregation methods specified per resource and metric.", "nullable" : true @@ -79,7 +79,7 @@ def create_instance(cls) -> "DefaultAggregation": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( DefaultAggregationAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/default_interpolation_stub.py b/test/types/default_interpolation_stub.py index 1d9c1c8..f1d8b9a 100644 --- a/test/types/default_interpolation_stub.py +++ b/test/types/default_interpolation_stub.py @@ -61,7 +61,7 @@ def create_instance(cls) -> "DefaultInterpolation": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( DefaultInterpolationAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/delete_response_stub.py b/test/types/delete_response_stub.py index 8ec8137..5de5765 100644 --- a/test/types/delete_response_stub.py +++ b/test/types/delete_response_stub.py @@ -38,7 +38,7 @@ "title" : " Links", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/_Links" + "$ref" : "#/components/schemas/_Links_value" }, "description" : "HAL links, indexed by link relation." }, @@ -46,7 +46,7 @@ "title" : " Embeddings", "type" : "object", "additionalProperties" : { - "$ref" : "#/components/schemas/_Embeddings" + "$ref" : "#/components/schemas/_Embeddings_value" }, "description" : "Hal embeddings, indexed by relation." } @@ -76,7 +76,7 @@ def create_instance(cls) -> "DeleteResponse": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( DeleteResponseAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/embeddings_stub.py b/test/types/embeddings_value_stub.py similarity index 59% rename from test/types/embeddings_stub.py rename to test/types/embeddings_value_stub.py index fa4ff67..f05ac97 100644 --- a/test/types/embeddings_stub.py +++ b/test/types/embeddings_value_stub.py @@ -16,16 +16,16 @@ from ..openapi import MODEL_DEFINITIONS, with_example_provider try: - from waylay.services.queries.models.embeddings import Embeddings + from waylay.services.queries.models.embeddings_value import EmbeddingsValue - EmbeddingsAdapter = TypeAdapter(Embeddings) + EmbeddingsValueAdapter = TypeAdapter(EmbeddingsValue) MODELS_AVAILABLE = True except ImportError as exc: MODELS_AVAILABLE = False -embeddings_model_schema = json.loads( +embeddings_value_model_schema = json.loads( r"""{ - "title" : "_Embeddings", + "title" : "_Embeddings_value", "anyOf" : [ { "$ref" : "#/components/schemas/HALEmbedding" }, { @@ -38,29 +38,31 @@ """, object_hook=with_example_provider, ) -embeddings_model_schema.update({"definitions": MODEL_DEFINITIONS}) +embeddings_value_model_schema.update({"definitions": MODEL_DEFINITIONS}) -embeddings_faker = JSF(embeddings_model_schema, allow_none_optionals=1) +embeddings_value_faker = JSF(embeddings_value_model_schema, allow_none_optionals=1) -class EmbeddingsStub: - """Embeddings unit test stubs.""" +class EmbeddingsValueStub: + """EmbeddingsValue unit test stubs.""" @classmethod def create_json(cls): """Create a dict stub instance.""" - return embeddings_faker.generate(use_defaults=True, use_examples=True) + return embeddings_value_faker.generate(use_defaults=True, use_examples=True) @classmethod - def create_instance(cls) -> "Embeddings": - """Create Embeddings stub instance.""" + def create_instance(cls) -> "EmbeddingsValue": + """Create EmbeddingsValue stub instance.""" if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema - backup_faker = JSF(EmbeddingsAdapter.json_schema(), allow_none_optionals=1) + backup_faker = JSF( + EmbeddingsValueAdapter.json_schema(), allow_none_optionals=1 + ) json = backup_faker.generate(use_defaults=True, use_examples=True) - return EmbeddingsAdapter.validate_python( + return EmbeddingsValueAdapter.validate_python( json, context={"skip_validation": True} ) diff --git a/test/types/from_override_stub.py b/test/types/from_override_stub.py index 6700d95..1d6d2ed 100644 --- a/test/types/from_override_stub.py +++ b/test/types/from_override_stub.py @@ -71,7 +71,7 @@ def create_instance(cls) -> "FromOverride": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( FromOverrideAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/grouping_interval_override_one_of_stub.py b/test/types/grouping_interval_override_one_of_stub.py index 65ddf4b..45f0cd0 100644 --- a/test/types/grouping_interval_override_one_of_stub.py +++ b/test/types/grouping_interval_override_one_of_stub.py @@ -59,7 +59,7 @@ def create_instance(cls) -> "GroupingIntervalOverrideOneOf": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( GroupingIntervalOverrideOneOfAdapter.json_schema(), diff --git a/test/types/grouping_interval_override_stub.py b/test/types/grouping_interval_override_stub.py index 3b34ce4..ec75ac7 100644 --- a/test/types/grouping_interval_override_stub.py +++ b/test/types/grouping_interval_override_stub.py @@ -67,7 +67,7 @@ def create_instance(cls) -> "GroupingIntervalOverride": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( GroupingIntervalOverrideAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/grouping_interval_stub.py b/test/types/grouping_interval_stub.py index 0e84994..1dd161d 100644 --- a/test/types/grouping_interval_stub.py +++ b/test/types/grouping_interval_stub.py @@ -61,7 +61,7 @@ def create_instance(cls) -> "GroupingInterval": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( GroupingIntervalAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/hal_link_method_stub.py b/test/types/hal_link_method_stub.py index 2a0c0dd..25fda03 100644 --- a/test/types/hal_link_method_stub.py +++ b/test/types/hal_link_method_stub.py @@ -52,7 +52,7 @@ def create_instance(cls) -> "HALLinkMethod": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( HALLinkMethodAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/hal_link_role_stub.py b/test/types/hal_link_role_stub.py index f0ab95c..eaa280e 100644 --- a/test/types/hal_link_role_stub.py +++ b/test/types/hal_link_role_stub.py @@ -51,7 +51,7 @@ def create_instance(cls) -> "HALLinkRole": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(HALLinkRoleAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/hal_link_stub.py b/test/types/hal_link_stub.py index 222255c..79dfb3a 100644 --- a/test/types/hal_link_stub.py +++ b/test/types/hal_link_stub.py @@ -67,7 +67,7 @@ def create_instance(cls) -> "HALLink": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(HALLinkAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/header_array_option_stub.py b/test/types/header_array_option_stub.py index f14b5c7..867d29d 100644 --- a/test/types/header_array_option_stub.py +++ b/test/types/header_array_option_stub.py @@ -53,7 +53,7 @@ def create_instance(cls) -> "HeaderArrayOption": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( HeaderArrayOptionAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/hierarchical_stub.py b/test/types/hierarchical_stub.py index 05d952e..2599702 100644 --- a/test/types/hierarchical_stub.py +++ b/test/types/hierarchical_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "Hierarchical": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( HierarchicalAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/http_validation_error_stub.py b/test/types/http_validation_error_stub.py index 8cffe43..d3ea319 100644 --- a/test/types/http_validation_error_stub.py +++ b/test/types/http_validation_error_stub.py @@ -62,7 +62,7 @@ def create_instance(cls) -> "HTTPValidationError": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( HTTPValidationErrorAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of10_stub.py b/test/types/interpolation_method_one_of10_stub.py index e15b602..6b9e56a 100644 --- a/test/types/interpolation_method_one_of10_stub.py +++ b/test/types/interpolation_method_one_of10_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf10": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf10Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of11_stub.py b/test/types/interpolation_method_one_of11_stub.py index a4c040a..ab5b9c9 100644 --- a/test/types/interpolation_method_one_of11_stub.py +++ b/test/types/interpolation_method_one_of11_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf11": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf11Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of12_stub.py b/test/types/interpolation_method_one_of12_stub.py index c5ae03b..b1965c7 100644 --- a/test/types/interpolation_method_one_of12_stub.py +++ b/test/types/interpolation_method_one_of12_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf12": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf12Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of13_stub.py b/test/types/interpolation_method_one_of13_stub.py index fadd44a..72984a4 100644 --- a/test/types/interpolation_method_one_of13_stub.py +++ b/test/types/interpolation_method_one_of13_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf13": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf13Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of1_stub.py b/test/types/interpolation_method_one_of1_stub.py index d36706d..5fae210 100644 --- a/test/types/interpolation_method_one_of1_stub.py +++ b/test/types/interpolation_method_one_of1_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf1": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf1Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of2_stub.py b/test/types/interpolation_method_one_of2_stub.py index 9caefdb..6198764 100644 --- a/test/types/interpolation_method_one_of2_stub.py +++ b/test/types/interpolation_method_one_of2_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf2": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf2Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of3_stub.py b/test/types/interpolation_method_one_of3_stub.py index 4cff7b1..ead07fe 100644 --- a/test/types/interpolation_method_one_of3_stub.py +++ b/test/types/interpolation_method_one_of3_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf3": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf3Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of4_stub.py b/test/types/interpolation_method_one_of4_stub.py index b667c57..250f54a 100644 --- a/test/types/interpolation_method_one_of4_stub.py +++ b/test/types/interpolation_method_one_of4_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf4": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf4Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of5_stub.py b/test/types/interpolation_method_one_of5_stub.py index 487a46e..8eeff0b 100644 --- a/test/types/interpolation_method_one_of5_stub.py +++ b/test/types/interpolation_method_one_of5_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf5": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf5Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of6_stub.py b/test/types/interpolation_method_one_of6_stub.py index 8f9a186..d322415 100644 --- a/test/types/interpolation_method_one_of6_stub.py +++ b/test/types/interpolation_method_one_of6_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf6": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf6Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of7_stub.py b/test/types/interpolation_method_one_of7_stub.py index 48653d1..820dd03 100644 --- a/test/types/interpolation_method_one_of7_stub.py +++ b/test/types/interpolation_method_one_of7_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf7": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf7Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of8_stub.py b/test/types/interpolation_method_one_of8_stub.py index 6c1c7c4..27ff11c 100644 --- a/test/types/interpolation_method_one_of8_stub.py +++ b/test/types/interpolation_method_one_of8_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf8": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf8Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of9_stub.py b/test/types/interpolation_method_one_of9_stub.py index a8fd7d8..f3c5e62 100644 --- a/test/types/interpolation_method_one_of9_stub.py +++ b/test/types/interpolation_method_one_of9_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf9": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOf9Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_one_of_stub.py b/test/types/interpolation_method_one_of_stub.py index 5b8da57..bbfe1d7 100644 --- a/test/types/interpolation_method_one_of_stub.py +++ b/test/types/interpolation_method_one_of_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "InterpolationMethodOneOf": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodOneOfAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_method_stub.py b/test/types/interpolation_method_stub.py index 9d44b8f..307465e 100644 --- a/test/types/interpolation_method_stub.py +++ b/test/types/interpolation_method_stub.py @@ -81,7 +81,7 @@ def create_instance(cls) -> "InterpolationMethod": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationMethodAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_spec_stub.py b/test/types/interpolation_spec_stub.py index a874323..727c312 100644 --- a/test/types/interpolation_spec_stub.py +++ b/test/types/interpolation_spec_stub.py @@ -67,7 +67,7 @@ def create_instance(cls) -> "InterpolationSpec": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationSpecAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/interpolation_stub.py b/test/types/interpolation_stub.py index 7ff4667..df8eb3d 100644 --- a/test/types/interpolation_stub.py +++ b/test/types/interpolation_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "Interpolation": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( InterpolationAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/links_stub.py b/test/types/links_value_stub.py similarity index 59% rename from test/types/links_stub.py rename to test/types/links_value_stub.py index a1760fb..fcab19e 100644 --- a/test/types/links_stub.py +++ b/test/types/links_value_stub.py @@ -16,16 +16,16 @@ from ..openapi import MODEL_DEFINITIONS, with_example_provider try: - from waylay.services.queries.models.links import Links + from waylay.services.queries.models.links_value import LinksValue - LinksAdapter = TypeAdapter(Links) + LinksValueAdapter = TypeAdapter(LinksValue) MODELS_AVAILABLE = True except ImportError as exc: MODELS_AVAILABLE = False -links_model_schema = json.loads( +links_value_model_schema = json.loads( r"""{ - "title" : "_Links", + "title" : "_Links_value", "anyOf" : [ { "$ref" : "#/components/schemas/HALLink" }, { @@ -38,27 +38,29 @@ """, object_hook=with_example_provider, ) -links_model_schema.update({"definitions": MODEL_DEFINITIONS}) +links_value_model_schema.update({"definitions": MODEL_DEFINITIONS}) -links_faker = JSF(links_model_schema, allow_none_optionals=1) +links_value_faker = JSF(links_value_model_schema, allow_none_optionals=1) -class LinksStub: - """Links unit test stubs.""" +class LinksValueStub: + """LinksValue unit test stubs.""" @classmethod def create_json(cls): """Create a dict stub instance.""" - return links_faker.generate(use_defaults=True, use_examples=True) + return links_value_faker.generate(use_defaults=True, use_examples=True) @classmethod - def create_instance(cls) -> "Links": - """Create Links stub instance.""" + def create_instance(cls) -> "LinksValue": + """Create LinksValue stub instance.""" if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema - backup_faker = JSF(LinksAdapter.json_schema(), allow_none_optionals=1) + backup_faker = JSF(LinksValueAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) - return LinksAdapter.validate_python(json, context={"skip_validation": True}) + return LinksValueAdapter.validate_python( + json, context={"skip_validation": True} + ) diff --git a/test/types/location_inner_stub.py b/test/types/location_inner_stub.py index 21fcb7d..428ca68 100644 --- a/test/types/location_inner_stub.py +++ b/test/types/location_inner_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "LocationInner": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( LocationInnerAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/message_arguments_stub.py b/test/types/message_arguments_stub.py index f745ad1..c2440a1 100644 --- a/test/types/message_arguments_stub.py +++ b/test/types/message_arguments_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "MessageArguments": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( MessageArgumentsAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/message_level_stub.py b/test/types/message_level_stub.py index b76b5cc..87e46a3 100644 --- a/test/types/message_level_stub.py +++ b/test/types/message_level_stub.py @@ -52,7 +52,7 @@ def create_instance(cls) -> "MessageLevel": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( MessageLevelAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/message_properties_stub.py b/test/types/message_properties_stub.py index bd8d231..7d1caba 100644 --- a/test/types/message_properties_stub.py +++ b/test/types/message_properties_stub.py @@ -61,7 +61,7 @@ def create_instance(cls) -> "MessageProperties": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( MessagePropertiesAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/message_stub.py b/test/types/message_stub.py index 305c968..b0ec83e 100644 --- a/test/types/message_stub.py +++ b/test/types/message_stub.py @@ -71,7 +71,7 @@ def create_instance(cls) -> "Message": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(MessageAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/object_data_set_stub.py b/test/types/object_data_set_stub.py index ee88b87..d7d0a8e 100644 --- a/test/types/object_data_set_stub.py +++ b/test/types/object_data_set_stub.py @@ -67,7 +67,7 @@ def create_instance(cls) -> "ObjectDataSet": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( ObjectDataSetAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/object_data_stub.py b/test/types/object_data_stub.py index c905491..a868339 100644 --- a/test/types/object_data_stub.py +++ b/test/types/object_data_stub.py @@ -63,7 +63,7 @@ } }, "additionalProperties" : { - "$ref" : "#/components/schemas/ObjectData_value" + "$ref" : "#/components/schemas/Data_" }, "description" : "Result data for a timestamp in object format." } @@ -89,7 +89,7 @@ def create_instance(cls) -> "ObjectData": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(ObjectDataAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/queries_list_response_stub.py b/test/types/queries_list_response_stub.py index 9d33b9d..069ed70 100644 --- a/test/types/queries_list_response_stub.py +++ b/test/types/queries_list_response_stub.py @@ -96,7 +96,7 @@ def create_instance(cls) -> "QueriesListResponse": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueriesListResponseAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/query_definition_stub.py b/test/types/query_definition_stub.py index 00e58a9..4a1becc 100644 --- a/test/types/query_definition_stub.py +++ b/test/types/query_definition_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "QueryDefinition": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueryDefinitionAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/query_entity_input_stub.py b/test/types/query_entity_input_stub.py index 96a2b21..9e63f20 100644 --- a/test/types/query_entity_input_stub.py +++ b/test/types/query_entity_input_stub.py @@ -67,7 +67,7 @@ def create_instance(cls) -> "QueryEntityInput": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueryEntityInputAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/query_execution_message_level_stub.py b/test/types/query_execution_message_level_stub.py index 0645514..a67b35d 100644 --- a/test/types/query_execution_message_level_stub.py +++ b/test/types/query_execution_message_level_stub.py @@ -57,7 +57,7 @@ def create_instance(cls) -> "QueryExecutionMessageLevel": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueryExecutionMessageLevelAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/query_execution_message_stub.py b/test/types/query_execution_message_stub.py index e3aa654..9de5792 100644 --- a/test/types/query_execution_message_stub.py +++ b/test/types/query_execution_message_stub.py @@ -90,7 +90,7 @@ def create_instance(cls) -> "QueryExecutionMessage": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueryExecutionMessageAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/query_hal_links_stub.py b/test/types/query_hal_links_stub.py index dcbdb4c..ccfa5f1 100644 --- a/test/types/query_hal_links_stub.py +++ b/test/types/query_hal_links_stub.py @@ -60,7 +60,7 @@ def create_instance(cls) -> "QueryHALLinks": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueryHALLinksAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/query_input_stub.py b/test/types/query_input_stub.py index d148a11..d0f9f02 100644 --- a/test/types/query_input_stub.py +++ b/test/types/query_input_stub.py @@ -100,7 +100,7 @@ def create_instance(cls) -> "QueryInput": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(QueryInputAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/query_list_hal_links_stub.py b/test/types/query_list_hal_links_stub.py index 36aa88a..ec854c1 100644 --- a/test/types/query_list_hal_links_stub.py +++ b/test/types/query_list_hal_links_stub.py @@ -72,7 +72,7 @@ def create_instance(cls) -> "QueryListHALLinks": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueryListHALLinksAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/query_list_item_stub.py b/test/types/query_list_item_stub.py index bb4f070..8d8834d 100644 --- a/test/types/query_list_item_stub.py +++ b/test/types/query_list_item_stub.py @@ -73,7 +73,7 @@ def create_instance(cls) -> "QueryListItem": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueryListItemAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/query_output_stub.py b/test/types/query_output_stub.py index 7ac72d2..1519d8d 100644 --- a/test/types/query_output_stub.py +++ b/test/types/query_output_stub.py @@ -100,7 +100,7 @@ def create_instance(cls) -> "QueryOutput": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(QueryOutputAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/query_response_stub.py b/test/types/query_response_stub.py index 3069839..c676779 100644 --- a/test/types/query_response_stub.py +++ b/test/types/query_response_stub.py @@ -82,7 +82,7 @@ def create_instance(cls) -> "QueryResponse": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueryResponseAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/query_result_stub.py b/test/types/query_result_stub.py index 927e672..af60e1b 100644 --- a/test/types/query_result_stub.py +++ b/test/types/query_result_stub.py @@ -80,7 +80,7 @@ def create_instance(cls) -> "QueryResult": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(QueryResultAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/query_update_input_stub.py b/test/types/query_update_input_stub.py index 6388a1a..455aa72 100644 --- a/test/types/query_update_input_stub.py +++ b/test/types/query_update_input_stub.py @@ -61,7 +61,7 @@ def create_instance(cls) -> "QueryUpdateInput": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( QueryUpdateInputAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render1_stub.py b/test/types/render1_stub.py index a68a152..655c192 100644 --- a/test/types/render1_stub.py +++ b/test/types/render1_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "Render1": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(Render1Adapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/render_mode_one_of1_stub.py b/test/types/render_mode_one_of1_stub.py index bb649e8..41cc647 100644 --- a/test/types/render_mode_one_of1_stub.py +++ b/test/types/render_mode_one_of1_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RenderModeOneOf1": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOf1Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_one_of2_stub.py b/test/types/render_mode_one_of2_stub.py index 8d66ae4..afe7d3e 100644 --- a/test/types/render_mode_one_of2_stub.py +++ b/test/types/render_mode_one_of2_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RenderModeOneOf2": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOf2Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_one_of3_stub.py b/test/types/render_mode_one_of3_stub.py index ae34083..5a3d513 100644 --- a/test/types/render_mode_one_of3_stub.py +++ b/test/types/render_mode_one_of3_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RenderModeOneOf3": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOf3Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_one_of4_stub.py b/test/types/render_mode_one_of4_stub.py index 23b906f..69efd2c 100644 --- a/test/types/render_mode_one_of4_stub.py +++ b/test/types/render_mode_one_of4_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RenderModeOneOf4": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOf4Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_one_of5_stub.py b/test/types/render_mode_one_of5_stub.py index b367e30..49b293c 100644 --- a/test/types/render_mode_one_of5_stub.py +++ b/test/types/render_mode_one_of5_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RenderModeOneOf5": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOf5Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_one_of6_stub.py b/test/types/render_mode_one_of6_stub.py index f87f8ca..6ea10a2 100644 --- a/test/types/render_mode_one_of6_stub.py +++ b/test/types/render_mode_one_of6_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RenderModeOneOf6": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOf6Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_one_of7_stub.py b/test/types/render_mode_one_of7_stub.py index 225b042..9ec8855 100644 --- a/test/types/render_mode_one_of7_stub.py +++ b/test/types/render_mode_one_of7_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RenderModeOneOf7": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOf7Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_one_of8_stub.py b/test/types/render_mode_one_of8_stub.py index 92c2f2b..44fae7f 100644 --- a/test/types/render_mode_one_of8_stub.py +++ b/test/types/render_mode_one_of8_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RenderModeOneOf8": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOf8Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_one_of9_stub.py b/test/types/render_mode_one_of9_stub.py index 3c5d397..9d95487 100644 --- a/test/types/render_mode_one_of9_stub.py +++ b/test/types/render_mode_one_of9_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RenderModeOneOf9": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOf9Adapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_one_of_stub.py b/test/types/render_mode_one_of_stub.py index 77040d4..a25a002 100644 --- a/test/types/render_mode_one_of_stub.py +++ b/test/types/render_mode_one_of_stub.py @@ -52,7 +52,7 @@ def create_instance(cls) -> "RenderModeOneOf": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RenderModeOneOfAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/render_mode_stub.py b/test/types/render_mode_stub.py index 4cb8c9e..9ced1cf 100644 --- a/test/types/render_mode_stub.py +++ b/test/types/render_mode_stub.py @@ -72,7 +72,7 @@ def create_instance(cls) -> "RenderMode": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(RenderModeAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/render_stub.py b/test/types/render_stub.py index dc62937..f55ab20 100644 --- a/test/types/render_stub.py +++ b/test/types/render_stub.py @@ -111,7 +111,7 @@ def create_instance(cls) -> "Render": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(RenderAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/response_data_set_stub.py b/test/types/response_data_set_stub.py index dc370f5..3e29116 100644 --- a/test/types/response_data_set_stub.py +++ b/test/types/response_data_set_stub.py @@ -59,7 +59,7 @@ def create_instance(cls) -> "ResponseDataSet": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( ResponseDataSetAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/row_data_set_data_axis_stub.py b/test/types/row_data_set_data_axis_stub.py index 6c650be..99d260a 100644 --- a/test/types/row_data_set_data_axis_stub.py +++ b/test/types/row_data_set_data_axis_stub.py @@ -56,7 +56,7 @@ def create_instance(cls) -> "RowDataSetDataAxis": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RowDataSetDataAxisAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/row_data_set_stub.py b/test/types/row_data_set_stub.py index 0705e38..da0b384 100644 --- a/test/types/row_data_set_stub.py +++ b/test/types/row_data_set_stub.py @@ -90,7 +90,7 @@ def create_instance(cls) -> "RowDataSet": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(RowDataSetAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/row_header_stub.py b/test/types/row_header_stub.py index 09f414b..a120ab3 100644 --- a/test/types/row_header_stub.py +++ b/test/types/row_header_stub.py @@ -60,7 +60,7 @@ def create_instance(cls) -> "RowHeader": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(RowHeaderAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/row_headers_inner_stub.py b/test/types/row_headers_inner_stub.py index 112cf5e..fcd4245 100644 --- a/test/types/row_headers_inner_stub.py +++ b/test/types/row_headers_inner_stub.py @@ -54,7 +54,7 @@ def create_instance(cls) -> "RowHeadersInner": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( RowHeadersInnerAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/series_data_set_stub.py b/test/types/series_data_set_stub.py index 167fd5e..204c9e1 100644 --- a/test/types/series_data_set_stub.py +++ b/test/types/series_data_set_stub.py @@ -95,7 +95,7 @@ def create_instance(cls) -> "SeriesDataSet": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( SeriesDataSetAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/series_spec_stub.py b/test/types/series_spec_stub.py index b199e50..825b964 100644 --- a/test/types/series_spec_stub.py +++ b/test/types/series_spec_stub.py @@ -78,7 +78,7 @@ def create_instance(cls) -> "SeriesSpec": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(SeriesSpecAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/test/types/time_window_from_stub.py b/test/types/time_window_from_stub.py index 8a1098e..35d903a 100644 --- a/test/types/time_window_from_stub.py +++ b/test/types/time_window_from_stub.py @@ -71,7 +71,7 @@ def create_instance(cls) -> "TimeWindowFrom": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( TimeWindowFromAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/time_window_until_stub.py b/test/types/time_window_until_stub.py index 7248de1..e781a80 100644 --- a/test/types/time_window_until_stub.py +++ b/test/types/time_window_until_stub.py @@ -71,7 +71,7 @@ def create_instance(cls) -> "TimeWindowUntil": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( TimeWindowUntilAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/validation_error_stub.py b/test/types/validation_error_stub.py index dea8956..621e103 100644 --- a/test/types/validation_error_stub.py +++ b/test/types/validation_error_stub.py @@ -68,7 +68,7 @@ def create_instance(cls) -> "ValidationError": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( ValidationErrorAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/window_override_stub.py b/test/types/window_override_stub.py index 5877d21..d4d8ce9 100644 --- a/test/types/window_override_stub.py +++ b/test/types/window_override_stub.py @@ -58,7 +58,7 @@ def create_instance(cls) -> "WindowOverride": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF( WindowOverrideAdapter.json_schema(), allow_none_optionals=1 diff --git a/test/types/window_stub.py b/test/types/window_stub.py index ba258f1..5ad15a3 100644 --- a/test/types/window_stub.py +++ b/test/types/window_stub.py @@ -59,7 +59,7 @@ def create_instance(cls) -> "Window": if not MODELS_AVAILABLE: raise ImportError("Models must be installed to create class stubs") json = cls.create_json() - if not json: + if json is None: # use backup example based on the pydantic model schema backup_faker = JSF(WindowAdapter.json_schema(), allow_none_optionals=1) json = backup_faker.generate(use_defaults=True, use_examples=True) diff --git a/waylay-sdk-queries-types/.openapi-generator/FILES b/waylay-sdk-queries-types/.openapi-generator/FILES index 4ec7e1a..62381e9 100644 --- a/waylay-sdk-queries-types/.openapi-generator/FILES +++ b/waylay-sdk-queries-types/.openapi-generator/FILES @@ -1,8 +1,8 @@ LICENSE.txt pyproject.toml src/waylay/services/queries/models/__init__.py -src/waylay/services/queries/models/aggregation_by_resource_and_metric.py -src/waylay/services/queries/models/aggregation_by_resource_or_metric.py +src/waylay/services/queries/models/aggregation_by_resource_and_metric_value.py +src/waylay/services/queries/models/aggregation_by_resource_or_metric_value.py src/waylay/services/queries/models/aggregation_method.py src/waylay/services/queries/models/aggregation_method_one_of.py src/waylay/services/queries/models/aggregation_method_one_of1.py @@ -24,6 +24,7 @@ src/waylay/services/queries/models/column_data_set.py src/waylay/services/queries/models/column_data_set_data_axis.py src/waylay/services/queries/models/column_header.py src/waylay/services/queries/models/column_headers_inner.py +src/waylay/services/queries/models/data.py src/waylay/services/queries/models/data_axis_option.py src/waylay/services/queries/models/data_set_attributes.py src/waylay/services/queries/models/data_set_window.py @@ -31,7 +32,7 @@ src/waylay/services/queries/models/datum.py src/waylay/services/queries/models/default_aggregation.py src/waylay/services/queries/models/default_interpolation.py src/waylay/services/queries/models/delete_response.py -src/waylay/services/queries/models/embeddings.py +src/waylay/services/queries/models/embeddings_value.py src/waylay/services/queries/models/from_override.py src/waylay/services/queries/models/grouping_interval.py src/waylay/services/queries/models/grouping_interval_override.py @@ -59,7 +60,7 @@ src/waylay/services/queries/models/interpolation_method_one_of7.py src/waylay/services/queries/models/interpolation_method_one_of8.py src/waylay/services/queries/models/interpolation_method_one_of9.py src/waylay/services/queries/models/interpolation_spec.py -src/waylay/services/queries/models/links.py +src/waylay/services/queries/models/links_value.py src/waylay/services/queries/models/location_inner.py src/waylay/services/queries/models/message.py src/waylay/services/queries/models/message_arguments.py @@ -68,7 +69,6 @@ src/waylay/services/queries/models/message_properties.py src/waylay/services/queries/models/object.py src/waylay/services/queries/models/object_data.py src/waylay/services/queries/models/object_data_set.py -src/waylay/services/queries/models/object_data_value.py src/waylay/services/queries/models/py.typed src/waylay/services/queries/models/queries_list_response.py src/waylay/services/queries/models/query_definition.py diff --git a/waylay-sdk-queries-types/.openapi-generator/VERSION b/waylay-sdk-queries-types/.openapi-generator/VERSION index 1985849..09a6d30 100644 --- a/waylay-sdk-queries-types/.openapi-generator/VERSION +++ b/waylay-sdk-queries-types/.openapi-generator/VERSION @@ -1 +1 @@ -7.7.0 +7.8.0 diff --git a/waylay-sdk-queries-types/pyproject.toml b/waylay-sdk-queries-types/pyproject.toml index 94dd00e..fdfda45 100644 --- a/waylay-sdk-queries-types/pyproject.toml +++ b/waylay-sdk-queries-types/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "waylay-sdk-queries-types" -version = "0.5.0.20240809" +version = "0.5.0.20241025" description = "Waylay Query: timeseries queries (v1 protocol) Types " authors = [ { name = "Waylay", email = "info@waylay.io"} @@ -12,8 +12,8 @@ authors = [ keywords = ["Waylay Query: timeseries queries (v1 protocol)" , "Types"] requires-python = ">= 3.9" dependencies = [ - "waylay-sdk-core ~= 0.2.3", - "waylay-sdk-queries == 0.5.0.20240809", + "waylay-sdk-core ~= 0.2.4", + "waylay-sdk-queries == 0.5.0.20241025", "pydantic ~= 2.6", "typing-extensions ~= 4.10", "eval-type-backport ~= 0.1.3; python_version < '3.10'", diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__init__.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/__init__.py index 6cdd648..b8dc3ef 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/__init__.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/__init__.py @@ -12,11 +12,13 @@ Do not edit the class manually. """ -__version__ = "0.5.0.20240809" +__version__ = "0.5.0.20241025" # import models into model package -from .aggregation_by_resource_and_metric import AggregationByResourceAndMetric -from .aggregation_by_resource_or_metric import AggregationByResourceOrMetric +from .aggregation_by_resource_and_metric_value import ( + AggregationByResourceAndMetricValue, +) +from .aggregation_by_resource_or_metric_value import AggregationByResourceOrMetricValue from .aggregation_method import AggregationMethod from .aggregation_method_one_of import AggregationMethodOneOf from .aggregation_method_one_of1 import AggregationMethodOneOf1 @@ -38,6 +40,7 @@ from .column_data_set_data_axis import ColumnDataSetDataAxis from .column_header import ColumnHeader from .column_headers_inner import ColumnHeadersInner +from .data import Data from .data_axis_option import DataAxisOption from .data_set_attributes import DataSetAttributes from .data_set_window import DataSetWindow @@ -45,7 +48,7 @@ from .default_aggregation import DefaultAggregation from .default_interpolation import DefaultInterpolation from .delete_response import DeleteResponse -from .embeddings import Embeddings +from .embeddings_value import EmbeddingsValue from .from_override import FromOverride from .grouping_interval import GroupingInterval from .grouping_interval_override import GroupingIntervalOverride @@ -73,7 +76,7 @@ from .interpolation_method_one_of12 import InterpolationMethodOneOf12 from .interpolation_method_one_of13 import InterpolationMethodOneOf13 from .interpolation_spec import InterpolationSpec -from .links import Links +from .links_value import LinksValue from .location_inner import LocationInner from .message import Message from .message_arguments import MessageArguments @@ -81,7 +84,6 @@ from .message_properties import MessageProperties from .object_data import ObjectData from .object_data_set import ObjectDataSet -from .object_data_value import ObjectDataValue from .queries_list_response import QueriesListResponse from .query_definition import QueryDefinition from .query_entity_input import QueryEntityInput @@ -123,8 +125,8 @@ __all__ = [ "__version__", - "AggregationByResourceAndMetric", - "AggregationByResourceOrMetric", + "AggregationByResourceAndMetricValue", + "AggregationByResourceOrMetricValue", "AggregationMethod", "AggregationMethodOneOf", "AggregationMethodOneOf1", @@ -146,6 +148,7 @@ "ColumnDataSetDataAxis", "ColumnHeader", "ColumnHeadersInner", + "Data", "DataAxisOption", "DataSetAttributes", "DataSetWindow", @@ -153,7 +156,7 @@ "DefaultAggregation", "DefaultInterpolation", "DeleteResponse", - "Embeddings", + "EmbeddingsValue", "FromOverride", "GroupingInterval", "GroupingIntervalOverride", @@ -181,7 +184,7 @@ "InterpolationMethodOneOf8", "InterpolationMethodOneOf9", "InterpolationSpec", - "Links", + "LinksValue", "LocationInner", "Message", "MessageArguments", @@ -189,7 +192,6 @@ "MessageProperties", "ObjectData", "ObjectDataSet", - "ObjectDataValue", "QueriesListResponse", "QueryDefinition", "QueryEntityInput", diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/__init__.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/__init__.cpython-311.pyc index 9b9670f..c92a59c 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/__init__.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/__init__.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_by_resource_and_metric_value.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_by_resource_and_metric_value.cpython-311.pyc new file mode 100644 index 0000000..15498d2 Binary files /dev/null and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_by_resource_and_metric_value.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_by_resource_or_metric_value.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_by_resource_or_metric_value.cpython-311.pyc new file mode 100644 index 0000000..f14acf9 Binary files /dev/null and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_by_resource_or_metric_value.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method.cpython-311.pyc index ae5a369..030fd51 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of.cpython-311.pyc index 58708fb..b68e3cd 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of1.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of1.cpython-311.pyc index d84604a..484e6e8 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of1.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of1.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of2.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of2.cpython-311.pyc index 7360ee5..2c62b46 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of2.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of2.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of3.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of3.cpython-311.pyc index cebd8e5..cd1189a 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of3.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of3.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of4.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of4.cpython-311.pyc index f14d660..9b5a014 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of4.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of4.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of5.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of5.cpython-311.pyc index 6dfe125..ba355e1 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of5.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of5.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of6.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of6.cpython-311.pyc index 0693b00..85c6651 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of6.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of6.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of7.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of7.cpython-311.pyc index ac39cb0..b1ebe59 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of7.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of7.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of8.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of8.cpython-311.pyc index 9d45590..9bfb5b2 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of8.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregation_method_one_of8.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregations_inner.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregations_inner.cpython-311.pyc index b325cf3..792c2fd 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregations_inner.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/aggregations_inner.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/align_at.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/align_at.cpython-311.pyc index 3dfd35b..77c07e8 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/align_at.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/align_at.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/align_shift.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/align_shift.cpython-311.pyc index 7c9017e..60a839f 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/align_shift.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/align_shift.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment.cpython-311.pyc index 8505382..ae35569 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment_grid_interval.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment_grid_interval.cpython-311.pyc index 2eb5b1d..c2d936c 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment_grid_interval.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment_grid_interval.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment_timezone.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment_timezone.cpython-311.pyc index e9d738e..f5c73b7 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment_timezone.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/alignment_timezone.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/cause_exception.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/cause_exception.cpython-311.pyc index fad28d2..60a3bbf 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/cause_exception.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/cause_exception.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_data_set.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_data_set.cpython-311.pyc index 136c5c6..aa75973 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_data_set.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_data_set.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_data_set_data_axis.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_data_set_data_axis.cpython-311.pyc index 724ffe1..f966fee 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_data_set_data_axis.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_data_set_data_axis.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_header.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_header.cpython-311.pyc index 1ad4b2c..80552ed 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_header.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_header.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_headers_inner.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_headers_inner.cpython-311.pyc index f039a01..9a4baee 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_headers_inner.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/column_headers_inner.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data.cpython-311.pyc new file mode 100644 index 0000000..0399fc8 Binary files /dev/null and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_axis_option.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_axis_option.cpython-311.pyc index f3ebbe3..8990afc 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_axis_option.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_axis_option.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_set_attributes.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_set_attributes.cpython-311.pyc index 318e890..dff65b6 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_set_attributes.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_set_attributes.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_set_window.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_set_window.cpython-311.pyc index 7b51c76..77cf01a 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_set_window.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/data_set_window.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/datum.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/datum.cpython-311.pyc index 304b114..fe4d388 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/datum.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/datum.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/default_aggregation.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/default_aggregation.cpython-311.pyc index ca89261..3fbc226 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/default_aggregation.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/default_aggregation.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/default_interpolation.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/default_interpolation.cpython-311.pyc index cbfc74a..45efdee 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/default_interpolation.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/default_interpolation.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/delete_response.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/delete_response.cpython-311.pyc index ebf7136..2fdbf67 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/delete_response.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/delete_response.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/embeddings_value.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/embeddings_value.cpython-311.pyc new file mode 100644 index 0000000..d5ed739 Binary files /dev/null and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/embeddings_value.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/from_override.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/from_override.cpython-311.pyc index 6224fe3..27e0c5f 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/from_override.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/from_override.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval.cpython-311.pyc index 96949c9..70ebf0a 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval_override.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval_override.cpython-311.pyc index 796ce33..8990311 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval_override.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval_override.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval_override_one_of.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval_override_one_of.cpython-311.pyc index 3202df7..608fa9a 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval_override_one_of.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/grouping_interval_override_one_of.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link.cpython-311.pyc index 0890075..c53ca0e 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link_method.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link_method.cpython-311.pyc index ba7a1af..f51928e 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link_method.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link_method.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link_role.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link_role.cpython-311.pyc index 5d37347..4008bfe 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link_role.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hal_link_role.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/header_array_option.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/header_array_option.cpython-311.pyc index 1d2883a..5959e8c 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/header_array_option.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/header_array_option.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hierarchical.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hierarchical.cpython-311.pyc index c7a84fb..2cc24c5 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hierarchical.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/hierarchical.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/http_validation_error.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/http_validation_error.cpython-311.pyc index a7c37e8..f34b193 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/http_validation_error.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/http_validation_error.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation.cpython-311.pyc index 090b077..a5b8553 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method.cpython-311.pyc index 0cbe788..f351177 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of.cpython-311.pyc index 918a84f..0dd7ff7 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of1.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of1.cpython-311.pyc index b5920fe..b6efc0c 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of1.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of1.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of10.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of10.cpython-311.pyc index 9787727..0056b0f 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of10.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of10.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of11.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of11.cpython-311.pyc index 2947d0d..0f3bfbd 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of11.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of11.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of12.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of12.cpython-311.pyc index 48351b5..7522be0 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of12.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of12.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of13.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of13.cpython-311.pyc index 7528d01..1d3a087 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of13.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of13.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of2.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of2.cpython-311.pyc index de27a08..14905ff 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of2.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of2.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of3.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of3.cpython-311.pyc index d884722..cc274eb 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of3.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of3.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of4.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of4.cpython-311.pyc index bff251b..f14b800 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of4.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of4.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of5.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of5.cpython-311.pyc index f48b0c5..ddbcf97 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of5.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of5.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of6.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of6.cpython-311.pyc index 81cbb0d..1650b44 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of6.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of6.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of7.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of7.cpython-311.pyc index d2f9adc..e1449ca 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of7.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of7.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of8.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of8.cpython-311.pyc index 6e5ddc5..e36f5c7 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of8.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of8.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of9.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of9.cpython-311.pyc index 98581b5..83c19d6 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of9.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_method_one_of9.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_spec.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_spec.cpython-311.pyc index cc62e06..b309d4a 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_spec.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/interpolation_spec.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/links_value.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/links_value.cpython-311.pyc new file mode 100644 index 0000000..999c799 Binary files /dev/null and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/links_value.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/location_inner.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/location_inner.cpython-311.pyc index 6e69c31..91cff8a 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/location_inner.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/location_inner.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message.cpython-311.pyc index 2f0bae8..379e8ab 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_arguments.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_arguments.cpython-311.pyc index 8e1650d..e6af9d3 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_arguments.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_arguments.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_level.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_level.cpython-311.pyc index a249b12..1a7d47d 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_level.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_level.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_properties.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_properties.cpython-311.pyc index 7b76c59..61eb932 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_properties.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/message_properties.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/object_data.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/object_data.cpython-311.pyc index c31b3a8..e28ad38 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/object_data.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/object_data.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/object_data_set.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/object_data_set.cpython-311.pyc index 6683205..72a84ca 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/object_data_set.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/object_data_set.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/queries_list_response.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/queries_list_response.cpython-311.pyc index 390524c..dd8a3f5 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/queries_list_response.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/queries_list_response.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_definition.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_definition.cpython-311.pyc index 86eb485..1ed85d0 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_definition.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_definition.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_entity_input.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_entity_input.cpython-311.pyc index fd4dd10..69c024a 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_entity_input.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_entity_input.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_execution_message.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_execution_message.cpython-311.pyc index 8004cd3..17e5ef4 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_execution_message.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_execution_message.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_execution_message_level.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_execution_message_level.cpython-311.pyc index 4c4728e..20195f5 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_execution_message_level.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_execution_message_level.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_hal_links.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_hal_links.cpython-311.pyc index 56dd52c..dfd79bc 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_hal_links.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_hal_links.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_input.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_input.cpython-311.pyc index 17661fc..0981a5e 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_input.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_input.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_list_hal_links.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_list_hal_links.cpython-311.pyc index 05c83ed..e6d98a8 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_list_hal_links.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_list_hal_links.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_list_item.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_list_item.cpython-311.pyc index 48b5dd2..870bc21 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_list_item.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_list_item.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_output.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_output.cpython-311.pyc index 9a9c723..e1ed288 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_output.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_output.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_response.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_response.cpython-311.pyc index 0c93442..428516a 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_response.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_response.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_result.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_result.cpython-311.pyc index 8ce4159..0ce2337 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_result.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_result.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_update_input.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_update_input.cpython-311.pyc index 7211a46..40368ba 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_update_input.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/query_update_input.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render.cpython-311.pyc index a575668..fb9920f 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render1.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render1.cpython-311.pyc index 19612bd..4227c57 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render1.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render1.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode.cpython-311.pyc index 00aa1ca..89628e5 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of.cpython-311.pyc index 62e4845..080bb6e 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of1.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of1.cpython-311.pyc index 4bbe23d..df0877c 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of1.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of1.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of2.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of2.cpython-311.pyc index 2f7504c..7d7112c 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of2.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of2.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of3.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of3.cpython-311.pyc index 243744d..cd1a935 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of3.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of3.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of4.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of4.cpython-311.pyc index a479c8b..62254fe 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of4.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of4.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of5.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of5.cpython-311.pyc index 5b95299..8e40f8e 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of5.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of5.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of6.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of6.cpython-311.pyc index 3ae8c5a..a412d18 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of6.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of6.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of7.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of7.cpython-311.pyc index a07319b..d2c0482 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of7.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of7.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of8.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of8.cpython-311.pyc index 662bece..7bd771f 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of8.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of8.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of9.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of9.cpython-311.pyc index dfdfb96..802e17f 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of9.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/render_mode_one_of9.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/response_data_set.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/response_data_set.cpython-311.pyc index 1a472c0..2384e8e 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/response_data_set.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/response_data_set.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_data_set.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_data_set.cpython-311.pyc index a29d3b3..dfa7b49 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_data_set.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_data_set.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_data_set_data_axis.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_data_set_data_axis.cpython-311.pyc index 89c9286..44f79c9 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_data_set_data_axis.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_data_set_data_axis.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_header.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_header.cpython-311.pyc index c23f171..e83940a 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_header.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_header.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_headers_inner.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_headers_inner.cpython-311.pyc index af5dc52..85b05df 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_headers_inner.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/row_headers_inner.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/series_data_set.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/series_data_set.cpython-311.pyc index e785785..25ed0a7 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/series_data_set.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/series_data_set.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/series_spec.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/series_spec.cpython-311.pyc index 1a2105b..80276e5 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/series_spec.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/series_spec.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/time_window_from.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/time_window_from.cpython-311.pyc index a5dec3a..3b7c65f 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/time_window_from.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/time_window_from.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/time_window_until.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/time_window_until.cpython-311.pyc index 85b980c..3443b35 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/time_window_until.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/time_window_until.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/validation_error.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/validation_error.cpython-311.pyc index d80f1b1..a8aa1ee 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/validation_error.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/validation_error.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/window.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/window.cpython-311.pyc index 1bb6de5..841f383 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/window.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/window.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/window_override.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/window_override.cpython-311.pyc index a9fa27f..2c96dc2 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/window_override.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/models/__pycache__/window_override.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_and_metric.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_and_metric_value.py similarity index 67% rename from waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_and_metric.py rename to waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_and_metric_value.py index 20fad80..0d899fc 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_and_metric.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_and_metric_value.py @@ -20,12 +20,14 @@ Annotated, # >=3.9 ) -from ..models.aggregation_by_resource_or_metric import AggregationByResourceOrMetric +from ..models.aggregation_by_resource_or_metric_value import ( + AggregationByResourceOrMetricValue, +) -AggregationByResourceAndMetric = Union[ +AggregationByResourceAndMetricValue = Union[ Annotated[ - Dict[str, AggregationByResourceOrMetric], + Dict[str, AggregationByResourceOrMetricValue], "Aggregation methods specified per resource or metric.", ] ] -"""AggregationByResourceAndMetric.""" +"""AggregationByResourceAndMetricValue.""" diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_or_metric.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_or_metric_value.py similarity index 88% rename from waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_or_metric.py rename to waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_or_metric_value.py index cf7c3a2..6e6e979 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_or_metric.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/aggregation_by_resource_or_metric_value.py @@ -23,10 +23,10 @@ from ..models.aggregation_method import AggregationMethod from ..models.aggregations_inner import AggregationsInner -AggregationByResourceOrMetric = Union[ +AggregationByResourceOrMetricValue = Union[ Annotated[AggregationMethod, ""], Annotated[ List[AggregationsInner], "Aggregation methods, leading to sepearate series." ], ] -"""AggregationByResourceOrMetric.""" +"""AggregationByResourceOrMetricValue.""" diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/alignment.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/alignment.py index 57b6197..2befff4 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/alignment.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/alignment.py @@ -14,6 +14,7 @@ from pydantic import ( ConfigDict, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.align_at import AlignAt diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/cause_exception.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/cause_exception.py index 1739613..85508da 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/cause_exception.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/cause_exception.py @@ -17,6 +17,7 @@ ConfigDict, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/column_data_set.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/column_data_set.py index f439cc5..5ae79ce 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/column_data_set.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/column_data_set.py @@ -17,6 +17,7 @@ ConfigDict, Field, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.column_data_set_data_axis import ColumnDataSetDataAxis diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/column_header.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/column_header.py index 269b5dd..ef4d926 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/column_header.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/column_header.py @@ -15,6 +15,7 @@ ConfigDict, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data_value.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/data.py similarity index 92% rename from waylay-sdk-queries-types/src/waylay/services/queries/models/object_data_value.py rename to waylay-sdk-queries-types/src/waylay/services/queries/models/data.py index f51d477..891aed8 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data_value.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/data.py @@ -21,11 +21,11 @@ from ..models.datum import Datum -ObjectDataValue = Union[ +Data = Union[ Annotated[ object, "Values for the series whose attributes corresponds with the key. Keyed by sub-levels.", ], Annotated[Datum, ""], ] -"""ObjectDataValue.""" +"""Data.""" diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/data_set_attributes.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/data_set_attributes.py index 7ba134c..ccd2c16 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/data_set_attributes.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/data_set_attributes.py @@ -16,6 +16,7 @@ Field, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/data_set_window.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/data_set_window.py index c5f7720..9041e21 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/data_set_window.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/data_set_window.py @@ -17,6 +17,7 @@ StrictInt, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/default_aggregation.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/default_aggregation.py index 145dd32..1581e17 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/default_aggregation.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/default_aggregation.py @@ -21,8 +21,12 @@ Annotated, # >=3.9 ) -from ..models.aggregation_by_resource_and_metric import AggregationByResourceAndMetric -from ..models.aggregation_by_resource_or_metric import AggregationByResourceOrMetric +from ..models.aggregation_by_resource_and_metric_value import ( + AggregationByResourceAndMetricValue, +) +from ..models.aggregation_by_resource_or_metric_value import ( + AggregationByResourceOrMetricValue, +) from ..models.aggregation_method import AggregationMethod from ..models.aggregations_inner import AggregationsInner @@ -32,11 +36,11 @@ List[AggregationsInner], "Aggregation methods, leading to sepearate series." ], Annotated[ - Dict[str, AggregationByResourceOrMetric], + Dict[str, AggregationByResourceOrMetricValue], "Aggregation methods specified per resource or metric.", ], Annotated[ - Dict[str, AggregationByResourceAndMetric], + Dict[str, AggregationByResourceAndMetricValue], "Aggregation methods specified per resource and metric.", ], ] diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/delete_response.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/delete_response.py index 226aaa8..8408cec 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/delete_response.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/delete_response.py @@ -17,10 +17,11 @@ ConfigDict, Field, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel -from ..models.embeddings import Embeddings -from ..models.links import Links +from ..models.embeddings_value import EmbeddingsValue +from ..models.links_value import LinksValue from ..models.message import Message @@ -28,10 +29,10 @@ class DeleteResponse(WaylayBaseModel): """Confirmation of a delete request..""" messages: List[Message] | None = None - links: Dict[str, Links] | None = Field( + links: Dict[str, LinksValue] | None = Field( default=None, description="HAL links, indexed by link relation.", alias="_links" ) - embeddings: Dict[str, Embeddings] | None = Field( + embeddings: Dict[str, EmbeddingsValue] | None = Field( default=None, description="Hal embeddings, indexed by relation.", alias="_embeddings", diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/embeddings.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/embeddings_value.py similarity index 92% rename from waylay-sdk-queries-types/src/waylay/services/queries/models/embeddings.py rename to waylay-sdk-queries-types/src/waylay/services/queries/models/embeddings_value.py index 12cd697..3bc9faa 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/embeddings.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/embeddings_value.py @@ -21,8 +21,8 @@ Annotated, # >=3.9 ) -Embeddings = Union[ +EmbeddingsValue = Union[ Annotated[Dict[str, object], "Any embedded representation in a HAL response."], Annotated[List[Dict[str, object]], ""], ] -"""Embeddings.""" +"""EmbeddingsValue.""" diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/hal_link.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/hal_link.py index b78704c..00aa4b9 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/hal_link.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/hal_link.py @@ -16,6 +16,7 @@ Field, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.hal_link_method import HALLinkMethod diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/http_validation_error.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/http_validation_error.py index 22308a1..82bdf16 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/http_validation_error.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/http_validation_error.py @@ -16,6 +16,7 @@ from pydantic import ( ConfigDict, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.validation_error import ValidationError diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/interpolation_spec.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/interpolation_spec.py index 2f6a0a0..918ead2 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/interpolation_spec.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/interpolation_spec.py @@ -16,6 +16,7 @@ Field, StrictInt, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.interpolation_method import InterpolationMethod diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/links.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/links_value.py similarity index 83% rename from waylay-sdk-queries-types/src/waylay/services/queries/models/links.py rename to waylay-sdk-queries-types/src/waylay/services/queries/models/links_value.py index 2e82141..68de6ab 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/links.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/links_value.py @@ -22,5 +22,5 @@ from ..models.hal_link import HALLink -Links = Union[Annotated[HALLink, ""], Annotated[List[HALLink], ""]] -"""Links.""" +LinksValue = Union[Annotated[HALLink, ""], Annotated[List[HALLink], ""]] +"""LinksValue.""" diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/message.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/message.py index 7d2dc39..7d95412 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/message.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/message.py @@ -17,6 +17,7 @@ ConfigDict, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.message_level import MessageLevel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/message_properties.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/message_properties.py index 3bb7616..98ee87b 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/message_properties.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/message_properties.py @@ -15,6 +15,7 @@ ConfigDict, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data.py index 514885c..c846aa3 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data.py @@ -20,6 +20,7 @@ StrictInt, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data_set.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data_set.py index 75fff8e..2252100 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data_set.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/object_data_set.py @@ -16,6 +16,7 @@ from pydantic import ( ConfigDict, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.data_set_attributes import DataSetAttributes diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/queries_list_response.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/queries_list_response.py index c2048c5..84bd33e 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/queries_list_response.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/queries_list_response.py @@ -18,6 +18,7 @@ Field, StrictInt, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.message import Message diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_entity_input.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_entity_input.py index 040f6e4..43838df 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_entity_input.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_entity_input.py @@ -18,6 +18,7 @@ Field, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.query_input import QueryInput diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_execution_message.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_execution_message.py index 1663981..ed81517 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_execution_message.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_execution_message.py @@ -18,6 +18,7 @@ Field, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.cause_exception import CauseException diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_hal_links.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_hal_links.py index 3307223..ca52af2 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_hal_links.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_hal_links.py @@ -15,6 +15,7 @@ ConfigDict, Field, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.hal_link import HALLink diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_input.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_input.py index 291f029..cef5659 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_input.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_input.py @@ -19,6 +19,7 @@ StrictInt, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.alignment import Alignment diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_list_hal_links.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_list_hal_links.py index 4f8e349..43dd67b 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_list_hal_links.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_list_hal_links.py @@ -15,6 +15,7 @@ ConfigDict, Field, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.hal_link import HALLink diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_list_item.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_list_item.py index bf749da..341cb77 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_list_item.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_list_item.py @@ -18,6 +18,7 @@ Field, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.query_hal_links import QueryHALLinks diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_output.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_output.py index 2bf8f09..2ae36ca 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_output.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_output.py @@ -19,6 +19,7 @@ StrictInt, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.alignment import Alignment diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_response.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_response.py index 2283101..47d8567 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_response.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_response.py @@ -18,6 +18,7 @@ Field, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.message import Message diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_result.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_result.py index 90ed5c1..df5525c 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_result.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_result.py @@ -17,6 +17,7 @@ ConfigDict, Field, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.query_execution_message import QueryExecutionMessage diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_update_input.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_update_input.py index 99550a3..4e5e75c 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/query_update_input.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/query_update_input.py @@ -17,6 +17,7 @@ ConfigDict, Field, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.query_input import QueryInput diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/render.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/render.py index 42855c4..4cf6452 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/render.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/render.py @@ -17,6 +17,7 @@ StrictBool, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.data_axis_option import DataAxisOption diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/row_data_set.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/row_data_set.py index 70a8be9..217f56e 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/row_data_set.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/row_data_set.py @@ -17,6 +17,7 @@ ConfigDict, Field, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.column_headers_inner import ColumnHeadersInner diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/row_header.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/row_header.py index 107b5fb..42b268a 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/row_header.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/row_header.py @@ -18,6 +18,7 @@ Field, StrictInt, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/series_data_set.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/series_data_set.py index 0866eb3..5d8715a 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/series_data_set.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/series_data_set.py @@ -17,6 +17,7 @@ ConfigDict, Field, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.column_data_set_data_axis import ColumnDataSetDataAxis diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/series_spec.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/series_spec.py index 5328d6e..3f1af59 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/series_spec.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/series_spec.py @@ -16,6 +16,7 @@ Field, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.aggregation_method import AggregationMethod diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/models/validation_error.py b/waylay-sdk-queries-types/src/waylay/services/queries/models/validation_error.py index b0b3f26..5e7dd46 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/models/validation_error.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/models/validation_error.py @@ -17,6 +17,7 @@ ConfigDict, StrictStr, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel from ..models.location_inner import LocationInner diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/__init__.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/__init__.cpython-311.pyc index a8ba055..0af4eae 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/__init__.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/__init__.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/execute_api.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/execute_api.cpython-311.pyc index f404e83..6de08f4 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/execute_api.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/execute_api.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/manage_api.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/manage_api.cpython-311.pyc index ac48a10..f511a19 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/manage_api.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/manage_api.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/status_api.cpython-311.pyc b/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/status_api.cpython-311.pyc index d1bd02e..71e3cb5 100644 Binary files a/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/status_api.cpython-311.pyc and b/waylay-sdk-queries-types/src/waylay/services/queries/queries/__pycache__/status_api.cpython-311.pyc differ diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/queries/execute_api.py b/waylay-sdk-queries-types/src/waylay/services/queries/queries/execute_api.py index 7fbfc87..fa4a306 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/queries/execute_api.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/queries/execute_api.py @@ -21,6 +21,7 @@ from typing_extensions import ( Annotated, # >=3.11 ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/queries/manage_api.py b/waylay-sdk-queries-types/src/waylay/services/queries/queries/manage_api.py index 4d093c2..36c2555 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/queries/manage_api.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/queries/manage_api.py @@ -19,6 +19,7 @@ from typing_extensions import ( Annotated, # >=3.11 ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries-types/src/waylay/services/queries/queries/status_api.py b/waylay-sdk-queries-types/src/waylay/services/queries/queries/status_api.py index 6ae43c3..134dc24 100644 --- a/waylay-sdk-queries-types/src/waylay/services/queries/queries/status_api.py +++ b/waylay-sdk-queries-types/src/waylay/services/queries/queries/status_api.py @@ -13,6 +13,7 @@ from pydantic import ( ConfigDict, ) + from waylay.sdk.api._models import BaseModel as WaylayBaseModel diff --git a/waylay-sdk-queries/.openapi-generator/VERSION b/waylay-sdk-queries/.openapi-generator/VERSION index 1985849..09a6d30 100644 --- a/waylay-sdk-queries/.openapi-generator/VERSION +++ b/waylay-sdk-queries/.openapi-generator/VERSION @@ -1 +1 @@ -7.7.0 +7.8.0 diff --git a/waylay-sdk-queries/pyproject.toml b/waylay-sdk-queries/pyproject.toml index fe9f1cd..6130b60 100644 --- a/waylay-sdk-queries/pyproject.toml +++ b/waylay-sdk-queries/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "waylay-sdk-queries" -version = "0.5.0.20240809" +version = "0.5.0.20241025" description = "Waylay Query: timeseries queries (v1 protocol)" authors = [ { name = "Waylay", email = "info@waylay.io"} @@ -12,7 +12,7 @@ authors = [ keywords = ["Waylay Query: timeseries queries (v1 protocol)"] requires-python = ">= 3.9" dependencies = [ - "waylay-sdk-core ~= 0.2.3", + "waylay-sdk-core ~= 0.2.4", "pydantic ~= 2.6", "typing-extensions ~= 4.10", "eval-type-backport ~= 0.1.3; python_version < '3.10'", diff --git a/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/__init__.cpython-311.pyc b/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/__init__.cpython-311.pyc index af21269..78d9e88 100644 Binary files a/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/__init__.cpython-311.pyc and b/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/__init__.cpython-311.pyc differ diff --git a/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/execute_api.cpython-311.pyc b/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/execute_api.cpython-311.pyc index 5294c5d..bad1a56 100644 Binary files a/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/execute_api.cpython-311.pyc and b/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/execute_api.cpython-311.pyc differ diff --git a/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/manage_api.cpython-311.pyc b/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/manage_api.cpython-311.pyc index 1c35b7d..d8b20ce 100644 Binary files a/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/manage_api.cpython-311.pyc and b/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/manage_api.cpython-311.pyc differ diff --git a/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/status_api.cpython-311.pyc b/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/status_api.cpython-311.pyc index 92e2070..89063f2 100644 Binary files a/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/status_api.cpython-311.pyc and b/waylay-sdk-queries/src/waylay/services/queries/api/__pycache__/status_api.cpython-311.pyc differ diff --git a/waylay-sdk-queries/src/waylay/services/queries/api/execute_api.py b/waylay-sdk-queries/src/waylay/services/queries/api/execute_api.py index a862650..1d56b12 100644 --- a/waylay-sdk-queries/src/waylay/services/queries/api/execute_api.py +++ b/waylay-sdk-queries/src/waylay/services/queries/api/execute_api.py @@ -24,6 +24,7 @@ StrictStr, TypeAdapter, ) + from waylay.sdk.api import ( HeaderTypes, QueryParamTypes, diff --git a/waylay-sdk-queries/src/waylay/services/queries/api/manage_api.py b/waylay-sdk-queries/src/waylay/services/queries/api/manage_api.py index 2666618..b1f4c7a 100644 --- a/waylay-sdk-queries/src/waylay/services/queries/api/manage_api.py +++ b/waylay-sdk-queries/src/waylay/services/queries/api/manage_api.py @@ -28,6 +28,7 @@ from typing_extensions import ( Annotated, # >=3.9, ) + from waylay.sdk.api import ( HeaderTypes, QueryParamTypes, diff --git a/waylay-sdk-queries/src/waylay/services/queries/api/status_api.py b/waylay-sdk-queries/src/waylay/services/queries/api/status_api.py index 021d71d..2caec47 100644 --- a/waylay-sdk-queries/src/waylay/services/queries/api/status_api.py +++ b/waylay-sdk-queries/src/waylay/services/queries/api/status_api.py @@ -23,6 +23,7 @@ StrictBool, TypeAdapter, ) + from waylay.sdk.api import ( HeaderTypes, QueryParamTypes, diff --git a/waylay-sdk-queries/src/waylay/services/queries/service/__init__.py b/waylay-sdk-queries/src/waylay/services/queries/service/__init__.py index b4c3aa5..b73d55c 100644 --- a/waylay-sdk-queries/src/waylay/services/queries/service/__init__.py +++ b/waylay-sdk-queries/src/waylay/services/queries/service/__init__.py @@ -12,7 +12,7 @@ Do not edit the class manually. """ -__version__ = "0.5.0.20240809" +__version__ = "0.5.0.20241025" from .service import QueriesService diff --git a/waylay-sdk-queries/src/waylay/services/queries/service/__pycache__/__init__.cpython-311.pyc b/waylay-sdk-queries/src/waylay/services/queries/service/__pycache__/__init__.cpython-311.pyc index 33e3efa..99f6812 100644 Binary files a/waylay-sdk-queries/src/waylay/services/queries/service/__pycache__/__init__.cpython-311.pyc and b/waylay-sdk-queries/src/waylay/services/queries/service/__pycache__/__init__.cpython-311.pyc differ diff --git a/waylay-sdk-queries/src/waylay/services/queries/service/__pycache__/service.cpython-311.pyc b/waylay-sdk-queries/src/waylay/services/queries/service/__pycache__/service.cpython-311.pyc index 97bcc61..7dfc059 100644 Binary files a/waylay-sdk-queries/src/waylay/services/queries/service/__pycache__/service.cpython-311.pyc and b/waylay-sdk-queries/src/waylay/services/queries/service/__pycache__/service.cpython-311.pyc differ