wds-client 0.10.0__py3-none-any.whl → 0.12.0__py3-none-any.whl

wds_client/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "0.10.0"
+__version__ = "0.12.0"
 
 # import apis into sdk package
 from wds_client.api.capabilities_api import CapabilitiesApi

wds_client/api/capabilities_api.py

@@ -246,11 +246,12 @@ class CapabilitiesApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting

wds_client/api/cloning_api.py

@@ -280,11 +280,12 @@ class CloningApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
         # set the HTTP header `Content-Type`
         if _content_type:
@@ -563,11 +564,12 @@ class CloningApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -818,11 +820,12 @@ class CloningApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting

wds_client/api/general_wds_information_api.py

@@ -247,11 +247,12 @@ class GeneralWDSInformationApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -486,11 +487,12 @@ class GeneralWDSInformationApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting

wds_client/api/import_api.py

@@ -282,11 +282,12 @@ class ImportApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
         # set the HTTP header `Content-Type`
         if _content_type:

wds_client/api/instances_api.py

@@ -284,11 +284,12 @@ class InstancesApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -560,11 +561,12 @@ class InstancesApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -818,11 +820,12 @@ class InstancesApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting

wds_client/api/job_api.py

@@ -267,11 +267,12 @@ class JobApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -540,11 +541,12 @@ class JobApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting

wds_client/api/records_api.py

@@ -336,11 +336,12 @@ class RecordsApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
         # set the HTTP header `Content-Type`
         if _content_type:
@@ -690,11 +691,12 @@ class RecordsApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
         # set the HTTP header `Content-Type`
         if _content_type:
@@ -1012,11 +1014,12 @@ class RecordsApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -1318,11 +1321,12 @@ class RecordsApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -1608,12 +1612,13 @@ class RecordsApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'text/tab-separated-values', 
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'text/tab-separated-values', 
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -1914,11 +1919,12 @@ class RecordsApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
         # set the HTTP header `Content-Type`
         if _content_type:
@@ -2250,11 +2256,12 @@ class RecordsApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
         # set the HTTP header `Content-Type`
         if _content_type:
@@ -2589,11 +2596,12 @@ class RecordsApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
         # set the HTTP header `Content-Type`
         if _content_type:

wds_client/api/schema_api.py

@@ -319,11 +319,12 @@ class SchemaApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -880,11 +881,12 @@ class SchemaApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -1170,11 +1172,12 @@ class SchemaApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
 
         # authentication setting
@@ -1496,11 +1499,12 @@ class SchemaApi:
 
 
         # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
 
         # set the HTTP header `Content-Type`
         if _content_type:

wds_client/api_client.py

@@ -88,7 +88,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'wds-client/0.10.0/python'
+        self.user_agent = 'wds-client/0.12.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):
@@ -227,7 +227,7 @@ class ApiClient:
             body = self.sanitize_for_serialization(body)
 
         # request url
-        if _host is None:
+        if _host is None or self.configuration.ignore_operation_servers:
             url = self.configuration.host + resource_path
         else:
             # use server/host defined in path or operation instead
@@ -314,10 +314,7 @@ class ApiClient:
                     match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type)
                 encoding = match.group(1) if match else "utf-8"
                 response_text = response_data.data.decode(encoding)
-                if response_type in ["bytearray", "str"]:
-                    return_data = self.__deserialize_primitive(response_text, response_type)
-                else:
-                    return_data = self.deserialize(response_text, response_type)
+                return_data = self.deserialize(response_text, response_type, content_type)
         finally:
             if not 200 <= response_data.status <= 299:
                 raise ApiException.from_response(
@@ -385,21 +382,35 @@ class ApiClient:
             for key, val in obj_dict.items()
         }
 
-    def deserialize(self, response_text, response_type):
+    def deserialize(self, response_text: str, response_type: str, content_type: Optional[str]):
         """Deserializes response into an object.
 
         :param response: RESTResponse object to be deserialized.
         :param response_type: class literal for
             deserialized object, or string of class name.
+        :param content_type: content type of response.
 
         :return: deserialized object.
         """
 
         # fetch data from response object
-        try:
-            data = json.loads(response_text)
-        except ValueError:
+        if content_type is None:
+            try:
+                data = json.loads(response_text)
+            except ValueError:
+                data = response_text
+        elif content_type.startswith("application/json"):
+            if response_text == "":
+                data = ""
+            else:
+                data = json.loads(response_text)
+        elif content_type.startswith("text/plain"):
             data = response_text
+        else:
+            raise ApiException(
+                status=0,
+                reason="Unsupported content type: {0}".format(content_type)
+            )
 
         return self.__deserialize(data, response_type)
 

wds_client/configuration.py

@@ -32,6 +32,9 @@ class Configuration:
     """This class contains various settings of the API client.
 
     :param host: Base url.
+    :param ignore_operation_servers
+      Boolean to ignore operation servers for the API client.
+      Config will use `host` as the base url regardless of the operation servers.
     :param api_key: Dict to store API key(s).
       Each entry in the dict specifies an API key.
       The dict key is the name of the security scheme in the OAS specification.
@@ -54,6 +57,7 @@ class Configuration:
       values before.
     :param ssl_ca_cert: str - the path to a file of concatenated CA certificates
       in PEM format.
+    :param retries: Number of retries for API requests.
 
     :Example:
     """
