diff --git a/gen/client_generator.py b/gen/client_generator.py index a0d02cd..81c3234 100644 --- a/gen/client_generator.py +++ b/gen/client_generator.py @@ -58,9 +58,25 @@ def get_type_for_param(param: dict, swagger: dict | None = None) -> str: if swagger is None: swagger = {} + _in = param.get("in") - if param.get("in") in ("query", "path"): + if _in == "path": return str.__name__ + elif _in == "query": + _type = get_path( + param, + "schema.type", + default="string" + ) + if _type in SIMPLE_TYPES_MAP: + return SIMPLE_TYPES_MAP[_type] + else: + _items_type = get_path( + param, + "schema.items.type", + default="string" + ) + return COMPLEX_TYPES_MAP[(_type, _items_type)] param_type = param.get("type") schema_type = get_path(param, "schema.type", None) @@ -154,6 +170,7 @@ def param_to_function_argument(param: dict, swagger: dict | None = None) -> str: swagger = {} name = convert_to_snake_case(param["name"]) + _type = get_type_for_param(param, swagger) is_required = param.get('required', False) @@ -556,6 +573,7 @@ def create_method_sig(swagger: dict, name: str, params: list[str], body_required path_params = [ p for p in params if p['name'] not in SPECIAL_HEADERS and p["in"] != "body" ] + elements = [name, ] sig = "" _input_parameters_strings = [param_to_function_argument(p) @@ -575,6 +593,7 @@ def create_method_sig(swagger: dict, name: str, params: list[str], body_required doc = generate_doc_string(name, path_params, body_required, body_not_required, swagger, method, path, indent_offset=1) + try: if len(elements) > 1: sig = "def %s(self, *, %s, data_partition_id: str | None = None) -> dict:" % tuple(elements) diff --git a/gen/tests_generator.py b/gen/tests_generator.py index e43422a..7fcfa7e 100644 --- a/gen/tests_generator.py +++ b/gen/tests_generator.py @@ -9,22 +9,16 @@ TYPE_DEFAULTS = { str: '"text"', - str | None: '"text"', 'str | None': '"text"', 'str': '"text"', - int | None: '10', 'int | None': '10', dict: '{}', 'dict': '{}', - bool | None: 'False', - list[str]: '["text"]', + 'bool | None': 'False', 'list[str]': '["text"]', - list[dict]: '[{}]', 'list[dict]': '[{}]', - list[dict] | None: '[{}]', - dict | None: '{}', + 'list[dict] | None': '[{}]', 'dict | None': '{}', - list[str] | None: '["text"]', 'list[str] | None': '["text"]' } diff --git a/osdu_client/services/entitlements/client.py b/osdu_client/services/entitlements/client.py index 1ca9a9e..cb6981d 100644 --- a/osdu_client/services/entitlements/client.py +++ b/osdu_client/services/entitlements/client.py @@ -436,7 +436,7 @@ def list_partition_groups( *, type: str, cursor: str | None = None, - limit: str | None = None, + limit: int | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -445,7 +445,7 @@ def list_partition_groups( data_partition_id (str): identifier of the data partition to query. If None sets by auth session. type (str): type cursor (str): cursor - limit (str): limit + limit (int): limit Returns: response data (dict) Raises: diff --git a/osdu_client/services/file/client.py b/osdu_client/services/file/client.py index e55def3..628fe92 100644 --- a/osdu_client/services/file/client.py +++ b/osdu_client/services/file/client.py @@ -7,7 +7,7 @@ from osdu_client.utils import urljoin from osdu_client.validation import validate_data -from .models import FileListRequest, FileLocationRequest, LocationRequest, Record, DeliveryGetFileSignedURLRequest +from .models import DeliveryGetFileSignedURLRequest, FileListRequest, FileLocationRequest, LocationRequest, Record class FileAPIError(OSDUAPIError): diff --git a/osdu_client/services/indexer/client.py b/osdu_client/services/indexer/client.py index 9bd0523..4c0f7a9 100644 --- a/osdu_client/services/indexer/client.py +++ b/osdu_client/services/indexer/client.py @@ -41,7 +41,7 @@ def provision_partition(self, data_partition_id: str | None = None) -> dict: def reindex_kind( self, *, - force_clean: str | None = None, + force_clean: bool | None = None, kind: str, cursor: str | None = None, data_partition_id: str | None = None, @@ -50,7 +50,7 @@ def reindex_kind( This API allows users to re-index a 'kind' without re-ingesting the records via storage API. Required roles: `service.search.admin` Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. - force_clean (str): Force Clean + force_clean (bool): Force Clean kind (str): cursor (str): Returns: @@ -83,13 +83,13 @@ def reindex_kind( return response.json() def reindex_partition( - self, *, force_clean: str | None = None, data_partition_id: str | None = None + self, *, force_clean: bool | None = None, data_partition_id: str | None = None ) -> dict: """ This API allows users to re-index an entire partition without re-ingesting the records via storage API.Required roles: `users.datalake.ops` Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. - force_clean (str): Force Clean + force_clean (bool): Force Clean Returns: response data (dict) Raises: diff --git a/osdu_client/services/legal/client.py b/osdu_client/services/legal/client.py index b78f7a7..64d11a2 100644 --- a/osdu_client/services/legal/client.py +++ b/osdu_client/services/legal/client.py @@ -18,13 +18,13 @@ class LegalClient(OSDUAPIClient): service_path = "/api/legal/v1/" def list_legaltags( - self, *, valid: str | None = None, data_partition_id: str | None = None + self, *, valid: bool | None = None, data_partition_id: str | None = None ) -> dict: """ This allows for the retrieval of all LegalTags. Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. - valid (str): If true returns only valid LegalTags, if false returns only invalid LegalTags. Default value is true. + valid (bool): If true returns only valid LegalTags, if false returns only invalid LegalTags. Default value is true. Returns: response data (dict) Raises: @@ -171,7 +171,7 @@ def validate_legaltags( def query_legaltags( self, *, - valid: str | None = None, + valid: bool | None = None, query_list: list[str] | None = None, operator_list: list[str] | None = None, sort_by: str | None = None, @@ -183,7 +183,7 @@ def query_legaltags( This allows search for specific attributes of legaltags including the attributes of extensionproperties Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. - valid (str): If true returns only valid LegalTags, if false returns only invalid LegalTags. Default value is true. + valid (bool): If true returns only valid LegalTags, if false returns only invalid LegalTags. Default value is true. query_list (list[str]): Filter condition query operator_list (list[str]): If there are multiple conditions need to be joined in by logical operators sort_by (str): diff --git a/osdu_client/services/policy/client.py b/osdu_client/services/policy/client.py index ef3d0ce..2422680 100644 --- a/osdu_client/services/policy/client.py +++ b/osdu_client/services/policy/client.py @@ -382,7 +382,7 @@ def evaluate_policy( self, *, policy_id: str, - include_auth: str | None = None, + include_auth: bool | None = None, correlation_id: str | None = None, user_agent: str | None = None, x_user_id: str | None = None, @@ -425,7 +425,7 @@ def evaluate_policy( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. policy_id (str): - include_auth (str): Update posted data to include auth (token, xuserid and data partition id) from headers + include_auth (bool): Update posted data to include auth (token, xuserid and data partition id) from headers correlation_id (str): user_agent (str): x_user_id (str): identifier the user in the query @@ -552,8 +552,8 @@ def get_api_policy_v1_info( def create_api_policy_v1_compile( self, *, - metrics: str | None = None, - instrument: str | None = None, + metrics: bool | None = None, + instrument: bool | None = None, correlation_id: str | None = None, user_agent: str | None = None, x_user_id: str | None = None, @@ -581,8 +581,8 @@ def create_api_policy_v1_compile( We recommend leaving query instrumentation off unless you are debugging a performance problem. Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. - metrics (str): Include report detailed performance metrics on requested on individual API call. Returned inline with the API response - instrument (str): Include instrumentation data wth detailed performance metrics on requested on individual API call. Returned inline with the API response + metrics (bool): Include report detailed performance metrics on requested on individual API call. Returned inline with the API response + instrument (bool): Include instrumentation data wth detailed performance metrics on requested on individual API call. Returned inline with the API response correlation_id (str): user_agent (str): x_user_id (str): identifier the user in the query @@ -617,7 +617,7 @@ def create_api_policy_v1_compile( def get_tenant( self, *, - all_data: str | None = None, + all_data: bool | None = None, correlation_id: str | None = None, user_agent: str | None = None, x_user_id: str | None = None, @@ -628,7 +628,7 @@ def get_tenant( These details are read from OPA configmap. Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. - all_data (str): + all_data (bool): correlation_id (str): user_agent (str): x_user_id (str): identifier the user in the query @@ -662,8 +662,8 @@ def update_tenant( self, *, service: str, - polling_min_delay_seconds: str | None = None, - polling_max_delay_seconds: str | None = None, + polling_min_delay_seconds: int | None = None, + polling_max_delay_seconds: int | None = None, correlation_id: str | None = None, user_agent: str | None = None, x_user_id: str | None = None, @@ -675,8 +675,8 @@ def update_tenant( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. service (str): - polling_min_delay_seconds (str): - polling_max_delay_seconds (str): + polling_min_delay_seconds (int): + polling_max_delay_seconds (int): correlation_id (str): user_agent (str): x_user_id (str): identifier the user in the query @@ -832,7 +832,7 @@ def validate_policy( self, *, policy_id: str, - template: str | None = None, + template: bool | None = None, correlation_id: str | None = None, user_agent: str | None = None, x_user_id: str | None = None, @@ -849,7 +849,7 @@ def validate_policy( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. policy_id (str): - template (str): + template (bool): correlation_id (str): user_agent (str): x_user_id (str): identifier the user in the query @@ -925,7 +925,7 @@ def get_backup( def bootstrap( self, *, - force: str | None = None, + force: bool | None = None, correlation_id: str | None = None, user_agent: str | None = None, x_user_id: str | None = None, @@ -949,7 +949,7 @@ def bootstrap( * HTTP_424_FAILED_DEPENDENCY - bundle server caused failure Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. - force (str): + force (bool): correlation_id (str): user_agent (str): x_user_id (str): identifier the user in the query diff --git a/osdu_client/services/sdms/client.py b/osdu_client/services/sdms/client.py index c0a50e7..59cbcb4 100644 --- a/osdu_client/services/sdms/client.py +++ b/osdu_client/services/sdms/client.py @@ -169,8 +169,8 @@ def get_dataset( subprojectid: str, path: str | None = None, datasetid: str, - seismicmeta: str | None = None, - translate_user_info: str | None = None, + seismicmeta: bool | None = None, + translate_user_info: bool | None = None, record_version: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -183,8 +183,8 @@ def get_dataset( subprojectid (str): Name of the subproject. path (str): Hierarchical path of the dataset. datasetid (str): Name of the dataset. - seismicmeta (str): Include the seismic storage metadata record if it exists. - translate_user_info (str): translate the user-id to a more human readable user info + seismicmeta (bool): Include the seismic storage metadata record if it exists. + translate_user_info (bool): translate the user-id to a more human readable user info record_version (str): Retrieve a specific version of the seismic storage metadata record Returns: response data (dict) @@ -397,7 +397,7 @@ def acquire_lock_for_dataset( path: str | None = None, datasetid: str, openmode: str | None = None, - wid: str | None = None, + wid: int | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -426,7 +426,7 @@ def acquire_lock_for_dataset( path (str): Hierarchical path of the dataset. datasetid (str): Name of the dataset. openmode (str): Type of the lock which can be set to 'read' (default) or 'write'. - wid (str): Session identifier issued for a previous write lock acquisition operation. + wid (int): Session identifier issued for a previous write lock acquisition operation. Returns: response data (dict) Raises: @@ -626,7 +626,7 @@ def upsert_tags_to_dataset( subprojectid: str, path: str | None = None, datasetid: str, - gtag: str, + gtag: list[str], data_partition_id: str | None = None, ) -> dict: """ @@ -647,7 +647,7 @@ def upsert_tags_to_dataset( subprojectid (str): Name of the subproject. path (str): Hierarchical path of the dataset. datasetid (str): Name of the dataset. - gtag (str): Gtags array list. + gtag (list[str]): Gtags array list. Returns: response data (dict) Raises: @@ -828,7 +828,7 @@ def list_datasets_in_subproject( impersonation_token_context: str | None = None, tenantid: str, subprojectid: str, - translate_user_info: str | None = None, + translate_user_info: bool | None = None, type: str | None = None, gtags: list[str] | None = None, search: str | None = None, @@ -848,7 +848,7 @@ def list_datasets_in_subproject( impersonation_token_context (str): The impersonation token context (required only with impersonation token credentials) tenantid (str): Name of the tenant. subprojectid (str): Name of the subproject. - translate_user_info (str): translate the user-id to a more human readable user info + translate_user_info (bool): translate the user-id to a more human readable user info type (str): gtags (list[str]): Array of global tags associated with the dataset metadata. Once assigned, they can be used to filter datasets. search (str): @@ -1004,7 +1004,7 @@ def ls( impersonation_token_context: str | None = None, sdpath: str, wmode: str | None = None, - limit: str | None = None, + limit: int | None = None, cursor: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -1018,7 +1018,7 @@ def ls( impersonation_token_context (str): The impersonation token context (required only with impersonation token credentials) sdpath (str): Seismic store path, sd://tenant/sub-project/path. wmode (str): Working mode, dirs or datasets or undefined for both. - limit (str): Limits the total number of datasets to return. + limit (int): Limits the total number of datasets to return. cursor (str): Pagination token - this query parameter can be omitted on first call. Returns: response data (dict) @@ -1128,7 +1128,7 @@ def copy_dataset( impersonation_token_context: str | None = None, sdpath_from: str, sdpath_to: str, - lock: str | None = None, + lock: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -1147,7 +1147,7 @@ def copy_dataset( impersonation_token_context (str): The impersonation token context (required only with impersonation token credentials) sdpath_from (str): Seismic store source dataset path. sdpath_to (str): Seismic store destination dataset path. - lock (str): Lock source and destination while copying. + lock (bool): Lock source and destination while copying. Returns: response data (dict) Raises: @@ -1178,7 +1178,7 @@ def get_gcs_access_token( *, impersonation_token_context: str | None = None, sdpath: str, - readonly: str | None = None, + readonly: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -1196,7 +1196,7 @@ def get_gcs_access_token( data_partition_id (str): identifier of the data partition to query. If None sets by auth session. impersonation_token_context (str): The impersonation token context (required only with impersonation token credentials) sdpath (str): Seismic store path in the format sd://tenant/sub-project. - readonly (str): Readonly access, true(default) or false. + readonly (bool): Readonly access, true(default) or false. Returns: response data (dict) Raises: @@ -1555,7 +1555,7 @@ def get_subproject_metadata( *, subprojectid: str, tenantid: str, - translate_user_info: str | None = None, + translate_user_info: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -1564,7 +1564,7 @@ def get_subproject_metadata( data_partition_id (str): identifier of the data partition to query. If None sets by auth session. subprojectid (str): Name of the subproject. tenantid (str): Name of the tenant. - translate_user_info (str): translate the user-id to a more human readable user info + translate_user_info (bool): translate the user-id to a more human readable user info Returns: response data (dict) Raises: @@ -1624,7 +1624,7 @@ def patch_subprojects_metadata( ltag: str, tenantid: str, subprojectid: str, - recursive: str | None = None, + recursive: bool | None = None, access_policy: str | None = "dataset", acls: dict | None = None, data_partition_id: str | None = None, @@ -1644,7 +1644,7 @@ def patch_subprojects_metadata( ltag (str): Legal tag of the subproject. tenantid (str): Name of the tenant. subprojectid (str): Name of the subproject. - recursive (str): True if the legal tags of all datasets in a subproject needs to be updated. + recursive (bool): True if the legal tags of all datasets in a subproject needs to be updated. access_policy (str): Access Policy for the subproject. acls (dict): ACLs with admin groups and viewer groups. Existing acls will be replaced with the provided acls. Returns: diff --git a/osdu_client/services/storage/client.py b/osdu_client/services/storage/client.py index 33c9982..11abb51 100644 --- a/osdu_client/services/storage/client.py +++ b/osdu_client/services/storage/client.py @@ -21,7 +21,7 @@ def update_records( self, *, x_collaboration: str | None = None, - skipdupes: str | None = None, + skipdupes: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -31,7 +31,7 @@ def update_records( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. x_collaboration (str): x-collaboration - skipdupes (str): Skip duplicates when updating records with the same value. + skipdupes (bool): Skip duplicates when updating records with the same value. Returns: response data (dict) Raises: @@ -205,7 +205,7 @@ def query_records_from_kind( *, x_collaboration: str | None = None, cursor: str | None = None, - limit: str | None = None, + limit: int | None = None, kind: str, data_partition_id: str | None = None, ) -> dict: @@ -216,7 +216,7 @@ def query_records_from_kind( data_partition_id (str): identifier of the data partition to query. If None sets by auth session. x_collaboration (str): x-collaboration cursor (str): Cursor - limit (str): Page Size + limit (int): Page Size kind (str): Filter Kind Returns: response data (dict) @@ -338,7 +338,7 @@ def get_record( *, x_collaboration: str | None = None, id: str, - attribute: str | None = None, + attribute: list[str] | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -348,7 +348,7 @@ def get_record( data_partition_id (str): identifier of the data partition to query. If None sets by auth session. x_collaboration (str): x-collaboration id (str): Record id - attribute (str): Filter attributes to restrict the returned fields of the record. Usage: data.{record-data-field-name}. + attribute (list[str]): Filter attributes to restrict the returned fields of the record. Usage: data.{record-data-field-name}. Returns: response data (dict) Raises: @@ -410,7 +410,7 @@ def get_record_version( x_collaboration: str | None = None, id: str, version: str, - attribute: str | None = None, + attribute: list[str] | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -421,7 +421,7 @@ def get_record_version( x_collaboration (str): x-collaboration id (str): Record id version (str): Record version - attribute (str): Filter attributes to restrict the returned fields of the record. Usage: data.{record-data-field-name}. + attribute (list[str]): Filter attributes to restrict the returned fields of the record. Usage: data.{record-data-field-name}. Returns: response data (dict) Raises: @@ -524,8 +524,8 @@ def purge_record_versions( x_collaboration: str | None = None, id: str, version_ids: str | None = None, - limit: str | None = None, - _form: str | None = None, + limit: int | None = None, + _form: int | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -536,8 +536,8 @@ def purge_record_versions( x_collaboration (str): x-collaboration id (str): Record id version_ids (str): Comma separated version ids (excluding latest version) to be deleted. Maximum 50 versions can be deleted per request. - limit (str): limit - _form (str): Record version id from which all record versions aside from the current one are deleted + limit (int): limit + _form (int): Record version id from which all record versions aside from the current one are deleted Returns: response data (dict) Raises: diff --git a/osdu_client/services/wellbore/v2.py b/osdu_client/services/wellbore/v2.py index 3e78135..c68059c 100644 --- a/osdu_client/services/wellbore/v2.py +++ b/osdu_client/services/wellbore/v2.py @@ -21,11 +21,11 @@ def get_alpha_logs_data( self, *, record_id: str, - offset: str | None = None, - limit: str | None = None, + offset: int | None = None, + limit: int | None = None, curves: str | None = None, - describe: str | None = None, - filter: str | None = None, + describe: bool | None = None, + filter: list[str] | None = None, orient: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -58,11 +58,11 @@ def get_alpha_logs_data( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. record_id (str): - offset (str): The number of rows that are to be skipped and not included in the result. - limit (str): The maximum number of rows to be returned. + offset (int): The number of rows that are to be skipped and not included in the result. + limit (int): The maximum number of rows to be returned. curves (str): Filters curves. List of curves to be returned. The curves are returned in the same order as it is given. - describe (str): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) - filter (str): + describe (bool): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) + filter (list[str]): The "filter" query parameter allows clients to filter by rows, it selects rows data following the pattern `$column_name:$operator:$value`. The supported operators are : lt, lte, gt, gte, eq, neq, in. @@ -333,11 +333,11 @@ def get_alpha_logs_versions_data( *, record_id: str, version: str, - offset: str | None = None, - limit: str | None = None, + offset: int | None = None, + limit: int | None = None, curves: str | None = None, - describe: str | None = None, - filter: str | None = None, + describe: bool | None = None, + filter: list[str] | None = None, orient: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -371,11 +371,11 @@ def get_alpha_logs_versions_data( data_partition_id (str): identifier of the data partition to query. If None sets by auth session. record_id (str): version (str): - offset (str): The number of rows that are to be skipped and not included in the result. - limit (str): The maximum number of rows to be returned. + offset (int): The number of rows that are to be skipped and not included in the result. + limit (int): The maximum number of rows to be returned. curves (str): Filters curves. List of curves to be returned. The curves are returned in the same order as it is given. - describe (str): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) - filter (str): + describe (bool): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) + filter (list[str]): The "filter" query parameter allows clients to filter by rows, it selects rows data following the pattern `$column_name:$operator:$value`. The supported operators are : lt, lte, gt, gte, eq, neq, in. @@ -442,7 +442,7 @@ def delete_dipset( self, *, dipsetid: str, - recursive: str | None = None, + recursive: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -450,7 +450,7 @@ def delete_dipset( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. dipsetid (str): - recursive (str): Whether or not to delete records children + recursive (bool): Whether or not to delete records children Returns: response data (dict) Raises: @@ -501,8 +501,8 @@ def get_dip( self, *, dipsetid: str, - index: str | None = None, - limit: str | None = None, + index: int | None = None, + limit: int | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -513,8 +513,8 @@ def get_dip( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. dipsetid (str): - index (str): - limit (str): + index (int): + limit (int): Returns: response data (dict) Raises: @@ -602,8 +602,8 @@ def query_dip_from_dipset( self, *, dipsetid: str, - min_reference: str | None = None, - max_reference: str | None = None, + min_reference: int | None = None, + max_reference: int | None = None, classification: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -614,8 +614,8 @@ def query_dip_from_dipset( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. dipsetid (str): - min_reference (str): Min reference for the dips to search in the dipset - max_reference (str): + min_reference (int): Min reference for the dips to search in the dipset + max_reference (int): classification (str): Returns: response data (dict) @@ -983,9 +983,9 @@ def get_decimated_log( self, *, logid: str, - quantiles: str | None = None, - start: str | None = None, - stop: str | None = None, + quantiles: int | None = None, + start: int | None = None, + stop: int | None = None, orient: str | None = None, bulk_path: str | None = None, data_partition_id: str | None = None, @@ -998,9 +998,9 @@ def get_decimated_log( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. logid (str): - quantiles (str): Number of division desired - start (str): The start value for the log decimation - stop (str): The stop value for the log decimation + quantiles (int): Number of division desired + start (int): The start value for the log decimation + stop (int): The stop value for the log decimation orient (str): response format JSON. Only "values" is allowed. bulk_path (str): The json path to the bulk reference (see https://goessner.net/articles/JsonPath/). Required for non wks:log. Returns: @@ -1237,7 +1237,7 @@ def delete_logset( self, *, logsetid: str, - recursive: str | None = None, + recursive: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -1245,7 +1245,7 @@ def delete_logset( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. logsetid (str): - recursive (str): Whether or not to delete records children + recursive (bool): Whether or not to delete records children Returns: response data (dict) Raises: @@ -1559,7 +1559,7 @@ def get_trajectory_data( self, *, trajectoryid: str, - channels: str | None = None, + channels: list[str] | None = None, orient: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -1570,7 +1570,7 @@ def get_trajectory_data( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. trajectoryid (str): - channels (str): List of channels to get. If not provided, return all channels. + channels (list[str]): List of channels to get. If not provided, return all channels. orient (str): format for JSON only. Returns: response data (dict) @@ -1700,7 +1700,7 @@ def get_trajectory_version_data( *, trajectoryid: str, version: str, - channels: str | None = None, + channels: list[str] | None = None, orient: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -1712,7 +1712,7 @@ def get_trajectory_version_data( data_partition_id (str): identifier of the data partition to query. If None sets by auth session. trajectoryid (str): version (str): - channels (str): List of channels to get. If not provided, return all channels. + channels (list[str]): List of channels to get. If not provided, return all channels. orient (str): format for JSON only. Returns: response data (dict) @@ -1767,7 +1767,7 @@ def delete_wellbores( self, *, wellboreid: str, - recursive: str | None = None, + recursive: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -1775,7 +1775,7 @@ def delete_wellbores( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. wellboreid (str): - recursive (str): Whether or not to delete records children + recursive (bool): Whether or not to delete records children Returns: response data (dict) Raises: @@ -1919,7 +1919,7 @@ def delete_well( self, *, wellid: str, - recursive: str | None = None, + recursive: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -1927,7 +1927,7 @@ def delete_well( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. wellid (str): - recursive (str): Whether or not to delete records children + recursive (bool): Whether or not to delete records children Returns: response data (dict) Raises: diff --git a/osdu_client/services/wellbore/v3.py b/osdu_client/services/wellbore/v3.py index 4ceace6..dc04800 100644 --- a/osdu_client/services/wellbore/v3.py +++ b/osdu_client/services/wellbore/v3.py @@ -672,11 +672,11 @@ def get_wellboretrajectories_data( self, *, record_id: str, - offset: str | None = None, - limit: str | None = None, + offset: int | None = None, + limit: int | None = None, curves: str | None = None, - describe: str | None = None, - filter: str | None = None, + describe: bool | None = None, + filter: list[str] | None = None, orient: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -709,11 +709,11 @@ def get_wellboretrajectories_data( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. record_id (str): - offset (str): The number of rows that are to be skipped and not included in the result. - limit (str): The maximum number of rows to be returned. + offset (int): The number of rows that are to be skipped and not included in the result. + limit (int): The maximum number of rows to be returned. curves (str): Filters curves. List of curves to be returned. The curves are returned in the same order as it is given. - describe (str): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) - filter (str): + describe (bool): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) + filter (list[str]): The "filter" query parameter allows clients to filter by rows, it selects rows data following the pattern `$column_name:$operator:$value`. The supported operators are : lt, lte, gt, gte, eq, neq, in. @@ -989,11 +989,11 @@ def get_returns_data_specified_version( *, record_id: str, version: str, - offset: str | None = None, - limit: str | None = None, + offset: int | None = None, + limit: int | None = None, curves: str | None = None, - describe: str | None = None, - filter: str | None = None, + describe: bool | None = None, + filter: list[str] | None = None, orient: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -1027,11 +1027,11 @@ def get_returns_data_specified_version( data_partition_id (str): identifier of the data partition to query. If None sets by auth session. record_id (str): version (str): - offset (str): The number of rows that are to be skipped and not included in the result. - limit (str): The maximum number of rows to be returned. + offset (int): The number of rows that are to be skipped and not included in the result. + limit (int): The maximum number of rows to be returned. curves (str): Filters curves. List of curves to be returned. The curves are returned in the same order as it is given. - describe (str): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) - filter (str): + describe (bool): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) + filter (list[str]): The "filter" query parameter allows clients to filter by rows, it selects rows data following the pattern `$column_name:$operator:$value`. The supported operators are : lt, lte, gt, gte, eq, neq, in. @@ -1077,7 +1077,7 @@ def delete_wellboretrajectories( self, *, wellboretrajectoryid: str, - purge: str | None = None, + purge: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -1085,7 +1085,7 @@ def delete_wellboretrajectories( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. wellboretrajectoryid (str): - purge (str): + purge (bool): Returns: response data (dict) Raises: @@ -1230,11 +1230,11 @@ def get_welllogs_data( self, *, record_id: str, - offset: str | None = None, - limit: str | None = None, + offset: int | None = None, + limit: int | None = None, curves: str | None = None, - describe: str | None = None, - filter: str | None = None, + describe: bool | None = None, + filter: list[str] | None = None, orient: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -1267,11 +1267,11 @@ def get_welllogs_data( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. record_id (str): - offset (str): The number of rows that are to be skipped and not included in the result. - limit (str): The maximum number of rows to be returned. + offset (int): The number of rows that are to be skipped and not included in the result. + limit (int): The maximum number of rows to be returned. curves (str): Filters curves. List of curves to be returned. The curves are returned in the same order as it is given. - describe (str): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) - filter (str): + describe (bool): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) + filter (list[str]): The "filter" query parameter allows clients to filter by rows, it selects rows data following the pattern `$column_name:$operator:$value`. The supported operators are : lt, lte, gt, gte, eq, neq, in. @@ -1590,11 +1590,11 @@ def get_welllog_version_data( *, record_id: str, version: str, - offset: str | None = None, - limit: str | None = None, + offset: int | None = None, + limit: int | None = None, curves: str | None = None, - describe: str | None = None, - filter: str | None = None, + describe: bool | None = None, + filter: list[str] | None = None, orient: str | None = None, data_partition_id: str | None = None, ) -> dict: @@ -1628,11 +1628,11 @@ def get_welllog_version_data( data_partition_id (str): identifier of the data partition to query. If None sets by auth session. record_id (str): version (str): - offset (str): The number of rows that are to be skipped and not included in the result. - limit (str): The maximum number of rows to be returned. + offset (int): The number of rows that are to be skipped and not included in the result. + limit (int): The maximum number of rows to be returned. curves (str): Filters curves. List of curves to be returned. The curves are returned in the same order as it is given. - describe (str): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) - filter (str): + describe (bool): The "describe" query option allows clients to request a description of the matching result. (number of rows, columns name) + filter (list[str]): The "filter" query parameter allows clients to filter by rows, it selects rows data following the pattern `$column_name:$operator:$value`. The supported operators are : lt, lte, gt, gte, eq, neq, in. @@ -1763,7 +1763,7 @@ def delete_welllog( self, *, welllogid: str, - purge: str | None = None, + purge: bool | None = None, data_partition_id: str | None = None, ) -> dict: """ @@ -1771,7 +1771,7 @@ def delete_welllog( Args: data_partition_id (str): identifier of the data partition to query. If None sets by auth session. welllogid (str): - purge (str): + purge (bool): Returns: response data (dict) Raises: diff --git a/pyproject.toml b/pyproject.toml index 4a06778..75cec7e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "osdu-client" -version = "1.3.0" +version = "1.4.0" description = "OSDU API Client" authors = ["Michal Murawski "] readme = "README.md" diff --git a/tests/entitlements/conftest.py b/tests/entitlements/conftest.py index 76a55f7..f8d3caa 100644 --- a/tests/entitlements/conftest.py +++ b/tests/entitlements/conftest.py @@ -15,6 +15,7 @@ def auth_backend() -> AuthBackendInterface: class AuthSession(AuthBackendInterface): base_url = "https://base.url" default_data_partition_id = "osdu" + authorization_header = {"Authorization": "Bearer access_token"} diff --git a/tests/entitlements/test_entitlements.py b/tests/entitlements/test_entitlements.py index ffac0fb..78091dd 100644 --- a/tests/entitlements/test_entitlements.py +++ b/tests/entitlements/test_entitlements.py @@ -3,33 +3,29 @@ def test_entitlements_add_member(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.add_member( - add_member_dto={}, group_email="text", + add_member_dto={}, data_partition_id="text", ) - def test_entitlements_create_group(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.create_group( group_info_dto={}, data_partition_id="text", ) - def test_entitlements_delete_group(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.delete_group( group_email="text", data_partition_id="text", ) - def test_entitlements_delete_member(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.delete_member( member_email="text", data_partition_id="text", ) - def test_entitlements_delete_member_from_group(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.delete_member_from_group( group_email="text", @@ -37,7 +33,6 @@ def test_entitlements_delete_member_from_group(entitlements_api_server, entitlem data_partition_id="text", ) - def test_entitlements_get_count_group_members(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_count_group_members( group_email="text", @@ -45,7 +40,6 @@ def test_entitlements_get_count_group_members(entitlements_api_server, entitleme data_partition_id="text", ) - def test_entitlements_get_groups(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_groups( on_behalf_of="text", @@ -53,70 +47,55 @@ def test_entitlements_get_groups(entitlements_api_server, entitlements_client: E data_partition_id="text", ) - def test_entitlements_get_groups_members(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_groups_members( group_email="text", role="text", include_type="text", data_partition_id="text", - ) - def test_entitlements_get_info(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_info( data_partition_id="text", - ) - def test_entitlements_get_liveness_check(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_liveness_check( data_partition_id="text", - ) - def test_entitlements_get_members_groups(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_members_groups( member_email="text", - type={}, + type="text", appid="text", role_required="text", data_partition_id="text", - ) - def test_entitlements_get_readiness_check(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_readiness_check( data_partition_id="text", - ) - def test_entitlements_initiate_tenant(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.initiate_tenant( data_partition_id="text", - ) - def test_entitlements_list_partition_groups(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.list_partition_groups( type="text", cursor="text", - limit="text", + limit=10, data_partition_id="text", - ) - def test_entitlements_update_groups(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.update_groups( - update_group_request=[{}], group_email="text", + update_group_request=[{}], data_partition_id="text", - ) + diff --git a/tests/file/conftest.py b/tests/file/conftest.py index 1f70551..5e34f3c 100644 --- a/tests/file/conftest.py +++ b/tests/file/conftest.py @@ -15,6 +15,7 @@ def auth_backend() -> AuthBackendInterface: class AuthSession(AuthBackendInterface): base_url = "https://base.url" default_data_partition_id = "osdu" + authorization_header = {"Authorization": "Bearer access_token"} diff --git a/tests/file/swagger.yaml b/tests/file/swagger.yaml index 816b653..882b712 100644 --- a/tests/file/swagger.yaml +++ b/tests/file/swagger.yaml @@ -763,8 +763,8 @@ components: description: Endianness of binary value. Enumeration- \BIG\ \LITTLE\. If absent applications will need to interpret from context indicators. type: string enum: [ - BIG - LITTLE + BIG, + LITTLE ] Checksum: diff --git a/tests/file/test_file.py b/tests/file/test_file.py index 25bade2..951d93a 100644 --- a/tests/file/test_file.py +++ b/tests/file/test_file.py @@ -4,7 +4,6 @@ def test_file_copy_file_collections(file_api_server, file_client: FileClient): file_client.copy_file_collections( data_partition_id="text", - ) @@ -27,7 +26,6 @@ def test_file_create_files_metadata(file_api_server, file_client: FileClient): id="text", ancestry={}, data_partition_id="text", - ) @@ -35,21 +33,18 @@ def test_file_delete_files_metadata(file_api_server, file_client: FileClient): file_client.delete_files_metadata( id="text", data_partition_id="text", - ) def test_file_get_file_collections_retrieval_instructions(file_api_server, file_client: FileClient): file_client.get_file_collections_retrieval_instructions( data_partition_id="text", - ) def test_file_get_file_collections_storage_instructions(file_api_server, file_client: FileClient): file_client.get_file_collections_storage_instructions( data_partition_id="text", - ) @@ -61,15 +56,13 @@ def test_file_get_file_list(file_api_server, file_client: FileClient): items=10, user_id="text", data_partition_id="text", - ) def test_file_get_file_location(file_api_server, file_client: FileClient): file_client.get_file_location( - file_id="2034ae65-552a-4c04-9e0c-e344ebe40bc7", + file_id="text", data_partition_id="text", - ) @@ -77,7 +70,6 @@ def test_file_get_file_signed_url(file_api_server, file_client: FileClient): file_client.get_file_signed_url( srn=["text"], data_partition_id="text", - ) @@ -85,29 +77,25 @@ def test_file_get_files_metadata(file_api_server, file_client: FileClient): file_client.get_files_metadata( id="text", data_partition_id="text", - ) def test_file_get_files_upload_url(file_api_server, file_client: FileClient): file_client.get_files_upload_url( data_partition_id="text", - ) def test_file_get_info(file_api_server, file_client: FileClient): file_client.get_info( data_partition_id="text", - ) def test_file_get_location(file_api_server, file_client: FileClient): file_client.get_location( - file_id="2034ae65-552a-4c04-9e0c-e344ebe40bc7", + file_id="text", data_partition_id="text", - ) @@ -116,5 +104,4 @@ def test_file_gets_url_to_download_file(file_api_server, file_client: FileClient id="text", expiry_time="text", data_partition_id="text", - ) diff --git a/tests/indexer/conftest.py b/tests/indexer/conftest.py index b95d8b3..a5f3252 100644 --- a/tests/indexer/conftest.py +++ b/tests/indexer/conftest.py @@ -14,7 +14,8 @@ def auth_backend() -> AuthBackendInterface: class AuthSession(AuthBackendInterface): base_url = "https://base.url" - default_data_partition_id = "osdu" + default_data_partition_id = "osdu" + authorization_header = {"Authorization": "Bearer access_token"} diff --git a/tests/indexer/test_indexer.py b/tests/indexer/test_indexer.py index ddd7b2a..445fffd 100644 --- a/tests/indexer/test_indexer.py +++ b/tests/indexer/test_indexer.py @@ -5,53 +5,45 @@ def test_indexer_delete_index(indexer_api_server, indexer_client: IndexerClient) indexer_client.delete_index( kind="text", data_partition_id="text", - ) def test_indexer_get_info(indexer_api_server, indexer_client: IndexerClient): indexer_client.get_info( data_partition_id="text", - ) def test_indexer_get_liveness_check(indexer_api_server, indexer_client: IndexerClient): indexer_client.get_liveness_check( data_partition_id="text", - ) def test_indexer_get_readiness_check(indexer_api_server, indexer_client: IndexerClient): indexer_client.get_readiness_check( data_partition_id="text", - ) def test_indexer_provision_partition(indexer_api_server, indexer_client: IndexerClient): indexer_client.provision_partition( data_partition_id="text", - ) def test_indexer_reindex_kind(indexer_api_server, indexer_client: IndexerClient): indexer_client.reindex_kind( + force_clean=False, kind="text", cursor="text", - force_clean="text", data_partition_id="text", - ) def test_indexer_reindex_partition(indexer_api_server, indexer_client: IndexerClient): indexer_client.reindex_partition( - force_clean="text", + force_clean=False, data_partition_id="text", - ) def test_indexer_reindex_records(indexer_api_server, indexer_client: IndexerClient): indexer_client.reindex_records( record_ids=["text"], data_partition_id="text", - ) diff --git a/tests/legal/conftest.py b/tests/legal/conftest.py index 29fd740..18fc4ce 100644 --- a/tests/legal/conftest.py +++ b/tests/legal/conftest.py @@ -14,7 +14,8 @@ def auth_backend() -> AuthBackendInterface: class AuthSession(AuthBackendInterface): base_url = "https://base.url" - default_data_partition_id = "osdu" + default_data_partition_id = "osdu" + authorization_header = {"Authorization": "Bearer access_token"} diff --git a/tests/legal/test_legal.py b/tests/legal/test_legal.py index d5a745d..efdbe4f 100644 --- a/tests/legal/test_legal.py +++ b/tests/legal/test_legal.py @@ -7,77 +7,66 @@ def test_legal_create_legaltag(legal_api_server, legal_client: LegalClient): description="text", properties={}, data_partition_id="text", - ) def test_legal_delete_legaltag(legal_api_server, legal_client: LegalClient): legal_client.delete_legaltag( name="text", data_partition_id="text", - ) def test_legal_get_batch_legaltags(legal_api_server, legal_client: LegalClient): legal_client.get_batch_legaltags( names=["text"], data_partition_id="text", - ) def test_legal_get_info(legal_api_server, legal_client: LegalClient): legal_client.get_info( data_partition_id="text", - ) def test_legal_get_legaltag(legal_api_server, legal_client: LegalClient): legal_client.get_legaltag( name="text", data_partition_id="text", - ) def test_legal_get_legaltag_compliance_job_status(legal_api_server, legal_client: LegalClient): legal_client.get_legaltag_compliance_job_status( data_partition_id="text", - ) def test_legal_get_legaltags_properties(legal_api_server, legal_client: LegalClient): legal_client.get_legaltags_properties( data_partition_id="text", - ) def test_legal_get_liveness_check(legal_api_server, legal_client: LegalClient): legal_client.get_liveness_check( data_partition_id="text", - ) def test_legal_get_readiness_check(legal_api_server, legal_client: LegalClient): legal_client.get_readiness_check( data_partition_id="text", - ) def test_legal_list_legaltags(legal_api_server, legal_client: LegalClient): legal_client.list_legaltags( - valid="text", + valid=False, data_partition_id="text", - ) def test_legal_query_legaltags(legal_api_server, legal_client: LegalClient): legal_client.query_legaltags( + valid=False, query_list=["text"], operator_list=["text"], sort_by="text", sort_order="text", limit=10, - valid="text", data_partition_id="text", - ) def test_legal_update_legaltag(legal_api_server, legal_client: LegalClient): @@ -88,13 +77,11 @@ def test_legal_update_legaltag(legal_api_server, legal_client: LegalClient): expiration_date="2024-01-01T00:00:00+00:00", extension_properties={}, data_partition_id="text", - ) def test_legal_validate_legaltags(legal_api_server, legal_client: LegalClient): legal_client.validate_legaltags( names=["text"], data_partition_id="text", - ) diff --git a/tests/policy/conftest.py b/tests/policy/conftest.py index bf29240..14f1261 100644 --- a/tests/policy/conftest.py +++ b/tests/policy/conftest.py @@ -14,7 +14,8 @@ def auth_backend() -> AuthBackendInterface: class AuthSession(AuthBackendInterface): base_url = "https://base.url" - default_data_partition_id = "osdu" + default_data_partition_id = "osdu" + authorization_header = {"Authorization": "Bearer access_token"} diff --git a/tests/policy/test_policy.py b/tests/policy/test_policy.py index bd9676f..71c0eaa 100644 --- a/tests/policy/test_policy.py +++ b/tests/policy/test_policy.py @@ -3,23 +3,21 @@ def test_policy_bootstrap(policy_api_server, policy_client: PolicyClient): policy_client.bootstrap( - force="text", + force=False, correlation_id="text", user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_create_api_policy_v1_compile(policy_api_server, policy_client: PolicyClient): policy_client.create_api_policy_v1_compile( - metrics="text", - instrument="text", + metrics=False, + instrument=False, correlation_id="text", user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_create_or_update_partition_policy(policy_api_server, policy_client: PolicyClient): @@ -30,7 +28,6 @@ def test_policy_create_or_update_partition_policy(policy_api_server, policy_clie user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_delete_partition_policy(policy_api_server, policy_client: PolicyClient): @@ -41,7 +38,6 @@ def test_policy_delete_partition_policy(policy_api_server, policy_client: Policy user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_delete_tenant(policy_api_server, policy_client: PolicyClient): @@ -50,18 +46,16 @@ def test_policy_delete_tenant(policy_api_server, policy_client: PolicyClient): user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_evaluate_policy(policy_api_server, policy_client: PolicyClient): policy_client.evaluate_policy( policy_id="text", - include_auth="text", + include_auth=False, correlation_id="text", user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_get_api_policy_v1_config(policy_api_server, policy_client: PolicyClient): @@ -70,7 +64,6 @@ def test_policy_get_api_policy_v1_config(policy_api_server, policy_client: Polic user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_get_api_policy_v1_info(policy_api_server, policy_client: PolicyClient): @@ -78,7 +71,6 @@ def test_policy_get_api_policy_v1_info(policy_api_server, policy_client: PolicyC correlation_id="text", user_agent="text", data_partition_id="text", - ) def test_policy_get_api_policy_v1_policies(policy_api_server, policy_client: PolicyClient): @@ -87,7 +79,6 @@ def test_policy_get_api_policy_v1_policies(policy_api_server, policy_client: Pol user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_get_api_policy_v1_policies_osdu_partition(policy_api_server, policy_client: PolicyClient): @@ -98,7 +89,6 @@ def test_policy_get_api_policy_v1_policies_osdu_partition(policy_api_server, pol user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_get_backup(policy_api_server, policy_client: PolicyClient): @@ -107,7 +97,6 @@ def test_policy_get_backup(policy_api_server, policy_client: PolicyClient): user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_get_fetch_instance_policy(policy_api_server, policy_client: PolicyClient): @@ -117,7 +106,6 @@ def test_policy_get_fetch_instance_policy(policy_api_server, policy_client: Poli user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_get_fetch_policy(policy_api_server, policy_client: PolicyClient): @@ -127,7 +115,6 @@ def test_policy_get_fetch_policy(policy_api_server, policy_client: PolicyClient) user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_get_health(policy_api_server, policy_client: PolicyClient): @@ -135,7 +122,6 @@ def test_policy_get_health(policy_api_server, policy_client: PolicyClient): correlation_id="text", user_agent="text", data_partition_id="text", - ) def test_policy_get_ready(policy_api_server, policy_client: PolicyClient): @@ -143,17 +129,15 @@ def test_policy_get_ready(policy_api_server, policy_client: PolicyClient): correlation_id="text", user_agent="text", data_partition_id="text", - ) def test_policy_get_tenant(policy_api_server, policy_client: PolicyClient): policy_client.get_tenant( - all_data="text", + all_data=False, correlation_id="text", user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_home_page(policy_api_server, policy_client: PolicyClient): @@ -161,7 +145,6 @@ def test_policy_home_page(policy_api_server, policy_client: PolicyClient): correlation_id="text", user_agent="text", data_partition_id="text", - ) def test_policy_translate_policy_api(policy_api_server, policy_client: PolicyClient): @@ -175,29 +158,26 @@ def test_policy_translate_policy_api(policy_api_server, policy_client: PolicyCli user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_update_tenant(policy_api_server, policy_client: PolicyClient): policy_client.update_tenant( service="text", - polling_min_delay_seconds="text", - polling_max_delay_seconds="text", + polling_min_delay_seconds=10, + polling_max_delay_seconds=10, correlation_id="text", user_agent="text", x_user_id="text", data_partition_id="text", - ) def test_policy_validate_policy(policy_api_server, policy_client: PolicyClient): policy_client.validate_policy( policy_id="text", - template="text", + template=False, correlation_id="text", user_agent="text", x_user_id="text", data_partition_id="text", - ) diff --git a/tests/rafs/conftest.py b/tests/rafs/conftest.py index cc0978e..b065d3e 100644 --- a/tests/rafs/conftest.py +++ b/tests/rafs/conftest.py @@ -14,7 +14,8 @@ def auth_backend() -> AuthBackendInterface: class AuthSession(AuthBackendInterface): base_url = "https://base.url" - default_data_partition_id = "osdu" + default_data_partition_id = "osdu" + authorization_header = {"Authorization": "Bearer access_token"} diff --git a/tests/rafs/test_rafs_v1.py b/tests/rafs/test_rafs_v1.py index a16636d..2dd5f49 100644 --- a/tests/rafs/test_rafs_v1.py +++ b/tests/rafs/test_rafs_v1.py @@ -4,157 +4,131 @@ def test_rafs_create_or_update_cce_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_cce_records( data_partition_id="text", - ) def test_rafs_create_or_update_compositionalanalysis_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_compositionalanalysis_records( data_partition_id="text", - ) def test_rafs_create_or_update_coring_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_coring_records( data_partition_id="text", - ) def test_rafs_create_or_update_cp_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_cp_records( data_partition_id="text", - ) def test_rafs_create_or_update_cvdt_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_cvdt_records( data_partition_id="text", - ) def test_rafs_create_or_update_difflib_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_difflib_records( data_partition_id="text", - ) def test_rafs_create_or_update_ep_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_ep_records( data_partition_id="text", - ) def test_rafs_create_or_update_er_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_er_records( data_partition_id="text", - ) def test_rafs_create_or_update_fri_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_fri_records( data_partition_id="text", - ) def test_rafs_create_or_update_ft_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_ft_records( data_partition_id="text", - ) def test_rafs_create_or_update_itt_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_itt_records( data_partition_id="text", - ) def test_rafs_create_or_update_mcmt_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_mcmt_records( data_partition_id="text", - ) def test_rafs_create_or_update_physchem_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_physchem_records( data_partition_id="text", - ) def test_rafs_create_or_update_pvt_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_pvt_records( data_partition_id="text", - ) def test_rafs_create_or_update_rc_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_rc_records( data_partition_id="text", - ) def test_rafs_create_or_update_rock_sample_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_rock_sample_records( data_partition_id="text", - ) def test_rafs_create_or_update_rp_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_rp_records( data_partition_id="text", - ) def test_rafs_create_or_update_sar_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_sar_records( data_partition_id="text", - ) def test_rafs_create_or_update_stoat_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_stoat_records( data_partition_id="text", - ) def test_rafs_create_or_update_stt_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_stt_records( data_partition_id="text", - ) def test_rafs_create_or_update_swellingtests_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_swellingtests_records( data_partition_id="text", - ) def test_rafs_create_or_update_transporttest_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_transporttest_records( data_partition_id="text", - ) def test_rafs_create_or_update_vlet_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_vlet_records( data_partition_id="text", - ) def test_rafs_create_or_update_wat_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_wat_records( data_partition_id="text", - ) def test_rafs_create_or_update_wgrp_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_or_update_wgrp_records( data_partition_id="text", - ) def test_rafs_create_rock_sample_analysis_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.create_rock_sample_analysis_record( data_partition_id="text", - ) def test_rafs_get_cce_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -165,14 +139,12 @@ def test_rafs_get_cce_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_cce_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_cce_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_cce_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -180,14 +152,12 @@ def test_rafs_get_cce_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_cce_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_cce_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_cce_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -195,7 +165,6 @@ def test_rafs_get_cce_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_compositionalanalysis_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -206,14 +175,12 @@ def test_rafs_get_compositionalanalysis_data(rafs_api_server, rafs_client_v1: RA rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_compositionalanalysis_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_compositionalanalysis_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_compositionalanalysis_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -221,14 +188,12 @@ def test_rafs_get_compositionalanalysis_record_version(rafs_api_server, rafs_cli version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_compositionalanalysis_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_compositionalanalysis_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_compositionalanalysis_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -236,14 +201,12 @@ def test_rafs_get_compositionalanalysis_source_data(rafs_api_server, rafs_client record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_coring_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_coring_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_cp_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -254,14 +217,12 @@ def test_rafs_get_cp_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_cp_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_cp_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_cp_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -269,14 +230,12 @@ def test_rafs_get_cp_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_cp_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_cp_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_cp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -284,7 +243,6 @@ def test_rafs_get_cp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_cvdt_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -295,14 +253,12 @@ def test_rafs_get_cvdt_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_cvdt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_cvdt_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_cvdt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -310,14 +266,12 @@ def test_rafs_get_cvdt_record_version(rafs_api_server, rafs_client_v1: RAFSClien version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_cvdt_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_cvdt_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_cvdt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -325,7 +279,6 @@ def test_rafs_get_cvdt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_difflib_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -336,14 +289,12 @@ def test_rafs_get_difflib_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_difflib_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_difflib_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_difflib_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -351,14 +302,12 @@ def test_rafs_get_difflib_record_version(rafs_api_server, rafs_client_v1: RAFSCl version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_difflib_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_difflib_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_difflib_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -366,7 +315,6 @@ def test_rafs_get_difflib_source_data(rafs_api_server, rafs_client_v1: RAFSClien record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_ep_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -377,14 +325,12 @@ def test_rafs_get_ep_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_ep_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_ep_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_ep_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -392,14 +338,12 @@ def test_rafs_get_ep_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_ep_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_ep_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_ep_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -407,7 +351,6 @@ def test_rafs_get_ep_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_et_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -418,14 +361,12 @@ def test_rafs_get_et_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_et_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_et_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_et_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -433,14 +374,12 @@ def test_rafs_get_et_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_et_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_et_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_et_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -448,7 +387,6 @@ def test_rafs_get_et_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_fri_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -459,14 +397,12 @@ def test_rafs_get_fri_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_fri_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_fri_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_fri_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -474,14 +410,12 @@ def test_rafs_get_fri_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_fri_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_fri_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_fri_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -489,7 +423,6 @@ def test_rafs_get_fri_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_ft_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -500,14 +433,12 @@ def test_rafs_get_ft_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_ft_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_ft_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_ft_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -515,14 +446,12 @@ def test_rafs_get_ft_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_ft_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_ft_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_ft_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -530,13 +459,11 @@ def test_rafs_get_ft_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_info(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_info( data_partition_id="text", - ) def test_rafs_get_itt_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -547,14 +474,12 @@ def test_rafs_get_itt_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_itt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_itt_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_itt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -562,14 +487,12 @@ def test_rafs_get_itt_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_itt_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_itt_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_itt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -577,7 +500,6 @@ def test_rafs_get_itt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_mcmt_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -588,14 +510,12 @@ def test_rafs_get_mcmt_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_mcmt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_mcmt_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_mcmt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -603,14 +523,12 @@ def test_rafs_get_mcmt_record_version(rafs_api_server, rafs_client_v1: RAFSClien version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_mcmt_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_mcmt_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_mcmt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -618,13 +536,11 @@ def test_rafs_get_mcmt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_metrics(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_metrics( data_partition_id="text", - ) def test_rafs_get_multistageseparatortests_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -635,14 +551,12 @@ def test_rafs_get_multistageseparatortests_data(rafs_api_server, rafs_client_v1: rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_multistageseparatortests_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_multistageseparatortests_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_multistageseparatortests_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -650,14 +564,12 @@ def test_rafs_get_multistageseparatortests_record_version(rafs_api_server, rafs_ version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_multistageseparatortests_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_multistageseparatortests_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_multistageseparatortests_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -665,7 +577,6 @@ def test_rafs_get_multistageseparatortests_source_data(rafs_api_server, rafs_cli record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_physchem_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -676,14 +587,12 @@ def test_rafs_get_physchem_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_physchem_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_physchem_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_physchem_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -691,7 +600,6 @@ def test_rafs_get_physchem_record_version(rafs_api_server, rafs_client_v1: RAFSC version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_physchem_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -699,14 +607,12 @@ def test_rafs_get_physchem_source_data(rafs_api_server, rafs_client_v1: RAFSClie record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_pvt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_pvt_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_pvt_record_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -714,7 +620,6 @@ def test_rafs_get_pvt_record_source_data(rafs_api_server, rafs_client_v1: RAFSCl record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_pvt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -722,14 +627,12 @@ def test_rafs_get_pvt_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_pvt_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_pvt_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_rc_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -740,14 +643,12 @@ def test_rafs_get_rc_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_rc_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_rc_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_rc_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -755,7 +656,6 @@ def test_rafs_get_rc_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_rc_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -763,7 +663,6 @@ def test_rafs_get_rc_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_record_coring_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -771,28 +670,24 @@ def test_rafs_get_record_coring_version(rafs_api_server, rafs_client_v1: RAFSCli version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_record_coring_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_record_coring_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_record_physchem_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_record_physchem_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_record_rc_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_record_rc_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_record_rock_sample_analysis_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -800,35 +695,30 @@ def test_rafs_get_record_rock_sample_analysis_version(rafs_api_server, rafs_clie version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_record_rock_sample_analysis_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_record_rock_sample_analysis_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_record_sar_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_record_sar_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_record_stoat_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_record_stoat_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_rock_sample_analysis_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_rock_sample_analysis_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_rock_sample_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -839,14 +729,12 @@ def test_rafs_get_rock_sample_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_rock_sample_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_rock_sample_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_rock_sample_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -854,14 +742,12 @@ def test_rafs_get_rock_sample_record_version(rafs_api_server, rafs_client_v1: RA version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_rock_sample_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_rock_sample_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_rock_sample_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -869,7 +755,6 @@ def test_rafs_get_rock_sample_source_data(rafs_api_server, rafs_client_v1: RAFSC record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_rp_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -880,14 +765,12 @@ def test_rafs_get_rp_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_rp_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_rp_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_rp_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -895,14 +778,12 @@ def test_rafs_get_rp_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_rp_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_rp_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_rp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -910,14 +791,12 @@ def test_rafs_get_rp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_sar_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_sar_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_sar_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -925,7 +804,6 @@ def test_rafs_get_sar_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_sar_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -933,7 +811,6 @@ def test_rafs_get_sar_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_stoat_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -944,14 +821,12 @@ def test_rafs_get_stoat_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_stoat_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_stoat_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_stoat_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -959,7 +834,6 @@ def test_rafs_get_stoat_record_version(rafs_api_server, rafs_client_v1: RAFSClie version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_stoat_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -967,7 +841,6 @@ def test_rafs_get_stoat_source_data(rafs_api_server, rafs_client_v1: RAFSClient) record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_stt_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -978,14 +851,12 @@ def test_rafs_get_stt_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_stt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_stt_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_stt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -993,14 +864,12 @@ def test_rafs_get_stt_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_stt_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_stt_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_stt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1008,7 +877,6 @@ def test_rafs_get_stt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_swellingtests_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1019,14 +887,12 @@ def test_rafs_get_swellingtests_data(rafs_api_server, rafs_client_v1: RAFSClient rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_swellingtests_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_swellingtests_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_swellingtests_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1034,14 +900,12 @@ def test_rafs_get_swellingtests_record_version(rafs_api_server, rafs_client_v1: version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_swellingtests_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_swellingtests_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_swellingtests_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1049,7 +913,6 @@ def test_rafs_get_swellingtests_source_data(rafs_api_server, rafs_client_v1: RAF record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_transporttest_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1060,14 +923,12 @@ def test_rafs_get_transporttest_data(rafs_api_server, rafs_client_v1: RAFSClient rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_transporttest_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_transporttest_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_transporttest_record_specific_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1075,14 +936,12 @@ def test_rafs_get_transporttest_record_specific_version(rafs_api_server, rafs_cl version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_transporttest_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_transporttest_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_transporttest_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1090,7 +949,6 @@ def test_rafs_get_transporttest_source_data(rafs_api_server, rafs_client_v1: RAF record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_vlet_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1101,14 +959,12 @@ def test_rafs_get_vlet_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_vlet_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_vlet_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_vlet_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1116,14 +972,12 @@ def test_rafs_get_vlet_record_version(rafs_api_server, rafs_client_v1: RAFSClien version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_vlet_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_vlet_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_vlet_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1131,7 +985,6 @@ def test_rafs_get_vlet_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_wat_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1142,14 +995,12 @@ def test_rafs_get_wat_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_wat_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_wat_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_wat_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1157,14 +1008,12 @@ def test_rafs_get_wat_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_wat_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_wat_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_wat_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1172,7 +1021,6 @@ def test_rafs_get_wat_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_get_wgrp_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1183,14 +1031,12 @@ def test_rafs_get_wgrp_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_wgrp_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_wgrp_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_wgrp_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1198,14 +1044,12 @@ def test_rafs_get_wgrp_record_version(rafs_api_server, rafs_client_v1: RAFSClien version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_wgrp_record_versions(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_wgrp_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_wgrp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1213,362 +1057,310 @@ def test_rafs_get_wgrp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_post_multistageseparatortests_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.post_multistageseparatortests_records( data_partition_id="text", - ) def test_rafs_soft_delete_cce_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_cce_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_compositionalanalysis_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_compositionalanalysis_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_coring_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_coring_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_cp_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_cp_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_cvdt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_cvdt_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_difflib_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_difflib_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_ep_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_ep_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_et_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_et_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_fri_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_fri_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_ft_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_ft_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_itt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_itt_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_mcmt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_mcmt_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_multistageseparatortests_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_multistageseparatortests_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_physchem_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_physchem_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_pvt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_pvt_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_rc_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_rc_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_rock_sample_analysis_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_rock_sample_analysis_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_rock_sample_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_rock_sample_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_rp_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_rp_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_sar_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_sar_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_stoat_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_stoat_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_stt_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_stt_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_swellingtests_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_swellingtests_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_transporttest_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_transporttest_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_vlet_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_vlet_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_wat_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_wat_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_wgrp_record(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.soft_delete_wgrp_record( record_id="text", data_partition_id="text", - ) def test_rafs_upload_cce_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_cce_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_compositionalanalysis_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_compositionalanalysis_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_cp_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_cp_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_cvdt_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_cvdt_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_difflib_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_difflib_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_ep_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_ep_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_et_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_et_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_fri_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_fri_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_ft_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_ft_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_itt_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_itt_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_mcmt_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_mcmt_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_multistageseparatortests_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_multistageseparatortests_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_physchem_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_physchem_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_rc_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_rc_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_rock_sample_analysis_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_rock_sample_analysis_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_rp_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_rp_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_stoat_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_stoat_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_stt_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_stt_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_swellingtests_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_swellingtests_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_transporttest_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_transporttest_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_vlet_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_vlet_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_wat_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_wat_data( record_id="text", data_partition_id="text", - ) def test_rafs_upload_wgrp_data(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.upload_wgrp_data( record_id="text", data_partition_id="text", - ) diff --git a/tests/rafs/test_rafs_v2.py b/tests/rafs/test_rafs_v2.py index 7e83e94..25c3132 100644 --- a/tests/rafs/test_rafs_v2.py +++ b/tests/rafs/test_rafs_v2.py @@ -4,38 +4,32 @@ def test_rafs_create_or_update_masterdata_records(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.create_or_update_masterdata_records( data_partition_id="text", - ) def test_rafs_create_or_update_pvt_records(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.create_or_update_pvt_records( data_partition_id="text", - ) def test_rafs_create_or_update_sa_records(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.create_or_update_sa_records( data_partition_id="text", - ) def test_rafs_create_or_update_sar_records(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.create_or_update_sar_records( data_partition_id="text", - ) def test_rafs_get_info(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_info( data_partition_id="text", - ) def test_rafs_get_masterdata_record(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_masterdata_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_masterdata_record_version(rafs_api_server, rafs_client_v2: RAFSClient): @@ -43,20 +37,17 @@ def test_rafs_get_masterdata_record_version(rafs_api_server, rafs_client_v2: RAF version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_masterdata_record_versions(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_masterdata_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_metrics(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_metrics( data_partition_id="text", - ) def test_rafs_get_pvt_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -68,14 +59,12 @@ def test_rafs_get_pvt_data(rafs_api_server, rafs_client_v2: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_pvt_record(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_pvt_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_pvt_record_version(rafs_api_server, rafs_client_v2: RAFSClient): @@ -83,21 +72,18 @@ def test_rafs_get_pvt_record_version(rafs_api_server, rafs_client_v2: RAFSClient version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_pvt_record_versions(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_pvt_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_sa_content_schema(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_sa_content_schema( analysistype="text", data_partition_id="text", - ) def test_rafs_get_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -109,14 +95,12 @@ def test_rafs_get_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_get_sa_record(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_sa_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_sa_record_version(rafs_api_server, rafs_client_v2: RAFSClient): @@ -124,27 +108,23 @@ def test_rafs_get_sa_record_version(rafs_api_server, rafs_client_v2: RAFSClient) version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_sa_record_versions(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_sa_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_sa_types(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_sa_types( data_partition_id="text", - ) def test_rafs_get_sar_record(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_sar_record( record_id="text", data_partition_id="text", - ) def test_rafs_get_sar_record_specific_version(rafs_api_server, rafs_client_v2: RAFSClient): @@ -152,14 +132,12 @@ def test_rafs_get_sar_record_specific_version(rafs_api_server, rafs_client_v2: R version="text", record_id="text", data_partition_id="text", - ) def test_rafs_get_sar_record_versions(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_sar_record_versions( record_id="text", data_partition_id="text", - ) def test_rafs_get_sar_source_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -167,7 +145,6 @@ def test_rafs_get_sar_source_data(rafs_api_server, rafs_client_v2: RAFSClient): record_id="text", version="text", data_partition_id="text", - ) def test_rafs_query_sa(rafs_api_server, rafs_client_v2: RAFSClient): @@ -177,7 +154,6 @@ def test_rafs_query_sa(rafs_api_server, rafs_client_v2: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_search_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -187,35 +163,30 @@ def test_rafs_search_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - ) def test_rafs_soft_delete_masterdata_record(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.soft_delete_masterdata_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_pvt_record(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.soft_delete_pvt_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_sa_record(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.soft_delete_sa_record( record_id="text", data_partition_id="text", - ) def test_rafs_soft_delete_sar_record(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.soft_delete_sar_record( record_id="text", data_partition_id="text", - ) def test_rafs_upload_pvt_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -223,7 +194,6 @@ def test_rafs_upload_pvt_data(rafs_api_server, rafs_client_v2: RAFSClient): record_id="text", analysis_type="text", data_partition_id="text", - ) def test_rafs_upload_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -231,6 +201,5 @@ def test_rafs_upload_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): record_id="text", analysis_type="text", data_partition_id="text", - ) diff --git a/tests/sdms/conftest.py b/tests/sdms/conftest.py index 927d9fe..e6e2bf2 100644 --- a/tests/sdms/conftest.py +++ b/tests/sdms/conftest.py @@ -14,7 +14,8 @@ def auth_backend() -> AuthBackendInterface: class AuthSession(AuthBackendInterface): base_url = "https://base.url" - default_data_partition_id = "osdu" + default_data_partition_id = "osdu" + authorization_header = {"Authorization": "Bearer access_token"} diff --git a/tests/sdms/test_sdms.py b/tests/sdms/test_sdms.py index bdca0bf..a1cee8b 100644 --- a/tests/sdms/test_sdms.py +++ b/tests/sdms/test_sdms.py @@ -9,23 +9,19 @@ def test_sdms_acquire_lock_for_dataset(sdms_api_server, sdms_client: SDMSClient) path="text", datasetid="text", openmode="text", - wid="text", + wid=10, data_partition_id="text", - ) - def test_sdms_check_datasets_list(sdms_api_server, sdms_client: SDMSClient): sdms_client.check_datasets_list( - datasets=["text"], impersonation_token_context="text", tenantid="text", subprojectid="text", + datasets=["text"], data_partition_id="text", - ) - def test_sdms_compute_and_get_size_dataset(sdms_api_server, sdms_client: SDMSClient): sdms_client.compute_and_get_size_dataset( impersonation_token_context="text", @@ -34,41 +30,33 @@ def test_sdms_compute_and_get_size_dataset(sdms_api_server, sdms_client: SDMSCli datasetid="text", path="text", data_partition_id="text", - ) - def test_sdms_copy_dataset(sdms_api_server, sdms_client: SDMSClient): sdms_client.copy_dataset( impersonation_token_context="text", sdpath_from="text", sdpath_to="text", - lock="text", + lock=False, data_partition_id="text", - ) - def test_sdms_create_impersonation_token(sdms_api_server, sdms_client: SDMSClient): sdms_client.create_impersonation_token( resources=[dict(resource="example-resource")], metadata={}, user_token="text", data_partition_id="text", - ) - def test_sdms_create_imptoken(sdms_api_server, sdms_client: SDMSClient): sdms_client.create_imptoken( token="text", resources=[dict(resource="example-resource")], refresh_url="text", data_partition_id="text", - ) - def test_sdms_create_new_subproject(sdms_api_server, sdms_client: SDMSClient): sdms_client.create_new_subproject( admin="text", @@ -80,19 +68,15 @@ def test_sdms_create_new_subproject(sdms_api_server, sdms_client: SDMSClient): subprojectid="text", tenantid="text", data_partition_id="text", - ) - def test_sdms_delete_all_datasets_in_subproject(sdms_api_server, sdms_client: SDMSClient): sdms_client.delete_all_datasets_in_subproject( - filter={}, path="text", + filter={}, data_partition_id="text", - ) - def test_sdms_delete_dataset(sdms_api_server, sdms_client: SDMSClient): sdms_client.delete_dataset( impersonation_token_context="text", @@ -101,44 +85,34 @@ def test_sdms_delete_dataset(sdms_api_server, sdms_client: SDMSClient): path="text", datasetid="text", data_partition_id="text", - ) - def test_sdms_delete_subproject(sdms_api_server, sdms_client: SDMSClient): sdms_client.delete_subproject( subprojectid="text", tenantid="text", data_partition_id="text", - ) - def test_sdms_delete_user(sdms_api_server, sdms_client: SDMSClient): sdms_client.delete_user( email="text", path="text", data_partition_id="text", - ) - def test_sdms_get_app(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_app( sdpath="text", data_partition_id="text", - ) - def test_sdms_get_app_trusted(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_app_trusted( sdpath="text", data_partition_id="text", - ) - def test_sdms_get_content_list(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_content_list( impersonation_token_context="text", @@ -146,10 +120,8 @@ def test_sdms_get_content_list(sdms_api_server, sdms_client: SDMSClient): subprojectid="text", path="text", data_partition_id="text", - ) - def test_sdms_get_dataset(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_dataset( impersonation_token_context="text", @@ -157,14 +129,12 @@ def test_sdms_get_dataset(sdms_api_server, sdms_client: SDMSClient): subprojectid="text", path="text", datasetid="text", - seismicmeta="text", - translate_user_info="text", + seismicmeta=False, + translate_user_info=False, record_version="text", data_partition_id="text", - ) - def test_sdms_get_dataset_access_permissions(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_dataset_access_permissions( impersonation_token_context="text", @@ -173,10 +143,8 @@ def test_sdms_get_dataset_access_permissions(sdms_api_server, sdms_client: SDMSC path="text", datasetid="text", data_partition_id="text", - ) - def test_sdms_get_datasets_sizes(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_datasets_sizes( impersonation_token_context="text", @@ -185,178 +153,146 @@ def test_sdms_get_datasets_sizes(sdms_api_server, sdms_client: SDMSClient): datasetid="text", path="text", data_partition_id="text", - ) - def test_sdms_get_download_connection_credentials_string(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_download_connection_credentials_string( impersonation_token_context="text", sdpath="text", data_partition_id="text", - ) - def test_sdms_get_gcs_access_token(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_gcs_access_token( impersonation_token_context="text", sdpath="text", - readonly="text", + readonly=False, data_partition_id="text", - ) - def test_sdms_get_info(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_info( data_partition_id="text", - ) - def test_sdms_get_operation_bulk_delete_status(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_operation_bulk_delete_status( operation_id="text", data_partition_id="text", - ) - def test_sdms_get_subproject_metadata(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_subproject_metadata( subprojectid="text", tenantid="text", - translate_user_info="text", + translate_user_info=False, data_partition_id="text", - ) - def test_sdms_get_svcstatus(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_svcstatus( data_partition_id="text", - ) - def test_sdms_get_svcstatus_access(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_svcstatus_access( data_partition_id="text", - ) - def test_sdms_get_tenant(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_tenant( tenantid="text", data_partition_id="text", - ) - def test_sdms_get_tenant_sdpath(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_tenant_sdpath( datapartition="text", data_partition_id="text", - ) - def test_sdms_get_upload_connection_credential_string(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_upload_connection_credential_string( impersonation_token_context="text", sdpath="text", data_partition_id="text", - ) - def test_sdms_get_user(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_user( sdpath="text", data_partition_id="text", - ) - def test_sdms_get_user_roles(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_user_roles( sdpath="text", data_partition_id="text", - ) - def test_sdms_list_datasets_in_subproject(sdms_api_server, sdms_client: SDMSClient): sdms_client.list_datasets_in_subproject( + impersonation_token_context="text", + tenantid="text", + subprojectid="text", + translate_user_info=False, type="text", gtags=["text"], search="text", filter={}, limit=10, cursor="text", - impersonation_token_context="text", - tenantid="text", - subprojectid="text", - translate_user_info="text", data_partition_id="text", - ) - def test_sdms_list_datasets_sizes(sdms_api_server, sdms_client: SDMSClient): sdms_client.list_datasets_sizes( - datasets=["text"], impersonation_token_context="text", tenantid="text", subprojectid="text", + datasets=["text"], data_partition_id="text", - ) - def test_sdms_list_storage_tiers(sdms_api_server, sdms_client: SDMSClient): sdms_client.list_storage_tiers( data_partition_id="text", - ) - def test_sdms_list_subprojects_in_tenant(sdms_api_server, sdms_client: SDMSClient): sdms_client.list_subprojects_in_tenant( tenantid="text", data_partition_id="text", - ) - def test_sdms_ls(sdms_api_server, sdms_client: SDMSClient): sdms_client.ls( impersonation_token_context="text", sdpath="text", wmode="text", - limit="text", + limit=10, cursor="text", data_partition_id="text", - ) - def test_sdms_ls_post(sdms_api_server, sdms_client: SDMSClient): sdms_client.ls_post( + impersonation_token_context="text", sdpath="text", wmode="text", limit=10, cursor="text", - impersonation_token_context="text", data_partition_id="text", - ) - def test_sdms_patch_dataset_metadata(sdms_api_server, sdms_client: SDMSClient): sdms_client.patch_dataset_metadata( + impersonation_token_context="text", + tenantid="text", + subprojectid="text", + path="text", + datasetid="text", + close="text", dataset_new_name="text", metadata={}, filemetadata={}, @@ -369,95 +305,73 @@ def test_sdms_patch_dataset_metadata(sdms_api_server, sdms_client: SDMSClient): openzgy_v1={}, segy_v1={}, acls={}, - impersonation_token_context="text", - tenantid="text", - subprojectid="text", - path="text", - datasetid="text", - close="text", data_partition_id="text", - ) - def test_sdms_patch_imptoken(sdms_api_server, sdms_client: SDMSClient): sdms_client.patch_imptoken( token="text", refresh_url="text", data_partition_id="text", - ) - def test_sdms_patch_subprojects_metadata(sdms_api_server, sdms_client: SDMSClient): sdms_client.patch_subprojects_metadata( - access_policy="text", - acls={}, ltag="text", tenantid="text", subprojectid="text", - recursive="text", + recursive=False, + access_policy="text", + acls={}, data_partition_id="text", - ) - def test_sdms_refresh_impersonation_token(sdms_api_server, sdms_client: SDMSClient): sdms_client.refresh_impersonation_token( impersonation_token="text", impersonation_token_context="text", data_partition_id="text", - ) - def test_sdms_refresh_imptoken(sdms_api_server, sdms_client: SDMSClient): sdms_client.refresh_imptoken( token="text", data_partition_id="text", - ) - def test_sdms_register_app(sdms_api_server, sdms_client: SDMSClient): sdms_client.register_app( email="text", sdpath="text", data_partition_id="text", - ) - def test_sdms_register_new_dataset(sdms_api_server, sdms_client: SDMSClient): sdms_client.register_new_dataset( - type="text", - gtags=["text"], - seismicmeta={}, - openzgy_v1={}, - segy_v1={}, - acls={}, impersonation_token_context="text", ltag="text", tenantid="text", subprojectid="text", path="text", datasetid="text", + type="text", + gtags=["text"], + seismicmeta={}, + openzgy_v1={}, + segy_v1={}, + acls={}, data_partition_id="text", - ) - def test_sdms_register_tenant(sdms_api_server, sdms_client: SDMSClient): sdms_client.register_tenant( + tenantid="text", gcpid="text", esd="text", default_acls="text", - tenantid="text", data_partition_id="text", - ) - def test_sdms_remove_lock_associated_with_dataset(sdms_api_server, sdms_client: SDMSClient): sdms_client.remove_lock_associated_with_dataset( impersonation_token_context="text", @@ -466,29 +380,23 @@ def test_sdms_remove_lock_associated_with_dataset(sdms_api_server, sdms_client: path="text", datasetid="text", data_partition_id="text", - ) - def test_sdms_set_app_trusted(sdms_api_server, sdms_client: SDMSClient): sdms_client.set_app_trusted( email="text", sdpath="text", data_partition_id="text", - ) - def test_sdms_update_user(sdms_api_server, sdms_client: SDMSClient): sdms_client.update_user( email="text", path="text", group="viewer", data_partition_id="text", - ) - def test_sdms_upsert_tags_to_dataset(sdms_api_server, sdms_client: SDMSClient): sdms_client.upsert_tags_to_dataset( impersonation_token_context="text", @@ -496,12 +404,10 @@ def test_sdms_upsert_tags_to_dataset(sdms_api_server, sdms_client: SDMSClient): subprojectid="text", path="text", datasetid="text", - gtag="text", + gtag=["text"], data_partition_id="text", - ) - def test_sdms_validate_ctag(sdms_api_server, sdms_client: SDMSClient): sdms_client.validate_ctag( impersonation_token_context="text", @@ -511,5 +417,5 @@ def test_sdms_validate_ctag(sdms_api_server, sdms_client: SDMSClient): datasetid="text", ctag="text", data_partition_id="text", - ) + diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py index 1e0bfad..3e8e707 100644 --- a/tests/storage/conftest.py +++ b/tests/storage/conftest.py @@ -15,6 +15,7 @@ def auth_backend() -> AuthBackendInterface: class AuthSession(AuthBackendInterface): base_url = "https://base.url" default_data_partition_id = "osdu" + authorization_header = {"Authorization": "Bearer access_token"} diff --git a/tests/storage/test_storage.py b/tests/storage/test_storage.py index 73d9493..fd78269 100644 --- a/tests/storage/test_storage.py +++ b/tests/storage/test_storage.py @@ -5,21 +5,18 @@ def test_storage_create_records_delete(storage_api_server, storage_client: Stora storage_client.create_records_delete( x_collaboration="text", data_partition_id="text", - ) def test_storage_create_replay(storage_api_server, storage_client: StorageClient): storage_client.create_replay( operation="text", - filter=[], + filter=["text"], data_partition_id="text", - ) def test_storage_create_whoami(storage_api_server, storage_client: StorageClient): storage_client.create_whoami( data_partition_id="text", - ) def test_storage_delete_record(storage_api_server, storage_client: StorageClient): @@ -27,34 +24,29 @@ def test_storage_delete_record(storage_api_server, storage_client: StorageClient x_collaboration="text", id="text", data_partition_id="text", - ) def test_storage_delete_whoami(storage_api_server, storage_client: StorageClient): storage_client.delete_whoami( data_partition_id="text", - ) def test_storage_get_info(storage_api_server, storage_client: StorageClient): storage_client.get_info( data_partition_id="text", - ) def test_storage_get_liveness_check(storage_api_server, storage_client: StorageClient): storage_client.get_liveness_check( data_partition_id="text", - ) def test_storage_get_record(storage_api_server, storage_client: StorageClient): storage_client.get_record( x_collaboration="text", id="text", - attribute="text", + attribute=["text"], data_partition_id="text", - ) def test_storage_get_record_version(storage_api_server, storage_client: StorageClient): @@ -62,9 +54,8 @@ def test_storage_get_record_version(storage_api_server, storage_client: StorageC x_collaboration="text", id="text", version="text", - attribute="text", + attribute=["text"], data_partition_id="text", - ) def test_storage_get_record_versions(storage_api_server, storage_client: StorageClient): @@ -72,32 +63,27 @@ def test_storage_get_record_versions(storage_api_server, storage_client: Storage x_collaboration="text", id="text", data_partition_id="text", - ) def test_storage_get_replay_status(storage_api_server, storage_client: StorageClient): storage_client.get_replay_status( id="text", data_partition_id="text", - ) def test_storage_get_whoami(storage_api_server, storage_client: StorageClient): storage_client.get_whoami( data_partition_id="text", - ) def test_storage_head_whoami(storage_api_server, storage_client: StorageClient): storage_client.head_whoami( data_partition_id="text", - ) def test_storage_options_whoami(storage_api_server, storage_client: StorageClient): storage_client.options_whoami( data_partition_id="text", - ) def test_storage_patch_records(storage_api_server, storage_client: StorageClient): @@ -108,13 +94,11 @@ def test_storage_patch_records(storage_api_server, storage_client: StorageClient ops=[{"value": []}], x_collaboration="text", data_partition_id="text", - ) def test_storage_patch_whoami(storage_api_server, storage_client: StorageClient): storage_client.patch_whoami( data_partition_id="text", - ) def test_storage_purge_record(storage_api_server, storage_client: StorageClient): @@ -122,7 +106,6 @@ def test_storage_purge_record(storage_api_server, storage_client: StorageClient) x_collaboration="text", id="text", data_partition_id="text", - ) def test_storage_purge_record_versions(storage_api_server, storage_client: StorageClient): @@ -130,45 +113,40 @@ def test_storage_purge_record_versions(storage_api_server, storage_client: Stora x_collaboration="text", id="text", version_ids="text", - limit="text", - _form="text", + limit=10, + _form=10, data_partition_id="text", - ) def test_storage_query_records(storage_api_server, storage_client: StorageClient): storage_client.query_records( + x_collaboration="text", records=["text"], attributes=["text"], - x_collaboration="text", data_partition_id="text", - ) def test_storage_query_records_batch(storage_api_server, storage_client: StorageClient): storage_client.query_records_batch( - records=["text"], x_collaboration="text", frame_of_reference="text", + records=["text"], data_partition_id="text", - ) def test_storage_query_records_from_kind(storage_api_server, storage_client: StorageClient): storage_client.query_records_from_kind( x_collaboration="text", cursor="text", - limit="text", + limit=10, kind="text", data_partition_id="text", - ) def test_storage_update_records(storage_api_server, storage_client: StorageClient): storage_client.update_records( x_collaboration="text", - skipdupes="text", + skipdupes=False, data_partition_id="text", - ) diff --git a/tests/wellbore/conftest.py b/tests/wellbore/conftest.py index 5c463d3..98cff6b 100644 --- a/tests/wellbore/conftest.py +++ b/tests/wellbore/conftest.py @@ -15,6 +15,7 @@ def auth_backend() -> AuthBackendInterface: class AuthSession(AuthBackendInterface): base_url = "https://base.url" default_data_partition_id = "osdu" + authorization_header = {"Authorization": "Bearer access_token"} diff --git a/tests/wellbore/test_wellbore_v2.py b/tests/wellbore/test_wellbore_v2.py index 181157f..55ea2ac 100644 --- a/tests/wellbore/test_wellbore_v2.py +++ b/tests/wellbore/test_wellbore_v2.py @@ -9,266 +9,206 @@ def test_wellbore_create_alpha_logs_sessions(wellbore_api_server, wellbore_clien time_to_live=10, record_id="text", data_partition_id="text", - ) - def test_wellbore_create_or_update_dipset(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.create_or_update_dipset( data_partition_id="text", - ) - def test_wellbore_create_or_update_logs(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.create_or_update_logs( data_partition_id="text", - ) - def test_wellbore_create_or_update_logsets(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.create_or_update_logsets( data_partition_id="text", - ) - def test_wellbore_create_or_update_marker(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.create_or_update_marker( data_partition_id="text", - ) - def test_wellbore_create_or_update_trajectories(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.create_or_update_trajectories( data_partition_id="text", - ) - def test_wellbore_create_or_update_well(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.create_or_update_well( data_partition_id="text", - ) - def test_wellbore_create_or_update_wellbore_v2(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.create_or_update_wellbore_v2( data_partition_id="text", - ) - def test_wellbore_create_trajectory_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.create_trajectory_data( trajectoryid="text", orient="text", data_partition_id="text", - ) - def test_wellbore_define_dips_dipset(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.define_dips_dipset( dipsetid="text", data_partition_id="text", - ) - def test_wellbore_delete_dip(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.delete_dip( dipsetid="text", index="text", data_partition_id="text", - ) - def test_wellbore_delete_dipset(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.delete_dipset( dipsetid="text", - recursive="text", + recursive=False, data_partition_id="text", - ) - def test_wellbore_delete_log(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.delete_log( logid="text", data_partition_id="text", - ) - def test_wellbore_delete_logset(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.delete_logset( logsetid="text", - recursive="text", + recursive=False, data_partition_id="text", - ) - def test_wellbore_delete_marker(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.delete_marker( markerid="text", data_partition_id="text", - ) - def test_wellbore_delete_trajectory(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.delete_trajectory( trajectoryid="text", data_partition_id="text", - ) - def test_wellbore_delete_well(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.delete_well( wellid="text", - recursive="text", + recursive=False, data_partition_id="text", - ) - def test_wellbore_delete_wellbores(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.delete_wellbores( wellboreid="text", - recursive="text", + recursive=False, data_partition_id="text", - ) - def test_wellbore_get_about(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_about( data_partition_id="text", - ) - def test_wellbore_get_alpha_logs_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_alpha_logs_data( record_id="text", - offset="text", - limit="text", + offset=10, + limit=10, curves="text", - describe="text", - filter="text", + describe=False, + filter=["text"], orient="text", data_partition_id="text", - ) - def test_wellbore_get_alpha_logs_versions_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_alpha_logs_versions_data( record_id="text", version="text", - offset="text", - limit="text", + offset=10, + limit=10, curves="text", - describe="text", - filter="text", + describe=False, + filter=["text"], orient="text", data_partition_id="text", - ) - def test_wellbore_get_decimated_log(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_decimated_log( logid="text", - quantiles="text", - start="text", - stop="text", + quantiles=10, + start=10, + stop=10, orient="text", bulk_path="text", data_partition_id="text", - ) - def test_wellbore_get_dip(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_dip( dipsetid="text", - index="text", - limit="text", + index=10, + limit=10, data_partition_id="text", - ) - def test_wellbore_get_dip_at_index(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_dip_at_index( dipsetid="text", index="text", data_partition_id="text", - ) - def test_wellbore_get_dipset(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_dipset( dipsetid="text", data_partition_id="text", - ) - def test_wellbore_get_dipsets_versions(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_dipsets_versions( dipsetid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_log(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_log( logid="text", data_partition_id="text", - ) - def test_wellbore_get_log_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_log_data( logid="text", orient="text", bulk_path="text", data_partition_id="text", - ) - def test_wellbore_get_log_statistics(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_log_statistics( logid="text", bulk_path="text", data_partition_id="text", - ) - def test_wellbore_get_log_version(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_log_version( logid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_log_version_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_log_version_data( logid="text", @@ -276,244 +216,188 @@ def test_wellbore_get_log_version_data(wellbore_api_server, wellbore_client_v2: orient="text", bulk_path="text", data_partition_id="text", - ) - def test_wellbore_get_log_versions(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_log_versions( logid="text", data_partition_id="text", - ) - def test_wellbore_get_logset(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_logset( logsetid="text", data_partition_id="text", - ) - def test_wellbore_get_logset_version(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_logset_version( logsetid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_logset_versions(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_logset_versions( logsetid="text", data_partition_id="text", - ) - def test_wellbore_get_marker(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_marker( markerid="text", data_partition_id="text", - ) - def test_wellbore_get_marker_version(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_marker_version( markerid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_marker_versions(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_marker_versions( markerid="text", data_partition_id="text", - ) - def test_wellbore_get_record_session_v2(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_record_session_v2( record_id="text", session_id="text", data_partition_id="text", - ) - def test_wellbore_get_trajectory(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_trajectory( trajectoryid="text", data_partition_id="text", - ) - def test_wellbore_get_trajectory_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_trajectory_data( trajectoryid="text", - channels="text", + channels=["text"], orient="text", data_partition_id="text", - ) - def test_wellbore_get_trajectory_version(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_trajectory_version( trajectoryid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_trajectory_version_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_trajectory_version_data( trajectoryid="text", version="text", - channels="text", + channels=["text"], orient="text", data_partition_id="text", - ) - def test_wellbore_get_trajectory_versions(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_trajectory_versions( trajectoryid="text", data_partition_id="text", - ) - def test_wellbore_get_version(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_version( data_partition_id="text", - ) - def test_wellbore_get_versions_dipset(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_versions_dipset( dipsetid="text", data_partition_id="text", - ) - def test_wellbore_get_versions_wellbore(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_versions_wellbore( wellboreid="text", data_partition_id="text", - ) - def test_wellbore_get_well_v2(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_well_v2( wellid="text", data_partition_id="text", - ) - def test_wellbore_get_well_version(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_well_version( wellid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_well_versions_v2(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_well_versions_v2( wellid="text", data_partition_id="text", - ) - def test_wellbore_get_wellbores(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_wellbores( wellboreid="text", data_partition_id="text", - ) - def test_wellbore_get_wellbores_versions(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_wellbores_versions( wellboreid="text", version="text", data_partition_id="text", - ) - def test_wellbore_insert_dip_in_dipset(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.insert_dip_in_dipset( dipsetid="text", data_partition_id="text", - ) - def test_wellbore_list_records_sessions_v2(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.list_records_sessions_v2( record_id="text", data_partition_id="text", - ) - def test_wellbore_patch_alpha_logs_sessions(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.patch_alpha_logs_sessions( state="commit", record_id="text", session_id="text", data_partition_id="text", - ) - def test_wellbore_query_dip_from_dipset(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.query_dip_from_dipset( dipsetid="text", - min_reference="text", - max_reference="text", + min_reference=10, + max_reference=10, classification="text", data_partition_id="text", - ) - def test_wellbore_recognize_family(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.recognize_family( label="text", description="text", log_unit="text", data_partition_id="text", - ) - def test_wellbore_send_alpha_logs_sessions_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.send_alpha_logs_sessions_data( record_id="text", session_id="text", data_partition_id="text", - ) - def test_wellbore_update_dip(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.update_dip( azimuth={ @@ -548,10 +432,8 @@ def test_wellbore_update_dip(wellbore_api_server, wellbore_client_v2: WellboreCl dipsetid="text", index="text", data_partition_id="text", - ) - def test_wellbore_update_log_recognition_upload_catalog(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.update_log_recognition_upload_catalog( acl={ @@ -563,33 +445,27 @@ def test_wellbore_update_log_recognition_upload_catalog(wellbore_api_server, wel }, legal={}, data_partition_id="text", - ) - def test_wellbore_upload_log_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.upload_log_data( logid="text", orient="text", bulk_path="text", data_partition_id="text", - ) - def test_wellbore_write_alpha_logs_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.write_alpha_logs_data( record_id="text", data_partition_id="text", - ) - def test_wellbore_write_log_data(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.write_log_data( logid="text", orient="text", bulk_path="text", data_partition_id="text", - ) + diff --git a/tests/wellbore/test_wellbore_v3.py b/tests/wellbore/test_wellbore_v3.py index ee3ac0a..52c2727 100644 --- a/tests/wellbore/test_wellbore_v3.py +++ b/tests/wellbore/test_wellbore_v3.py @@ -4,70 +4,52 @@ def test_wellbore_create_or_update_wellbore_interval_set(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_or_update_wellbore_interval_set( data_partition_id="text", - ) - def test_wellbore_create_or_update_wellbore_v3(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_or_update_wellbore_v3( data_partition_id="text", - ) - def test_wellbore_create_or_update_wells(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_or_update_wells( data_partition_id="text", - ) - def test_wellbore_create_query_wellbore_welllogs(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_query_wellbore_welllogs( wellbore_attribute="text", data_partition_id="text", - ) - def test_wellbore_create_query_wellbores_wellboremarkersets(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_query_wellbores_wellboremarkersets( wellbore_id="text", data_partition_id="text", - ) - def test_wellbore_create_query_wellbores_welllogs(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_query_wellbores_welllogs( wellbore_id="text", data_partition_id="text", - ) - def test_wellbore_create_wellbore_markerset(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_wellbore_markerset( data_partition_id="text", - ) - def test_wellbore_create_wellboretrajectories(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_wellboretrajectories( data_partition_id="text", - ) - def test_wellbore_create_wellboretrajectories_data(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_wellboretrajectories_data( record_id="text", data_partition_id="text", - ) - def test_wellbore_create_wellboretrajectories_sessions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_wellboretrajectories_sessions( mode="overwrite", @@ -76,435 +58,339 @@ def test_wellbore_create_wellboretrajectories_sessions(wellbore_api_server, well time_to_live=10, record_id="text", data_partition_id="text", - ) - def test_wellbore_create_wellboretrajectories_sessions_data(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_wellboretrajectories_sessions_data( record_id="text", session_id="text", data_partition_id="text", - ) - def test_wellbore_create_welllogs(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_welllogs( data_partition_id="text", - ) - def test_wellbore_create_welllogs_data(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_welllogs_data( record_id="text", data_partition_id="text", - ) - def test_wellbore_create_welllogs_sessions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_welllogs_sessions( + record_id="text", mode="overwrite", from_version=10, meta={}, time_to_live=10, - record_id="text", data_partition_id="text", - ) - def test_wellbore_delete_well(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.delete_well( wellid="text", data_partition_id="text", - ) - def test_wellbore_delete_wellbore(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.delete_wellbore( wellboreid="text", data_partition_id="text", - ) - def test_wellbore_delete_wellbore_interval_set(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.delete_wellbore_interval_set( wellboreintervalsetsid="text", data_partition_id="text", - ) - def test_wellbore_delete_wellbore_markerset(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.delete_wellbore_markerset( wellboremarkersetid="text", data_partition_id="text", - ) - def test_wellbore_delete_wellboretrajectories(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.delete_wellboretrajectories( wellboretrajectoryid="text", - purge="text", + purge=False, data_partition_id="text", - ) - def test_wellbore_delete_welllog(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.delete_welllog( welllogid="text", - purge="text", + purge=False, data_partition_id="text", - ) - def test_wellbore_get_about(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_about( data_partition_id="text", - ) - def test_wellbore_get_record_session_v3(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_record_session_v3( record_id="text", session_id="text", data_partition_id="text", - ) - def test_wellbore_get_returns_data_specified_version(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_returns_data_specified_version( record_id="text", version="text", - offset="text", - limit="text", + offset=10, + limit=10, curves="text", - describe="text", - filter="text", + describe=False, + filter=["text"], orient="text", data_partition_id="text", - ) - def test_wellbore_get_session(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_session( record_id="text", session_id="text", data_partition_id="text", - ) - def test_wellbore_get_version(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_version( data_partition_id="text", - ) - def test_wellbore_get_versions_wellbore_interval_set(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_versions_wellbore_interval_set( wellboreintervalsetsid="text", data_partition_id="text", - ) - def test_wellbore_get_versions_wellboretrajectory(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_versions_wellboretrajectory( wellboretrajectoryid="text", data_partition_id="text", - ) - def test_wellbore_get_well(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_well( wellid="text", data_partition_id="text", - ) - def test_wellbore_get_well_version(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_well_version( wellid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_well_versions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_well_versions( wellid="text", data_partition_id="text", - ) - def test_wellbore_get_wellbore(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellbore( wellboreid="text", data_partition_id="text", - ) - def test_wellbore_get_wellbore_interval_set(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellbore_interval_set( wellboreintervalsetsid="text", data_partition_id="text", - ) - def test_wellbore_get_wellbore_interval_sets_versions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellbore_interval_sets_versions( wellboreintervalsetsid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_wellbore_versions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellbore_versions( wellboreid="text", data_partition_id="text", - ) - def test_wellbore_get_wellboremarkerset_versions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellboremarkerset_versions( wellboremarkersetid="text", data_partition_id="text", - ) - def test_wellbore_get_wellboremarkersets(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellboremarkersets( wellboremarkersetid="text", data_partition_id="text", - ) - def test_wellbore_get_wellboremarkersets_versions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellboremarkersets_versions( wellboremarkersetid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_wellbores_versions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellbores_versions( wellboreid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_wellboretrajectories(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellboretrajectories( wellboretrajectoryid="text", data_partition_id="text", - ) - def test_wellbore_get_wellboretrajectories_data(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellboretrajectories_data( record_id="text", - offset="text", - limit="text", + offset=10, + limit=10, curves="text", - describe="text", - filter="text", + describe=False, + filter=["text"], orient="text", data_partition_id="text", - ) - def test_wellbore_get_wellboretrajectories_versions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_wellboretrajectories_versions( wellboretrajectoryid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_welllog(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_welllog( welllogid="text", data_partition_id="text", - ) - def test_wellbore_get_welllog_version(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_welllog_version( welllogid="text", version="text", data_partition_id="text", - ) - def test_wellbore_get_welllog_version_data(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_welllog_version_data( record_id="text", version="text", - offset="text", - limit="text", + offset=10, + limit=10, curves="text", - describe="text", - filter="text", + describe=False, + filter=["text"], orient="text", data_partition_id="text", - ) - def test_wellbore_get_welllog_version_data_statistics(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_welllog_version_data_statistics( record_id="text", version="text", curves="text", data_partition_id="text", - ) - def test_wellbore_get_welllog_versions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_welllog_versions( welllogid="text", data_partition_id="text", - ) - def test_wellbore_get_welllogs_data(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_welllogs_data( record_id="text", - offset="text", - limit="text", + offset=10, + limit=10, curves="text", - describe="text", - filter="text", + describe=False, + filter=["text"], orient="text", data_partition_id="text", - ) - def test_wellbore_get_welllogs_data_statistics(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_welllogs_data_statistics( record_id="text", curves="text", data_partition_id="text", - ) - def test_wellbore_list_records_sessions_v3(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.list_records_sessions_v3( record_id="text", data_partition_id="text", - ) - def test_wellbore_list_session_given_record(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.list_session_given_record( record_id="text", data_partition_id="text", - ) - def test_wellbore_patch_wellboretrajectories_sessions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.patch_wellboretrajectories_sessions( - state="commit", record_id="text", session_id="text", + state="commit", data_partition_id="text", - ) - def test_wellbore_query_alpha_query_wellbores(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.query_alpha_query_wellbores( names="text", data_partition_id="text", - ) - def test_wellbore_query_alpha_query_wellbores_wellboretrajectories(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.query_alpha_query_wellbores_wellboretrajectories( wellbore_id="text", data_partition_id="text", - ) - def test_wellbore_query_alpha_query_welllogs(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.query_alpha_query_welllogs( names="text", wellbore_id="text", mnemonics="text", data_partition_id="text", - ) - def test_wellbore_recognize_family(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.recognize_family( label="text", description="text", log_unit="text", data_partition_id="text", - ) - def test_wellbore_send_welllog_sessions_data(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.send_welllog_sessions_data( record_id="text", session_id="text", data_partition_id="text", - ) - def test_wellbore_trigger_welllog_version_data_statistics(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.trigger_welllog_version_data_statistics( record_id="text", version="text", data_partition_id="text", - ) - def test_wellbore_update_log_recognition_upload_catalog(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.update_log_recognition_upload_catalog( acl={ @@ -516,15 +402,13 @@ def test_wellbore_update_log_recognition_upload_catalog(wellbore_api_server, wel }, legal={}, data_partition_id="text", - ) - def test_wellbore_update_welllogs_sessions(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.update_welllogs_sessions( - state="commit", record_id="text", session_id="text", + state="commit", data_partition_id="text", - ) +