ncbi-datasets-pyclient 18.13.0__py3-none-any.whl → 18.14.0__py3-none-any.whl

ncbi/datasets/openapi/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "v18.13.0"
+__version__ = "v18.14.0"
 
 # Define package exports
 __all__ = [

ncbi/datasets/openapi/api_client.py

@@ -91,7 +91,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/v18.13.0/python'
+        self.user_agent = 'OpenAPI-Generator/v18.14.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):
@@ -312,7 +312,7 @@ class ApiClient:
                 return_data = self.__deserialize_file(response_data)
             elif response_type is not None:
                 match = None
-                content_type = response_data.getheader('content-type')
+                content_type = response_data.headers.get('content-type')
                 if content_type is not None:
                     match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type)
                 encoding = match.group(1) if match else "utf-8"
@@ -329,7 +329,7 @@ class ApiClient:
         return ApiResponse(
             status_code = response_data.status,
             data = return_data,
-            headers = response_data.getheaders(),
+            headers = response_data.headers,
             raw_data = response_data.data
         )
 
@@ -701,7 +701,7 @@ class ApiClient:
         os.close(fd)
         os.remove(path)
 
-        content_disposition = response.getheader("Content-Disposition")
+        content_disposition = response.headers.get("Content-Disposition")
         if content_disposition:
             m = re.search(
                 r'filename=[\'"]?([^\'"\s]+)[\'"]?',

ncbi/datasets/openapi/configuration.py

@@ -165,7 +165,7 @@ class Configuration:
     :param ca_cert_data: verify the peer using concatenated CA certificate data
       in PEM (str) or DER (bytes) format.
     :param cert_file: the path to a client certificate file, for mTLS.
-    :param key_file: the path to a client key file, for mTLS. 
+    :param key_file: the path to a client key file, for mTLS.
 
     :Example:
 
@@ -506,6 +506,7 @@ conf = ncbi.datasets.openapi.Configuration(
         password = ""
         if self.password is not None:
             password = self.password
+
         return urllib3.util.make_headers(
             basic_auth=username + ':' + password
         ).get('authorization')
@@ -545,7 +546,7 @@ conf = ncbi.datasets.openapi.Configuration(
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v2\n"\
-               "SDK Package Version: v18.13.0".\
+               "SDK Package Version: v18.14.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]:
@@ -593,6 +594,7 @@ conf = ncbi.datasets.openapi.Configuration(
                 variable_name, variable['default_value'])
 
             if 'enum_values' in variable \
+                    and variable['enum_values'] \
                     and used_value not in variable['enum_values']:
                 raise ValueError(
                     "The variable `{0}` in the host URL has invalid value "

ncbi/datasets/openapi/exceptions.py

@@ -128,7 +128,7 @@ class ApiException(OpenApiException):
                     self.body = http_resp.data.decode('utf-8')
                 except Exception:
                     pass
-            self.headers = http_resp.getheaders()
+            self.headers = http_resp.headers
 
     @classmethod
     def from_response(
@@ -169,8 +169,11 @@ class ApiException(OpenApiException):
             error_message += "HTTP response headers: {0}\n".format(
                 self.headers)
 
-        if self.data or self.body:
-            error_message += "HTTP response body: {0}\n".format(self.data or self.body)
+        if self.body:
+            error_message += "HTTP response body: {0}\n".format(self.body)
+
+        if self.data:
+            error_message += "HTTP response data: {0}\n".format(self.data)
 
         return error_message
 

ncbi/datasets/openapi/models/v2_taxonomy_image_metadata_response.py

@@ -34,7 +34,8 @@ class V2TaxonomyImageMetadataResponse(BaseModel):
     source: Optional[StrictStr] = None
     image_sizes: Optional[List[V2ImageSize]] = None
     format: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["tax_id", "src", "license", "attribution", "source", "image_sizes", "format"]
+    license_url: Optional[StrictStr] = None
+    __properties: ClassVar[List[str]] = ["tax_id", "src", "license", "attribution", "source", "image_sizes", "format", "license_url"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -93,7 +94,8 @@ class V2TaxonomyImageMetadataResponse(BaseModel):
             "attribution": obj.get("attribution"),
             "source": obj.get("source"),
             "image_sizes": obj.get("image_sizes"),
-            "format": obj.get("format")
+            "format": obj.get("format"),
+            "license_url": obj.get("license_url")
         })
         return _obj
 

ncbi/datasets/openapi/rest.py

@@ -48,12 +48,17 @@ class RESTResponse(io.IOBase):
             self.data = self.response.data
         return self.data
 
+    @property
+    def headers(self):
+        """Returns a dictionary of response headers."""
+        return self.response.headers
+
     def getheaders(self):
-        """Returns a dictionary of the response headers."""
+        """Returns a dictionary of the response headers; use ``headers`` instead."""
         return self.response.headers
 
     def getheader(self, name, default=None):
-        """Returns a given response header."""
+        """Returns a given response header; use ``headers.get()`` instead."""
         return self.response.headers.get(name, default)
 
 

{ncbi_datasets_pyclient-18.13.0.dist-info → ncbi_datasets_pyclient-18.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ncbi-datasets-pyclient
-Version: 18.13.0
+Version: 18.14.0
 Summary: NCBI Datasets API
 Home-page: 
 Author: NCBI
@@ -25,8 +25,8 @@ The NCBI Datasets version 2 API is updated often to add new features, fix bugs,
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: v2
-- Package version: v18.13.0
-- Generator version: 7.17.0
+- Package version: v18.14.0
+- Generator version: 7.18.0
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.

{ncbi_datasets_pyclient-18.13.0.dist-info → ncbi_datasets_pyclient-18.14.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 ncbi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ncbi/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ncbi/datasets/openapi/__init__.py,sha256=baMVUyNiDaG3l5F_gXFQgkVBnsPMo29hDIMJLCMaOd8,48153
-ncbi/datasets/openapi/api_client.py,sha256=4TaKsOQaISnSI7CGV3ui04bP_lot0YI4yQpow4nFzJ0,27915
+ncbi/datasets/openapi/__init__.py,sha256=M-TECgwgDztgK2I51HX90ZFH5f-YPxns-HoL2ZtV1KQ,48153
+ncbi/datasets/openapi/api_client.py,sha256=TgI9ofKkCpGh6JhkgD0eEDc0KoqLg3vTsEc7fBeYV-k,27914
 ncbi/datasets/openapi/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
-ncbi/datasets/openapi/configuration.py,sha256=3NnvRFxXWLT8rjkPD0y_04E0-ngEH13YSqrHqcFAHsc,19581
-ncbi/datasets/openapi/exceptions.py,sha256=uJp-1_qZGrZC7YdvUkzgDw8tiahMY76Z9RWMAPr1Ui8,6551
+ncbi/datasets/openapi/configuration.py,sha256=Y2oUyxFeIocARGWgMcGM7Yz45aEN_67kPMOEyPHYh9U,19631
+ncbi/datasets/openapi/exceptions.py,sha256=xadY9SBMaA6_xxeVXrQxSZ0HAZzTsGyLV2K0FvEcyyM,6618
 ncbi/datasets/openapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ncbi/datasets/openapi/rest.py,sha256=reVTSnJHoLWgb5QOTljw2ch_0y6rxGxjUsuDpBvvSck,9555
+ncbi/datasets/openapi/rest.py,sha256=Ctofd5lL4uvuj0TGuAZJCuow61p24oeTTwncy8HlnuU,9742
 ncbi/datasets/openapi/api/__init__.py,sha256=2VCn5BqhrzOpHK-aKjTkyqdMh8X0NQdS_crGrGHNxU4,541
 ncbi/datasets/openapi/api/bio_sample_api.py,sha256=nvtfxO09Nb7ewWRsytXl0d1isnc4Mc8h7_AKNYVEvdM,12032
 ncbi/datasets/openapi/api/gene_api.py,sha256=N3zPvT7mDP3oTOnexBop50xsDotuEEd5UjRYRF0gkkQ,542577
@@ -134,7 +134,7 @@ ncbi/datasets/openapi/models/v2_taxonomy_filtered_subtree_response_edge.py,sha25
 ncbi/datasets/openapi/models/v2_taxonomy_filtered_subtree_response_edge_child_status.py,sha256=lO-NRHsk-XiLABelQRpqR1LSB-BHNTaLcveuThkI5CQ,1077
 ncbi/datasets/openapi/models/v2_taxonomy_filtered_subtree_response_edges_entry.py,sha256=g7b8u9SZ4RdkaR6rQGP3d9y2E5uA7AZZJm_pGFpj_uA,3658
 ncbi/datasets/openapi/models/v2_taxonomy_image_metadata_request.py,sha256=_6KXWk76iPs3I2atcYdfG9Orufiairit5P3Yyzy2VRY,2647
-ncbi/datasets/openapi/models/v2_taxonomy_image_metadata_response.py,sha256=7cFNNgIw7Xq0TEmBJtz1HkUqzCTUuTOYcvDsf4TDFeY,3302
+ncbi/datasets/openapi/models/v2_taxonomy_image_metadata_response.py,sha256=SxMnzSfBQiJxhV6ZLkG-I9_ucXw7J1XQvd3C5M9bdGs,3412
 ncbi/datasets/openapi/models/v2_taxonomy_image_request.py,sha256=uCDfoKmYlazJn19tpyfTaFtXl9VbCCvu6rxO9kkXdHM,2875
 ncbi/datasets/openapi/models/v2_taxonomy_links_request.py,sha256=JPt3wtf5HXzFbmFU1cPzWHJls-hr05ecEdf06FlPooc,2615
 ncbi/datasets/openapi/models/v2_taxonomy_links_response.py,sha256=0jrssuvulVw4aK1Bniu30OP-Zlb-KkyYBdIWizFf9o4,4058
@@ -298,8 +298,8 @@ ncbi/datasets/openapi/models/v2reports_warning.py,sha256=ra1UBVPtnrtaV9oLkmfizs4
 ncbi/datasets/openapi/models/v2reports_warning_gene_warning_code.py,sha256=6RDXn2v5GymCsGQMtoFVyp_x6qN_II3GKZRR5zsIEl8,1378
 ncbi/datasets/openapi/models/v2reports_warning_replaced_id.py,sha256=MQh3OXNaIEtRSYq0sp-V3FqfD8qHra0dp-va3xsHG4I,2745
 ncbi/datasets/openapi/models/v2reports_wgs_info.py,sha256=LDWjSZgSVmdUg894kdeBsOCIHWmQUKrA90_4ktnmM2o,2903
-ncbi_datasets_pyclient-18.13.0.dist-info/licenses/LICENSE,sha256=4hywPAiqr3WLJWIV6zs2wK9aCcBUQVRwLJWPi2AegMk,1501
-ncbi_datasets_pyclient-18.13.0.dist-info/METADATA,sha256=DI9tLbUezN-8hSOognBzQS9asAOLArOjjNNSdlww35s,43941
-ncbi_datasets_pyclient-18.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ncbi_datasets_pyclient-18.13.0.dist-info/top_level.txt,sha256=nraz3S7SoUNG6x6jm3du082BqAAEJWm-Jm5TmKNo320,5
-ncbi_datasets_pyclient-18.13.0.dist-info/RECORD,,
+ncbi_datasets_pyclient-18.14.0.dist-info/licenses/LICENSE,sha256=4hywPAiqr3WLJWIV6zs2wK9aCcBUQVRwLJWPi2AegMk,1501
+ncbi_datasets_pyclient-18.14.0.dist-info/METADATA,sha256=LyBJa_ZcFQDEgR9TZrlAiA2dfd1PSoYwUh4uISwVwg0,43941
+ncbi_datasets_pyclient-18.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ncbi_datasets_pyclient-18.14.0.dist-info/top_level.txt,sha256=nraz3S7SoUNG6x6jm3du082BqAAEJWm-Jm5TmKNo320,5
+ncbi_datasets_pyclient-18.14.0.dist-info/RECORD,,