@@ -66,7 +70,11 @@ class Configuration:
                  access_token=None,
                  server_index=None, server_variables=None,
                  server_operation_index=None, server_operation_variables=None,
+                 ignore_operation_servers=False,
                  ssl_ca_cert=None,
+                 retries=None,
+                 *,
+                 debug: Optional[bool] = None
                  ) -> None:
         """Constructor
         """
@@ -81,6 +89,9 @@ class Configuration:
         self.server_operation_variables = server_operation_variables or {}
         """Default server variables
         """
+        self.ignore_operation_servers = ignore_operation_servers
+        """Ignore operation servers
+        """
         self.temp_folder_path = None
         """Temp file folder for downloading files
         """
@@ -124,7 +135,10 @@ class Configuration:
         self.logger_file = None
         """Debug file location
         """
-        self.debug = False
+        if debug is not None:
+            self.debug = debug
+        else:
+            self.__debug = False
         """Debug switch
         """
 
@@ -167,7 +181,7 @@ class Configuration:
         self.safe_chars_for_path_param = ''
         """Safe chars for path_param
         """
-        self.retries = None
+        self.retries = retries
         """Adding retries to override urllib3 default value 3
         """
         # Enable client side validation
@@ -378,7 +392,7 @@ class Configuration:
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v0.2\n"\
-               "SDK Package Version: 0.10.0".\
+               "SDK Package Version: 0.12.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

wds_client/models/search_request.py

