From 5f7d30d8d3d4e857b21f76b1e826e24b44a8c2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Mon, 15 Jul 2024 11:54:08 +0200 Subject: [PATCH] fix: Removed tenant from clients --- gen/client_generator.py | 19 +- osdu_client/services/dataset/client.py | 71 +- osdu_client/services/entitlements/client.py | 84 +- osdu_client/services/file/client.py | 125 +- osdu_client/services/indexer/client.py | 67 +- osdu_client/services/legal/client.py | 135 +- osdu_client/services/notification/client.py | 12 +- osdu_client/services/partition/client.py | 52 +- osdu_client/services/policy/client.py | 66 +- osdu_client/services/pws/client.py | 107 +- osdu_client/services/rafs/common.py | 12 +- osdu_client/services/rafs/v1.py | 1339 ++--------------- osdu_client/services/rafs/v2.py | 185 +-- osdu_client/services/register/client.py | 106 +- osdu_client/services/schema/client.py | 72 +- osdu_client/services/schema/method_names.json | 2 +- osdu_client/services/sdms/client.py | 408 ++--- osdu_client/services/search/client.py | 74 +- osdu_client/services/secret/client.py | 94 +- osdu_client/services/storage/client.py | 158 +- osdu_client/services/wellbore/common.py | 18 +- osdu_client/services/wellbore/v2.py | 371 +---- osdu_client/services/wellbore/v3.py | 356 +---- osdu_client/services/welldelivery/client.py | 313 +--- pyproject.toml | 2 +- tests/dataset/test_dataset.py | 9 - tests/entitlements/test_entitlements.py | 38 +- tests/file/test_file.py | 26 +- tests/indexer/test_indexer.py | 16 +- tests/legal/test_legal.py | 26 +- tests/notification/test_notification.py | 4 +- tests/partition/test_partition.py | 14 +- tests/policy/test_policy.py | 40 +- tests/pws/test_pws.py | 28 +- tests/rafs/test_rafs_v1.py | 416 ++--- tests/rafs/test_rafs_v2.py | 62 +- tests/register/test_register.py | 32 +- tests/schema/test_schema.py | 18 +- tests/sdms/test_sdms.py | 96 +- tests/search/test_search.py | 10 +- tests/secret/test_secret.py | 20 +- tests/storage/test_storage.py | 44 +- tests/wellbore/test_wellbore_v2.py | 126 +- tests/wellbore/test_wellbore_v3.py | 118 +- tests/welldelivery/test_welldelivery.py | 70 +- 45 files changed, 1284 insertions(+), 4177 deletions(-) diff --git a/gen/client_generator.py b/gen/client_generator.py index 403507b..e29d1f3 100644 --- a/gen/client_generator.py +++ b/gen/client_generator.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import json import os import re @@ -32,7 +34,6 @@ SPECIAL_HEADERS = ( "data-partition-id", - "tenant", ) FORBIDDEN_NAMES = { @@ -170,8 +171,8 @@ def create_headers_block(required_header_params_without_special, optional_header "headers = self.auth.get_headers()", "if data_partition_id:", f"{INDENT}headers['data-partition-id'] = data_partition_id", - "if tenant:", - f"{INDENT}headers['tenant'] = tenant" + #"if tenant:", + #f"{INDENT}headers['tenant'] = tenant" ] if required_header_params_without_special: lines.append( @@ -517,18 +518,16 @@ def create_method_sig(swagger: dict, name: str, params: list[str], body_required p for p in params if p['name'] not in SPECIAL_HEADERS and p["in"] != "body" ] elements = [name, ] - sig = "" _input_parameters_strings = [] if body_required: _input_parameters_strings += parse_request_body(swagger, body_required) - if body_not_required: _input_parameters_strings += parse_request_body(swagger, body_not_required) - - _input_parameters_strings += [param_to_function_argument(p) for p in path_params] - + + _input_parameters_strings += [param_to_function_argument(p) for p in sorted(path_params, key=lambda x: 0 if x.get("required") else 1)] + if _input_parameters_strings: sig += ", ".join(_input_parameters_strings) @@ -537,9 +536,9 @@ def create_method_sig(swagger: dict, name: str, params: list[str], body_required try: if len(elements) > 1: - sig = "def %s(self, *, %s, data_partition_id: str | None = None, tenant: str | None = None) -> dict:" % tuple(elements) + sig = "def %s(self, *, %s, data_partition_id: str | None = None) -> dict:" % tuple(elements) else: - sig = "def %s(self, data_partition_id: str | None = None, tenant: str | None = None) -> dict:" % tuple(elements) + sig = "def %s(self, data_partition_id: str | None = None) -> dict:" % tuple(elements) return sig except Exception as e: raise Exception(elements, len(elements)) from e diff --git a/osdu_client/services/dataset/client.py b/osdu_client/services/dataset/client.py index 1a32c02..18bfbe4 100644 --- a/osdu_client/services/dataset/client.py +++ b/osdu_client/services/dataset/client.py @@ -18,27 +18,21 @@ class DatasetClient(OSDUAPIClient): service_path = "/api/dataset/v1/" def create_or_update_dataset_registry( - self, - *, - dataset_registries: list[dict], - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, dataset_registries: list[dict], data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "datasetRegistries": dataset_registries, } if self.validation: - validate_data(data, CreateDatasetRegistryRequest, DatasetAPIError) + validate_data(request_data, CreateDatasetRegistryRequest, DatasetAPIError) url = urljoin(self.base_url, self.service_path, "registerDataset") - response = requests.put(url, headers=headers, json=data) + response = requests.put(url, headers=headers, json=request_data) if not response.ok: raise DatasetAPIError(response.text, response.status_code) return response.json() @@ -49,13 +43,10 @@ def get_storage_instructions( kind_sub_type: str, expiry_time: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "kindSubType": kind_sub_type, @@ -70,17 +61,11 @@ def get_storage_instructions( return response.json() def get_revoke_url( - self, - *, - kind_sub_type: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, kind_sub_type: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "kindSubType": kind_sub_type, @@ -98,13 +83,10 @@ def get_retrieval_instructions( id: str, expiry_time: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "id": id, @@ -124,43 +106,34 @@ def get_retrieval_instructions_for_multiple_datasets( dataset_registry_ids: list[str], expiry_time: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if expiry_time is not None: params["expiryTime"] = expiry_time - data = { + request_data = { "datasetRegistryIds": dataset_registry_ids, } if self.validation: - validate_data(data, GetDatasetRegistryRequest, DatasetAPIError) + validate_data(request_data, GetDatasetRegistryRequest, DatasetAPIError) url = urljoin(self.base_url, self.service_path, "retrievalInstructions") - response = requests.post(url, headers=headers, params=params, json=data) + response = requests.post(url, headers=headers, params=params, json=request_data) if not response.ok: raise DatasetAPIError(response.text, response.status_code) return response.json() def get_dataset_registry( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "id": id, @@ -173,39 +146,29 @@ def get_dataset_registry( return response.json() def get_dataset_registries( - self, - *, - dataset_registry_ids: list[str], - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, dataset_registry_ids: list[str], data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "datasetRegistryIds": dataset_registry_ids, } if self.validation: - validate_data(data, GetDatasetRegistryRequest, DatasetAPIError) + validate_data(request_data, GetDatasetRegistryRequest, DatasetAPIError) url = urljoin(self.base_url, self.service_path, "getDatasetRegistry") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise DatasetAPIError(response.text, response.status_code) return response.json() - def get_liveness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_liveness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "liveness_check") response = requests.get(url, headers=headers) @@ -213,14 +176,10 @@ def get_liveness_check( raise DatasetAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/entitlements/client.py b/osdu_client/services/entitlements/client.py index b0ce12a..1ba076f 100644 --- a/osdu_client/services/entitlements/client.py +++ b/osdu_client/services/entitlements/client.py @@ -14,14 +14,10 @@ class EntitlementsAPIError(OSDUAPIError): class EntitlementsClient(OSDUAPIClient): service_path = "/api/entitlements/v2" - def get_liveness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_liveness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "_ah/liveness_check") response = requests.get(url, headers=headers) @@ -29,14 +25,10 @@ def get_liveness_check( raise EntitlementsAPIError(response.text, response.status_code) return response.json() - def get_readiness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_readiness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "_ah/readiness_check") response = requests.get(url, headers=headers) @@ -50,13 +42,10 @@ def get_groups( on_behalf_of: str | None = None, role_required: str | None = False, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if on_behalf_of is not None: headers["on-behalf-of"] = on_behalf_of @@ -71,40 +60,28 @@ def get_groups( return response.json() def create_group( - self, - *, - group_info_dto: dict, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, group_info_dto: dict, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "groupInfoDto": group_info_dto, } url = urljoin(self.base_url, self.service_path, "groups") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise EntitlementsAPIError(response.text, response.status_code) return response.json() def delete_group( - self, - *, - group_email: str | None = None, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, group_email: str | None = None, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if group_email is not None: @@ -122,20 +99,17 @@ def update_groups( update_group_request: list[dict], group_email: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "updateGroupRequest": update_group_request, } url = urljoin(self.base_url, self.service_path, "groups/%s" % group_email) - response = requests.patch(url, headers=headers, json=data) + response = requests.patch(url, headers=headers, json=request_data) if not response.ok: raise EntitlementsAPIError(response.text, response.status_code) return response.json() @@ -147,13 +121,10 @@ def get_groups_members( role: str | None = None, include_type: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if role is not None: @@ -175,22 +146,19 @@ def add_member( add_member_dto: dict, group_email: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "addMemberDto": add_member_dto, } url = urljoin( self.base_url, self.service_path, "groups/%s/members" % group_email ) - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise EntitlementsAPIError(response.text, response.status_code) return response.json() @@ -201,13 +169,10 @@ def delete_member_from_group( group_email: str, member_email: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -220,17 +185,11 @@ def delete_member_from_group( return response.json() def delete_member( - self, - *, - member_email: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, member_email: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "members/%s" % member_email) response = requests.delete(url, headers=headers) @@ -246,13 +205,10 @@ def get_members_groups( appid: str | None = None, role_required: str | None = False, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "type": type, @@ -270,14 +226,10 @@ def get_members_groups( raise EntitlementsAPIError(response.text, response.status_code) return response.json() - def initiate_tenant( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def initiate_tenant(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "tenant-provisioning") response = requests.post(url, headers=headers) @@ -285,14 +237,10 @@ def initiate_tenant( raise EntitlementsAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) @@ -306,13 +254,10 @@ def get_count_group_members( group_email: str, role: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if role is not None: @@ -333,13 +278,10 @@ def list_partition_groups( cursor: str | None = None, limit: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "type": type, diff --git a/osdu_client/services/file/client.py b/osdu_client/services/file/client.py index 3b8601e..3635ddc 100644 --- a/osdu_client/services/file/client.py +++ b/osdu_client/services/file/client.py @@ -18,39 +18,29 @@ class FileClient(OSDUAPIClient): service_path = "" def get_location( - self, - *, - file_id: str | None = None, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, file_id: str | None = None, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = {} + request_data = {} if file_id is not None: - data["FileID"] = file_id + request_data["FileID"] = file_id if self.validation: - validate_data(data, LocationRequest, FileAPIError) + validate_data(request_data, LocationRequest, FileAPIError) url = urljoin(self.base_url, self.service_path, "v2/getLocation") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise FileAPIError(response.text, response.status_code) return response.json() - def get_files_upload_url( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_files_upload_url(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "v2/files/uploadURL") response = requests.get(url, headers=headers) @@ -68,46 +58,37 @@ def create_files_metadata( id: str | None = None, ancestry: dict | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "kind": kind, "acl": acl, "legal": legal, "data": data, } if id is not None: - data["id"] = id + request_data["id"] = id if ancestry is not None: - data["ancestry"] = ancestry + request_data["ancestry"] = ancestry if self.validation: - validate_data(data, Record, FileAPIError) + validate_data(request_data, Record, FileAPIError) url = urljoin(self.base_url, self.service_path, "v2/files/metadata") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise FileAPIError(response.text, response.status_code) return response.json() def get_files_metadata( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "v2/files/%s/metadata" % id) response = requests.get(url, headers=headers) @@ -116,17 +97,11 @@ def get_files_metadata( return response.json() def delete_files_metadata( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "v2/files/%s/metadata" % id) response = requests.delete(url, headers=headers) @@ -140,13 +115,10 @@ def gets_url_to_download_file( id: str, expiry_time: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if expiry_time is not None: @@ -159,53 +131,41 @@ def gets_url_to_download_file( return response.json() def get_file_location( - self, - *, - file_id: str | None = None, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, file_id: str | None = None, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = {} + request_data = {} if file_id is not None: - data["FileID"] = file_id + request_data["FileID"] = file_id if self.validation: - validate_data(data, FileLocationRequest, FileAPIError) + validate_data(request_data, FileLocationRequest, FileAPIError) url = urljoin(self.base_url, self.service_path, "v2/getFileLocation") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise FileAPIError(response.text, response.status_code) return response.json() def get_file_signed_url( - self, - *, - srn: list[str] | None = None, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, srn: list[str] | None = None, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = {} + request_data = {} if srn is not None: - data["srn"] = srn + request_data["srn"] = srn if self.validation: - validate_data(data, DeliveryGetFileSignedURLRequest, FileAPIError) + validate_data(request_data, DeliveryGetFileSignedURLRequest, FileAPIError) url = urljoin(self.base_url, self.service_path, "v2/delivery/getFileSignedUrl") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise FileAPIError(response.text, response.status_code) return response.json() @@ -219,43 +179,36 @@ def get_file_list( items: int | None = None, user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = {} + request_data = {} if time_from is not None: - data["TimeFrom"] = time_from + request_data["TimeFrom"] = time_from if time_to is not None: - data["TimeTo"] = time_to + request_data["TimeTo"] = time_to if page_num is not None: - data["PageNum"] = page_num + request_data["PageNum"] = page_num if items is not None: - data["Items"] = items + request_data["Items"] = items if user_id is not None: - data["UserID"] = user_id + request_data["UserID"] = user_id if self.validation: - validate_data(data, FileListRequest, FileAPIError) + validate_data(request_data, FileListRequest, FileAPIError) url = urljoin(self.base_url, self.service_path, "v2/getFileList") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise FileAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "v2/info") response = requests.get(url, headers=headers) @@ -264,13 +217,11 @@ def get_info( return response.json() def get_file_collections_storage_instructions( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "v2/file-collections/storageInstructions" @@ -281,13 +232,11 @@ def get_file_collections_storage_instructions( return response.json() def get_file_collections_retrieval_instructions( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -299,14 +248,10 @@ def get_file_collections_retrieval_instructions( raise FileAPIError(response.text, response.status_code) return response.json() - def copy_file_collections( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def copy_file_collections(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "v2/file-collections/copy") response = requests.post(url, headers=headers) diff --git a/osdu_client/services/indexer/client.py b/osdu_client/services/indexer/client.py index 0180003..a5e243d 100644 --- a/osdu_client/services/indexer/client.py +++ b/osdu_client/services/indexer/client.py @@ -17,14 +17,10 @@ class IndexerAPIError(OSDUAPIError): class IndexerClient(OSDUAPIClient): service_path = "/api/indexer/v2" - def provision_partition( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def provision_partition(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "partitions/provision") response = requests.put(url, headers=headers) @@ -39,45 +35,36 @@ def reindex_kind( cursor: str | None = None, force_clean: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if force_clean is not None: params["force_clean"] = force_clean - data = { + request_data = { "kind": kind, } if cursor is not None: - data["cursor"] = cursor + request_data["cursor"] = cursor if self.validation: - validate_data(data, RecordReindexRequest, IndexerAPIError) + validate_data(request_data, RecordReindexRequest, IndexerAPIError) url = urljoin(self.base_url, self.service_path, "reindex") - response = requests.post(url, headers=headers, params=params, json=data) + response = requests.post(url, headers=headers, params=params, json=request_data) if not response.ok: raise IndexerAPIError(response.text, response.status_code) return response.json() def reindex_partition( - self, - *, - force_clean: str | None = None, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, force_clean: str | None = None, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if force_clean is not None: @@ -90,39 +77,29 @@ def reindex_partition( return response.json() def reindex_records( - self, - *, - record_ids: list[str], - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_ids: list[str], data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "recordIds": record_ids, } if self.validation: - validate_data(data, ReindexRecordsRequest, IndexerAPIError) + validate_data(request_data, ReindexRecordsRequest, IndexerAPIError) url = urljoin(self.base_url, self.service_path, "reindex/records") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise IndexerAPIError(response.text, response.status_code) return response.json() - def get_readiness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_readiness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "readiness_check") response = requests.get(url, headers=headers) @@ -130,14 +107,10 @@ def get_readiness_check( raise IndexerAPIError(response.text, response.status_code) return response.json() - def get_liveness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_liveness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "liveness_check") response = requests.get(url, headers=headers) @@ -145,14 +118,10 @@ def get_liveness_check( raise IndexerAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) @@ -160,18 +129,10 @@ def get_info( raise IndexerAPIError(response.text, response.status_code) return response.json() - def delete_index( - self, - *, - kind: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def delete_index(self, *, kind: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "kind": kind, diff --git a/osdu_client/services/legal/client.py b/osdu_client/services/legal/client.py index 8e6c14a..b8903a6 100644 --- a/osdu_client/services/legal/client.py +++ b/osdu_client/services/legal/client.py @@ -18,17 +18,11 @@ class LegalClient(OSDUAPIClient): service_path = "/api/legal/v1/" def list_legaltags( - self, - *, - valid: str | None = None, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, valid: str | None = None, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if valid is not None: @@ -49,31 +43,28 @@ def update_legaltag( expiration_date: str | None = None, extension_properties: dict | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = {} + request_data = {} if name is not None: - data["name"] = name + request_data["name"] = name if contract_id is not None: - data["contractId"] = contract_id + request_data["contractId"] = contract_id if description is not None: - data["description"] = description + request_data["description"] = description if expiration_date is not None: - data["expirationDate"] = expiration_date + request_data["expirationDate"] = expiration_date if extension_properties is not None: - data["extensionProperties"] = extension_properties + request_data["extensionProperties"] = extension_properties if self.validation: - validate_data(data, UpdateLegalTag, LegalAPIError) + validate_data(request_data, UpdateLegalTag, LegalAPIError) url = urljoin(self.base_url, self.service_path, "legaltags") - response = requests.put(url, headers=headers, json=data) + response = requests.put(url, headers=headers, json=request_data) if not response.ok: raise LegalAPIError(response.text, response.status_code) return response.json() @@ -85,53 +76,44 @@ def create_legaltag( description: str | None = None, properties: dict | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = {} + request_data = {} if name is not None: - data["name"] = name + request_data["name"] = name if description is not None: - data["description"] = description + request_data["description"] = description if properties is not None: - data["properties"] = properties + request_data["properties"] = properties if self.validation: - validate_data(data, LegalTagDto, LegalAPIError) + validate_data(request_data, LegalTagDto, LegalAPIError) url = urljoin(self.base_url, self.service_path, "legaltags") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise LegalAPIError(response.text, response.status_code) return response.json() def validate_legaltags( - self, - *, - names: list[str], - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, names: list[str], data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "names": names, } if self.validation: - validate_data(data, RequestLegalTags, LegalAPIError) + validate_data(request_data, RequestLegalTags, LegalAPIError) url = urljoin(self.base_url, self.service_path, "legaltags:validate") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise LegalAPIError(response.text, response.status_code) return response.json() @@ -146,73 +128,60 @@ def query_legaltags( limit: int | None = None, valid: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if valid is not None: params["valid"] = valid - data = {} + request_data = {} if query_list is not None: - data["queryList"] = query_list + request_data["queryList"] = query_list if operator_list is not None: - data["operatorList"] = operator_list + request_data["operatorList"] = operator_list if sort_by is not None: - data["sortBy"] = sort_by + request_data["sortBy"] = sort_by if sort_order is not None: - data["sortOrder"] = sort_order + request_data["sortOrder"] = sort_order if limit is not None: - data["limit"] = limit + request_data["limit"] = limit if self.validation: - validate_data(data, SearchLegalTag, LegalAPIError) + validate_data(request_data, SearchLegalTag, LegalAPIError) url = urljoin(self.base_url, self.service_path, "legaltags:query") - response = requests.post(url, headers=headers, params=params, json=data) + response = requests.post(url, headers=headers, params=params, json=request_data) if not response.ok: raise LegalAPIError(response.text, response.status_code) return response.json() def get_batch_legaltags( - self, - *, - names: list[str], - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, names: list[str], data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "names": names, } if self.validation: - validate_data(data, RequestLegalTags, LegalAPIError) + validate_data(request_data, RequestLegalTags, LegalAPIError) url = urljoin(self.base_url, self.service_path, "legaltags:batchRetrieve") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise LegalAPIError(response.text, response.status_code) return response.json() - def get_legaltags_properties( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_legaltags_properties(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "legaltags:properties") response = requests.get(url, headers=headers) @@ -220,18 +189,10 @@ def get_legaltags_properties( raise LegalAPIError(response.text, response.status_code) return response.json() - def get_legaltag( - self, - *, - name: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_legaltag(self, *, name: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "legaltags/%s" % name) response = requests.get(url, headers=headers) @@ -240,17 +201,11 @@ def get_legaltag( return response.json() def delete_legaltag( - self, - *, - name: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, name: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "legaltags/%s" % name) response = requests.delete(url, headers=headers) @@ -259,13 +214,11 @@ def delete_legaltag( return response.json() def get_legaltag_compliance_job_status( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "jobs/updateLegalTagStatus") response = requests.get(url, headers=headers) @@ -273,14 +226,10 @@ def get_legaltag_compliance_job_status( raise LegalAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) @@ -288,14 +237,10 @@ def get_info( raise LegalAPIError(response.text, response.status_code) return response.json() - def get_readiness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_readiness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "_ah/readiness_check") response = requests.get(url, headers=headers) @@ -303,14 +248,10 @@ def get_readiness_check( raise LegalAPIError(response.text, response.status_code) return response.json() - def get_liveness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_liveness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "_ah/liveness_check") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/notification/client.py b/osdu_client/services/notification/client.py index dffe57e..3846cc0 100644 --- a/osdu_client/services/notification/client.py +++ b/osdu_client/services/notification/client.py @@ -14,14 +14,10 @@ class NotificationAPIError(OSDUAPIError): class NotificationClient(OSDUAPIClient): service_path = "/api/notification/v1" - def record_changed( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def record_changed(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "push-handlers/records-changed") response = requests.post(url, headers=headers) @@ -29,14 +25,10 @@ def record_changed( raise NotificationAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/partition/client.py b/osdu_client/services/partition/client.py index d9d85d5..de7cd40 100644 --- a/osdu_client/services/partition/client.py +++ b/osdu_client/services/partition/client.py @@ -18,17 +18,11 @@ class PartitionClient(OSDUAPIClient): service_path = "/api/partition/v1" def get_partition( - self, - *, - partition_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, partition_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "partitions/%s" % partition_id) response = requests.get(url, headers=headers) @@ -42,39 +36,30 @@ def create_partitions( properties: dict, partition_id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "properties": properties, } if self.validation: - validate_data(data, PartitionInfo, PartitionAPIError) + validate_data(request_data, PartitionInfo, PartitionAPIError) url = urljoin(self.base_url, self.service_path, "partitions/%s" % partition_id) - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise PartitionAPIError(response.text, response.status_code) return response.json() def delete_partition( - self, - *, - partition_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, partition_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "partitions/%s" % partition_id) response = requests.delete(url, headers=headers) @@ -88,35 +73,28 @@ def update_partitions( properties: dict, partition_id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "properties": properties, } if self.validation: - validate_data(data, PartitionInfo, PartitionAPIError) + validate_data(request_data, PartitionInfo, PartitionAPIError) url = urljoin(self.base_url, self.service_path, "partitions/%s" % partition_id) - response = requests.patch(url, headers=headers, json=data) + response = requests.patch(url, headers=headers, json=request_data) if not response.ok: raise PartitionAPIError(response.text, response.status_code) return response.json() - def list_partitions( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def list_partitions(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "partitions") response = requests.get(url, headers=headers) @@ -124,14 +102,10 @@ def list_partitions( raise PartitionAPIError(response.text, response.status_code) return response.json() - def get_liveness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_liveness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "liveness_check") response = requests.get(url, headers=headers) @@ -139,14 +113,10 @@ def get_liveness_check( raise PartitionAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/policy/client.py b/osdu_client/services/policy/client.py index 04f8443..65ad339 100644 --- a/osdu_client/services/policy/client.py +++ b/osdu_client/services/policy/client.py @@ -23,13 +23,10 @@ def home_page( correlation_id: str | None = None, user_agent: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -48,13 +45,10 @@ def get_api_policy_v1_policies( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -76,13 +70,10 @@ def get_fetch_policy( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -106,13 +97,10 @@ def get_fetch_instance_policy( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -139,13 +127,10 @@ def get_api_policy_v1_policies_osdu_partition( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -172,13 +157,10 @@ def delete_partition_policy( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -205,13 +187,10 @@ def create_or_update_partition_policy( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -238,13 +217,10 @@ def evaluate_policy( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -276,13 +252,10 @@ def translate_policy_api( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -290,17 +263,17 @@ def translate_policy_api( if x_user_id is not None: headers["x-user-id"] = x_user_id - data = { + request_data = { "query": query, "input": input, "unknowns": unknowns, } if self.validation: - validate_data(data, TranslateItem, PolicyAPIError) + validate_data(request_data, TranslateItem, PolicyAPIError) url = urljoin(self.base_url, self.service_path, "api/policy/v1/translate") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise PolicyAPIError(response.text, response.status_code) return response.json() @@ -311,13 +284,10 @@ def get_api_policy_v1_info( correlation_id: str | None = None, user_agent: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -338,13 +308,10 @@ def create_api_policy_v1_compile( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -372,13 +339,10 @@ def get_tenant( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -406,13 +370,10 @@ def update_tenant( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -441,13 +402,10 @@ def delete_tenant( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -467,13 +425,10 @@ def get_health( correlation_id: str | None = None, user_agent: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -491,13 +446,10 @@ def get_ready( correlation_id: str | None = None, user_agent: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -518,13 +470,10 @@ def validate_policy( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -551,13 +500,10 @@ def get_backup( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -579,13 +525,10 @@ def bootstrap( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: @@ -610,13 +553,10 @@ def get_api_policy_v1_config( user_agent: str | None = None, x_user_id: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if correlation_id is not None: headers["correlation-id"] = correlation_id if user_agent is not None: diff --git a/osdu_client/services/pws/client.py b/osdu_client/services/pws/client.py index 6749d73..3e619ca 100644 --- a/osdu_client/services/pws/client.py +++ b/osdu_client/services/pws/client.py @@ -17,14 +17,10 @@ class PWSAPIError(OSDUAPIError): class PWSClient(OSDUAPIClient): service_path = "/api/pws/v1/" - def get_projects( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_projects(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "projects") response = requests.get(url, headers=headers) @@ -32,14 +28,10 @@ def get_projects( raise PWSAPIError(response.text, response.status_code) return response.json() - def create_project( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_project(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "projects") response = requests.post(url, headers=headers) @@ -53,39 +45,30 @@ def change_projects_status( status: str | None = None, id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = {} + request_data = {} if status is not None: - data["status"] = status + request_data["status"] = status if self.validation: - validate_data(data, StatusDto, PWSAPIError) + validate_data(request_data, StatusDto, PWSAPIError) url = urljoin(self.base_url, self.service_path, "projects/%s/status" % id) - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise PWSAPIError(response.text, response.status_code) return response.json() def get_project_resources( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "projects/%s/resources" % id) response = requests.get(url, headers=headers) @@ -94,17 +77,11 @@ def get_project_resources( return response.json() def assign_projects_resources( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "projects/%s/resources" % id) response = requests.post(url, headers=headers) @@ -113,17 +90,11 @@ def assign_projects_resources( return response.json() def delete_projects_resources( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "projects/%s/resources" % id) response = requests.delete(url, headers=headers) @@ -132,17 +103,11 @@ def delete_projects_resources( return response.json() def get_projects_lifecycleevent( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "projects/%s/lifecycleevent" % id @@ -153,17 +118,11 @@ def get_projects_lifecycleevent( return response.json() def assign_projects_lifecycleevent( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "projects/%s/lifecycleevent" % id @@ -174,17 +133,11 @@ def assign_projects_lifecycleevent( return response.json() def delete_projects_lifecycleevent( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "projects/%s/lifecycleevent" % id @@ -194,18 +147,10 @@ def delete_projects_lifecycleevent( raise PWSAPIError(response.text, response.status_code) return response.json() - def get_project( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_project(self, *, id: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "projects/%s" % id) response = requests.get(url, headers=headers) @@ -214,17 +159,11 @@ def get_project( return response.json() def get_projects_wip_resources( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "projects/%s/wip-resources" % id @@ -234,14 +173,10 @@ def get_projects_wip_resources( raise PWSAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) @@ -249,14 +184,10 @@ def get_info( raise PWSAPIError(response.text, response.status_code) return response.json() - def get_readiness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_readiness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "_ah/readiness_check") response = requests.get(url, headers=headers) @@ -264,14 +195,10 @@ def get_readiness_check( raise PWSAPIError(response.text, response.status_code) return response.json() - def get_liveness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_liveness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "_ah/liveness_check") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/rafs/common.py b/osdu_client/services/rafs/common.py index 9c47a8e..a85498c 100644 --- a/osdu_client/services/rafs/common.py +++ b/osdu_client/services/rafs/common.py @@ -14,14 +14,10 @@ class RAFSAPIError(OSDUAPIError): class RAFSCommonClient(OSDUAPIClient): service_path = "" - def get_metrics( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_metrics(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "metrics") response = requests.get(url, headers=headers) @@ -29,14 +25,10 @@ def get_metrics( raise RAFSAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "api/rafs-ddms/info") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/rafs/v1.py b/osdu_client/services/rafs/v1.py index bb88083..0a9a0c9 100644 --- a/osdu_client/services/rafs/v1.py +++ b/osdu_client/services/rafs/v1.py @@ -23,13 +23,10 @@ def get_rock_sample_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -51,17 +48,11 @@ def get_rock_sample_data( return response.json() def upload_rock_sample_analysis_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -79,13 +70,10 @@ def get_rock_sample_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -102,17 +90,11 @@ def get_rock_sample_source_data( return response.json() def get_rock_sample_analysis_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -125,17 +107,11 @@ def get_rock_sample_analysis_record( return response.json() def soft_delete_rock_sample_analysis_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -148,17 +124,11 @@ def soft_delete_rock_sample_analysis_record( return response.json() def get_record_rock_sample_analysis_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -171,18 +141,11 @@ def get_record_rock_sample_analysis_versions( return response.json() def get_record_rock_sample_analysis_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -195,13 +158,11 @@ def get_record_rock_sample_analysis_version( return response.json() def create_rock_sample_analysis_record( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/rocksampleanalyses" @@ -212,17 +173,11 @@ def create_rock_sample_analysis_record( return response.json() def get_coring_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -235,17 +190,11 @@ def get_coring_record( return response.json() def soft_delete_coring_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -258,17 +207,11 @@ def soft_delete_coring_record( return response.json() def get_record_coring_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -281,18 +224,11 @@ def get_record_coring_versions( return response.json() def get_record_coring_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -305,13 +241,11 @@ def get_record_coring_version( return response.json() def create_or_update_coring_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/coringreports" @@ -322,17 +256,11 @@ def create_or_update_coring_records( return response.json() def get_rock_sample_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -345,17 +273,11 @@ def get_rock_sample_record( return response.json() def soft_delete_rock_sample_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -368,17 +290,11 @@ def soft_delete_rock_sample_record( return response.json() def get_rock_sample_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -391,18 +307,11 @@ def get_rock_sample_record_versions( return response.json() def get_rock_sample_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -415,13 +324,11 @@ def get_rock_sample_record_version( return response.json() def create_or_update_rock_sample_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "api/rafs-ddms/v1/rocksamples") response = requests.post(url, headers=headers) @@ -430,17 +337,11 @@ def create_or_update_rock_sample_records( return response.json() def get_pvt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -453,17 +354,11 @@ def get_pvt_record( return response.json() def soft_delete_pvt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -476,17 +371,11 @@ def soft_delete_pvt_record( return response.json() def get_pvt_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -499,18 +388,11 @@ def get_pvt_record_versions( return response.json() def get_pvt_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -523,13 +405,11 @@ def get_pvt_record_version( return response.json() def create_or_update_pvt_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "api/rafs-ddms/v1/pvtreports") response = requests.post(url, headers=headers) @@ -543,13 +423,10 @@ def get_pvt_record_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -574,13 +451,10 @@ def get_cce_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -601,17 +475,11 @@ def get_cce_data( return response.json() def upload_cce_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -629,13 +497,10 @@ def get_cce_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -652,17 +517,11 @@ def get_cce_source_data( return response.json() def get_cce_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -675,17 +534,11 @@ def get_cce_record( return response.json() def soft_delete_cce_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -698,17 +551,11 @@ def soft_delete_cce_record( return response.json() def get_cce_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -721,18 +568,11 @@ def get_cce_record_versions( return response.json() def get_cce_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -745,13 +585,11 @@ def get_cce_record_version( return response.json() def create_or_update_cce_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "api/rafs-ddms/v1/ccereports") response = requests.post(url, headers=headers) @@ -768,13 +606,10 @@ def get_difflib_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -795,17 +630,11 @@ def get_difflib_data( return response.json() def upload_difflib_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -823,13 +652,10 @@ def get_difflib_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -846,17 +672,11 @@ def get_difflib_source_data( return response.json() def get_difflib_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -869,17 +689,11 @@ def get_difflib_record( return response.json() def soft_delete_difflib_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -892,17 +706,11 @@ def soft_delete_difflib_record( return response.json() def get_difflib_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -915,18 +723,11 @@ def get_difflib_record_versions( return response.json() def get_difflib_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -939,13 +740,11 @@ def get_difflib_record_version( return response.json() def create_or_update_difflib_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/difflibreports" @@ -964,13 +763,10 @@ def get_transporttest_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -991,17 +787,11 @@ def get_transporttest_data( return response.json() def upload_transporttest_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1019,13 +809,10 @@ def get_transporttest_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -1042,17 +829,11 @@ def get_transporttest_source_data( return response.json() def get_transporttest_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1065,17 +846,11 @@ def get_transporttest_record( return response.json() def soft_delete_transporttest_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1088,17 +863,11 @@ def soft_delete_transporttest_record( return response.json() def get_transporttest_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1111,18 +880,11 @@ def get_transporttest_record_versions( return response.json() def get_transporttest_record_specific_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1135,13 +897,11 @@ def get_transporttest_record_specific_version( return response.json() def create_or_update_transporttest_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/transporttests" @@ -1160,13 +920,10 @@ def get_compositionalanalysis_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -1188,17 +945,11 @@ def get_compositionalanalysis_data( return response.json() def upload_compositionalanalysis_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1216,13 +967,10 @@ def get_compositionalanalysis_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -1239,17 +987,11 @@ def get_compositionalanalysis_source_data( return response.json() def get_compositionalanalysis_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1262,17 +1004,11 @@ def get_compositionalanalysis_record( return response.json() def soft_delete_compositionalanalysis_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1285,17 +1021,11 @@ def soft_delete_compositionalanalysis_record( return response.json() def get_compositionalanalysis_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1308,18 +1038,11 @@ def get_compositionalanalysis_record_versions( return response.json() def get_compositionalanalysis_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1333,13 +1056,11 @@ def get_compositionalanalysis_record_version( return response.json() def create_or_update_compositionalanalysis_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1360,13 +1081,10 @@ def get_multistageseparatortests_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -1388,17 +1106,11 @@ def get_multistageseparatortests_data( return response.json() def upload_multistageseparatortests_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1416,13 +1128,10 @@ def get_multistageseparatortests_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -1439,17 +1148,11 @@ def get_multistageseparatortests_source_data( return response.json() def get_multistageseparatortests_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1462,17 +1165,11 @@ def get_multistageseparatortests_record( return response.json() def soft_delete_multistageseparatortests_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1485,17 +1182,11 @@ def soft_delete_multistageseparatortests_record( return response.json() def get_multistageseparatortests_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1508,18 +1199,11 @@ def get_multistageseparatortests_record_versions( return response.json() def get_multistageseparatortests_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1533,13 +1217,11 @@ def get_multistageseparatortests_record_version( return response.json() def post_multistageseparatortests_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1560,13 +1242,10 @@ def get_swellingtests_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -1587,17 +1266,11 @@ def get_swellingtests_data( return response.json() def upload_swellingtests_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1615,13 +1288,10 @@ def get_swellingtests_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -1638,17 +1308,11 @@ def get_swellingtests_source_data( return response.json() def get_swellingtests_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1661,17 +1325,11 @@ def get_swellingtests_record( return response.json() def soft_delete_swellingtests_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1684,17 +1342,11 @@ def soft_delete_swellingtests_record( return response.json() def get_swellingtests_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1707,18 +1359,11 @@ def get_swellingtests_record_versions( return response.json() def get_swellingtests_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1731,13 +1376,11 @@ def get_swellingtests_record_version( return response.json() def create_or_update_swellingtests_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/swellingtests" @@ -1756,13 +1399,10 @@ def get_cvdt_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -1784,17 +1424,11 @@ def get_cvdt_data( return response.json() def upload_cvdt_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1812,13 +1446,10 @@ def get_cvdt_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -1835,17 +1466,11 @@ def get_cvdt_source_data( return response.json() def get_cvdt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1858,17 +1483,11 @@ def get_cvdt_record( return response.json() def soft_delete_cvdt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1881,17 +1500,11 @@ def soft_delete_cvdt_record( return response.json() def get_cvdt_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1904,18 +1517,11 @@ def get_cvdt_record_versions( return response.json() def get_cvdt_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1929,13 +1535,11 @@ def get_cvdt_record_version( return response.json() def create_or_update_cvdt_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1956,13 +1560,10 @@ def get_wat_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -1984,17 +1585,11 @@ def get_wat_data( return response.json() def upload_wat_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2012,13 +1607,10 @@ def get_wat_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -2035,17 +1627,11 @@ def get_wat_source_data( return response.json() def get_wat_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2058,17 +1644,11 @@ def get_wat_record( return response.json() def soft_delete_wat_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2081,17 +1661,11 @@ def soft_delete_wat_record( return response.json() def get_wat_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2104,18 +1678,11 @@ def get_wat_record_versions( return response.json() def get_wat_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2129,13 +1696,11 @@ def get_wat_record_version( return response.json() def create_or_update_wat_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/wateranalysisreports" @@ -2154,13 +1719,10 @@ def get_stoat_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -2182,17 +1744,11 @@ def get_stoat_data( return response.json() def upload_stoat_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2210,13 +1766,10 @@ def get_stoat_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -2233,17 +1786,11 @@ def get_stoat_source_data( return response.json() def get_stoat_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2256,17 +1803,11 @@ def get_stoat_record( return response.json() def soft_delete_stoat_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2279,17 +1820,11 @@ def soft_delete_stoat_record( return response.json() def get_record_stoat_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2302,18 +1837,11 @@ def get_record_stoat_versions( return response.json() def get_stoat_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2327,13 +1855,11 @@ def get_stoat_record_version( return response.json() def create_or_update_stoat_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2354,13 +1880,10 @@ def get_itt_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -2382,17 +1905,11 @@ def get_itt_data( return response.json() def upload_itt_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2410,13 +1927,10 @@ def get_itt_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -2433,17 +1947,11 @@ def get_itt_source_data( return response.json() def get_itt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2456,17 +1964,11 @@ def get_itt_record( return response.json() def soft_delete_itt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2479,17 +1981,11 @@ def soft_delete_itt_record( return response.json() def get_itt_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2502,18 +1998,11 @@ def get_itt_record_versions( return response.json() def get_itt_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2527,13 +2016,11 @@ def get_itt_record_version( return response.json() def create_or_update_itt_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/interfacialtensiontests" @@ -2552,13 +2039,10 @@ def get_vlet_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -2580,17 +2064,11 @@ def get_vlet_data( return response.json() def upload_vlet_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2608,13 +2086,10 @@ def get_vlet_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -2631,17 +2106,11 @@ def get_vlet_source_data( return response.json() def get_vlet_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2654,17 +2123,11 @@ def get_vlet_record( return response.json() def soft_delete_vlet_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2677,17 +2140,11 @@ def soft_delete_vlet_record( return response.json() def get_vlet_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2700,18 +2157,11 @@ def get_vlet_record_versions( return response.json() def get_vlet_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2725,13 +2175,11 @@ def get_vlet_record_version( return response.json() def create_or_update_vlet_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2752,13 +2200,10 @@ def get_mcmt_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -2780,17 +2225,11 @@ def get_mcmt_data( return response.json() def upload_mcmt_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2808,13 +2247,10 @@ def get_mcmt_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -2831,17 +2267,11 @@ def get_mcmt_source_data( return response.json() def get_mcmt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2854,17 +2284,11 @@ def get_mcmt_record( return response.json() def soft_delete_mcmt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2877,17 +2301,11 @@ def soft_delete_mcmt_record( return response.json() def get_mcmt_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2900,18 +2318,11 @@ def get_mcmt_record_versions( return response.json() def get_mcmt_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2925,13 +2336,11 @@ def get_mcmt_record_version( return response.json() def create_or_update_mcmt_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -2952,13 +2361,10 @@ def get_stt_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -2979,17 +2385,11 @@ def get_stt_data( return response.json() def upload_stt_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3007,13 +2407,10 @@ def get_stt_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -3030,17 +2427,11 @@ def get_stt_source_data( return response.json() def get_stt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3053,17 +2444,11 @@ def get_stt_record( return response.json() def soft_delete_stt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3076,17 +2461,11 @@ def soft_delete_stt_record( return response.json() def get_stt_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3099,18 +2478,11 @@ def get_stt_record_versions( return response.json() def get_stt_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3123,13 +2495,11 @@ def get_stt_record_version( return response.json() def create_or_update_stt_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/slimtubetests" @@ -3140,17 +2510,11 @@ def create_or_update_stt_records( return response.json() def get_sar_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3163,17 +2527,11 @@ def get_sar_record( return response.json() def soft_delete_sar_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3186,17 +2544,11 @@ def soft_delete_sar_record( return response.json() def get_record_sar_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3209,18 +2561,11 @@ def get_record_sar_versions( return response.json() def get_sar_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3234,13 +2579,11 @@ def get_sar_record_version( return response.json() def create_or_update_sar_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/samplesanalysesreport" @@ -3256,13 +2599,10 @@ def get_sar_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -3287,13 +2627,10 @@ def get_cp_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -3315,17 +2652,11 @@ def get_cp_data( return response.json() def upload_cp_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3343,13 +2674,10 @@ def get_cp_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -3366,17 +2694,11 @@ def get_cp_source_data( return response.json() def get_cp_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3389,17 +2711,11 @@ def get_cp_record( return response.json() def soft_delete_cp_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3412,17 +2728,11 @@ def soft_delete_cp_record( return response.json() def get_cp_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3435,18 +2745,11 @@ def get_cp_record_versions( return response.json() def get_cp_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3459,14 +2762,10 @@ def get_cp_record_version( raise RAFSAPIError(response.text, response.status_code) return response.json() - def create_or_update_cp_records( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_cp_records(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/capillarypressuretests" @@ -3477,17 +2776,11 @@ def create_or_update_cp_records( return response.json() def get_rp_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3500,17 +2793,11 @@ def get_rp_record( return response.json() def soft_delete_rp_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3523,17 +2810,11 @@ def soft_delete_rp_record( return response.json() def get_rp_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3546,18 +2827,11 @@ def get_rp_record_versions( return response.json() def get_rp_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3570,14 +2844,10 @@ def get_rp_record_version( raise RAFSAPIError(response.text, response.status_code) return response.json() - def create_or_update_rp_records( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_rp_records(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3598,13 +2868,10 @@ def get_rp_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -3626,17 +2893,11 @@ def get_rp_data( return response.json() def upload_rp_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3654,13 +2915,10 @@ def get_rp_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -3677,17 +2935,11 @@ def get_rp_source_data( return response.json() def get_ft_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3700,17 +2952,11 @@ def get_ft_record( return response.json() def soft_delete_ft_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3723,17 +2969,11 @@ def soft_delete_ft_record( return response.json() def get_ft_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3746,18 +2986,11 @@ def get_ft_record_versions( return response.json() def get_ft_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3769,14 +3002,10 @@ def get_ft_record_version( raise RAFSAPIError(response.text, response.status_code) return response.json() - def create_or_update_ft_records( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_ft_records(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/fractionationtests" @@ -3795,13 +3024,10 @@ def get_ft_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -3822,17 +3048,11 @@ def get_ft_data( return response.json() def upload_ft_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3850,13 +3070,10 @@ def get_ft_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -3873,17 +3090,11 @@ def get_ft_source_data( return response.json() def get_et_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3896,17 +3107,11 @@ def get_et_record( return response.json() def soft_delete_et_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3919,17 +3124,11 @@ def soft_delete_et_record( return response.json() def get_et_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3942,18 +3141,11 @@ def get_et_record_versions( return response.json() def get_et_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -3965,14 +3157,10 @@ def get_et_record_version( raise RAFSAPIError(response.text, response.status_code) return response.json() - def create_or_update_er_records( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_er_records(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/extractiontests" @@ -3991,13 +3179,10 @@ def get_et_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -4018,17 +3203,11 @@ def get_et_data( return response.json() def upload_et_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4046,13 +3225,10 @@ def get_et_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -4069,17 +3245,11 @@ def get_et_source_data( return response.json() def get_physchem_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4092,17 +3262,11 @@ def get_physchem_record( return response.json() def soft_delete_physchem_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4115,17 +3279,11 @@ def soft_delete_physchem_record( return response.json() def get_record_physchem_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4138,18 +3296,11 @@ def get_record_physchem_versions( return response.json() def get_physchem_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4163,13 +3314,11 @@ def get_physchem_record_version( return response.json() def create_or_update_physchem_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/physicalchemistrytests" @@ -4188,13 +3337,10 @@ def get_physchem_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -4216,17 +3362,11 @@ def get_physchem_data( return response.json() def upload_physchem_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4244,13 +3384,10 @@ def get_physchem_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -4267,17 +3404,11 @@ def get_physchem_source_data( return response.json() def get_ep_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4290,17 +3421,11 @@ def get_ep_record( return response.json() def soft_delete_ep_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4313,17 +3438,11 @@ def soft_delete_ep_record( return response.json() def get_ep_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4336,18 +3455,11 @@ def get_ep_record_versions( return response.json() def get_ep_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4360,14 +3472,10 @@ def get_ep_record_version( raise RAFSAPIError(response.text, response.status_code) return response.json() - def create_or_update_ep_records( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_ep_records(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/electricalproperties" @@ -4386,13 +3494,10 @@ def get_ep_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -4414,17 +3519,11 @@ def get_ep_data( return response.json() def upload_ep_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4442,13 +3541,10 @@ def get_ep_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -4465,17 +3561,11 @@ def get_ep_source_data( return response.json() def get_rc_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4488,17 +3578,11 @@ def get_rc_record( return response.json() def soft_delete_rc_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4511,17 +3595,11 @@ def soft_delete_rc_record( return response.json() def get_record_rc_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4534,18 +3612,11 @@ def get_record_rc_versions( return response.json() def get_rc_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4558,14 +3629,10 @@ def get_rc_record_version( raise RAFSAPIError(response.text, response.status_code) return response.json() - def create_or_update_rc_records( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_rc_records(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v1/rockcompressibilities" @@ -4584,13 +3651,10 @@ def get_rc_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -4612,17 +3676,11 @@ def get_rc_data( return response.json() def upload_rc_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4640,13 +3698,10 @@ def get_rc_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -4663,17 +3718,11 @@ def get_rc_source_data( return response.json() def get_wgrp_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4686,17 +3735,11 @@ def get_wgrp_record( return response.json() def soft_delete_wgrp_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4709,17 +3752,11 @@ def soft_delete_wgrp_record( return response.json() def get_wgrp_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4732,18 +3769,11 @@ def get_wgrp_record_versions( return response.json() def get_wgrp_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4757,13 +3787,11 @@ def get_wgrp_record_version( return response.json() def create_or_update_wgrp_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4784,13 +3812,10 @@ def get_wgrp_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -4812,17 +3837,11 @@ def get_wgrp_data( return response.json() def upload_wgrp_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4840,13 +3859,10 @@ def get_wgrp_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -4863,17 +3879,11 @@ def get_wgrp_source_data( return response.json() def get_fri_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4886,17 +3896,11 @@ def get_fri_record( return response.json() def soft_delete_fri_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4909,17 +3913,11 @@ def soft_delete_fri_record( return response.json() def get_fri_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4932,18 +3930,11 @@ def get_fri_record_versions( return response.json() def get_fri_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4957,13 +3948,11 @@ def get_fri_record_version( return response.json() def create_or_update_fri_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -4984,13 +3973,10 @@ def get_fri_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -5012,17 +3998,11 @@ def get_fri_data( return response.json() def upload_fri_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -5040,13 +4020,10 @@ def get_fri_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: diff --git a/osdu_client/services/rafs/v2.py b/osdu_client/services/rafs/v2.py index 1609dba..a787b6d 100644 --- a/osdu_client/services/rafs/v2.py +++ b/osdu_client/services/rafs/v2.py @@ -15,17 +15,11 @@ class RAFSClient(RAFSCommonClient): service_path = "" def get_sar_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -38,17 +32,11 @@ def get_sar_record( return response.json() def soft_delete_sar_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -61,17 +49,11 @@ def soft_delete_sar_record( return response.json() def get_sar_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -84,18 +66,11 @@ def get_sar_record_versions( return response.json() def get_sar_record_specific_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -109,13 +84,11 @@ def get_sar_record_specific_version( return response.json() def create_or_update_sar_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v2/samplesanalysesreport" @@ -131,13 +104,10 @@ def get_sar_source_data( record_id: str, version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if version is not None: @@ -153,14 +123,10 @@ def get_sar_source_data( raise RAFSAPIError(response.text, response.status_code) return response.json() - def get_sa_types( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_sa_types(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -173,17 +139,11 @@ def get_sa_types( return response.json() def get_sa_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -196,17 +156,11 @@ def get_sa_record( return response.json() def soft_delete_sa_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -219,17 +173,11 @@ def soft_delete_sa_record( return response.json() def get_sa_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -242,18 +190,11 @@ def get_sa_record_versions( return response.json() def get_sa_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -265,14 +206,10 @@ def get_sa_record_version( raise RAFSAPIError(response.text, response.status_code) return response.json() - def create_or_update_sa_records( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_sa_records(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v2/samplesanalysis" @@ -283,17 +220,11 @@ def create_or_update_sa_records( return response.json() def get_sa_content_schema( - self, - *, - analysistype: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, analysistype: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -315,13 +246,10 @@ def get_sa_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -348,13 +276,10 @@ def upload_sa_data( record_id: str, analysis_type: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -374,13 +299,10 @@ def search_sa_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -408,13 +330,10 @@ def query_sa( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -435,17 +354,11 @@ def query_sa( return response.json() def get_masterdata_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -458,17 +371,11 @@ def get_masterdata_record( return response.json() def soft_delete_masterdata_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -481,17 +388,11 @@ def soft_delete_masterdata_record( return response.json() def get_masterdata_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -504,18 +405,11 @@ def get_masterdata_record_versions( return response.json() def get_masterdata_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -528,13 +422,11 @@ def get_masterdata_record_version( return response.json() def create_or_update_masterdata_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "api/rafs-ddms/v2/masterdata") response = requests.post(url, headers=headers) @@ -543,17 +435,11 @@ def create_or_update_masterdata_records( return response.json() def get_pvt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v2/pvtmodel/%s" % record_id @@ -564,17 +450,11 @@ def get_pvt_record( return response.json() def soft_delete_pvt_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "api/rafs-ddms/v2/pvtmodel/%s" % record_id @@ -585,17 +465,11 @@ def soft_delete_pvt_record( return response.json() def get_pvt_record_versions( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -608,18 +482,11 @@ def get_pvt_record_versions( return response.json() def get_pvt_record_version( - self, - *, - version: str, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, version: str, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -632,13 +499,11 @@ def get_pvt_record_version( return response.json() def create_or_update_pvt_records( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "api/rafs-ddms/v2/pvtmodel") response = requests.post(url, headers=headers) @@ -656,13 +521,10 @@ def get_pvt_data( rows_filter: str | None = None, columns_aggregation: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if columns_filter is not None: @@ -689,13 +551,10 @@ def upload_pvt_data( record_id: str, analysis_type: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, diff --git a/osdu_client/services/register/client.py b/osdu_client/services/register/client.py index 058f9bc..bf4993a 100644 --- a/osdu_client/services/register/client.py +++ b/osdu_client/services/register/client.py @@ -17,18 +17,10 @@ class RegisterAPIError(OSDUAPIError): class RegisterClient(OSDUAPIClient): service_path = "/api/register/v1" - def get_ddms( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_ddms(self, *, id: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/%s" % id) response = requests.get(url, headers=headers) @@ -36,18 +28,10 @@ def get_ddms( raise RegisterAPIError(response.text, response.status_code) return response.json() - def delete_ddms( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def delete_ddms(self, *, id: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/%s" % id) response = requests.delete(url, headers=headers) @@ -64,13 +48,10 @@ def create_ddms( contact_email: str | None = None, interfaces: list[dict] | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = {} if id is not None: @@ -93,18 +74,10 @@ def create_ddms( raise RegisterAPIError(response.text, response.status_code) return response.json() - def query_ddms( - self, - *, - type: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def query_ddms(self, *, type: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "type": type, @@ -117,19 +90,11 @@ def query_ddms( return response.json() def get_d( - self, - *, - id: str, - type: str, - localid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, type: str, localid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/%s/%s/%s" % (id, type, localid) @@ -139,18 +104,10 @@ def get_d( raise RegisterAPIError(response.text, response.status_code) return response.json() - def get_action( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_action(self, *, id: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "action/%s" % id) response = requests.get(url, headers=headers) @@ -158,18 +115,10 @@ def get_action( raise RegisterAPIError(response.text, response.status_code) return response.json() - def delete_action( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def delete_action(self, *, id: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "action/%s" % id) response = requests.delete(url, headers=headers) @@ -188,13 +137,10 @@ def create_action( url: str | None = None, filter: dict | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = {} if id is not None: @@ -227,13 +173,10 @@ def create_action_test( action: dict | None = None, test_payload: dict | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = {} if action is not None: @@ -259,13 +202,10 @@ def create_action_get( legal: dict | None = None, data: dict | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = {} if id is not None: @@ -297,13 +237,10 @@ def create_subscription( push_endpoint: str | None = None, secret: dict | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = {} if name is not None: @@ -327,17 +264,11 @@ def create_subscription( return response.json() def get_subscription( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "subscription/%s" % id) response = requests.get(url, headers=headers) @@ -346,17 +277,11 @@ def get_subscription( return response.json() def delete_subscription( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "subscription/%s" % id) response = requests.delete(url, headers=headers) @@ -371,13 +296,10 @@ def update_subscription_secret( value: dict | None = None, id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = {} if secret_type is not None: @@ -394,14 +316,10 @@ def update_subscription_secret( raise RegisterAPIError(response.text, response.status_code) return response.json() - def get_topics( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_topics(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "topics") response = requests.get(url, headers=headers) @@ -409,14 +327,10 @@ def get_topics( raise RegisterAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/schema/client.py b/osdu_client/services/schema/client.py index 55bb1fd..b54282c 100644 --- a/osdu_client/services/schema/client.py +++ b/osdu_client/services/schema/client.py @@ -17,30 +17,23 @@ class SchemaAPIError(OSDUAPIError): class SchemaClient(OSDUAPIClient): service_path = "/api/schema-service/v1" - def update_schemas_system( - self, - *, - schema_info: dict, - schema: dict, - data_partition_id: str | None = None, - tenant: str | None = None, + def create_or_update_schema_system( + self, *, schema_info: dict, schema: dict, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "schemaInfo": schema_info, "schema": schema, } if self.validation: - validate_data(data, SchemaRequest, SchemaAPIError) + validate_data(request_data, SchemaRequest, SchemaAPIError) url = urljoin(self.base_url, self.service_path, "schemas/system") - response = requests.put(url, headers=headers, json=data) + response = requests.put(url, headers=headers, json=request_data) if not response.ok: raise SchemaAPIError(response.text, response.status_code) return response.json() @@ -60,13 +53,10 @@ def search_schemas( limit: str | None = None, offset: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if authority is not None: @@ -99,73 +89,51 @@ def search_schemas( return response.json() def update_schema( - self, - *, - schema_info: dict, - schema: dict, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, schema_info: dict, schema: dict, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "schemaInfo": schema_info, "schema": schema, } if self.validation: - validate_data(data, SchemaRequest, SchemaAPIError) + validate_data(request_data, SchemaRequest, SchemaAPIError) url = urljoin(self.base_url, self.service_path, "schema") - response = requests.put(url, headers=headers, json=data) + response = requests.put(url, headers=headers, json=request_data) if not response.ok: raise SchemaAPIError(response.text, response.status_code) return response.json() def create_schema( - self, - *, - schema_info: dict, - schema: dict, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, schema_info: dict, schema: dict, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "schemaInfo": schema_info, "schema": schema, } if self.validation: - validate_data(data, SchemaRequest, SchemaAPIError) + validate_data(request_data, SchemaRequest, SchemaAPIError) url = urljoin(self.base_url, self.service_path, "schema") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SchemaAPIError(response.text, response.status_code) return response.json() - def get_schema( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_schema(self, *, id: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "schema/%s" % id) response = requests.get(url, headers=headers) @@ -173,14 +141,10 @@ def get_schema( raise SchemaAPIError(response.text, response.status_code) return response.json() - def get_liveness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_liveness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "liveness_check") response = requests.get(url, headers=headers) @@ -188,14 +152,10 @@ def get_liveness_check( raise SchemaAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/schema/method_names.json b/osdu_client/services/schema/method_names.json index e547a78..249a61f 100644 --- a/osdu_client/services/schema/method_names.json +++ b/osdu_client/services/schema/method_names.json @@ -1,6 +1,6 @@ { "put:/schemas/system": [ - "update_schemas_system", + "create_or_update_schema_system", "Creates/Updates a schema in development status", "Creates a new schema or updates an already existing schema with status `DEVELOPMENT` in the schema repository. If a user tries to create a schema with status other than `DEVELOPMENT`, API will not throw an exception.

The update of schema without `DEVELOPMENT` status would cause error. Any schema instance with the same schemaIdentity is replaced. A schema state can also be changed from `DEVELOPMENT` to `PUBLISHED` or `OBSOLETE` while updating schema content or by providing the same schema content.

**Note:** The schema may refer to other schema definitions in `DEVELOPMENT` state. If those schemas are updated themselves, it is the developer's responsibility to PUT the dependent schemas again to update the schema. Scope for a schema will be SHARED for all the schemas created using this API.

Service principal authorization is required to call thi API.

" ], diff --git a/osdu_client/services/sdms/client.py b/osdu_client/services/sdms/client.py index becadfa..d33fc0e 100644 --- a/osdu_client/services/sdms/client.py +++ b/osdu_client/services/sdms/client.py @@ -19,14 +19,10 @@ class SDMSAPIError(OSDUAPIError): class SDMSClient(OSDUAPIClient): service_path = "api/seismic-store/v3" - def get_svcstatus( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_svcstatus(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "svcstatus") response = requests.get(url, headers=headers) @@ -34,14 +30,10 @@ def get_svcstatus( raise SDMSAPIError(response.text, response.status_code) return response.json() - def get_svcstatus_access( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_svcstatus_access(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "svcstatus/access") response = requests.get(url, headers=headers) @@ -49,14 +41,10 @@ def get_svcstatus_access( raise SDMSAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) @@ -80,13 +68,10 @@ def register_new_dataset( path: str | None = None, datasetid: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context if ltag is not None: @@ -96,22 +81,22 @@ def register_new_dataset( if path is not None: params["path"] = path - data = {} + request_data = {} if type is not None: - data["type"] = type + request_data["type"] = type if gtags is not None: - data["gtags"] = gtags + request_data["gtags"] = gtags if seismicmeta is not None: - data["seismicmeta"] = seismicmeta + request_data["seismicmeta"] = seismicmeta if openzgy_v1 is not None: - data["openzgy_v1"] = openzgy_v1 + request_data["openzgy_v1"] = openzgy_v1 if segy_v1 is not None: - data["segy_v1"] = segy_v1 + request_data["segy_v1"] = segy_v1 if acls is not None: - data["acls"] = acls + request_data["acls"] = acls if self.validation: - validate_data(data, DatasetRegisterBody, SDMSAPIError) + validate_data(request_data, DatasetRegisterBody, SDMSAPIError) url = urljoin( self.base_url, @@ -119,7 +104,7 @@ def register_new_dataset( "dataset/tenant/%s/subproject/%s/dataset/%s" % (tenantid, subprojectid, datasetid), ) - response = requests.post(url, headers=headers, params=params, json=data) + response = requests.post(url, headers=headers, params=params, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() @@ -136,13 +121,10 @@ def get_dataset( translate_user_info: str | None = None, record_version: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -176,13 +158,10 @@ def delete_dataset( path: str | None = None, datasetid: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -223,13 +202,10 @@ def patch_dataset_metadata( datasetid: str, close: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -239,34 +215,34 @@ def patch_dataset_metadata( if close is not None: params["close"] = close - data = {} + request_data = {} if dataset_new_name is not None: - data["dataset_new_name"] = dataset_new_name + request_data["dataset_new_name"] = dataset_new_name if metadata is not None: - data["metadata"] = metadata + request_data["metadata"] = metadata if filemetadata is not None: - data["filemetadata"] = filemetadata + request_data["filemetadata"] = filemetadata if last_modified_date is not None: - data["last_modified_date"] = last_modified_date + request_data["last_modified_date"] = last_modified_date if gtags is not None: - data["gtags"] = gtags + request_data["gtags"] = gtags if ltag is not None: - data["ltag"] = ltag + request_data["ltag"] = ltag if readonly is not None: - data["readonly"] = readonly + request_data["readonly"] = readonly if status is not None: - data["status"] = status + request_data["status"] = status if seismicmeta is not None: - data["seismicmeta"] = seismicmeta + request_data["seismicmeta"] = seismicmeta if openzgy_v1 is not None: - data["openzgy_v1"] = openzgy_v1 + request_data["openzgy_v1"] = openzgy_v1 if segy_v1 is not None: - data["segy_v1"] = segy_v1 + request_data["segy_v1"] = segy_v1 if acls is not None: - data["acls"] = acls + request_data["acls"] = acls if self.validation: - validate_data(data, DatasetPatch, SDMSAPIError) + validate_data(request_data, DatasetPatch, SDMSAPIError) url = urljoin( self.base_url, @@ -274,7 +250,9 @@ def patch_dataset_metadata( "dataset/tenant/%s/subproject/%s/dataset/%s" % (tenantid, subprojectid, datasetid), ) - response = requests.patch(url, headers=headers, params=params, json=data) + response = requests.patch( + url, headers=headers, params=params, json=request_data + ) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() @@ -290,13 +268,10 @@ def acquire_lock_for_dataset( openmode: str | None = None, wid: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -328,13 +303,10 @@ def remove_lock_associated_with_dataset( path: str | None = None, datasetid: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -362,13 +334,10 @@ def get_dataset_access_permissions( path: str | None = None, datasetid: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -397,13 +366,10 @@ def validate_ctag( datasetid: str, ctag: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -434,13 +400,10 @@ def upsert_tags_to_dataset( datasetid: str, gtag: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -470,13 +433,10 @@ def compute_and_get_size_dataset( datasetid: str, path: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -504,13 +464,10 @@ def get_datasets_sizes( datasetid: str | None = None, path: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -538,13 +495,10 @@ def get_content_list( subprojectid: str, path: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -577,13 +531,10 @@ def list_datasets_in_subproject( subprojectid: str, translate_user_info: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -591,29 +542,29 @@ def list_datasets_in_subproject( if translate_user_info is not None: params["translate-user-info"] = translate_user_info - data = {} + request_data = {} if type is not None: - data["type"] = type + request_data["type"] = type if gtags is not None: - data["gtags"] = gtags + request_data["gtags"] = gtags if search is not None: - data["search"] = search + request_data["search"] = search if filter is not None: - data["filter"] = filter + request_data["filter"] = filter if limit is not None: - data["limit"] = limit + request_data["limit"] = limit if cursor is not None: - data["cursor"] = cursor + request_data["cursor"] = cursor if self.validation: - validate_data(data, DatasetListBody, SDMSAPIError) + validate_data(request_data, DatasetListBody, SDMSAPIError) url = urljoin( self.base_url, self.service_path, "dataset/tenant/%s/subproject/%s" % (tenantid, subprojectid), ) - response = requests.post(url, headers=headers, params=params, json=data) + response = requests.post(url, headers=headers, params=params, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() @@ -626,29 +577,26 @@ def check_datasets_list( tenantid: str, subprojectid: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context - data = { + request_data = { "datasets": datasets, } if self.validation: - validate_data(data, DatasetCheckList, SDMSAPIError) + validate_data(request_data, DatasetCheckList, SDMSAPIError) url = urljoin( self.base_url, self.service_path, "dataset/tenant/%s/subproject/%s/exist" % (tenantid, subprojectid), ) - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() @@ -661,29 +609,26 @@ def list_datasets_sizes( tenantid: str, subprojectid: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context - data = { + request_data = { "datasets": datasets, } if self.validation: - validate_data(data, DatasetCheckList, SDMSAPIError) + validate_data(request_data, DatasetCheckList, SDMSAPIError) url = urljoin( self.base_url, self.service_path, "dataset/tenant/%s/subproject/%s/sizes" % (tenantid, subprojectid), ) - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() @@ -697,13 +642,10 @@ def ls( limit: str | None = None, cursor: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -732,43 +674,36 @@ def ls_post( cursor: str | None = None, impersonation_token_context: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context - data = { + request_data = { "sdpath": sdpath, } if wmode is not None: - data["wmode"] = wmode + request_data["wmode"] = wmode if limit is not None: - data["limit"] = limit + request_data["limit"] = limit if cursor is not None: - data["cursor"] = cursor + request_data["cursor"] = cursor if self.validation: - validate_data(data, DatasetLsBody, SDMSAPIError) + validate_data(request_data, DatasetLsBody, SDMSAPIError) url = urljoin(self.base_url, self.service_path, "utility/ls") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() - def list_storage_tiers( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def list_storage_tiers(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "utility/storage-tiers") response = requests.get(url, headers=headers) @@ -784,13 +719,10 @@ def copy_dataset( sdpath_to: str, lock: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -814,13 +746,10 @@ def get_gcs_access_token( sdpath: str, readonly: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -842,13 +771,10 @@ def get_upload_connection_credential_string( impersonation_token_context: str | None = None, sdpath: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -870,13 +796,10 @@ def get_download_connection_credentials_string( impersonation_token_context: str | None = None, sdpath: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if impersonation_token_context is not None: headers["impersonation-token-context"] = impersonation_token_context @@ -899,79 +822,63 @@ def create_imptoken( resources: list[dict], refresh_url: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "token": token, "resources": resources, "refresh-url": refresh_url, } if self.validation: - validate_data(data, ImpTokenRequest, SDMSAPIError) + validate_data(request_data, ImpTokenRequest, SDMSAPIError) url = urljoin(self.base_url, self.service_path, "imptoken") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() def refresh_imptoken( - self, - *, - token: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, token: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "token": token, } if self.validation: - validate_data(data, RefreshTokenRequest, SDMSAPIError) + validate_data(request_data, RefreshTokenRequest, SDMSAPIError) url = urljoin(self.base_url, self.service_path, "imptoken") - response = requests.put(url, headers=headers, json=data) + response = requests.put(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() def patch_imptoken( - self, - *, - token: str, - refresh_url: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, token: str, refresh_url: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "token": token, "refresh-url": refresh_url, } if self.validation: - validate_data(data, ImpTokenPatchRequest, SDMSAPIError) + validate_data(request_data, ImpTokenPatchRequest, SDMSAPIError) url = urljoin(self.base_url, self.service_path, "imptoken") - response = requests.patch(url, headers=headers, json=data) + response = requests.patch(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() @@ -983,30 +890,27 @@ def create_impersonation_token( metadata: dict | None = None, user_token: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant headers.update( { "user-token": user_token, } ) - data = { + request_data = { "resources": resources, } if metadata is not None: - data["metadata"] = metadata + request_data["metadata"] = metadata if self.validation: - validate_data(data, ImpersonationTokenRequest, SDMSAPIError) + validate_data(request_data, ImpersonationTokenRequest, SDMSAPIError) url = urljoin(self.base_url, self.service_path, "impersonation-token") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() @@ -1017,13 +921,10 @@ def refresh_impersonation_token( impersonation_token: str, impersonation_token_context: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant headers.update( { "impersonation-token": impersonation_token, @@ -1049,37 +950,34 @@ def create_new_subproject( subprojectid: str, tenantid: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if ltag is not None: headers["ltag"] = ltag - data = {} + request_data = {} if admin is not None: - data["admin"] = admin + request_data["admin"] = admin if storage_class is not None: - data["storage_class"] = storage_class + request_data["storage_class"] = storage_class if storage_location is not None: - data["storage_location"] = storage_location + request_data["storage_location"] = storage_location if access_policy is not None: - data["access_policy"] = access_policy + request_data["access_policy"] = access_policy if acls is not None: - data["acls"] = acls + request_data["acls"] = acls if self.validation: - validate_data(data, SubProjectCreateBody, SDMSAPIError) + validate_data(request_data, SubProjectCreateBody, SDMSAPIError) url = urljoin( self.base_url, self.service_path, "subproject/tenant/%s/subproject/%s" % (subprojectid, tenantid), ) - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() @@ -1091,13 +989,10 @@ def get_subproject_metadata( tenantid: str, translate_user_info: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if translate_user_info is not None: @@ -1114,18 +1009,11 @@ def get_subproject_metadata( return response.json() def delete_subproject( - self, - *, - subprojectid: str, - tenantid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, subprojectid: str, tenantid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1147,13 +1035,10 @@ def patch_subprojects_metadata( subprojectid: str, recursive: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant headers.update( { "ltag": ltag, @@ -1164,37 +1049,33 @@ def patch_subprojects_metadata( if recursive is not None: params["recursive"] = recursive - data = {} + request_data = {} if access_policy is not None: - data["access_policy"] = access_policy + request_data["access_policy"] = access_policy if acls is not None: - data["acls"] = acls + request_data["acls"] = acls if self.validation: - validate_data(data, SubProjectPatchBody, SDMSAPIError) + validate_data(request_data, SubProjectPatchBody, SDMSAPIError) url = urljoin( self.base_url, self.service_path, "subproject/tenant/%s/subproject/%s" % (tenantid, subprojectid), ) - response = requests.patch(url, headers=headers, params=params, json=data) + response = requests.patch( + url, headers=headers, params=params, json=request_data + ) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() def list_subprojects_in_tenant( - self, - *, - tenantid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, tenantid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "subproject/tenant/%s" % tenantid @@ -1212,41 +1093,32 @@ def register_tenant( default_acls: str, tenantid: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "gcpid": gcpid, "esd": esd, "default_acls": default_acls, } if self.validation: - validate_data(data, TenantCreateBody, SDMSAPIError) + validate_data(request_data, TenantCreateBody, SDMSAPIError) url = urljoin(self.base_url, self.service_path, "tenant/%s" % tenantid) - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() def get_tenant( - self, - *, - tenantid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, tenantid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "tenant/%s" % tenantid) response = requests.get(url, headers=headers) @@ -1255,17 +1127,11 @@ def get_tenant( return response.json() def get_tenant_sdpath( - self, - *, - datapartition: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, datapartition: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "datapartition": datapartition, @@ -1278,47 +1144,31 @@ def get_tenant_sdpath( return response.json() def update_user( - self, - *, - email: str, - path: str, - group: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, email: str, path: str, group: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "email": email, "path": path, "group": group, } if self.validation: - validate_data(data, UserAddRequest, SDMSAPIError) + validate_data(request_data, UserAddRequest, SDMSAPIError) url = urljoin(self.base_url, self.service_path, "user") - response = requests.put(url, headers=headers, json=data) + response = requests.put(url, headers=headers, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() - def get_user( - self, - *, - sdpath: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_user(self, *, sdpath: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "sdpath": sdpath, @@ -1331,18 +1181,11 @@ def get_user( return response.json() def delete_user( - self, - *, - email: str, - path: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, email: str, path: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "email": email, @@ -1356,17 +1199,11 @@ def delete_user( return response.json() def get_user_roles( - self, - *, - sdpath: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, sdpath: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "sdpath": sdpath, @@ -1379,18 +1216,11 @@ def get_user_roles( return response.json() def register_app( - self, - *, - email: str, - sdpath: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, email: str, sdpath: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "email": email, @@ -1403,18 +1233,10 @@ def register_app( raise SDMSAPIError(response.text, response.status_code) return response.json() - def get_app( - self, - *, - sdpath: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_app(self, *, sdpath: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "sdpath": sdpath, @@ -1427,18 +1249,11 @@ def get_app( return response.json() def set_app_trusted( - self, - *, - email: str, - sdpath: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, email: str, sdpath: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "email": email, @@ -1452,17 +1267,11 @@ def set_app_trusted( return response.json() def get_app_trusted( - self, - *, - sdpath: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, sdpath: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "sdpath": sdpath, @@ -1480,43 +1289,34 @@ def delete_all_datasets_in_subproject( filter: dict | None = None, path: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = { "path": path, } - data = {} + request_data = {} if filter is not None: - data["filter"] = filter + request_data["filter"] = filter if self.validation: - validate_data(data, DatasetBulkDeleteBody, SDMSAPIError) + validate_data(request_data, DatasetBulkDeleteBody, SDMSAPIError) url = urljoin(self.base_url, self.service_path, "operation/bulk-delete") - response = requests.put(url, headers=headers, params=params, json=data) + response = requests.put(url, headers=headers, params=params, json=request_data) if not response.ok: raise SDMSAPIError(response.text, response.status_code) return response.json() def get_operation_bulk_delete_status( - self, - *, - operation_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, operation_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "operation/bulk-delete/%s" % operation_id diff --git a/osdu_client/services/search/client.py b/osdu_client/services/search/client.py index f4f22a1..446e92a 100644 --- a/osdu_client/services/search/client.py +++ b/osdu_client/services/search/client.py @@ -31,41 +31,38 @@ def query_with_cursor( spatial_filter: dict | None = None, cursor: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "kind": kind, } if limit is not None: - data["limit"] = limit + request_data["limit"] = limit if query is not None: - data["query"] = query + request_data["query"] = query if highlighted_fields is not None: - data["highlightedFields"] = highlighted_fields + request_data["highlightedFields"] = highlighted_fields if returned_fields is not None: - data["returnedFields"] = returned_fields + request_data["returnedFields"] = returned_fields if sort is not None: - data["sort"] = sort + request_data["sort"] = sort if query_as_owner is not None: - data["queryAsOwner"] = query_as_owner + request_data["queryAsOwner"] = query_as_owner if track_total_count is not None: - data["trackTotalCount"] = track_total_count + request_data["trackTotalCount"] = track_total_count if spatial_filter is not None: - data["spatialFilter"] = spatial_filter + request_data["spatialFilter"] = spatial_filter if cursor is not None: - data["cursor"] = cursor + request_data["cursor"] = cursor if self.validation: - validate_data(data, CursorQueryRequest, SearchAPIError) + validate_data(request_data, CursorQueryRequest, SearchAPIError) url = urljoin(self.base_url, self.service_path, "query_with_cursor") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SearchAPIError(response.text, response.status_code) return response.json() @@ -85,55 +82,48 @@ def query( aggregate_by: str | None = None, offset: int | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "kind": kind, } if limit is not None: - data["limit"] = limit + request_data["limit"] = limit if query is not None: - data["query"] = query + request_data["query"] = query if highlighted_fields is not None: - data["highlightedFields"] = highlighted_fields + request_data["highlightedFields"] = highlighted_fields if returned_fields is not None: - data["returnedFields"] = returned_fields + request_data["returnedFields"] = returned_fields if sort is not None: - data["sort"] = sort + request_data["sort"] = sort if query_as_owner is not None: - data["queryAsOwner"] = query_as_owner + request_data["queryAsOwner"] = query_as_owner if track_total_count is not None: - data["trackTotalCount"] = track_total_count + request_data["trackTotalCount"] = track_total_count if spatial_filter is not None: - data["spatialFilter"] = spatial_filter + request_data["spatialFilter"] = spatial_filter if aggregate_by is not None: - data["aggregateBy"] = aggregate_by + request_data["aggregateBy"] = aggregate_by if offset is not None: - data["offset"] = offset + request_data["offset"] = offset if self.validation: - validate_data(data, QueryRequest, SearchAPIError) + validate_data(request_data, QueryRequest, SearchAPIError) url = urljoin(self.base_url, self.service_path, "query") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SearchAPIError(response.text, response.status_code) return response.json() - def get_readiness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_readiness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "readiness_check") response = requests.get(url, headers=headers) @@ -141,14 +131,10 @@ def get_readiness_check( raise SearchAPIError(response.text, response.status_code) return response.json() - def get_liveness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_liveness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "liveness_check") response = requests.get(url, headers=headers) @@ -156,14 +142,10 @@ def get_liveness_check( raise SearchAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/secret/client.py b/osdu_client/services/secret/client.py index 3012f77..638e3c3 100644 --- a/osdu_client/services/secret/client.py +++ b/osdu_client/services/secret/client.py @@ -18,17 +18,11 @@ class SecretClient(OSDUAPIClient): service_path = "/api/secret/v1" def get_secret( - self, - *, - secret_name: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, secret_name: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "secrets/%s" % secret_name) response = requests.get(url, headers=headers) @@ -46,47 +40,38 @@ def update_secret( enabled: bool | None = None, secret_name: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = {} + request_data = {} if id is not None: - data["id"] = id + request_data["id"] = id if key is not None: - data["key"] = key + request_data["key"] = key if value is not None: - data["value"] = value + request_data["value"] = value if created_at is not None: - data["createdAt"] = created_at + request_data["createdAt"] = created_at if enabled is not None: - data["enabled"] = enabled + request_data["enabled"] = enabled if self.validation: - validate_data(data, Secret, SecretAPIError) + validate_data(request_data, Secret, SecretAPIError) url = urljoin(self.base_url, self.service_path, "secrets/%s" % secret_name) - response = requests.put(url, headers=headers, json=data) + response = requests.put(url, headers=headers, json=request_data) if not response.ok: raise SecretAPIError(response.text, response.status_code) return response.json() def delete_secret( - self, - *, - secret_name: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, secret_name: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "secrets/%s" % secret_name) response = requests.delete(url, headers=headers) @@ -94,14 +79,10 @@ def delete_secret( raise SecretAPIError(response.text, response.status_code) return response.json() - def list_secrets( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def list_secrets(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "secrets") response = requests.get(url, headers=headers) @@ -118,43 +99,36 @@ def create_secrets( created_at: str | None = None, enabled: bool | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = {} + request_data = {} if id is not None: - data["id"] = id + request_data["id"] = id if key is not None: - data["key"] = key + request_data["key"] = key if value is not None: - data["value"] = value + request_data["value"] = value if created_at is not None: - data["createdAt"] = created_at + request_data["createdAt"] = created_at if enabled is not None: - data["enabled"] = enabled + request_data["enabled"] = enabled if self.validation: - validate_data(data, Secret, SecretAPIError) + validate_data(request_data, Secret, SecretAPIError) url = urljoin(self.base_url, self.service_path, "secrets") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise SecretAPIError(response.text, response.status_code) return response.json() - def create_secrets_get( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_secrets_get(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "secrets:retrieve") response = requests.post(url, headers=headers) @@ -163,17 +137,11 @@ def create_secrets_get( return response.json() def create_secrets_recover( - self, - *, - secret_name: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, secret_name: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "secrets/recover/%s" % secret_name @@ -184,17 +152,11 @@ def create_secrets_recover( return response.json() def get_secrets_deleted( - self, - *, - secret_name: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, secret_name: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "secrets/deleted/%s" % secret_name @@ -204,14 +166,10 @@ def get_secrets_deleted( raise SecretAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) @@ -219,14 +177,10 @@ def get_info( raise SecretAPIError(response.text, response.status_code) return response.json() - def get_health( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_health(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "health") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/storage/client.py b/osdu_client/services/storage/client.py index cd708e8..2971726 100644 --- a/osdu_client/services/storage/client.py +++ b/osdu_client/services/storage/client.py @@ -23,13 +23,10 @@ def update_records( x_collaboration: str | None = None, skipdupes: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration @@ -50,26 +47,23 @@ def patch_records( ops: list[dict], x_collaboration: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration - data = { + request_data = { "query": query, "ops": ops, } if self.validation: - validate_data(data, RecordBulkUpdateParam, StorageAPIError) + validate_data(request_data, RecordBulkUpdateParam, StorageAPIError) url = urljoin(self.base_url, self.service_path, "records") - response = requests.patch(url, headers=headers, json=data) + response = requests.patch(url, headers=headers, json=request_data) if not response.ok: raise StorageAPIError(response.text, response.status_code) return response.json() @@ -81,27 +75,24 @@ def update_records_copy( records: list[dict] | None = None, x_collaboration: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration - data = {} + request_data = {} if target is not None: - data["target"] = target + request_data["target"] = target if records is not None: - data["records"] = records + request_data["records"] = records if self.validation: - validate_data(data, CopyRecordReferencesModel, StorageAPIError) + validate_data(request_data, CopyRecordReferencesModel, StorageAPIError) url = urljoin(self.base_url, self.service_path, "records/copy") - response = requests.put(url, headers=headers, json=data) + response = requests.put(url, headers=headers, json=request_data) if not response.ok: raise StorageAPIError(response.text, response.status_code) return response.json() @@ -109,16 +100,13 @@ def update_records_copy( def delete_record( self, *, - x_collaboration: str | None = None, id: str, + x_collaboration: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration @@ -133,13 +121,10 @@ def create_records_delete( *, x_collaboration: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration @@ -152,18 +137,15 @@ def create_records_delete( def query_records_from_kind( self, *, + kind: str, x_collaboration: str | None = None, cursor: str | None = None, limit: str | None = None, - kind: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration @@ -188,27 +170,24 @@ def query_records( attributes: list[str] | None = None, x_collaboration: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration - data = { + request_data = { "records": records, } if attributes is not None: - data["attributes"] = attributes + request_data["attributes"] = attributes if self.validation: - validate_data(data, MultiRecordIds, StorageAPIError) + validate_data(request_data, MultiRecordIds, StorageAPIError) url = urljoin(self.base_url, self.service_path, "query/records") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise StorageAPIError(response.text, response.status_code) return response.json() @@ -217,16 +196,13 @@ def query_records_batch( self, *, records: list[str], - x_collaboration: str | None = None, frame_of_reference: str, + x_collaboration: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant headers.update( { "frame-of-reference": frame_of_reference, @@ -235,15 +211,15 @@ def query_records_batch( if x_collaboration is not None: headers["x-collaboration"] = x_collaboration - data = { + request_data = { "records": records, } if self.validation: - validate_data(data, MultiRecordRequest, StorageAPIError) + validate_data(request_data, MultiRecordRequest, StorageAPIError) url = urljoin(self.base_url, self.service_path, "query/records:batch") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise StorageAPIError(response.text, response.status_code) return response.json() @@ -251,17 +227,14 @@ def query_records_batch( def get_record( self, *, - x_collaboration: str | None = None, id: str, + x_collaboration: str | None = None, attribute: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration @@ -278,16 +251,13 @@ def get_record( def purge_record( self, *, - x_collaboration: str | None = None, id: str, + x_collaboration: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration @@ -300,18 +270,15 @@ def purge_record( def get_record_version( self, *, - x_collaboration: str | None = None, id: str, version: str, + x_collaboration: str | None = None, attribute: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration @@ -328,16 +295,13 @@ def get_record_version( def get_record_versions( self, *, - x_collaboration: str | None = None, id: str, + x_collaboration: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration @@ -347,14 +311,10 @@ def get_record_versions( raise StorageAPIError(response.text, response.status_code) return response.json() - def get_liveness_check( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_liveness_check(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "liveness_check") response = requests.get(url, headers=headers) @@ -362,14 +322,10 @@ def get_liveness_check( raise StorageAPIError(response.text, response.status_code) return response.json() - def get_info( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_info(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "info") response = requests.get(url, headers=headers) @@ -380,19 +336,16 @@ def get_info( def purge_record_versions( self, *, - x_collaboration: str | None = None, id: str, + x_collaboration: str | None = None, version_ids: str | None = None, limit: str | None = None, _form: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant if x_collaboration is not None: headers["x-collaboration"] = x_collaboration @@ -411,17 +364,11 @@ def purge_record_versions( return response.json() def get_replay_status( - self, - *, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "replay/status/%s" % id) response = requests.get(url, headers=headers) @@ -435,37 +382,30 @@ def create_replay( operation: str, filter: Union[list[str]] | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "operation": operation, } if filter is not None: - data["filter"] = filter + request_data["filter"] = filter if self.validation: - validate_data(data, ReplayRequest, StorageAPIError) + validate_data(request_data, ReplayRequest, StorageAPIError) url = urljoin(self.base_url, self.service_path, "replay") - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise StorageAPIError(response.text, response.status_code) return response.json() - def get_whoami( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_whoami(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "whoami") response = requests.get(url, headers=headers) @@ -473,14 +413,10 @@ def get_whoami( raise StorageAPIError(response.text, response.status_code) return response.json() - def update_whoami( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def update_whoami(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "whoami") response = requests.put(url, headers=headers) @@ -488,14 +424,10 @@ def update_whoami( raise StorageAPIError(response.text, response.status_code) return response.json() - def create_whoami( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_whoami(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "whoami") response = requests.post(url, headers=headers) @@ -503,14 +435,10 @@ def create_whoami( raise StorageAPIError(response.text, response.status_code) return response.json() - def delete_whoami( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def delete_whoami(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "whoami") response = requests.delete(url, headers=headers) @@ -518,14 +446,10 @@ def delete_whoami( raise StorageAPIError(response.text, response.status_code) return response.json() - def options_whoami( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def options_whoami(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "whoami") response = requests.options(url, headers=headers) @@ -533,14 +457,10 @@ def options_whoami( raise StorageAPIError(response.text, response.status_code) return response.json() - def head_whoami( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def head_whoami(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "whoami") response = requests.head(url, headers=headers) @@ -548,14 +468,10 @@ def head_whoami( raise StorageAPIError(response.text, response.status_code) return response.json() - def patch_whoami( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def patch_whoami(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "whoami") response = requests.patch(url, headers=headers) diff --git a/osdu_client/services/wellbore/common.py b/osdu_client/services/wellbore/common.py index 0a055cf..730c5e2 100644 --- a/osdu_client/services/wellbore/common.py +++ b/osdu_client/services/wellbore/common.py @@ -17,14 +17,10 @@ class WellboreAPIError(OSDUAPIError): class WellboreCommonClient(OSDUAPIClient): service_path = "" - def get_about( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_about(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "about") response = requests.get(url, headers=headers) @@ -39,13 +35,10 @@ def recognize_family( description: str | None = None, log_unit: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = { "label": label, @@ -71,13 +64,10 @@ def update_log_recognition_upload_catalog( data: dict, legal: dict, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = { "acl": acl, @@ -96,14 +86,10 @@ def update_log_recognition_upload_catalog( raise WellboreAPIError(response.text, response.status_code) return response.json() - def get_version( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def get_version(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "version") response = requests.get(url, headers=headers) diff --git a/osdu_client/services/wellbore/v2.py b/osdu_client/services/wellbore/v2.py index 49105c2..dd6b475 100644 --- a/osdu_client/services/wellbore/v2.py +++ b/osdu_client/services/wellbore/v2.py @@ -28,13 +28,10 @@ def get_alpha_logs_data( filter: str | None = None, orient: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if offset is not None: @@ -59,17 +56,11 @@ def get_alpha_logs_data( return response.json() def write_alpha_logs_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "alpha/ddms/v2/logs/%s/data" % record_id @@ -80,17 +71,11 @@ def write_alpha_logs_data( return response.json() def list_records_sessions_v2( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -111,13 +96,10 @@ def create_alpha_logs_sessions( time_to_live: int | None = "1440", record_id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = { "mode": mode, @@ -143,18 +125,11 @@ def create_alpha_logs_sessions( return response.json() def get_record_session_v2( - self, - *, - record_id: str, - session_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, session_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -173,13 +148,10 @@ def patch_alpha_logs_sessions( record_id: str, session_id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = { "state": state, @@ -199,18 +171,11 @@ def patch_alpha_logs_sessions( return response.json() def send_alpha_logs_sessions_data( - self, - *, - record_id: str, - session_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, session_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -234,13 +199,10 @@ def get_alpha_logs_versions_data( filter: str | None = None, orient: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if offset is not None: @@ -266,14 +228,10 @@ def get_alpha_logs_versions_data( raise WellboreAPIError(response.text, response.status_code) return response.json() - def create_or_update_dipset( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_dipset(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/dipsets") response = requests.post(url, headers=headers) @@ -287,13 +245,10 @@ def delete_dipset( dipsetid: str, recursive: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if recursive is not None: @@ -306,17 +261,11 @@ def delete_dipset( return response.json() def get_dipset( - self, - *, - dipsetid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, dipsetid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/dipsets/%s" % dipsetid) response = requests.get(url, headers=headers) @@ -331,13 +280,10 @@ def get_dip( index: str | None = None, limit: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if index is not None: @@ -354,17 +300,11 @@ def get_dip( return response.json() def define_dips_dipset( - self, - *, - dipsetid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, dipsetid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v2/dipsets/%s/dips" % dipsetid @@ -375,17 +315,11 @@ def define_dips_dipset( return response.json() def insert_dip_in_dipset( - self, - *, - dipsetid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, dipsetid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -405,13 +339,10 @@ def query_dip_from_dipset( max_reference: str | None = None, classification: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if min_reference is not None: @@ -430,18 +361,11 @@ def query_dip_from_dipset( return response.json() def delete_dip( - self, - *, - dipsetid: str, - index: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, dipsetid: str, index: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -454,18 +378,11 @@ def delete_dip( return response.json() def get_dip_at_index( - self, - *, - dipsetid: str, - index: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, dipsetid: str, index: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -491,13 +408,10 @@ def update_dip( dipsetid: str, index: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = { "azimuth": azimuth, @@ -529,17 +443,11 @@ def update_dip( return response.json() def get_versions_dipset( - self, - *, - dipsetid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, dipsetid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v2/dipsets/%s/versions" % dipsetid @@ -550,18 +458,11 @@ def get_versions_dipset( return response.json() def get_dipsets_versions( - self, - *, - dipsetid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, dipsetid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -573,14 +474,10 @@ def get_dipsets_versions( raise WellboreAPIError(response.text, response.status_code) return response.json() - def create_or_update_logs( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_logs(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/logs") response = requests.post(url, headers=headers) @@ -588,18 +485,10 @@ def create_or_update_logs( raise WellboreAPIError(response.text, response.status_code) return response.json() - def delete_log( - self, - *, - logid: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def delete_log(self, *, logid: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/logs/%s" % logid) response = requests.delete(url, headers=headers) @@ -607,18 +496,10 @@ def delete_log( raise WellboreAPIError(response.text, response.status_code) return response.json() - def get_log( - self, - *, - logid: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_log(self, *, logid: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/logs/%s" % logid) response = requests.get(url, headers=headers) @@ -633,13 +514,10 @@ def get_log_data( orient: str | None = None, bulk_path: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if orient is not None: @@ -660,13 +538,10 @@ def write_log_data( orient: str | None = None, bulk_path: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if orient is not None: @@ -690,13 +565,10 @@ def get_decimated_log( orient: str | None = None, bulk_path: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if quantiles is not None: @@ -724,13 +596,10 @@ def get_log_statistics( logid: str, bulk_path: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if bulk_path is not None: @@ -751,13 +620,10 @@ def upload_log_data( orient: str | None = None, bulk_path: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if orient is not None: @@ -774,17 +640,11 @@ def upload_log_data( return response.json() def get_log_versions( - self, - *, - logid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, logid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v2/logs/%s/versions" % logid @@ -795,18 +655,11 @@ def get_log_versions( return response.json() def get_log_version( - self, - *, - logid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, logid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -826,13 +679,10 @@ def get_log_version_data( orient: str | None = None, bulk_path: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if orient is not None: @@ -850,14 +700,10 @@ def get_log_version_data( raise WellboreAPIError(response.text, response.status_code) return response.json() - def create_or_update_logsets( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_logsets(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/logsets") response = requests.post(url, headers=headers) @@ -871,13 +717,10 @@ def delete_logset( logsetid: str, recursive: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if recursive is not None: @@ -890,17 +733,11 @@ def delete_logset( return response.json() def get_logset( - self, - *, - logsetid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, logsetid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/logsets/%s" % logsetid) response = requests.get(url, headers=headers) @@ -909,17 +746,11 @@ def get_logset( return response.json() def get_logset_versions( - self, - *, - logsetid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, logsetid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v2/logsets/%s/versions" % logsetid @@ -930,18 +761,11 @@ def get_logset_versions( return response.json() def get_logset_version( - self, - *, - logsetid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, logsetid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -953,14 +777,10 @@ def get_logset_version( raise WellboreAPIError(response.text, response.status_code) return response.json() - def create_or_update_marker( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_marker(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/markers") response = requests.post(url, headers=headers) @@ -969,17 +789,11 @@ def create_or_update_marker( return response.json() def delete_marker( - self, - *, - markerid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, markerid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/markers/%s" % markerid) response = requests.delete(url, headers=headers) @@ -988,17 +802,11 @@ def delete_marker( return response.json() def get_marker( - self, - *, - markerid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, markerid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/markers/%s" % markerid) response = requests.get(url, headers=headers) @@ -1007,17 +815,11 @@ def get_marker( return response.json() def get_marker_versions( - self, - *, - markerid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, markerid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v2/markers/%s/versions" % markerid @@ -1028,18 +830,11 @@ def get_marker_versions( return response.json() def get_marker_version( - self, - *, - markerid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, markerid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1052,13 +847,11 @@ def get_marker_version( return response.json() def create_or_update_trajectories( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/trajectories") response = requests.post(url, headers=headers) @@ -1067,17 +860,11 @@ def create_or_update_trajectories( return response.json() def delete_trajectory( - self, - *, - trajectoryid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, trajectoryid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v2/trajectories/%s" % trajectoryid @@ -1088,17 +875,11 @@ def delete_trajectory( return response.json() def get_trajectory( - self, - *, - trajectoryid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, trajectoryid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v2/trajectories/%s" % trajectoryid @@ -1115,13 +896,10 @@ def get_trajectory_data( channels: str | None = None, orient: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if channels is not None: @@ -1145,13 +923,10 @@ def create_trajectory_data( trajectoryid: str, orient: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if orient is not None: @@ -1168,17 +943,11 @@ def create_trajectory_data( return response.json() def get_trajectory_versions( - self, - *, - trajectoryid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, trajectoryid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1191,18 +960,11 @@ def get_trajectory_versions( return response.json() def get_trajectory_version( - self, - *, - trajectoryid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, trajectoryid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1222,13 +984,10 @@ def get_trajectory_version_data( channels: str | None = None, orient: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if channels is not None: @@ -1247,13 +1006,11 @@ def get_trajectory_version_data( return response.json() def create_or_update_wellbore_v2( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/wellbores") response = requests.post(url, headers=headers) @@ -1267,13 +1024,10 @@ def delete_wellbores( wellboreid: str, recursive: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if recursive is not None: @@ -1288,17 +1042,11 @@ def delete_wellbores( return response.json() def get_wellbores( - self, - *, - wellboreid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v2/wellbores/%s" % wellboreid @@ -1309,17 +1057,11 @@ def get_wellbores( return response.json() def get_versions_wellbore( - self, - *, - wellboreid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1332,18 +1074,11 @@ def get_versions_wellbore( return response.json() def get_wellbores_versions( - self, - *, - wellboreid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1355,14 +1090,10 @@ def get_wellbores_versions( raise WellboreAPIError(response.text, response.status_code) return response.json() - def create_or_update_well( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_well(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/wells") response = requests.post(url, headers=headers) @@ -1376,13 +1107,10 @@ def delete_well( wellid: str, recursive: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if recursive is not None: @@ -1394,18 +1122,10 @@ def delete_well( raise WellboreAPIError(response.text, response.status_code) return response.json() - def get_well_v2( - self, - *, - wellid: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_well_v2(self, *, wellid: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v2/wells/%s" % wellid) response = requests.get(url, headers=headers) @@ -1414,17 +1134,11 @@ def get_well_v2( return response.json() def get_well_versions_v2( - self, - *, - wellid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v2/wells/%s/versions" % wellid @@ -1435,18 +1149,11 @@ def get_well_versions_v2( return response.json() def get_well_version( - self, - *, - wellid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, diff --git a/osdu_client/services/wellbore/v3.py b/osdu_client/services/wellbore/v3.py index 0775550..7a25834 100644 --- a/osdu_client/services/wellbore/v3.py +++ b/osdu_client/services/wellbore/v3.py @@ -18,17 +18,11 @@ class WellboreClient(WellboreCommonClient): service_path = "" def query_alpha_query_wellbores( - self, - *, - names: str | None = None, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, names: str | None = None, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if names is not None: @@ -41,17 +35,11 @@ def query_alpha_query_wellbores( return response.json() def query_alpha_query_wellbores_wellboretrajectories( - self, - *, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -70,13 +58,10 @@ def query_alpha_query_welllogs( wellbore_id: str | None = None, mnemonics: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if names is not None: @@ -93,17 +78,11 @@ def query_alpha_query_welllogs( return response.json() def create_query_wellbore_welllogs( - self, - *, - wellbore_attribute: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_attribute: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -116,17 +95,11 @@ def create_query_wellbore_welllogs( return response.json() def create_query_wellbores_wellboremarkersets( - self, - *, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -139,17 +112,11 @@ def create_query_wellbores_wellboremarkersets( return response.json() def create_query_wellbores_welllogs( - self, - *, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -162,13 +129,11 @@ def create_query_wellbores_welllogs( return response.json() def create_or_update_wellbore_interval_set( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v3/wellboreintervalsets") response = requests.post(url, headers=headers) @@ -177,17 +142,11 @@ def create_or_update_wellbore_interval_set( return response.json() def delete_wellbore_interval_set( - self, - *, - wellboreintervalsetsid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreintervalsetsid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -200,17 +159,11 @@ def delete_wellbore_interval_set( return response.json() def get_wellbore_interval_set( - self, - *, - wellboreintervalsetsid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreintervalsetsid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -223,17 +176,11 @@ def get_wellbore_interval_set( return response.json() def get_versions_wellbore_interval_set( - self, - *, - wellboreintervalsetsid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreintervalsetsid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -251,13 +198,10 @@ def get_wellbore_interval_sets_versions( wellboreintervalsetsid: str, version: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -270,14 +214,10 @@ def get_wellbore_interval_sets_versions( raise WellboreAPIError(response.text, response.status_code) return response.json() - def create_wellbore_markerset( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_wellbore_markerset(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v3/wellboremarkersets") response = requests.post(url, headers=headers) @@ -286,17 +226,11 @@ def create_wellbore_markerset( return response.json() def delete_wellbore_markerset( - self, - *, - wellboremarkersetid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboremarkersetid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -309,17 +243,11 @@ def delete_wellbore_markerset( return response.json() def get_wellboremarkersets( - self, - *, - wellboremarkersetid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboremarkersetid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -332,17 +260,11 @@ def get_wellboremarkersets( return response.json() def get_wellboremarkerset_versions( - self, - *, - wellboremarkersetid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboremarkersetid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -360,13 +282,10 @@ def get_wellboremarkersets_versions( wellboremarkersetid: str, version: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -380,13 +299,11 @@ def get_wellboremarkersets_versions( return response.json() def create_or_update_wellbore_v3( - self, data_partition_id: str | None = None, tenant: str | None = None + self, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v3/wellbores") response = requests.post(url, headers=headers) @@ -395,17 +312,11 @@ def create_or_update_wellbore_v3( return response.json() def delete_wellbore( - self, - *, - wellboreid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v3/wellbores/%s" % wellboreid @@ -416,17 +327,11 @@ def delete_wellbore( return response.json() def get_wellbore( - self, - *, - wellboreid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v3/wellbores/%s" % wellboreid @@ -437,17 +342,11 @@ def get_wellbore( return response.json() def get_wellbore_versions( - self, - *, - wellboreid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -460,18 +359,11 @@ def get_wellbore_versions( return response.json() def get_wellbores_versions( - self, - *, - wellboreid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboreid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -483,14 +375,10 @@ def get_wellbores_versions( raise WellboreAPIError(response.text, response.status_code) return response.json() - def create_wellboretrajectories( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_wellboretrajectories(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v3/wellboretrajectories") response = requests.post(url, headers=headers) @@ -509,13 +397,10 @@ def get_wellboretrajectories_data( filter: str | None = None, orient: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if offset is not None: @@ -542,17 +427,11 @@ def get_wellboretrajectories_data( return response.json() def create_wellboretrajectories_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -565,17 +444,11 @@ def create_wellboretrajectories_data( return response.json() def list_records_sessions_v3( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -596,13 +469,10 @@ def create_wellboretrajectories_sessions( time_to_live: int | None = "1440", record_id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = { "mode": mode, @@ -628,18 +498,11 @@ def create_wellboretrajectories_sessions( return response.json() def get_record_session_v3( - self, - *, - record_id: str, - session_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, session_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -658,13 +521,10 @@ def patch_wellboretrajectories_sessions( record_id: str, session_id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = { "state": state, @@ -684,18 +544,11 @@ def patch_wellboretrajectories_sessions( return response.json() def create_wellboretrajectories_sessions_data( - self, - *, - record_id: str, - session_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, session_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -720,13 +573,10 @@ def get_returns_data_specified_version( filter: str | None = None, orient: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if offset is not None: @@ -758,13 +608,10 @@ def delete_wellboretrajectories( wellboretrajectoryid: str, purge: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if purge is not None: @@ -781,17 +628,11 @@ def delete_wellboretrajectories( return response.json() def get_wellboretrajectories( - self, - *, - wellboretrajectoryid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboretrajectoryid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -804,17 +645,11 @@ def get_wellboretrajectories( return response.json() def get_versions_wellboretrajectory( - self, - *, - wellboretrajectoryid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellboretrajectoryid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -832,13 +667,10 @@ def get_wellboretrajectories_versions( wellboretrajectoryid: str, version: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -851,14 +683,10 @@ def get_wellboretrajectories_versions( raise WellboreAPIError(response.text, response.status_code) return response.json() - def create_welllogs( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_welllogs(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v3/welllogs") response = requests.post(url, headers=headers) @@ -877,13 +705,10 @@ def get_welllogs_data( filter: str | None = None, orient: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if offset is not None: @@ -908,17 +733,11 @@ def get_welllogs_data( return response.json() def create_welllogs_data( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v3/welllogs/%s/data" % record_id @@ -934,13 +753,10 @@ def get_welllogs_data_statistics( record_id: str, curves: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if curves is not None: @@ -957,17 +773,11 @@ def get_welllogs_data_statistics( return response.json() def list_session_given_record( - self, - *, - record_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v3/welllogs/%s/sessions" % record_id @@ -986,13 +796,10 @@ def create_welllogs_sessions( time_to_live: int | None = "1440", record_id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = { "mode": mode, @@ -1016,18 +823,11 @@ def create_welllogs_sessions( return response.json() def get_session( - self, - *, - record_id: str, - session_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, session_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1046,13 +846,10 @@ def update_welllogs_sessions( record_id: str, session_id: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant request_data = { "state": state, @@ -1072,18 +869,11 @@ def update_welllogs_sessions( return response.json() def send_welllog_sessions_data( - self, - *, - record_id: str, - session_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, session_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1107,13 +897,10 @@ def get_welllog_version_data( filter: str | None = None, orient: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if offset is not None: @@ -1146,13 +933,10 @@ def get_welllog_version_data_statistics( version: str, curves: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if curves is not None: @@ -1169,18 +953,11 @@ def get_welllog_version_data_statistics( return response.json() def trigger_welllog_version_data_statistics( - self, - *, - record_id: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, record_id: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1198,13 +975,10 @@ def delete_welllog( welllogid: str, purge: str | None = None, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant params = {} if purge is not None: @@ -1219,17 +993,11 @@ def delete_welllog( return response.json() def get_welllog( - self, - *, - welllogid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, welllogid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v3/welllogs/%s" % welllogid @@ -1240,17 +1008,11 @@ def get_welllog( return response.json() def get_welllog_versions( - self, - *, - welllogid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, welllogid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v3/welllogs/%s/versions" % welllogid @@ -1261,18 +1023,11 @@ def get_welllog_versions( return response.json() def get_welllog_version( - self, - *, - welllogid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, welllogid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -1284,14 +1039,10 @@ def get_welllog_version( raise WellboreAPIError(response.text, response.status_code) return response.json() - def create_or_update_wells( - self, data_partition_id: str | None = None, tenant: str | None = None - ) -> dict: + def create_or_update_wells(self, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v3/wells") response = requests.post(url, headers=headers) @@ -1299,18 +1050,10 @@ def create_or_update_wells( raise WellboreAPIError(response.text, response.status_code) return response.json() - def delete_well( - self, - *, - wellid: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def delete_well(self, *, wellid: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v3/wells/%s" % wellid) response = requests.delete(url, headers=headers) @@ -1318,18 +1061,10 @@ def delete_well( raise WellboreAPIError(response.text, response.status_code) return response.json() - def get_well( - self, - *, - wellid: str, - data_partition_id: str | None = None, - tenant: str | None = None, - ) -> dict: + def get_well(self, *, wellid: str, data_partition_id: str | None = None) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "ddms/v3/wells/%s" % wellid) response = requests.get(url, headers=headers) @@ -1338,17 +1073,11 @@ def get_well( return response.json() def get_well_versions( - self, - *, - wellid: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellid: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "ddms/v3/wells/%s/versions" % wellid @@ -1359,18 +1088,11 @@ def get_well_versions( return response.json() def get_well_version( - self, - *, - wellid: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellid: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, diff --git a/osdu_client/services/welldelivery/client.py b/osdu_client/services/welldelivery/client.py index 3952840..3d236ef 100644 --- a/osdu_client/services/welldelivery/client.py +++ b/osdu_client/services/welldelivery/client.py @@ -15,42 +15,28 @@ class WellDeliveryClient(OSDUAPIClient): service_path = "/api/well-delivery" def create_or_update_storage( - self, - *, - entity: dict, - type: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, entity: dict, type: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant - data = { + request_data = { "Entity": entity, } url = urljoin(self.base_url, self.service_path, "storage/v1/%s" % type) - response = requests.put(url, headers=headers, json=data) + response = requests.put(url, headers=headers, json=request_data) if not response.ok: raise WellDeliveryAPIError(response.text, response.status_code) return response.json() def get_entity( - self, - *, - type: str, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, type: str, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "storage/v1/%s/%s" % (type, id)) response = requests.get(url, headers=headers) @@ -59,18 +45,11 @@ def get_entity( return response.json() def delete_entity( - self, - *, - type: str, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, type: str, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin(self.base_url, self.service_path, "storage/v1/%s/%s" % (type, id)) response = requests.delete(url, headers=headers) @@ -79,19 +58,11 @@ def delete_entity( return response.json() def get_entity_version( - self, - *, - type: str, - id: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, type: str, id: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -104,19 +75,11 @@ def get_entity_version( return response.json() def delete_storage_version( - self, - *, - type: str, - id: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, type: str, id: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -129,18 +92,11 @@ def delete_storage_version( return response.json() def get_storage_version( - self, - *, - type: str, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, type: str, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "storage/v1/%s/versions/%s" % (type, id) @@ -151,18 +107,11 @@ def get_storage_version( return response.json() def purge_entity( - self, - *, - type: str, - id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, type: str, id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "storage/v1/%s/%s:purge" % (type, id) @@ -173,17 +122,11 @@ def purge_entity( return response.json() def get_version_number_list_well_activity_program( - self, - *, - well_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -196,17 +139,11 @@ def get_version_number_list_well_activity_program( return response.json() def get_well_activity_program( - self, - *, - well_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -219,18 +156,11 @@ def get_well_activity_program( return response.json() def get_well_activity_program_version( - self, - *, - well_id: str, - wap_version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, wap_version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -243,17 +173,11 @@ def get_well_activity_program_version( return response.json() def get_well_activity_program_with_refs( - self, - *, - well_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -266,18 +190,11 @@ def get_well_activity_program_with_refs( return response.json() def get_well_activity_program_version_with_refs( - self, - *, - well_id: str, - wap_version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, wap_version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -291,17 +208,11 @@ def get_well_activity_program_version_with_refs( return response.json() def get_well_activity_programs_full_content_by_well( - self, - *, - well_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -314,17 +225,11 @@ def get_well_activity_programs_full_content_by_well( return response.json() def get_activity_plans_by_well( - self, - *, - well_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "activityPlans/v1/by_well/%s" % well_id @@ -335,17 +240,11 @@ def get_activity_plans_by_well( return response.json() def get_version_number_list_actual_well( - self, - *, - name: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, name: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -358,17 +257,11 @@ def get_version_number_list_actual_well( return response.json() def get_well_by_name_actual( - self, - *, - name: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, name: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "wells/v1/by_name/%s:actual" % name @@ -379,18 +272,11 @@ def get_well_by_name_actual( return response.json() def get_well_version_by_name_actual( - self, - *, - name: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, name: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -403,17 +289,11 @@ def get_well_version_by_name_actual( return response.json() def get_version_number_list_planned_well( - self, - *, - name: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, name: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -426,17 +306,11 @@ def get_version_number_list_planned_well( return response.json() def get_well_by_name_planned( - self, - *, - name: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, name: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "wells/v1/by_name/%s:planned" % name @@ -447,18 +321,11 @@ def get_well_by_name_planned( return response.json() def get_well_version_by_name_planned( - self, - *, - name: str, - version: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, name: str, version: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -471,17 +338,11 @@ def get_well_version_by_name_planned( return response.json() def get_version_number_list_actual_wellbore( - self, - *, - well_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -494,17 +355,11 @@ def get_version_number_list_actual_wellbore( return response.json() def get_wellbore_actual( - self, - *, - well_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, self.service_path, "wellbores/v1/by_well/%s:actual" % well_id @@ -520,13 +375,10 @@ def get_wellbore_version_actual( well_id: str, wellbore_version: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -539,17 +391,11 @@ def get_wellbore_version_actual( return response.json() def get_version_number_list_planned_wellbore( - self, - *, - well_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -562,17 +408,11 @@ def get_version_number_list_planned_wellbore( return response.json() def get_wellbore_planned( - self, - *, - well_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, well_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -590,13 +430,10 @@ def get_wellbore_version_planned( well_id: str, wellbore_version: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -609,17 +446,11 @@ def get_wellbore_version_planned( return response.json() def get_hole_sections_v1_by_wellbore( - self, - *, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -632,17 +463,11 @@ def get_hole_sections_v1_by_wellbore( return response.json() def get_bha_runs_v1_by_hole_section( - self, - *, - hole_section_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, hole_section_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -655,17 +480,11 @@ def get_bha_runs_v1_by_hole_section( return response.json() def get_bha_runs_v1_by_wellbore_actual( - self, - *, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -684,44 +503,34 @@ def query_v1_by_well_batch( content__type: str, type: str, data_partition_id: str | None = None, - tenant: str | None = None, ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant headers.update( { "Content-Type": content__type, } ) - data = { + request_data = { "well_ids": well_ids, } url = urljoin( self.base_url, self.service_path, "query/v1/by_well/%s:batch" % type ) - response = requests.post(url, headers=headers, json=data) + response = requests.post(url, headers=headers, json=request_data) if not response.ok: raise WellDeliveryAPIError(response.text, response.status_code) return response.json() def query_v1_by_wellbore_planned( - self, - *, - type: str, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, type: str, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -734,18 +543,11 @@ def query_v1_by_wellbore_planned( return response.json() def query_v1_by_wellbore_actual( - self, - *, - type: str, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, type: str, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -758,17 +560,11 @@ def query_v1_by_wellbore_actual( return response.json() def get_wellbore_fluids_programs( - self, - *, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -781,17 +577,11 @@ def get_wellbore_fluids_programs( return response.json() def get_wellbore_operations_reports( - self, - *, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -804,17 +594,11 @@ def get_wellbore_operations_reports( return response.json() def get_wellbore_operations_reports_latest( - self, - *, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -827,18 +611,11 @@ def get_wellbore_operations_reports_latest( return response.json() def get_operations_reports_by_time_range( - self, - *, - start_time: str, - end_time: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, start_time: str, end_time: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -851,17 +628,11 @@ def get_operations_reports_by_time_range( return response.json() def get_operations_reports_with_refs_by_operations_report_id( - self, - *, - operations_report_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, operations_report_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, @@ -875,17 +646,11 @@ def get_operations_reports_with_refs_by_operations_report_id( return response.json() def get_wellbore_fluids_reports( - self, - *, - wellbore_id: str, - data_partition_id: str | None = None, - tenant: str | None = None, + self, *, wellbore_id: str, data_partition_id: str | None = None ) -> dict: headers = self.auth.get_headers() if data_partition_id: headers["data-partition-id"] = data_partition_id - if tenant: - headers["tenant"] = tenant url = urljoin( self.base_url, diff --git a/pyproject.toml b/pyproject.toml index 548438e..53d2609 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "osdu-client" -version = "1.0.0" +version = "1.1.0" description = "OSDU API Client" authors = ["Michal Murawski "] readme = "README.md" diff --git a/tests/dataset/test_dataset.py b/tests/dataset/test_dataset.py index 97198df..3eff215 100644 --- a/tests/dataset/test_dataset.py +++ b/tests/dataset/test_dataset.py @@ -5,7 +5,6 @@ def test_dataset_create_or_update_dataset_registry(dataset_api_server, dataset_c dataset_client.create_or_update_dataset_registry( dataset_registries=[{"acl": {}, "data": {}}], data_partition_id="text", - tenant="text", ) @@ -13,7 +12,6 @@ def test_dataset_get_dataset_registries(dataset_api_server, dataset_client: Data dataset_client.get_dataset_registries( dataset_registry_ids=["text"], data_partition_id="text", - tenant="text", ) @@ -21,21 +19,18 @@ def test_dataset_get_dataset_registry(dataset_api_server, dataset_client: Datase dataset_client.get_dataset_registry( id="text", data_partition_id="text", - tenant="text", ) def test_dataset_get_info(dataset_api_server, dataset_client: DatasetClient): dataset_client.get_info( data_partition_id="text", - tenant="text", ) def test_dataset_get_liveness_check(dataset_api_server, dataset_client: DatasetClient): dataset_client.get_liveness_check( data_partition_id="text", - tenant="text", ) @@ -44,7 +39,6 @@ def test_dataset_get_retrieval_instructions(dataset_api_server, dataset_client: id="text", expiry_time="text", data_partition_id="text", - tenant="text", ) @@ -53,7 +47,6 @@ def test_dataset_get_retrieval_instructions_for_multiple_datasets(dataset_api_se dataset_registry_ids=["text"], expiry_time="text", data_partition_id="text", - tenant="text", ) @@ -61,7 +54,6 @@ def test_dataset_get_revoke_url(dataset_api_server, dataset_client: DatasetClien dataset_client.get_revoke_url( kind_sub_type="text", data_partition_id="text", - tenant="text", ) @@ -70,5 +62,4 @@ def test_dataset_get_storage_instructions(dataset_api_server, dataset_client: Da kind_sub_type="text", expiry_time="text", data_partition_id="text", - tenant="text", ) diff --git a/tests/entitlements/test_entitlements.py b/tests/entitlements/test_entitlements.py index 6ab2bc6..ffac0fb 100644 --- a/tests/entitlements/test_entitlements.py +++ b/tests/entitlements/test_entitlements.py @@ -6,75 +6,78 @@ def test_entitlements_add_member(entitlements_api_server, entitlements_client: E add_member_dto={}, group_email="text", data_partition_id="text", - tenant="text", ) + def test_entitlements_create_group(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.create_group( group_info_dto={}, data_partition_id="text", - tenant="text", ) + def test_entitlements_delete_group(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.delete_group( group_email="text", data_partition_id="text", - tenant="text", ) + def test_entitlements_delete_member(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.delete_member( member_email="text", data_partition_id="text", - tenant="text", ) + def test_entitlements_delete_member_from_group(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.delete_member_from_group( group_email="text", member_email="text", data_partition_id="text", - tenant="text", ) + def test_entitlements_get_count_group_members(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_count_group_members( group_email="text", role="text", data_partition_id="text", - tenant="text", ) + def test_entitlements_get_groups(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_groups( on_behalf_of="text", role_required="text", data_partition_id="text", - tenant="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", - tenant="text", + ) + def test_entitlements_get_info(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_info( data_partition_id="text", - tenant="text", + ) + def test_entitlements_get_liveness_check(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_liveness_check( data_partition_id="text", - tenant="text", + ) + def test_entitlements_get_members_groups(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_members_groups( member_email="text", @@ -82,35 +85,38 @@ def test_entitlements_get_members_groups(entitlements_api_server, entitlements_c appid="text", role_required="text", data_partition_id="text", - tenant="text", + ) + def test_entitlements_get_readiness_check(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.get_readiness_check( data_partition_id="text", - tenant="text", + ) + def test_entitlements_initiate_tenant(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.initiate_tenant( data_partition_id="text", - tenant="text", + ) + def test_entitlements_list_partition_groups(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.list_partition_groups( type="text", cursor="text", limit="text", data_partition_id="text", - tenant="text", + ) + def test_entitlements_update_groups(entitlements_api_server, entitlements_client: EntitlementsClient): entitlements_client.update_groups( update_group_request=[{}], group_email="text", data_partition_id="text", - tenant="text", - ) + ) diff --git a/tests/file/test_file.py b/tests/file/test_file.py index 6fe4564..25bade2 100644 --- a/tests/file/test_file.py +++ b/tests/file/test_file.py @@ -4,7 +4,7 @@ def test_file_copy_file_collections(file_api_server, file_client: FileClient): file_client.copy_file_collections( data_partition_id="text", - tenant="text", + ) @@ -27,7 +27,7 @@ def test_file_create_files_metadata(file_api_server, file_client: FileClient): id="text", ancestry={}, data_partition_id="text", - tenant="text", + ) @@ -35,21 +35,21 @@ def test_file_delete_files_metadata(file_api_server, file_client: FileClient): file_client.delete_files_metadata( id="text", data_partition_id="text", - tenant="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", - tenant="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", - tenant="text", + ) @@ -61,7 +61,7 @@ def test_file_get_file_list(file_api_server, file_client: FileClient): items=10, user_id="text", data_partition_id="text", - tenant="text", + ) @@ -69,7 +69,7 @@ def test_file_get_file_location(file_api_server, file_client: FileClient): file_client.get_file_location( file_id="2034ae65-552a-4c04-9e0c-e344ebe40bc7", data_partition_id="text", - tenant="text", + ) @@ -77,7 +77,7 @@ 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", - tenant="text", + ) @@ -85,21 +85,21 @@ def test_file_get_files_metadata(file_api_server, file_client: FileClient): file_client.get_files_metadata( id="text", data_partition_id="text", - tenant="text", + ) def test_file_get_files_upload_url(file_api_server, file_client: FileClient): file_client.get_files_upload_url( data_partition_id="text", - tenant="text", + ) def test_file_get_info(file_api_server, file_client: FileClient): file_client.get_info( data_partition_id="text", - tenant="text", + ) @@ -107,7 +107,7 @@ def test_file_get_location(file_api_server, file_client: FileClient): file_client.get_location( file_id="2034ae65-552a-4c04-9e0c-e344ebe40bc7", data_partition_id="text", - tenant="text", + ) @@ -116,5 +116,5 @@ def test_file_gets_url_to_download_file(file_api_server, file_client: FileClient id="text", expiry_time="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/indexer/test_indexer.py b/tests/indexer/test_indexer.py index a008752..ddd7b2a 100644 --- a/tests/indexer/test_indexer.py +++ b/tests/indexer/test_indexer.py @@ -5,31 +5,31 @@ def test_indexer_delete_index(indexer_api_server, indexer_client: IndexerClient) indexer_client.delete_index( kind="text", data_partition_id="text", - tenant="text", + ) def test_indexer_get_info(indexer_api_server, indexer_client: IndexerClient): indexer_client.get_info( data_partition_id="text", - tenant="text", + ) def test_indexer_get_liveness_check(indexer_api_server, indexer_client: IndexerClient): indexer_client.get_liveness_check( data_partition_id="text", - tenant="text", + ) def test_indexer_get_readiness_check(indexer_api_server, indexer_client: IndexerClient): indexer_client.get_readiness_check( data_partition_id="text", - tenant="text", + ) def test_indexer_provision_partition(indexer_api_server, indexer_client: IndexerClient): indexer_client.provision_partition( data_partition_id="text", - tenant="text", + ) def test_indexer_reindex_kind(indexer_api_server, indexer_client: IndexerClient): @@ -38,20 +38,20 @@ def test_indexer_reindex_kind(indexer_api_server, indexer_client: IndexerClient) cursor="text", force_clean="text", data_partition_id="text", - tenant="text", + ) def test_indexer_reindex_partition(indexer_api_server, indexer_client: IndexerClient): indexer_client.reindex_partition( force_clean="text", data_partition_id="text", - tenant="text", + ) def test_indexer_reindex_records(indexer_api_server, indexer_client: IndexerClient): indexer_client.reindex_records( record_ids=["text"], data_partition_id="text", - tenant="text", + ) diff --git a/tests/legal/test_legal.py b/tests/legal/test_legal.py index 81f7216..d5a745d 100644 --- a/tests/legal/test_legal.py +++ b/tests/legal/test_legal.py @@ -7,65 +7,65 @@ def test_legal_create_legaltag(legal_api_server, legal_client: LegalClient): description="text", properties={}, data_partition_id="text", - tenant="text", + ) def test_legal_delete_legaltag(legal_api_server, legal_client: LegalClient): legal_client.delete_legaltag( name="text", data_partition_id="text", - tenant="text", + ) def test_legal_get_batch_legaltags(legal_api_server, legal_client: LegalClient): legal_client.get_batch_legaltags( names=["text"], data_partition_id="text", - tenant="text", + ) def test_legal_get_info(legal_api_server, legal_client: LegalClient): legal_client.get_info( data_partition_id="text", - tenant="text", + ) def test_legal_get_legaltag(legal_api_server, legal_client: LegalClient): legal_client.get_legaltag( name="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_legal_get_legaltags_properties(legal_api_server, legal_client: LegalClient): legal_client.get_legaltags_properties( data_partition_id="text", - tenant="text", + ) def test_legal_get_liveness_check(legal_api_server, legal_client: LegalClient): legal_client.get_liveness_check( data_partition_id="text", - tenant="text", + ) def test_legal_get_readiness_check(legal_api_server, legal_client: LegalClient): legal_client.get_readiness_check( data_partition_id="text", - tenant="text", + ) def test_legal_list_legaltags(legal_api_server, legal_client: LegalClient): legal_client.list_legaltags( valid="text", data_partition_id="text", - tenant="text", + ) def test_legal_query_legaltags(legal_api_server, legal_client: LegalClient): @@ -77,7 +77,7 @@ def test_legal_query_legaltags(legal_api_server, legal_client: LegalClient): limit=10, valid="text", data_partition_id="text", - tenant="text", + ) def test_legal_update_legaltag(legal_api_server, legal_client: LegalClient): @@ -88,13 +88,13 @@ 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", - tenant="text", + ) def test_legal_validate_legaltags(legal_api_server, legal_client: LegalClient): legal_client.validate_legaltags( names=["text"], data_partition_id="text", - tenant="text", + ) diff --git a/tests/notification/test_notification.py b/tests/notification/test_notification.py index f6e8bf3..9690c3e 100644 --- a/tests/notification/test_notification.py +++ b/tests/notification/test_notification.py @@ -4,12 +4,12 @@ def test_notification_get_info(notification_api_server, notification_client: NotificationClient): notification_client.get_info( data_partition_id="text", - tenant="text", + ) def test_notification_record_changed(notification_api_server, notification_client: NotificationClient): notification_client.record_changed( data_partition_id="text", - tenant="text", + ) diff --git a/tests/partition/test_partition.py b/tests/partition/test_partition.py index 14c02c5..b058bd0 100644 --- a/tests/partition/test_partition.py +++ b/tests/partition/test_partition.py @@ -6,39 +6,39 @@ def test_partition_create_partitions(partition_api_server, partition_client: Par properties={}, partition_id="text", data_partition_id="text", - tenant="text", + ) def test_partition_delete_partition(partition_api_server, partition_client: PartitionClient): partition_client.delete_partition( partition_id="text", data_partition_id="text", - tenant="text", + ) def test_partition_get_info(partition_api_server, partition_client: PartitionClient): partition_client.get_info( data_partition_id="text", - tenant="text", + ) def test_partition_get_liveness_check(partition_api_server, partition_client: PartitionClient): partition_client.get_liveness_check( data_partition_id="text", - tenant="text", + ) def test_partition_get_partition(partition_api_server, partition_client: PartitionClient): partition_client.get_partition( partition_id="text", data_partition_id="text", - tenant="text", + ) def test_partition_list_partitions(partition_api_server, partition_client: PartitionClient): partition_client.list_partitions( data_partition_id="text", - tenant="text", + ) def test_partition_update_partitions(partition_api_server, partition_client: PartitionClient): @@ -46,6 +46,6 @@ def test_partition_update_partitions(partition_api_server, partition_client: Par properties={}, partition_id="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/policy/test_policy.py b/tests/policy/test_policy.py index 82de9bd..bd9676f 100644 --- a/tests/policy/test_policy.py +++ b/tests/policy/test_policy.py @@ -8,7 +8,7 @@ def test_policy_bootstrap(policy_api_server, policy_client: PolicyClient): user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_create_api_policy_v1_compile(policy_api_server, policy_client: PolicyClient): @@ -19,7 +19,7 @@ def test_policy_create_api_policy_v1_compile(policy_api_server, policy_client: P user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_create_or_update_partition_policy(policy_api_server, policy_client: PolicyClient): @@ -30,7 +30,7 @@ def test_policy_create_or_update_partition_policy(policy_api_server, policy_clie user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_delete_partition_policy(policy_api_server, policy_client: PolicyClient): @@ -41,7 +41,7 @@ def test_policy_delete_partition_policy(policy_api_server, policy_client: Policy user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_delete_tenant(policy_api_server, policy_client: PolicyClient): @@ -50,7 +50,7 @@ def test_policy_delete_tenant(policy_api_server, policy_client: PolicyClient): user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_evaluate_policy(policy_api_server, policy_client: PolicyClient): @@ -61,7 +61,7 @@ def test_policy_evaluate_policy(policy_api_server, policy_client: PolicyClient): user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_get_api_policy_v1_config(policy_api_server, policy_client: PolicyClient): @@ -70,7 +70,7 @@ 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", - tenant="text", + ) def test_policy_get_api_policy_v1_info(policy_api_server, policy_client: PolicyClient): @@ -78,7 +78,7 @@ def test_policy_get_api_policy_v1_info(policy_api_server, policy_client: PolicyC correlation_id="text", user_agent="text", data_partition_id="text", - tenant="text", + ) def test_policy_get_api_policy_v1_policies(policy_api_server, policy_client: PolicyClient): @@ -87,7 +87,7 @@ 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", - tenant="text", + ) def test_policy_get_api_policy_v1_policies_osdu_partition(policy_api_server, policy_client: PolicyClient): @@ -98,7 +98,7 @@ 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", - tenant="text", + ) def test_policy_get_backup(policy_api_server, policy_client: PolicyClient): @@ -107,7 +107,7 @@ def test_policy_get_backup(policy_api_server, policy_client: PolicyClient): user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_get_fetch_instance_policy(policy_api_server, policy_client: PolicyClient): @@ -117,7 +117,7 @@ def test_policy_get_fetch_instance_policy(policy_api_server, policy_client: Poli user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_get_fetch_policy(policy_api_server, policy_client: PolicyClient): @@ -127,7 +127,7 @@ def test_policy_get_fetch_policy(policy_api_server, policy_client: PolicyClient) user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_get_health(policy_api_server, policy_client: PolicyClient): @@ -135,7 +135,7 @@ def test_policy_get_health(policy_api_server, policy_client: PolicyClient): correlation_id="text", user_agent="text", data_partition_id="text", - tenant="text", + ) def test_policy_get_ready(policy_api_server, policy_client: PolicyClient): @@ -143,7 +143,7 @@ def test_policy_get_ready(policy_api_server, policy_client: PolicyClient): correlation_id="text", user_agent="text", data_partition_id="text", - tenant="text", + ) def test_policy_get_tenant(policy_api_server, policy_client: PolicyClient): @@ -153,7 +153,7 @@ def test_policy_get_tenant(policy_api_server, policy_client: PolicyClient): user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_home_page(policy_api_server, policy_client: PolicyClient): @@ -161,7 +161,7 @@ def test_policy_home_page(policy_api_server, policy_client: PolicyClient): correlation_id="text", user_agent="text", data_partition_id="text", - tenant="text", + ) def test_policy_translate_policy_api(policy_api_server, policy_client: PolicyClient): @@ -175,7 +175,7 @@ def test_policy_translate_policy_api(policy_api_server, policy_client: PolicyCli user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_update_tenant(policy_api_server, policy_client: PolicyClient): @@ -187,7 +187,7 @@ def test_policy_update_tenant(policy_api_server, policy_client: PolicyClient): user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) def test_policy_validate_policy(policy_api_server, policy_client: PolicyClient): @@ -198,6 +198,6 @@ def test_policy_validate_policy(policy_api_server, policy_client: PolicyClient): user_agent="text", x_user_id="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/pws/test_pws.py b/tests/pws/test_pws.py index 67819f9..1471719 100644 --- a/tests/pws/test_pws.py +++ b/tests/pws/test_pws.py @@ -5,14 +5,14 @@ def test_pws_assign_projects_lifecycleevent(pws_api_server, pws_client: PWSClien pws_client.assign_projects_lifecycleevent( id="text", data_partition_id="text", - tenant="text", + ) def test_pws_assign_projects_resources(pws_api_server, pws_client: PWSClient): pws_client.assign_projects_resources( id="text", data_partition_id="text", - tenant="text", + ) def test_pws_change_projects_status(pws_api_server, pws_client: PWSClient): @@ -20,78 +20,78 @@ def test_pws_change_projects_status(pws_api_server, pws_client: PWSClient): status="Open", id="text", data_partition_id="text", - tenant="text", + ) def test_pws_create_project(pws_api_server, pws_client: PWSClient): pws_client.create_project( data_partition_id="text", - tenant="text", + ) def test_pws_delete_projects_lifecycleevent(pws_api_server, pws_client: PWSClient): pws_client.delete_projects_lifecycleevent( id="text", data_partition_id="text", - tenant="text", + ) def test_pws_delete_projects_resources(pws_api_server, pws_client: PWSClient): pws_client.delete_projects_resources( id="text", data_partition_id="text", - tenant="text", + ) def test_pws_get_info(pws_api_server, pws_client: PWSClient): pws_client.get_info( data_partition_id="text", - tenant="text", + ) def test_pws_get_liveness_check(pws_api_server, pws_client: PWSClient): pws_client.get_liveness_check( data_partition_id="text", - tenant="text", + ) def test_pws_get_project(pws_api_server, pws_client: PWSClient): pws_client.get_project( id="text", data_partition_id="text", - tenant="text", + ) def test_pws_get_project_resources(pws_api_server, pws_client: PWSClient): pws_client.get_project_resources( id="text", data_partition_id="text", - tenant="text", + ) def test_pws_get_projects(pws_api_server, pws_client: PWSClient): pws_client.get_projects( data_partition_id="text", - tenant="text", + ) def test_pws_get_projects_lifecycleevent(pws_api_server, pws_client: PWSClient): pws_client.get_projects_lifecycleevent( id="text", data_partition_id="text", - tenant="text", + ) def test_pws_get_projects_wip_resources(pws_api_server, pws_client: PWSClient): pws_client.get_projects_wip_resources( id="text", data_partition_id="text", - tenant="text", + ) def test_pws_get_readiness_check(pws_api_server, pws_client: PWSClient): pws_client.get_readiness_check( data_partition_id="text", - tenant="text", + ) diff --git a/tests/rafs/test_rafs_v1.py b/tests/rafs/test_rafs_v1.py index d58e1d1..a16636d 100644 --- a/tests/rafs/test_rafs_v1.py +++ b/tests/rafs/test_rafs_v1.py @@ -4,157 +4,157 @@ 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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="text", + ) def test_rafs_get_cce_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -165,14 +165,14 @@ def test_rafs_get_cce_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_cce_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -180,14 +180,14 @@ def test_rafs_get_cce_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_cce_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -195,7 +195,7 @@ def test_rafs_get_cce_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_compositionalanalysis_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -206,14 +206,14 @@ def test_rafs_get_compositionalanalysis_data(rafs_api_server, rafs_client_v1: RA rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_compositionalanalysis_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -221,14 +221,14 @@ def test_rafs_get_compositionalanalysis_record_version(rafs_api_server, rafs_cli version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_compositionalanalysis_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -236,14 +236,14 @@ def test_rafs_get_compositionalanalysis_source_data(rafs_api_server, rafs_client record_id="text", version="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_cp_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -254,14 +254,14 @@ def test_rafs_get_cp_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_cp_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -269,14 +269,14 @@ def test_rafs_get_cp_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_cp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -284,7 +284,7 @@ def test_rafs_get_cp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_cvdt_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -295,14 +295,14 @@ def test_rafs_get_cvdt_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_cvdt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -310,14 +310,14 @@ def test_rafs_get_cvdt_record_version(rafs_api_server, rafs_client_v1: RAFSClien version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_cvdt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -325,7 +325,7 @@ def test_rafs_get_cvdt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_difflib_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -336,14 +336,14 @@ def test_rafs_get_difflib_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_difflib_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -351,14 +351,14 @@ def test_rafs_get_difflib_record_version(rafs_api_server, rafs_client_v1: RAFSCl version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_difflib_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -366,7 +366,7 @@ def test_rafs_get_difflib_source_data(rafs_api_server, rafs_client_v1: RAFSClien record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_ep_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -377,14 +377,14 @@ def test_rafs_get_ep_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_ep_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -392,14 +392,14 @@ def test_rafs_get_ep_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_ep_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -407,7 +407,7 @@ def test_rafs_get_ep_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_et_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -418,14 +418,14 @@ def test_rafs_get_et_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_et_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -433,14 +433,14 @@ def test_rafs_get_et_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_et_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -448,7 +448,7 @@ def test_rafs_get_et_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_fri_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -459,14 +459,14 @@ def test_rafs_get_fri_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_fri_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -474,14 +474,14 @@ def test_rafs_get_fri_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_fri_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -489,7 +489,7 @@ def test_rafs_get_fri_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_ft_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -500,14 +500,14 @@ def test_rafs_get_ft_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_ft_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -515,14 +515,14 @@ def test_rafs_get_ft_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_ft_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -530,13 +530,13 @@ def test_rafs_get_ft_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_info(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_info( data_partition_id="text", - tenant="text", + ) def test_rafs_get_itt_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -547,14 +547,14 @@ def test_rafs_get_itt_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_itt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -562,14 +562,14 @@ def test_rafs_get_itt_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_itt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -577,7 +577,7 @@ def test_rafs_get_itt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_mcmt_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -588,14 +588,14 @@ def test_rafs_get_mcmt_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_mcmt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -603,14 +603,14 @@ def test_rafs_get_mcmt_record_version(rafs_api_server, rafs_client_v1: RAFSClien version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_mcmt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -618,13 +618,13 @@ def test_rafs_get_mcmt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_metrics(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.get_metrics( data_partition_id="text", - tenant="text", + ) def test_rafs_get_multistageseparatortests_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -635,14 +635,14 @@ def test_rafs_get_multistageseparatortests_data(rafs_api_server, rafs_client_v1: rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_multistageseparatortests_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -650,14 +650,14 @@ def test_rafs_get_multistageseparatortests_record_version(rafs_api_server, rafs_ version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_multistageseparatortests_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -665,7 +665,7 @@ def test_rafs_get_multistageseparatortests_source_data(rafs_api_server, rafs_cli record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_physchem_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -676,14 +676,14 @@ def test_rafs_get_physchem_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_physchem_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -691,7 +691,7 @@ def test_rafs_get_physchem_record_version(rafs_api_server, rafs_client_v1: RAFSC version="text", record_id="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_physchem_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -699,14 +699,14 @@ def test_rafs_get_physchem_source_data(rafs_api_server, rafs_client_v1: RAFSClie record_id="text", version="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_pvt_record_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -714,7 +714,7 @@ def test_rafs_get_pvt_record_source_data(rafs_api_server, rafs_client_v1: RAFSCl record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_pvt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -722,14 +722,14 @@ def test_rafs_get_pvt_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_rc_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -740,14 +740,14 @@ def test_rafs_get_rc_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_rc_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -755,7 +755,7 @@ def test_rafs_get_rc_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_rc_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -763,7 +763,7 @@ def test_rafs_get_rc_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_record_coring_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -771,28 +771,28 @@ def test_rafs_get_record_coring_version(rafs_api_server, rafs_client_v1: RAFSCli version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="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", - tenant="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", - tenant="text", + ) def test_rafs_get_record_rock_sample_analysis_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -800,35 +800,35 @@ def test_rafs_get_record_rock_sample_analysis_version(rafs_api_server, rafs_clie version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="text", + ) def test_rafs_get_rock_sample_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -839,14 +839,14 @@ def test_rafs_get_rock_sample_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_rock_sample_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -854,14 +854,14 @@ def test_rafs_get_rock_sample_record_version(rafs_api_server, rafs_client_v1: RA version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_rock_sample_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -869,7 +869,7 @@ def test_rafs_get_rock_sample_source_data(rafs_api_server, rafs_client_v1: RAFSC record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_rp_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -880,14 +880,14 @@ def test_rafs_get_rp_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_rp_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -895,14 +895,14 @@ def test_rafs_get_rp_record_version(rafs_api_server, rafs_client_v1: RAFSClient) version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_rp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -910,14 +910,14 @@ def test_rafs_get_rp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_sar_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -925,7 +925,7 @@ def test_rafs_get_sar_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_sar_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -933,7 +933,7 @@ def test_rafs_get_sar_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_stoat_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -944,14 +944,14 @@ def test_rafs_get_stoat_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_stoat_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -959,7 +959,7 @@ def test_rafs_get_stoat_record_version(rafs_api_server, rafs_client_v1: RAFSClie version="text", record_id="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_stoat_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -967,7 +967,7 @@ def test_rafs_get_stoat_source_data(rafs_api_server, rafs_client_v1: RAFSClient) record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_stt_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -978,14 +978,14 @@ def test_rafs_get_stt_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_stt_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -993,14 +993,14 @@ def test_rafs_get_stt_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_stt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1008,7 +1008,7 @@ def test_rafs_get_stt_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_swellingtests_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1019,14 +1019,14 @@ def test_rafs_get_swellingtests_data(rafs_api_server, rafs_client_v1: RAFSClient rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_swellingtests_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1034,14 +1034,14 @@ def test_rafs_get_swellingtests_record_version(rafs_api_server, rafs_client_v1: version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_swellingtests_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1049,7 +1049,7 @@ def test_rafs_get_swellingtests_source_data(rafs_api_server, rafs_client_v1: RAF record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_transporttest_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1060,14 +1060,14 @@ def test_rafs_get_transporttest_data(rafs_api_server, rafs_client_v1: RAFSClient rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_transporttest_record_specific_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1075,14 +1075,14 @@ def test_rafs_get_transporttest_record_specific_version(rafs_api_server, rafs_cl version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_transporttest_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1090,7 +1090,7 @@ def test_rafs_get_transporttest_source_data(rafs_api_server, rafs_client_v1: RAF record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_vlet_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1101,14 +1101,14 @@ def test_rafs_get_vlet_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_vlet_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1116,14 +1116,14 @@ def test_rafs_get_vlet_record_version(rafs_api_server, rafs_client_v1: RAFSClien version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_vlet_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1131,7 +1131,7 @@ def test_rafs_get_vlet_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_wat_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1142,14 +1142,14 @@ def test_rafs_get_wat_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_wat_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1157,14 +1157,14 @@ def test_rafs_get_wat_record_version(rafs_api_server, rafs_client_v1: RAFSClient version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_wat_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1172,7 +1172,7 @@ def test_rafs_get_wat_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_get_wgrp_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1183,14 +1183,14 @@ def test_rafs_get_wgrp_data(rafs_api_server, rafs_client_v1: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_wgrp_record_version(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1198,14 +1198,14 @@ def test_rafs_get_wgrp_record_version(rafs_api_server, rafs_client_v1: RAFSClien version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_wgrp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): @@ -1213,362 +1213,362 @@ def test_rafs_get_wgrp_source_data(rafs_api_server, rafs_client_v1: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_post_multistageseparatortests_records(rafs_api_server, rafs_client_v1: RAFSClient): rafs_client_v1.post_multistageseparatortests_records( data_partition_id="text", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="text", + ) diff --git a/tests/rafs/test_rafs_v2.py b/tests/rafs/test_rafs_v2.py index 0db0884..7e83e94 100644 --- a/tests/rafs/test_rafs_v2.py +++ b/tests/rafs/test_rafs_v2.py @@ -4,38 +4,38 @@ 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", - tenant="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", - tenant="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", - tenant="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", - tenant="text", + ) def test_rafs_get_info(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_info( data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_masterdata_record_version(rafs_api_server, rafs_client_v2: RAFSClient): @@ -43,20 +43,20 @@ def test_rafs_get_masterdata_record_version(rafs_api_server, rafs_client_v2: RAF version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_metrics(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_metrics( data_partition_id="text", - tenant="text", + ) def test_rafs_get_pvt_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -68,14 +68,14 @@ def test_rafs_get_pvt_data(rafs_api_server, rafs_client_v2: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_pvt_record_version(rafs_api_server, rafs_client_v2: RAFSClient): @@ -83,21 +83,21 @@ def test_rafs_get_pvt_record_version(rafs_api_server, rafs_client_v2: RAFSClient version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="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", - tenant="text", + ) def test_rafs_get_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -109,14 +109,14 @@ def test_rafs_get_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_sa_record_version(rafs_api_server, rafs_client_v2: RAFSClient): @@ -124,27 +124,27 @@ def test_rafs_get_sa_record_version(rafs_api_server, rafs_client_v2: RAFSClient) version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_sa_types(rafs_api_server, rafs_client_v2: RAFSClient): rafs_client_v2.get_sa_types( data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_sar_record_specific_version(rafs_api_server, rafs_client_v2: RAFSClient): @@ -152,14 +152,14 @@ def test_rafs_get_sar_record_specific_version(rafs_api_server, rafs_client_v2: R version="text", record_id="text", data_partition_id="text", - tenant="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", - tenant="text", + ) def test_rafs_get_sar_source_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -167,7 +167,7 @@ def test_rafs_get_sar_source_data(rafs_api_server, rafs_client_v2: RAFSClient): record_id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_rafs_query_sa(rafs_api_server, rafs_client_v2: RAFSClient): @@ -177,7 +177,7 @@ def test_rafs_query_sa(rafs_api_server, rafs_client_v2: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="text", + ) def test_rafs_search_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -187,35 +187,35 @@ def test_rafs_search_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): rows_filter="text", columns_aggregation="text", data_partition_id="text", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="text", + ) def test_rafs_upload_pvt_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -223,7 +223,7 @@ def test_rafs_upload_pvt_data(rafs_api_server, rafs_client_v2: RAFSClient): record_id="text", analysis_type="text", data_partition_id="text", - tenant="text", + ) def test_rafs_upload_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): @@ -231,6 +231,6 @@ def test_rafs_upload_sa_data(rafs_api_server, rafs_client_v2: RAFSClient): record_id="text", analysis_type="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/register/test_register.py b/tests/register/test_register.py index 4d1ee38..2a299e6 100644 --- a/tests/register/test_register.py +++ b/tests/register/test_register.py @@ -11,7 +11,7 @@ def test_register_create_action(register_api_server, register_client: RegisterCl url="https://example.url", filter={}, data_partition_id="text", - tenant="text", + ) def test_register_create_action_get(register_api_server, register_client: RegisterClient): @@ -22,7 +22,7 @@ def test_register_create_action_get(register_api_server, register_client: Regist legal={}, data={}, data_partition_id="text", - tenant="text", + ) def test_register_create_action_test(register_api_server, register_client: RegisterClient): @@ -30,7 +30,7 @@ def test_register_create_action_test(register_api_server, register_client: Regis action={}, test_payload={}, data_partition_id="text", - tenant="text", + ) def test_register_create_ddms(register_api_server, register_client: RegisterClient): @@ -43,7 +43,7 @@ def test_register_create_ddms(register_api_server, register_client: RegisterClie "schema": {} }], data_partition_id="text", - tenant="text", + ) def test_register_create_subscription(register_api_server, register_client: RegisterClient): @@ -54,35 +54,35 @@ def test_register_create_subscription(register_api_server, register_client: Regi push_endpoint="text", secret={}, data_partition_id="text", - tenant="text", + ) def test_register_delete_action(register_api_server, register_client: RegisterClient): register_client.delete_action( id="text", data_partition_id="text", - tenant="text", + ) def test_register_delete_ddms(register_api_server, register_client: RegisterClient): register_client.delete_ddms( id="text", data_partition_id="text", - tenant="text", + ) def test_register_delete_subscription(register_api_server, register_client: RegisterClient): register_client.delete_subscription( id="text", data_partition_id="text", - tenant="text", + ) def test_register_get_action(register_api_server, register_client: RegisterClient): register_client.get_action( id="text", data_partition_id="text", - tenant="text", + ) def test_register_get_d(register_api_server, register_client: RegisterClient): @@ -91,40 +91,40 @@ def test_register_get_d(register_api_server, register_client: RegisterClient): type="text", localid="text", data_partition_id="text", - tenant="text", + ) def test_register_get_ddms(register_api_server, register_client: RegisterClient): register_client.get_ddms( id="text", data_partition_id="text", - tenant="text", + ) def test_register_get_info(register_api_server, register_client: RegisterClient): register_client.get_info( data_partition_id="text", - tenant="text", + ) def test_register_get_subscription(register_api_server, register_client: RegisterClient): register_client.get_subscription( id="text", data_partition_id="text", - tenant="text", + ) def test_register_get_topics(register_api_server, register_client: RegisterClient): register_client.get_topics( data_partition_id="text", - tenant="text", + ) def test_register_query_ddms(register_api_server, register_client: RegisterClient): register_client.query_ddms( type="text", data_partition_id="text", - tenant="text", + ) def test_register_update_subscription_secret(register_api_server, register_client: RegisterClient): @@ -133,6 +133,6 @@ def test_register_update_subscription_secret(register_api_server, register_clien value={}, id="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/schema/test_schema.py b/tests/schema/test_schema.py index 7dca3c5..531aebe 100644 --- a/tests/schema/test_schema.py +++ b/tests/schema/test_schema.py @@ -16,21 +16,21 @@ def test_schema_create_schema(schema_api_server, schema_client: SchemaClient): }, schema={}, data_partition_id="text", - tenant="text", + ) def test_schema_get_info(schema_api_server, schema_client: SchemaClient): schema_client.get_info( data_partition_id="text", - tenant="text", + ) def test_schema_get_liveness_check(schema_api_server, schema_client: SchemaClient): schema_client.get_liveness_check( data_partition_id="text", - tenant="text", + ) @@ -38,7 +38,7 @@ def test_schema_get_schema(schema_api_server, schema_client: SchemaClient): schema_client.get_schema( id="text", data_partition_id="text", - tenant="text", + ) @@ -56,7 +56,7 @@ def test_schema_search_schemas(schema_api_server, schema_client: SchemaClient): limit="text", offset="text", data_partition_id="text", - tenant="text", + ) @@ -75,12 +75,12 @@ def test_schema_update_schema(schema_api_server, schema_client: SchemaClient): }, schema={}, data_partition_id="text", - tenant="text", + ) -def test_schema_update_schemas_system(schema_api_server, schema_client: SchemaClient): - schema_client.update_schemas_system( +def test_schema_create_or_update_schema_system(schema_api_server, schema_client: SchemaClient): + schema_client.create_or_update_schema_system( schema_info={ "schemaIdentity": { "source": "source", @@ -94,5 +94,5 @@ def test_schema_update_schemas_system(schema_api_server, schema_client: SchemaCl }, schema={}, data_partition_id="text", - tenant="text", + ) diff --git a/tests/sdms/test_sdms.py b/tests/sdms/test_sdms.py index 7184965..bdca0bf 100644 --- a/tests/sdms/test_sdms.py +++ b/tests/sdms/test_sdms.py @@ -11,7 +11,7 @@ def test_sdms_acquire_lock_for_dataset(sdms_api_server, sdms_client: SDMSClient) openmode="text", wid="text", data_partition_id="text", - tenant="text", + ) @@ -22,7 +22,7 @@ def test_sdms_check_datasets_list(sdms_api_server, sdms_client: SDMSClient): tenantid="text", subprojectid="text", data_partition_id="text", - tenant="text", + ) @@ -34,7 +34,7 @@ def test_sdms_compute_and_get_size_dataset(sdms_api_server, sdms_client: SDMSCli datasetid="text", path="text", data_partition_id="text", - tenant="text", + ) @@ -45,7 +45,7 @@ def test_sdms_copy_dataset(sdms_api_server, sdms_client: SDMSClient): sdpath_to="text", lock="text", data_partition_id="text", - tenant="text", + ) @@ -55,7 +55,7 @@ def test_sdms_create_impersonation_token(sdms_api_server, sdms_client: SDMSClien metadata={}, user_token="text", data_partition_id="text", - tenant="text", + ) @@ -65,7 +65,7 @@ def test_sdms_create_imptoken(sdms_api_server, sdms_client: SDMSClient): resources=[dict(resource="example-resource")], refresh_url="text", data_partition_id="text", - tenant="text", + ) @@ -80,7 +80,7 @@ def test_sdms_create_new_subproject(sdms_api_server, sdms_client: SDMSClient): subprojectid="text", tenantid="text", data_partition_id="text", - tenant="text", + ) @@ -89,7 +89,7 @@ def test_sdms_delete_all_datasets_in_subproject(sdms_api_server, sdms_client: SD filter={}, path="text", data_partition_id="text", - tenant="text", + ) @@ -101,7 +101,7 @@ def test_sdms_delete_dataset(sdms_api_server, sdms_client: SDMSClient): path="text", datasetid="text", data_partition_id="text", - tenant="text", + ) @@ -110,7 +110,7 @@ def test_sdms_delete_subproject(sdms_api_server, sdms_client: SDMSClient): subprojectid="text", tenantid="text", data_partition_id="text", - tenant="text", + ) @@ -119,7 +119,7 @@ def test_sdms_delete_user(sdms_api_server, sdms_client: SDMSClient): email="text", path="text", data_partition_id="text", - tenant="text", + ) @@ -127,7 +127,7 @@ def test_sdms_get_app(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_app( sdpath="text", data_partition_id="text", - tenant="text", + ) @@ -135,7 +135,7 @@ def test_sdms_get_app_trusted(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_app_trusted( sdpath="text", data_partition_id="text", - tenant="text", + ) @@ -146,7 +146,7 @@ def test_sdms_get_content_list(sdms_api_server, sdms_client: SDMSClient): subprojectid="text", path="text", data_partition_id="text", - tenant="text", + ) @@ -161,7 +161,7 @@ def test_sdms_get_dataset(sdms_api_server, sdms_client: SDMSClient): translate_user_info="text", record_version="text", data_partition_id="text", - tenant="text", + ) @@ -173,7 +173,7 @@ def test_sdms_get_dataset_access_permissions(sdms_api_server, sdms_client: SDMSC path="text", datasetid="text", data_partition_id="text", - tenant="text", + ) @@ -185,7 +185,7 @@ def test_sdms_get_datasets_sizes(sdms_api_server, sdms_client: SDMSClient): datasetid="text", path="text", data_partition_id="text", - tenant="text", + ) @@ -194,7 +194,7 @@ def test_sdms_get_download_connection_credentials_string(sdms_api_server, sdms_c impersonation_token_context="text", sdpath="text", data_partition_id="text", - tenant="text", + ) @@ -204,14 +204,14 @@ def test_sdms_get_gcs_access_token(sdms_api_server, sdms_client: SDMSClient): sdpath="text", readonly="text", data_partition_id="text", - tenant="text", + ) def test_sdms_get_info(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_info( data_partition_id="text", - tenant="text", + ) @@ -219,7 +219,7 @@ def test_sdms_get_operation_bulk_delete_status(sdms_api_server, sdms_client: SDM sdms_client.get_operation_bulk_delete_status( operation_id="text", data_partition_id="text", - tenant="text", + ) @@ -229,21 +229,21 @@ def test_sdms_get_subproject_metadata(sdms_api_server, sdms_client: SDMSClient): tenantid="text", translate_user_info="text", data_partition_id="text", - tenant="text", + ) def test_sdms_get_svcstatus(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_svcstatus( data_partition_id="text", - tenant="text", + ) def test_sdms_get_svcstatus_access(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_svcstatus_access( data_partition_id="text", - tenant="text", + ) @@ -251,7 +251,7 @@ def test_sdms_get_tenant(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_tenant( tenantid="text", data_partition_id="text", - tenant="text", + ) @@ -259,7 +259,7 @@ def test_sdms_get_tenant_sdpath(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_tenant_sdpath( datapartition="text", data_partition_id="text", - tenant="text", + ) @@ -268,7 +268,7 @@ def test_sdms_get_upload_connection_credential_string(sdms_api_server, sdms_clie impersonation_token_context="text", sdpath="text", data_partition_id="text", - tenant="text", + ) @@ -276,7 +276,7 @@ def test_sdms_get_user(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_user( sdpath="text", data_partition_id="text", - tenant="text", + ) @@ -284,7 +284,7 @@ def test_sdms_get_user_roles(sdms_api_server, sdms_client: SDMSClient): sdms_client.get_user_roles( sdpath="text", data_partition_id="text", - tenant="text", + ) @@ -301,7 +301,7 @@ def test_sdms_list_datasets_in_subproject(sdms_api_server, sdms_client: SDMSClie subprojectid="text", translate_user_info="text", data_partition_id="text", - tenant="text", + ) @@ -312,14 +312,14 @@ def test_sdms_list_datasets_sizes(sdms_api_server, sdms_client: SDMSClient): tenantid="text", subprojectid="text", data_partition_id="text", - tenant="text", + ) def test_sdms_list_storage_tiers(sdms_api_server, sdms_client: SDMSClient): sdms_client.list_storage_tiers( data_partition_id="text", - tenant="text", + ) @@ -327,7 +327,7 @@ def test_sdms_list_subprojects_in_tenant(sdms_api_server, sdms_client: SDMSClien sdms_client.list_subprojects_in_tenant( tenantid="text", data_partition_id="text", - tenant="text", + ) @@ -339,7 +339,7 @@ def test_sdms_ls(sdms_api_server, sdms_client: SDMSClient): limit="text", cursor="text", data_partition_id="text", - tenant="text", + ) @@ -351,7 +351,7 @@ def test_sdms_ls_post(sdms_api_server, sdms_client: SDMSClient): cursor="text", impersonation_token_context="text", data_partition_id="text", - tenant="text", + ) @@ -376,7 +376,7 @@ def test_sdms_patch_dataset_metadata(sdms_api_server, sdms_client: SDMSClient): datasetid="text", close="text", data_partition_id="text", - tenant="text", + ) @@ -385,7 +385,7 @@ def test_sdms_patch_imptoken(sdms_api_server, sdms_client: SDMSClient): token="text", refresh_url="text", data_partition_id="text", - tenant="text", + ) @@ -398,7 +398,7 @@ def test_sdms_patch_subprojects_metadata(sdms_api_server, sdms_client: SDMSClien subprojectid="text", recursive="text", data_partition_id="text", - tenant="text", + ) @@ -407,7 +407,7 @@ def test_sdms_refresh_impersonation_token(sdms_api_server, sdms_client: SDMSClie impersonation_token="text", impersonation_token_context="text", data_partition_id="text", - tenant="text", + ) @@ -415,7 +415,7 @@ def test_sdms_refresh_imptoken(sdms_api_server, sdms_client: SDMSClient): sdms_client.refresh_imptoken( token="text", data_partition_id="text", - tenant="text", + ) @@ -424,7 +424,7 @@ def test_sdms_register_app(sdms_api_server, sdms_client: SDMSClient): email="text", sdpath="text", data_partition_id="text", - tenant="text", + ) @@ -443,7 +443,7 @@ def test_sdms_register_new_dataset(sdms_api_server, sdms_client: SDMSClient): path="text", datasetid="text", data_partition_id="text", - tenant="text", + ) @@ -454,7 +454,7 @@ def test_sdms_register_tenant(sdms_api_server, sdms_client: SDMSClient): default_acls="text", tenantid="text", data_partition_id="text", - tenant="text", + ) @@ -466,7 +466,7 @@ def test_sdms_remove_lock_associated_with_dataset(sdms_api_server, sdms_client: path="text", datasetid="text", data_partition_id="text", - tenant="text", + ) @@ -475,7 +475,7 @@ def test_sdms_set_app_trusted(sdms_api_server, sdms_client: SDMSClient): email="text", sdpath="text", data_partition_id="text", - tenant="text", + ) @@ -485,7 +485,7 @@ def test_sdms_update_user(sdms_api_server, sdms_client: SDMSClient): path="text", group="viewer", data_partition_id="text", - tenant="text", + ) @@ -498,7 +498,7 @@ def test_sdms_upsert_tags_to_dataset(sdms_api_server, sdms_client: SDMSClient): datasetid="text", gtag="text", data_partition_id="text", - tenant="text", + ) @@ -511,5 +511,5 @@ def test_sdms_validate_ctag(sdms_api_server, sdms_client: SDMSClient): datasetid="text", ctag="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/search/test_search.py b/tests/search/test_search.py index e9a2eeb..5e37f86 100644 --- a/tests/search/test_search.py +++ b/tests/search/test_search.py @@ -4,19 +4,19 @@ def test_search_get_info(search_api_server, search_client: SearchClient): search_client.get_info( data_partition_id="text", - tenant="text", + ) def test_search_get_liveness_check(search_api_server, search_client: SearchClient): search_client.get_liveness_check( data_partition_id="text", - tenant="text", + ) def test_search_get_readiness_check(search_api_server, search_client: SearchClient): search_client.get_readiness_check( data_partition_id="text", - tenant="text", + ) def test_search_query(search_api_server, search_client: SearchClient): @@ -35,7 +35,7 @@ def test_search_query(search_api_server, search_client: SearchClient): aggregate_by="text", offset=10, data_partition_id="text", - tenant="text", + ) def test_search_query_with_cursor(search_api_server, search_client: SearchClient): @@ -53,6 +53,6 @@ def test_search_query_with_cursor(search_api_server, search_client: SearchClient }, cursor="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/secret/test_secret.py b/tests/secret/test_secret.py index 04b4536..5531f1f 100644 --- a/tests/secret/test_secret.py +++ b/tests/secret/test_secret.py @@ -9,59 +9,59 @@ def test_secret_create_secrets(secret_api_server, secret_client: SecretClient): created_at="2024-01-01T00:00:00+00:00", enabled=False, data_partition_id="text", - tenant="text", + ) def test_secret_create_secrets_get(secret_api_server, secret_client: SecretClient): secret_client.create_secrets_get( data_partition_id="text", - tenant="text", + ) def test_secret_create_secrets_recover(secret_api_server, secret_client: SecretClient): secret_client.create_secrets_recover( secret_name="text", data_partition_id="text", - tenant="text", + ) def test_secret_delete_secret(secret_api_server, secret_client: SecretClient): secret_client.delete_secret( secret_name="text", data_partition_id="text", - tenant="text", + ) def test_secret_get_health(secret_api_server, secret_client: SecretClient): secret_client.get_health( data_partition_id="text", - tenant="text", + ) def test_secret_get_info(secret_api_server, secret_client: SecretClient): secret_client.get_info( data_partition_id="text", - tenant="text", + ) def test_secret_get_secret(secret_api_server, secret_client: SecretClient): secret_client.get_secret( secret_name="text", data_partition_id="text", - tenant="text", + ) def test_secret_get_secrets_deleted(secret_api_server, secret_client: SecretClient): secret_client.get_secrets_deleted( secret_name="text", data_partition_id="text", - tenant="text", + ) def test_secret_list_secrets(secret_api_server, secret_client: SecretClient): secret_client.list_secrets( data_partition_id="text", - tenant="text", + ) def test_secret_update_secret(secret_api_server, secret_client: SecretClient): @@ -73,6 +73,6 @@ def test_secret_update_secret(secret_api_server, secret_client: SecretClient): enabled=False, secret_name="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/storage/test_storage.py b/tests/storage/test_storage.py index d6885d3..73d9493 100644 --- a/tests/storage/test_storage.py +++ b/tests/storage/test_storage.py @@ -5,7 +5,7 @@ def test_storage_create_records_delete(storage_api_server, storage_client: Stora storage_client.create_records_delete( x_collaboration="text", data_partition_id="text", - tenant="text", + ) def test_storage_create_replay(storage_api_server, storage_client: StorageClient): @@ -13,13 +13,13 @@ def test_storage_create_replay(storage_api_server, storage_client: StorageClient operation="text", filter=[], data_partition_id="text", - tenant="text", + ) def test_storage_create_whoami(storage_api_server, storage_client: StorageClient): storage_client.create_whoami( data_partition_id="text", - tenant="text", + ) def test_storage_delete_record(storage_api_server, storage_client: StorageClient): @@ -27,25 +27,25 @@ def test_storage_delete_record(storage_api_server, storage_client: StorageClient x_collaboration="text", id="text", data_partition_id="text", - tenant="text", + ) def test_storage_delete_whoami(storage_api_server, storage_client: StorageClient): storage_client.delete_whoami( data_partition_id="text", - tenant="text", + ) def test_storage_get_info(storage_api_server, storage_client: StorageClient): storage_client.get_info( data_partition_id="text", - tenant="text", + ) def test_storage_get_liveness_check(storage_api_server, storage_client: StorageClient): storage_client.get_liveness_check( data_partition_id="text", - tenant="text", + ) def test_storage_get_record(storage_api_server, storage_client: StorageClient): @@ -54,7 +54,7 @@ def test_storage_get_record(storage_api_server, storage_client: StorageClient): id="text", attribute="text", data_partition_id="text", - tenant="text", + ) def test_storage_get_record_version(storage_api_server, storage_client: StorageClient): @@ -64,7 +64,7 @@ def test_storage_get_record_version(storage_api_server, storage_client: StorageC version="text", attribute="text", data_partition_id="text", - tenant="text", + ) def test_storage_get_record_versions(storage_api_server, storage_client: StorageClient): @@ -72,32 +72,32 @@ def test_storage_get_record_versions(storage_api_server, storage_client: Storage x_collaboration="text", id="text", data_partition_id="text", - tenant="text", + ) def test_storage_get_replay_status(storage_api_server, storage_client: StorageClient): storage_client.get_replay_status( id="text", data_partition_id="text", - tenant="text", + ) def test_storage_get_whoami(storage_api_server, storage_client: StorageClient): storage_client.get_whoami( data_partition_id="text", - tenant="text", + ) def test_storage_head_whoami(storage_api_server, storage_client: StorageClient): storage_client.head_whoami( data_partition_id="text", - tenant="text", + ) def test_storage_options_whoami(storage_api_server, storage_client: StorageClient): storage_client.options_whoami( data_partition_id="text", - tenant="text", + ) def test_storage_patch_records(storage_api_server, storage_client: StorageClient): @@ -108,13 +108,13 @@ def test_storage_patch_records(storage_api_server, storage_client: StorageClient ops=[{"value": []}], x_collaboration="text", data_partition_id="text", - tenant="text", + ) def test_storage_patch_whoami(storage_api_server, storage_client: StorageClient): storage_client.patch_whoami( data_partition_id="text", - tenant="text", + ) def test_storage_purge_record(storage_api_server, storage_client: StorageClient): @@ -122,7 +122,7 @@ def test_storage_purge_record(storage_api_server, storage_client: StorageClient) x_collaboration="text", id="text", data_partition_id="text", - tenant="text", + ) def test_storage_purge_record_versions(storage_api_server, storage_client: StorageClient): @@ -133,7 +133,7 @@ def test_storage_purge_record_versions(storage_api_server, storage_client: Stora limit="text", _form="text", data_partition_id="text", - tenant="text", + ) def test_storage_query_records(storage_api_server, storage_client: StorageClient): @@ -142,7 +142,7 @@ def test_storage_query_records(storage_api_server, storage_client: StorageClient attributes=["text"], x_collaboration="text", data_partition_id="text", - tenant="text", + ) def test_storage_query_records_batch(storage_api_server, storage_client: StorageClient): @@ -151,7 +151,7 @@ def test_storage_query_records_batch(storage_api_server, storage_client: Storage x_collaboration="text", frame_of_reference="text", data_partition_id="text", - tenant="text", + ) def test_storage_query_records_from_kind(storage_api_server, storage_client: StorageClient): @@ -161,7 +161,7 @@ def test_storage_query_records_from_kind(storage_api_server, storage_client: Sto limit="text", kind="text", data_partition_id="text", - tenant="text", + ) def test_storage_update_records(storage_api_server, storage_client: StorageClient): @@ -169,6 +169,6 @@ def test_storage_update_records(storage_api_server, storage_client: StorageClien x_collaboration="text", skipdupes="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/wellbore/test_wellbore_v2.py b/tests/wellbore/test_wellbore_v2.py index e081a24..181157f 100644 --- a/tests/wellbore/test_wellbore_v2.py +++ b/tests/wellbore/test_wellbore_v2.py @@ -9,56 +9,56 @@ def test_wellbore_create_alpha_logs_sessions(wellbore_api_server, wellbore_clien time_to_live=10, record_id="text", data_partition_id="text", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="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", - tenant="text", + ) @@ -67,7 +67,7 @@ def test_wellbore_create_trajectory_data(wellbore_api_server, wellbore_client_v2 trajectoryid="text", orient="text", data_partition_id="text", - tenant="text", + ) @@ -75,7 +75,7 @@ def test_wellbore_define_dips_dipset(wellbore_api_server, wellbore_client_v2: We wellbore_client_v2.define_dips_dipset( dipsetid="text", data_partition_id="text", - tenant="text", + ) @@ -84,7 +84,7 @@ def test_wellbore_delete_dip(wellbore_api_server, wellbore_client_v2: WellboreCl dipsetid="text", index="text", data_partition_id="text", - tenant="text", + ) @@ -93,7 +93,7 @@ def test_wellbore_delete_dipset(wellbore_api_server, wellbore_client_v2: Wellbor dipsetid="text", recursive="text", data_partition_id="text", - tenant="text", + ) @@ -101,7 +101,7 @@ def test_wellbore_delete_log(wellbore_api_server, wellbore_client_v2: WellboreCl wellbore_client_v2.delete_log( logid="text", data_partition_id="text", - tenant="text", + ) @@ -110,7 +110,7 @@ def test_wellbore_delete_logset(wellbore_api_server, wellbore_client_v2: Wellbor logsetid="text", recursive="text", data_partition_id="text", - tenant="text", + ) @@ -118,7 +118,7 @@ def test_wellbore_delete_marker(wellbore_api_server, wellbore_client_v2: Wellbor wellbore_client_v2.delete_marker( markerid="text", data_partition_id="text", - tenant="text", + ) @@ -126,7 +126,7 @@ def test_wellbore_delete_trajectory(wellbore_api_server, wellbore_client_v2: Wel wellbore_client_v2.delete_trajectory( trajectoryid="text", data_partition_id="text", - tenant="text", + ) @@ -135,7 +135,7 @@ def test_wellbore_delete_well(wellbore_api_server, wellbore_client_v2: WellboreC wellid="text", recursive="text", data_partition_id="text", - tenant="text", + ) @@ -144,14 +144,14 @@ def test_wellbore_delete_wellbores(wellbore_api_server, wellbore_client_v2: Well wellboreid="text", recursive="text", data_partition_id="text", - tenant="text", + ) def test_wellbore_get_about(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_about( data_partition_id="text", - tenant="text", + ) @@ -165,7 +165,7 @@ def test_wellbore_get_alpha_logs_data(wellbore_api_server, wellbore_client_v2: W filter="text", orient="text", data_partition_id="text", - tenant="text", + ) @@ -180,7 +180,7 @@ def test_wellbore_get_alpha_logs_versions_data(wellbore_api_server, wellbore_cli filter="text", orient="text", data_partition_id="text", - tenant="text", + ) @@ -193,7 +193,7 @@ def test_wellbore_get_decimated_log(wellbore_api_server, wellbore_client_v2: Wel orient="text", bulk_path="text", data_partition_id="text", - tenant="text", + ) @@ -203,7 +203,7 @@ def test_wellbore_get_dip(wellbore_api_server, wellbore_client_v2: WellboreClien index="text", limit="text", data_partition_id="text", - tenant="text", + ) @@ -212,7 +212,7 @@ def test_wellbore_get_dip_at_index(wellbore_api_server, wellbore_client_v2: Well dipsetid="text", index="text", data_partition_id="text", - tenant="text", + ) @@ -220,7 +220,7 @@ def test_wellbore_get_dipset(wellbore_api_server, wellbore_client_v2: WellboreCl wellbore_client_v2.get_dipset( dipsetid="text", data_partition_id="text", - tenant="text", + ) @@ -229,7 +229,7 @@ def test_wellbore_get_dipsets_versions(wellbore_api_server, wellbore_client_v2: dipsetid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -237,7 +237,7 @@ def test_wellbore_get_log(wellbore_api_server, wellbore_client_v2: WellboreClien wellbore_client_v2.get_log( logid="text", data_partition_id="text", - tenant="text", + ) @@ -247,7 +247,7 @@ def test_wellbore_get_log_data(wellbore_api_server, wellbore_client_v2: Wellbore orient="text", bulk_path="text", data_partition_id="text", - tenant="text", + ) @@ -256,7 +256,7 @@ def test_wellbore_get_log_statistics(wellbore_api_server, wellbore_client_v2: We logid="text", bulk_path="text", data_partition_id="text", - tenant="text", + ) @@ -265,7 +265,7 @@ def test_wellbore_get_log_version(wellbore_api_server, wellbore_client_v2: Wellb logid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -276,7 +276,7 @@ def test_wellbore_get_log_version_data(wellbore_api_server, wellbore_client_v2: orient="text", bulk_path="text", data_partition_id="text", - tenant="text", + ) @@ -284,7 +284,7 @@ def test_wellbore_get_log_versions(wellbore_api_server, wellbore_client_v2: Well wellbore_client_v2.get_log_versions( logid="text", data_partition_id="text", - tenant="text", + ) @@ -292,7 +292,7 @@ def test_wellbore_get_logset(wellbore_api_server, wellbore_client_v2: WellboreCl wellbore_client_v2.get_logset( logsetid="text", data_partition_id="text", - tenant="text", + ) @@ -301,7 +301,7 @@ def test_wellbore_get_logset_version(wellbore_api_server, wellbore_client_v2: We logsetid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -309,7 +309,7 @@ def test_wellbore_get_logset_versions(wellbore_api_server, wellbore_client_v2: W wellbore_client_v2.get_logset_versions( logsetid="text", data_partition_id="text", - tenant="text", + ) @@ -317,7 +317,7 @@ def test_wellbore_get_marker(wellbore_api_server, wellbore_client_v2: WellboreCl wellbore_client_v2.get_marker( markerid="text", data_partition_id="text", - tenant="text", + ) @@ -326,7 +326,7 @@ def test_wellbore_get_marker_version(wellbore_api_server, wellbore_client_v2: We markerid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -334,7 +334,7 @@ def test_wellbore_get_marker_versions(wellbore_api_server, wellbore_client_v2: W wellbore_client_v2.get_marker_versions( markerid="text", data_partition_id="text", - tenant="text", + ) @@ -343,7 +343,7 @@ def test_wellbore_get_record_session_v2(wellbore_api_server, wellbore_client_v2: record_id="text", session_id="text", data_partition_id="text", - tenant="text", + ) @@ -351,7 +351,7 @@ def test_wellbore_get_trajectory(wellbore_api_server, wellbore_client_v2: Wellbo wellbore_client_v2.get_trajectory( trajectoryid="text", data_partition_id="text", - tenant="text", + ) @@ -361,7 +361,7 @@ def test_wellbore_get_trajectory_data(wellbore_api_server, wellbore_client_v2: W channels="text", orient="text", data_partition_id="text", - tenant="text", + ) @@ -370,7 +370,7 @@ def test_wellbore_get_trajectory_version(wellbore_api_server, wellbore_client_v2 trajectoryid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -381,7 +381,7 @@ def test_wellbore_get_trajectory_version_data(wellbore_api_server, wellbore_clie channels="text", orient="text", data_partition_id="text", - tenant="text", + ) @@ -389,14 +389,14 @@ def test_wellbore_get_trajectory_versions(wellbore_api_server, wellbore_client_v wellbore_client_v2.get_trajectory_versions( trajectoryid="text", data_partition_id="text", - tenant="text", + ) def test_wellbore_get_version(wellbore_api_server, wellbore_client_v2: WellboreClient): wellbore_client_v2.get_version( data_partition_id="text", - tenant="text", + ) @@ -404,7 +404,7 @@ def test_wellbore_get_versions_dipset(wellbore_api_server, wellbore_client_v2: W wellbore_client_v2.get_versions_dipset( dipsetid="text", data_partition_id="text", - tenant="text", + ) @@ -412,7 +412,7 @@ def test_wellbore_get_versions_wellbore(wellbore_api_server, wellbore_client_v2: wellbore_client_v2.get_versions_wellbore( wellboreid="text", data_partition_id="text", - tenant="text", + ) @@ -420,7 +420,7 @@ def test_wellbore_get_well_v2(wellbore_api_server, wellbore_client_v2: WellboreC wellbore_client_v2.get_well_v2( wellid="text", data_partition_id="text", - tenant="text", + ) @@ -429,7 +429,7 @@ def test_wellbore_get_well_version(wellbore_api_server, wellbore_client_v2: Well wellid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -437,7 +437,7 @@ def test_wellbore_get_well_versions_v2(wellbore_api_server, wellbore_client_v2: wellbore_client_v2.get_well_versions_v2( wellid="text", data_partition_id="text", - tenant="text", + ) @@ -445,7 +445,7 @@ def test_wellbore_get_wellbores(wellbore_api_server, wellbore_client_v2: Wellbor wellbore_client_v2.get_wellbores( wellboreid="text", data_partition_id="text", - tenant="text", + ) @@ -454,7 +454,7 @@ def test_wellbore_get_wellbores_versions(wellbore_api_server, wellbore_client_v2 wellboreid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -462,7 +462,7 @@ def test_wellbore_insert_dip_in_dipset(wellbore_api_server, wellbore_client_v2: wellbore_client_v2.insert_dip_in_dipset( dipsetid="text", data_partition_id="text", - tenant="text", + ) @@ -470,7 +470,7 @@ def test_wellbore_list_records_sessions_v2(wellbore_api_server, wellbore_client_ wellbore_client_v2.list_records_sessions_v2( record_id="text", data_partition_id="text", - tenant="text", + ) @@ -480,7 +480,7 @@ def test_wellbore_patch_alpha_logs_sessions(wellbore_api_server, wellbore_client record_id="text", session_id="text", data_partition_id="text", - tenant="text", + ) @@ -491,7 +491,7 @@ def test_wellbore_query_dip_from_dipset(wellbore_api_server, wellbore_client_v2: max_reference="text", classification="text", data_partition_id="text", - tenant="text", + ) @@ -501,7 +501,7 @@ def test_wellbore_recognize_family(wellbore_api_server, wellbore_client_v2: Well description="text", log_unit="text", data_partition_id="text", - tenant="text", + ) @@ -510,7 +510,7 @@ def test_wellbore_send_alpha_logs_sessions_data(wellbore_api_server, wellbore_cl record_id="text", session_id="text", data_partition_id="text", - tenant="text", + ) @@ -548,7 +548,7 @@ def test_wellbore_update_dip(wellbore_api_server, wellbore_client_v2: WellboreCl dipsetid="text", index="text", data_partition_id="text", - tenant="text", + ) @@ -563,7 +563,7 @@ def test_wellbore_update_log_recognition_upload_catalog(wellbore_api_server, wel }, legal={}, data_partition_id="text", - tenant="text", + ) @@ -573,7 +573,7 @@ def test_wellbore_upload_log_data(wellbore_api_server, wellbore_client_v2: Wellb orient="text", bulk_path="text", data_partition_id="text", - tenant="text", + ) @@ -581,7 +581,7 @@ def test_wellbore_write_alpha_logs_data(wellbore_api_server, wellbore_client_v2: wellbore_client_v2.write_alpha_logs_data( record_id="text", data_partition_id="text", - tenant="text", + ) @@ -591,5 +591,5 @@ def test_wellbore_write_log_data(wellbore_api_server, wellbore_client_v2: Wellbo orient="text", bulk_path="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/wellbore/test_wellbore_v3.py b/tests/wellbore/test_wellbore_v3.py index 48c8d85..ee3ac0a 100644 --- a/tests/wellbore/test_wellbore_v3.py +++ b/tests/wellbore/test_wellbore_v3.py @@ -4,21 +4,21 @@ 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", - tenant="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", - tenant="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", - tenant="text", + ) @@ -26,7 +26,7 @@ def test_wellbore_create_query_wellbore_welllogs(wellbore_api_server, wellbore_c wellbore_client_v3.create_query_wellbore_welllogs( wellbore_attribute="text", data_partition_id="text", - tenant="text", + ) @@ -34,7 +34,7 @@ def test_wellbore_create_query_wellbores_wellboremarkersets(wellbore_api_server, wellbore_client_v3.create_query_wellbores_wellboremarkersets( wellbore_id="text", data_partition_id="text", - tenant="text", + ) @@ -42,21 +42,21 @@ def test_wellbore_create_query_wellbores_welllogs(wellbore_api_server, wellbore_ wellbore_client_v3.create_query_wellbores_welllogs( wellbore_id="text", data_partition_id="text", - tenant="text", + ) def test_wellbore_create_wellbore_markerset(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_wellbore_markerset( data_partition_id="text", - tenant="text", + ) def test_wellbore_create_wellboretrajectories(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_wellboretrajectories( data_partition_id="text", - tenant="text", + ) @@ -64,7 +64,7 @@ def test_wellbore_create_wellboretrajectories_data(wellbore_api_server, wellbore wellbore_client_v3.create_wellboretrajectories_data( record_id="text", data_partition_id="text", - tenant="text", + ) @@ -76,7 +76,7 @@ def test_wellbore_create_wellboretrajectories_sessions(wellbore_api_server, well time_to_live=10, record_id="text", data_partition_id="text", - tenant="text", + ) @@ -85,14 +85,14 @@ def test_wellbore_create_wellboretrajectories_sessions_data(wellbore_api_server, record_id="text", session_id="text", data_partition_id="text", - tenant="text", + ) def test_wellbore_create_welllogs(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.create_welllogs( data_partition_id="text", - tenant="text", + ) @@ -100,7 +100,7 @@ def test_wellbore_create_welllogs_data(wellbore_api_server, wellbore_client_v3: wellbore_client_v3.create_welllogs_data( record_id="text", data_partition_id="text", - tenant="text", + ) @@ -112,7 +112,7 @@ def test_wellbore_create_welllogs_sessions(wellbore_api_server, wellbore_client_ time_to_live=10, record_id="text", data_partition_id="text", - tenant="text", + ) @@ -120,7 +120,7 @@ def test_wellbore_delete_well(wellbore_api_server, wellbore_client_v3: WellboreC wellbore_client_v3.delete_well( wellid="text", data_partition_id="text", - tenant="text", + ) @@ -128,7 +128,7 @@ def test_wellbore_delete_wellbore(wellbore_api_server, wellbore_client_v3: Wellb wellbore_client_v3.delete_wellbore( wellboreid="text", data_partition_id="text", - tenant="text", + ) @@ -136,7 +136,7 @@ def test_wellbore_delete_wellbore_interval_set(wellbore_api_server, wellbore_cli wellbore_client_v3.delete_wellbore_interval_set( wellboreintervalsetsid="text", data_partition_id="text", - tenant="text", + ) @@ -144,7 +144,7 @@ def test_wellbore_delete_wellbore_markerset(wellbore_api_server, wellbore_client wellbore_client_v3.delete_wellbore_markerset( wellboremarkersetid="text", data_partition_id="text", - tenant="text", + ) @@ -153,7 +153,7 @@ def test_wellbore_delete_wellboretrajectories(wellbore_api_server, wellbore_clie wellboretrajectoryid="text", purge="text", data_partition_id="text", - tenant="text", + ) @@ -162,14 +162,14 @@ def test_wellbore_delete_welllog(wellbore_api_server, wellbore_client_v3: Wellbo welllogid="text", purge="text", data_partition_id="text", - tenant="text", + ) def test_wellbore_get_about(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_about( data_partition_id="text", - tenant="text", + ) @@ -178,7 +178,7 @@ def test_wellbore_get_record_session_v3(wellbore_api_server, wellbore_client_v3: record_id="text", session_id="text", data_partition_id="text", - tenant="text", + ) @@ -193,7 +193,7 @@ def test_wellbore_get_returns_data_specified_version(wellbore_api_server, wellbo filter="text", orient="text", data_partition_id="text", - tenant="text", + ) @@ -202,14 +202,14 @@ def test_wellbore_get_session(wellbore_api_server, wellbore_client_v3: WellboreC record_id="text", session_id="text", data_partition_id="text", - tenant="text", + ) def test_wellbore_get_version(wellbore_api_server, wellbore_client_v3: WellboreClient): wellbore_client_v3.get_version( data_partition_id="text", - tenant="text", + ) @@ -217,7 +217,7 @@ def test_wellbore_get_versions_wellbore_interval_set(wellbore_api_server, wellbo wellbore_client_v3.get_versions_wellbore_interval_set( wellboreintervalsetsid="text", data_partition_id="text", - tenant="text", + ) @@ -225,7 +225,7 @@ def test_wellbore_get_versions_wellboretrajectory(wellbore_api_server, wellbore_ wellbore_client_v3.get_versions_wellboretrajectory( wellboretrajectoryid="text", data_partition_id="text", - tenant="text", + ) @@ -233,7 +233,7 @@ def test_wellbore_get_well(wellbore_api_server, wellbore_client_v3: WellboreClie wellbore_client_v3.get_well( wellid="text", data_partition_id="text", - tenant="text", + ) @@ -242,7 +242,7 @@ def test_wellbore_get_well_version(wellbore_api_server, wellbore_client_v3: Well wellid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -250,7 +250,7 @@ def test_wellbore_get_well_versions(wellbore_api_server, wellbore_client_v3: Wel wellbore_client_v3.get_well_versions( wellid="text", data_partition_id="text", - tenant="text", + ) @@ -258,7 +258,7 @@ def test_wellbore_get_wellbore(wellbore_api_server, wellbore_client_v3: Wellbore wellbore_client_v3.get_wellbore( wellboreid="text", data_partition_id="text", - tenant="text", + ) @@ -266,7 +266,7 @@ def test_wellbore_get_wellbore_interval_set(wellbore_api_server, wellbore_client wellbore_client_v3.get_wellbore_interval_set( wellboreintervalsetsid="text", data_partition_id="text", - tenant="text", + ) @@ -275,7 +275,7 @@ def test_wellbore_get_wellbore_interval_sets_versions(wellbore_api_server, wellb wellboreintervalsetsid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -283,7 +283,7 @@ def test_wellbore_get_wellbore_versions(wellbore_api_server, wellbore_client_v3: wellbore_client_v3.get_wellbore_versions( wellboreid="text", data_partition_id="text", - tenant="text", + ) @@ -291,7 +291,7 @@ def test_wellbore_get_wellboremarkerset_versions(wellbore_api_server, wellbore_c wellbore_client_v3.get_wellboremarkerset_versions( wellboremarkersetid="text", data_partition_id="text", - tenant="text", + ) @@ -299,7 +299,7 @@ def test_wellbore_get_wellboremarkersets(wellbore_api_server, wellbore_client_v3 wellbore_client_v3.get_wellboremarkersets( wellboremarkersetid="text", data_partition_id="text", - tenant="text", + ) @@ -308,7 +308,7 @@ def test_wellbore_get_wellboremarkersets_versions(wellbore_api_server, wellbore_ wellboremarkersetid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -317,7 +317,7 @@ def test_wellbore_get_wellbores_versions(wellbore_api_server, wellbore_client_v3 wellboreid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -325,7 +325,7 @@ def test_wellbore_get_wellboretrajectories(wellbore_api_server, wellbore_client_ wellbore_client_v3.get_wellboretrajectories( wellboretrajectoryid="text", data_partition_id="text", - tenant="text", + ) @@ -339,7 +339,7 @@ def test_wellbore_get_wellboretrajectories_data(wellbore_api_server, wellbore_cl filter="text", orient="text", data_partition_id="text", - tenant="text", + ) @@ -348,7 +348,7 @@ def test_wellbore_get_wellboretrajectories_versions(wellbore_api_server, wellbor wellboretrajectoryid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -356,7 +356,7 @@ def test_wellbore_get_welllog(wellbore_api_server, wellbore_client_v3: WellboreC wellbore_client_v3.get_welllog( welllogid="text", data_partition_id="text", - tenant="text", + ) @@ -365,7 +365,7 @@ def test_wellbore_get_welllog_version(wellbore_api_server, wellbore_client_v3: W welllogid="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -380,7 +380,7 @@ def test_wellbore_get_welllog_version_data(wellbore_api_server, wellbore_client_ filter="text", orient="text", data_partition_id="text", - tenant="text", + ) @@ -390,7 +390,7 @@ def test_wellbore_get_welllog_version_data_statistics(wellbore_api_server, wellb version="text", curves="text", data_partition_id="text", - tenant="text", + ) @@ -398,7 +398,7 @@ def test_wellbore_get_welllog_versions(wellbore_api_server, wellbore_client_v3: wellbore_client_v3.get_welllog_versions( welllogid="text", data_partition_id="text", - tenant="text", + ) @@ -412,7 +412,7 @@ def test_wellbore_get_welllogs_data(wellbore_api_server, wellbore_client_v3: Wel filter="text", orient="text", data_partition_id="text", - tenant="text", + ) @@ -421,7 +421,7 @@ def test_wellbore_get_welllogs_data_statistics(wellbore_api_server, wellbore_cli record_id="text", curves="text", data_partition_id="text", - tenant="text", + ) @@ -429,7 +429,7 @@ def test_wellbore_list_records_sessions_v3(wellbore_api_server, wellbore_client_ wellbore_client_v3.list_records_sessions_v3( record_id="text", data_partition_id="text", - tenant="text", + ) @@ -437,7 +437,7 @@ def test_wellbore_list_session_given_record(wellbore_api_server, wellbore_client wellbore_client_v3.list_session_given_record( record_id="text", data_partition_id="text", - tenant="text", + ) @@ -447,7 +447,7 @@ def test_wellbore_patch_wellboretrajectories_sessions(wellbore_api_server, wellb record_id="text", session_id="text", data_partition_id="text", - tenant="text", + ) @@ -455,7 +455,7 @@ def test_wellbore_query_alpha_query_wellbores(wellbore_api_server, wellbore_clie wellbore_client_v3.query_alpha_query_wellbores( names="text", data_partition_id="text", - tenant="text", + ) @@ -463,7 +463,7 @@ def test_wellbore_query_alpha_query_wellbores_wellboretrajectories(wellbore_api_ wellbore_client_v3.query_alpha_query_wellbores_wellboretrajectories( wellbore_id="text", data_partition_id="text", - tenant="text", + ) @@ -473,7 +473,7 @@ def test_wellbore_query_alpha_query_welllogs(wellbore_api_server, wellbore_clien wellbore_id="text", mnemonics="text", data_partition_id="text", - tenant="text", + ) @@ -483,7 +483,7 @@ def test_wellbore_recognize_family(wellbore_api_server, wellbore_client_v3: Well description="text", log_unit="text", data_partition_id="text", - tenant="text", + ) @@ -492,7 +492,7 @@ def test_wellbore_send_welllog_sessions_data(wellbore_api_server, wellbore_clien record_id="text", session_id="text", data_partition_id="text", - tenant="text", + ) @@ -501,7 +501,7 @@ def test_wellbore_trigger_welllog_version_data_statistics(wellbore_api_server, w record_id="text", version="text", data_partition_id="text", - tenant="text", + ) @@ -516,7 +516,7 @@ def test_wellbore_update_log_recognition_upload_catalog(wellbore_api_server, wel }, legal={}, data_partition_id="text", - tenant="text", + ) @@ -526,5 +526,5 @@ def test_wellbore_update_welllogs_sessions(wellbore_api_server, wellbore_client_ record_id="text", session_id="text", data_partition_id="text", - tenant="text", + ) diff --git a/tests/welldelivery/test_welldelivery.py b/tests/welldelivery/test_welldelivery.py index 65540fd..a6b6c27 100644 --- a/tests/welldelivery/test_welldelivery.py +++ b/tests/welldelivery/test_welldelivery.py @@ -6,7 +6,7 @@ def test_welldelivery_create_or_update_storage(welldelivery_api_server, welldeli entity={}, type="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_delete_entity(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -14,7 +14,7 @@ def test_welldelivery_delete_entity(welldelivery_api_server, welldelivery_client type="text", id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_delete_storage_version(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -23,28 +23,28 @@ def test_welldelivery_delete_storage_version(welldelivery_api_server, welldelive id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_activity_plans_by_well(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_activity_plans_by_well( well_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_bha_runs_v1_by_hole_section(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_bha_runs_v1_by_hole_section( hole_section_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_bha_runs_v1_by_wellbore_actual(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_bha_runs_v1_by_wellbore_actual( wellbore_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_entity(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -52,7 +52,7 @@ def test_welldelivery_get_entity(welldelivery_api_server, welldelivery_client: W type="text", id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_entity_version(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -61,14 +61,14 @@ def test_welldelivery_get_entity_version(welldelivery_api_server, welldelivery_c id="text", version="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_hole_sections_v1_by_wellbore(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_hole_sections_v1_by_wellbore( wellbore_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_operations_reports_by_time_range(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -76,14 +76,14 @@ def test_welldelivery_get_operations_reports_by_time_range(welldelivery_api_serv start_time="text", end_time="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_operations_reports_with_refs_by_operations_report_id(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_operations_reports_with_refs_by_operations_report_id( operations_report_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_storage_version(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -91,49 +91,49 @@ def test_welldelivery_get_storage_version(welldelivery_api_server, welldelivery_ type="text", id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_version_number_list_actual_well(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_version_number_list_actual_well( name="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_version_number_list_actual_wellbore(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_version_number_list_actual_wellbore( well_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_version_number_list_planned_well(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_version_number_list_planned_well( name="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_version_number_list_planned_wellbore(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_version_number_list_planned_wellbore( well_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_version_number_list_well_activity_program(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_version_number_list_well_activity_program( well_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_well_activity_program(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_well_activity_program( well_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_well_activity_program_version(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -141,7 +141,7 @@ def test_welldelivery_get_well_activity_program_version(welldelivery_api_server, well_id="text", wap_version="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_well_activity_program_version_with_refs(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -149,35 +149,35 @@ def test_welldelivery_get_well_activity_program_version_with_refs(welldelivery_a well_id="text", wap_version="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_well_activity_program_with_refs(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_well_activity_program_with_refs( well_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_well_activity_programs_full_content_by_well(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_well_activity_programs_full_content_by_well( well_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_well_by_name_actual(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_well_by_name_actual( name="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_well_by_name_planned(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_well_by_name_planned( name="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_well_version_by_name_actual(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -185,7 +185,7 @@ def test_welldelivery_get_well_version_by_name_actual(welldelivery_api_server, w name="text", version="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_well_version_by_name_planned(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -193,49 +193,49 @@ def test_welldelivery_get_well_version_by_name_planned(welldelivery_api_server, name="text", version="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_wellbore_actual(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_wellbore_actual( well_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_wellbore_fluids_programs(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_wellbore_fluids_programs( wellbore_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_wellbore_fluids_reports(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_wellbore_fluids_reports( wellbore_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_wellbore_operations_reports(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_wellbore_operations_reports( wellbore_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_wellbore_operations_reports_latest(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_wellbore_operations_reports_latest( wellbore_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_wellbore_planned(welldelivery_api_server, welldelivery_client: WellDeliveryClient): welldelivery_client.get_wellbore_planned( well_id="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_wellbore_version_actual(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -243,7 +243,7 @@ def test_welldelivery_get_wellbore_version_actual(welldelivery_api_server, welld well_id="text", wellbore_version="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_get_wellbore_version_planned(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -251,7 +251,7 @@ def test_welldelivery_get_wellbore_version_planned(welldelivery_api_server, well well_id="text", wellbore_version="text", data_partition_id="text", - tenant="text", + ) def test_welldelivery_purge_entity(welldelivery_api_server, welldelivery_client: WellDeliveryClient): @@ -259,6 +259,6 @@ def test_welldelivery_purge_entity(welldelivery_api_server, welldelivery_client: type="text", id="text", data_partition_id="text", - tenant="text", + )