@@ -31,7 +31,7 @@ class SearchRequest(BaseModel):
     """ # noqa: E501
     offset: Optional[Annotated[int, Field(strict=True, ge=0)]] = Field(default=0, description="Pagination offset")
     limit: Optional[Annotated[int, Field(le=1000, strict=True, ge=0)]] = Field(default=10, description="Pagination limit")
-    sort: Optional[SearchSortDirection] = None
+    sort: Optional[SearchSortDirection] = SearchSortDirection.ASC
     sort_attribute: Optional[StrictStr] = Field(default=None, alias="sortAttribute")
     filter: Optional[SearchFilter] = None
     __properties: ClassVar[List[str]] = ["offset", "limit", "sort", "sortAttribute", "filter"]
@@ -92,7 +92,7 @@ class SearchRequest(BaseModel):
         _obj = cls.model_validate({
             "offset": obj.get("offset") if obj.get("offset") is not None else 0,
             "limit": obj.get("limit") if obj.get("limit") is not None else 10,
-            "sort": obj.get("sort"),
+            "sort": obj.get("sort") if obj.get("sort") is not None else SearchSortDirection.ASC,
             "sortAttribute": obj.get("sortAttribute"),
             "filter": SearchFilter.from_dict(obj["filter"]) if obj.get("filter") is not None else None
         })

{wds_client-0.10.0.dist-info → wds_client-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wds-client
-Version: 0.10.0
+Version: 0.12.0
 Summary: Workspace Data Service
 Home-page: 
 Author: OpenAPI Generator community

{wds_client-0.10.0.dist-info → wds_client-0.12.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-wds_client/__init__.py,sha256=GpOXZZcSqHCkYXo1exlpRb7ZpXWaPjdzhz8PpBv1frQ,3258
-wds_client/api_client.py,sha256=rC6sxrc0hWLQzKS-WjVdJ7zAc6YfiPz1tHwwgefrKos,26462
+wds_client/__init__.py,sha256=qt3f14mn1GDw-Uw41roPsEk53FG9x2dftFr3FbiNuFI,3258
+wds_client/api_client.py,sha256=oJtwCI1odUf0b0pltRXWzWymsnJoXPmqDnq-Igu2YEk,26923
 wds_client/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
-wds_client/configuration.py,sha256=O87OeSqajNVmBLkdYD54F5aSquKn5tpWXUsbwG5dyTo,14876
+wds_client/configuration.py,sha256=N5xKkxtXNZv4K4P1o_L28nXqAwAGpIsVGloLuehtV7U,15455
 wds_client/exceptions.py,sha256=674T2OrRc-tySXqf45i00iZdt3r6AS-RnWjBUgRxAvc,6122
 wds_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wds_client/rest.py,sha256=Gbp9F8A2qoMDg4xrkCjSAG0FDHXUxcNB8oyfzJXxw4U,9554
 wds_client/api/__init__.py,sha256=sOPGmC1nqF5yugy7QZrIgnqcpKKWmT8tSUQN7_35SM0,480
-wds_client/api/capabilities_api.py,sha256=m9AZnzduVbIVGPyRQTSmBACIsqywo9ymvrWk8zoryBw,10266
-wds_client/api/cloning_api.py,sha256=wJOguaDHU5OlhYXcp41glt-63cStau7pnuAUqm9MvZk,32266
-wds_client/api/general_wds_information_api.py,sha256=LMtPAddLz4-8WTBVHy6DQFGVBD6EzWapI2Yzsn1k_tA,20130
-wds_client/api/import_api.py,sha256=LPu_9Ar_dEjrIORzlxKzL8uSB_CYh9HJ3eb29Fjef_s,12867
-wds_client/api/instances_api.py,sha256=svpIhbty5QGZrRHrEynmoC94auCqsnWNUgiXl9i1SZo,32621
-wds_client/api/job_api.py,sha256=Iy5rns4-2peAU1gQ89InfJvvRw1v5ZxY1DKB50osfkI,21676
-wds_client/api/records_api.py,sha256=hy2y__WW2TSVw5vJK0cw_ydXY3WyyXkgvjow_begBUU,106076
-wds_client/api/schema_api.py,sha256=H0yxUeb2OzcqQ2LWiF9vrHNO1U-5PMmD6YQeeOmWnX4,60801
+wds_client/api/capabilities_api.py,sha256=fbu84ZPzJq2cWS_x4HK_AeuvycDavlvbD-RkumXzs1M,10329
+wds_client/api/cloning_api.py,sha256=LkDwC-FYSyWqYqWHZZTI5Xic-jo01VlrjbT9J1joLjw,32455
+wds_client/api/general_wds_information_api.py,sha256=xwfn820K0Q1BaWtIEWWuIkMUNxeFFq2LQiiYIY4BUrA,20256
+wds_client/api/import_api.py,sha256=-R7A7mr-FkkF-CKA_aEdXw_gFi101vm3n6pgWEoXgfU,12930
+wds_client/api/instances_api.py,sha256=o-vro_J-OfcIORXLviD_tCKjScr0c7zVMEXqs45PtTg,32810
+wds_client/api/job_api.py,sha256=2oQdl-1Si_QloKtiPGgOitftCb0GMto-O-PZoyUZ7kE,21802
+wds_client/api/records_api.py,sha256=YRtEN-WB9jIoBALlyq36tau0vDXs4VFg6royVSo3DlQ,106584
+wds_client/api/schema_api.py,sha256=GfEelK0lsBEuxD7TxS7b3PUdM6HO61rMbt2up1Pwhe4,61053
 wds_client/models/__init__.py,sha256=IWiDjPW3dO2X2l8EuchR_g_A3_pqrSTcl_3kdL7_RLs,2317
 wds_client/models/app.py,sha256=9aTIAS8vTOch8zKHBvZHuXumL0vYZBOO2g9Y8VKjPPw,2772
 wds_client/models/attribute_data_type.py,sha256=R4kI1B2oH7pcyNYcIUElp5MmAMWGj0KY1AeQ5zo0lKk,1514
@@ -41,12 +41,12 @@ wds_client/models/record_request.py,sha256=c-jJuqOgogRM5HdR2HoafMnpIAdfCukysSBFC
 wds_client/models/record_response.py,sha256=ZniN8hDVM7QAEbhwbUnr5RXYpZJHqwFPxBlmlhorBDk,3001
 wds_client/models/record_type_schema.py,sha256=WITuWzyFehg0sYNwhixeeCT7lODEZvEFnlDLVjxAugw,3752
 wds_client/models/search_filter.py,sha256=x7DKOQEgJfYZ71b2AmBvvGLSnhZhycSKsjAIOr135ZY,2720
-wds_client/models/search_request.py,sha256=adtHBdVRwEurvnCnoffT0fwfFzk_AAsE98mOAe7ItXo,3722
+wds_client/models/search_request.py,sha256=RLJq3S4vC4bg9dprEH0kT-h9m6PVblBkAzVHYw5XW-I,3801
 wds_client/models/search_sort_direction.py,sha256=fnqUYvbgXHQ5mESZnxDvcUZ5wi6i770fkqu00jtCATM,932
 wds_client/models/status_response.py,sha256=A5i2yWShlaGVVyi1DGg1KsC8S4fyLbmxJmqLlMKmtH0,2768
 wds_client/models/tsv_upload_response.py,sha256=yhj-3KEFzs-EYnaGZvsr6KgrK6wlYCZKVA7ObfZ2ECc,2807
 wds_client/models/version_response.py,sha256=pQ9eukrGQPdLBwvPKN_ucFlMKff25oGywruwIdL918o,3516
-wds_client-0.10.0.dist-info/METADATA,sha256=Zn1d6aOLz79ad5-y5LFhF3TdLJPGll_QtTaGskALzsk,675
-wds_client-0.10.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-wds_client-0.10.0.dist-info/top_level.txt,sha256=hU2h533r5-3FzApV8ps3zXmQJKy74SPT3sYR8-uZhp8,11
-wds_client-0.10.0.dist-info/RECORD,,
+wds_client-0.12.0.dist-info/METADATA,sha256=BmNJ1DmMefV0NZcPAuYvWnCrZWdim4AoQfPPppHQKPI,675
+wds_client-0.12.0.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+wds_client-0.12.0.dist-info/top_level.txt,sha256=hU2h533r5-3FzApV8ps3zXmQJKy74SPT3sYR8-uZhp8,11
+wds_client-0.12.0.dist-info/RECORD,,

{wds_client-0.10.0.dist-info → wds_client-0.12.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any