Release 1.70.0 (#187)

Author: fa-ui-bot

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "py-pure-client"
-version = "1.69.0"
+version = "1.70.0"
 description = "Pure Storage Python clients for FlashArray, FlashBlade, and Pure1 APIs"
 authors = [
     { name = "Pure Storage", email = "[email protected]" }

pypureclient/_version.py

@@ -1,3 +1,3 @@
 __name__ = 'py-pure-client'
-__version__ = '1.69.0'
+__version__ = '1.70.0'
 __default_user_agent__ = 'pure/{}/{}'.format(__name__, __version__)

pypureclient/flashblade/FB_2_0/client.py

@@ -4,6 +4,9 @@
 import urllib3
 import uuid
 import warnings
+import os
+import re
+import tempfile
 
 from typing import Any, Dict, List, Optional, Tuple, Union
 from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, conint, conlist, constr, validator
@@ -83,10 +86,10 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
             PureError: If it could not create an ID or access token
         """
         urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-        config = Configuration()
-        config.verify_ssl = resolve_ssl_validation(verify_ssl)
-        config.ssl_ca_cert = ssl_cert
-        config.host = self._get_base_url(target)
+        self.config = Configuration()
+        self.config.verify_ssl = resolve_ssl_validation(verify_ssl)
+        self.config.ssl_ca_cert = ssl_cert
+        self.config.host = self._get_base_url(target)
 
         effective_user_agent = user_agent or self.USER_AGENT
 
@@ -101,7 +104,7 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
             self._token_man = APITokenManager(
                 api_token_auth_endpoint,
                 api_token,
-                verify_ssl=config.verify_ssl,
+                verify_ssl=self.config.verify_ssl,
                 token_dispose_endpoint=api_token_dispose_endpoint,
                 user_agent=effective_user_agent,
                 timeout=timeout
@@ -117,10 +120,10 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
                 'sub': username,
             }
             self._token_man = TokenManager(auth_endpoint, id_token, private_key_file, private_key_password,
-                                           payload=payload, headers=headers, verify_ssl=config.verify_ssl,
+                                           payload=payload, headers=headers, verify_ssl=self.config.verify_ssl,
                                            timeout=timeout)
 
-        self._api_client = ApiClient(configuration=config)
+        self._api_client = ApiClient(configuration=self.config)
         self._api_client.user_agent = effective_user_agent
         self._set_agent_header()
         self._set_auth_header()
@@ -16890,7 +16893,10 @@ def _create_valid_response(self, response: ApiResponse, endpoint, kwargs):
         Returns:
             ValidResponse
         """
-        body = response.data
+        if response.headers and "content-type" in response.headers.keys() and response.headers["content-type"] in ["application/octet-stream", "text/plain"]:
+            body = self._create_file(response)
+        else:
+            body = response.data
         headers = response.headers
 
         continuation_token = getattr(body, "continuation_token", None)
@@ -16910,6 +16916,19 @@ def _create_valid_response(self, response: ApiResponse, endpoint, kwargs):
         return ValidResponse(response.status_code, continuation_token, total_item_count,
                              items, headers, total, more_items_remaining)
 
+    def _create_file(self, response):
+        path = tempfile.mkdtemp(dir=self.config.temp_folder_path)
+
+        content_disposition = response.headers["Content-Disposition"]
+        if content_disposition:
+            filename = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                                 content_disposition).group(1)
+            path = os.path.join(os.path.dirname(path), filename)
+
+        with open(path, "wb") as f:
+            f.write(response.data)
+
+        return path
 
     def _create_api_versions_response(self, response: ApiResponse, endpoint, kwargs):
         """

pypureclient/flashblade/FB_2_1/client.py

@@ -4,6 +4,9 @@
 import urllib3
 import uuid
 import warnings
+import os
+import re
+import tempfile
 
 from typing import Any, Dict, List, Optional, Tuple, Union
 from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, conint, conlist, constr, validator
@@ -83,10 +86,10 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
             PureError: If it could not create an ID or access token
         """
         urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-        config = Configuration()
-        config.verify_ssl = resolve_ssl_validation(verify_ssl)
-        config.ssl_ca_cert = ssl_cert
-        config.host = self._get_base_url(target)
+        self.config = Configuration()
+        self.config.verify_ssl = resolve_ssl_validation(verify_ssl)
+        self.config.ssl_ca_cert = ssl_cert
+        self.config.host = self._get_base_url(target)
 
         effective_user_agent = user_agent or self.USER_AGENT
 
@@ -101,7 +104,7 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
             self._token_man = APITokenManager(
                 api_token_auth_endpoint,
                 api_token,
-                verify_ssl=config.verify_ssl,
+                verify_ssl=self.config.verify_ssl,
                 token_dispose_endpoint=api_token_dispose_endpoint,
                 user_agent=effective_user_agent,
                 timeout=timeout
@@ -117,10 +120,10 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
                 'sub': username,
             }
             self._token_man = TokenManager(auth_endpoint, id_token, private_key_file, private_key_password,
-                                           payload=payload, headers=headers, verify_ssl=config.verify_ssl,
+                                           payload=payload, headers=headers, verify_ssl=self.config.verify_ssl,
                                            timeout=timeout)
 
-        self._api_client = ApiClient(configuration=config)
+        self._api_client = ApiClient(configuration=self.config)
         self._api_client.user_agent = effective_user_agent
         self._set_agent_header()
         self._set_auth_header()
@@ -17613,7 +17616,10 @@ def _create_valid_response(self, response: ApiResponse, endpoint, kwargs):
         Returns:
             ValidResponse
         """
-        body = response.data
+        if response.headers and "content-type" in response.headers.keys() and response.headers["content-type"] in ["application/octet-stream", "text/plain"]:
+            body = self._create_file(response)
+        else:
+            body = response.data
         headers = response.headers
 
         continuation_token = getattr(body, "continuation_token", None)
@@ -17633,6 +17639,19 @@ def _create_valid_response(self, response: ApiResponse, endpoint, kwargs):
         return ValidResponse(response.status_code, continuation_token, total_item_count,
                              items, headers, total, more_items_remaining)
 
+    def _create_file(self, response):
+        path = tempfile.mkdtemp(dir=self.config.temp_folder_path)
+
+        content_disposition = response.headers["Content-Disposition"]
+        if content_disposition:
+            filename = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                                 content_disposition).group(1)
+            path = os.path.join(os.path.dirname(path), filename)
+
+        with open(path, "wb") as f:
+            f.write(response.data)
+
+        return path
 
     def _create_api_versions_response(self, response: ApiResponse, endpoint, kwargs):
         """

pypureclient/flashblade/FB_2_10/client.py

@@ -4,6 +4,9 @@
 import urllib3
 import uuid
 import warnings
+import os
+import re
+import tempfile
 
 from typing import Any, Dict, List, Optional, Tuple, Union
 from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, conint, conlist, constr, validator
@@ -83,10 +86,10 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
             PureError: If it could not create an ID or access token
         """
         urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-        config = Configuration()
-        config.verify_ssl = resolve_ssl_validation(verify_ssl)
-        config.ssl_ca_cert = ssl_cert
-        config.host = self._get_base_url(target)
+        self.config = Configuration()
+        self.config.verify_ssl = resolve_ssl_validation(verify_ssl)
+        self.config.ssl_ca_cert = ssl_cert
+        self.config.host = self._get_base_url(target)
 
         effective_user_agent = user_agent or self.USER_AGENT
 
@@ -101,7 +104,7 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
             self._token_man = APITokenManager(
                 api_token_auth_endpoint,
                 api_token,
-                verify_ssl=config.verify_ssl,
+                verify_ssl=self.config.verify_ssl,
                 token_dispose_endpoint=api_token_dispose_endpoint,
                 user_agent=effective_user_agent,
                 timeout=timeout
@@ -117,10 +120,10 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
                 'sub': username,
             }
             self._token_man = TokenManager(auth_endpoint, id_token, private_key_file, private_key_password,
-                                           payload=payload, headers=headers, verify_ssl=config.verify_ssl,
+                                           payload=payload, headers=headers, verify_ssl=self.config.verify_ssl,
                                            timeout=timeout)
 
-        self._api_client = ApiClient(configuration=config)
+        self._api_client = ApiClient(configuration=self.config)
         self._api_client.user_agent = effective_user_agent
         self._set_agent_header()
         self._set_auth_header()
@@ -22137,7 +22140,10 @@ def _create_valid_response(self, response: ApiResponse, endpoint, kwargs):
         Returns:
             ValidResponse
         """
-        body = response.data
+        if response.headers and "content-type" in response.headers.keys() and response.headers["content-type"] in ["application/octet-stream", "text/plain"]:
+            body = self._create_file(response)
+        else:
+            body = response.data
         headers = response.headers
 
         continuation_token = getattr(body, "continuation_token", None)
@@ -22157,6 +22163,19 @@ def _create_valid_response(self, response: ApiResponse, endpoint, kwargs):
         return ValidResponse(response.status_code, continuation_token, total_item_count,
                              items, headers, total, more_items_remaining)
 
+    def _create_file(self, response):
+        path = tempfile.mkdtemp(dir=self.config.temp_folder_path)
+
+        content_disposition = response.headers["Content-Disposition"]
+        if content_disposition:
+            filename = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                                 content_disposition).group(1)
+            path = os.path.join(os.path.dirname(path), filename)
+
+        with open(path, "wb") as f:
+            f.write(response.data)
+
+        return path
 
     def _create_api_versions_response(self, response: ApiResponse, endpoint, kwargs):
         """

pypureclient/flashblade/FB_2_10/models/logs_async.py

@@ -21,7 +21,7 @@
 from typing import List, Optional, Union
 from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr, conint, conlist
 from pypureclient.flashblade.FB_2_10.models.file_info import FileInfo
-from pypureclient.flashblade.FB_2_10.models.fixed_reference import FixedReference
+from pypureclient.flashblade.FB_2_10.models.reference import Reference
 
 
 class LogsAsync(BaseModel):
@@ -32,7 +32,7 @@ class LogsAsync(BaseModel):
     name: Optional[StrictStr] = Field(default=None, description="Name of the object (e.g., a file system or snapshot).")
     available_files: Optional[conlist(FileInfo)] = Field(default=None, description="All of the available files ready for download.")
     end_time: Optional[conint(strict=True, ge=0)] = Field(default=None, description="When the time window ends (in milliseconds since epoch). start_time and end_time determine the number of hours for which the logs are prepared for. At most 6 hours of logs can be prepared in one request. start_time and end_time are truncated to hour boundaries.")
-    hardware_components: Optional[conlist(FixedReference)] = Field(default=None, description="All of the hardware components for which logs are being processed.")
+    hardware_components: Optional[conlist(Reference)] = Field(default=None, description="All of the hardware components for which logs are being processed.")
     last_request_time: Optional[conint(strict=True, ge=0)] = Field(default=None, description="The last time log preparation was requested (in milliseconds since epoch).")
     processing: Optional[StrictBool] = Field(default=None, description="Returns a value of `true` if the logs are being prepared.")
     progress: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="A representation of log preparation progress. Ranges from 0 to 1.0.")
@@ -130,7 +130,7 @@ def from_dict(cls, obj: dict) -> LogsAsync:
             "name": obj.get("name"),
             "available_files": [FileInfo.from_dict(_item) for _item in obj.get("available_files")] if obj.get("available_files") is not None else None,
             "end_time": obj.get("end_time"),
-            "hardware_components": [FixedReference.from_dict(_item) for _item in obj.get("hardware_components")] if obj.get("hardware_components") is not None else None,
+            "hardware_components": [Reference.from_dict(_item) for _item in obj.get("hardware_components")] if obj.get("hardware_components") is not None else None,
             "last_request_time": obj.get("last_request_time"),
             "processing": obj.get("processing"),
             "progress": obj.get("progress"),

pypureclient/flashblade/FB_2_10/models/smb_share_policy_rule.py

@@ -60,7 +60,6 @@ def to_dict(self, include_readonly: bool=True) -> Dict[str, Any]:
             excluded_fields.update([
                 "id",
                 "name",
-                "principal",
             ])
         none_fields: Set[str] = set()
         for _field in self.__fields__.keys():

pypureclient/flashblade/FB_2_11/client.py

@@ -4,6 +4,9 @@
 import urllib3
 import uuid
 import warnings
+import os
+import re
+import tempfile
 
 from typing import Any, Dict, List, Optional, Tuple, Union
 from pydantic import Field, StrictBool, StrictFloat, StrictInt, StrictStr, conint, conlist, constr, validator
@@ -83,10 +86,10 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
             PureError: If it could not create an ID or access token
         """
         urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-        config = Configuration()
-        config.verify_ssl = resolve_ssl_validation(verify_ssl)
-        config.ssl_ca_cert = ssl_cert
-        config.host = self._get_base_url(target)
+        self.config = Configuration()
+        self.config.verify_ssl = resolve_ssl_validation(verify_ssl)
+        self.config.ssl_ca_cert = ssl_cert
+        self.config.host = self._get_base_url(target)
 
         effective_user_agent = user_agent or self.USER_AGENT
 
@@ -101,7 +104,7 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
             self._token_man = APITokenManager(
                 api_token_auth_endpoint,
                 api_token,
-                verify_ssl=config.verify_ssl,
+                verify_ssl=self.config.verify_ssl,
                 token_dispose_endpoint=api_token_dispose_endpoint,
                 user_agent=effective_user_agent,
                 timeout=timeout
@@ -117,10 +120,10 @@ def __init__(self, target, id_token=None, private_key_file=None, private_key_pas
                 'sub': username,
             }
             self._token_man = TokenManager(auth_endpoint, id_token, private_key_file, private_key_password,
-                                           payload=payload, headers=headers, verify_ssl=config.verify_ssl,
+                                           payload=payload, headers=headers, verify_ssl=self.config.verify_ssl,
                                            timeout=timeout)
 
-        self._api_client = ApiClient(configuration=config)
+        self._api_client = ApiClient(configuration=self.config)
         self._api_client.user_agent = effective_user_agent
         self._set_agent_header()
         self._set_auth_header()
@@ -22143,7 +22146,10 @@ def _create_valid_response(self, response: ApiResponse, endpoint, kwargs):
         Returns:
             ValidResponse
         """
-        body = response.data
+        if response.headers and "content-type" in response.headers.keys() and response.headers["content-type"] in ["application/octet-stream", "text/plain"]:
+            body = self._create_file(response)
+        else:
+            body = response.data
         headers = response.headers
 
         continuation_token = getattr(body, "continuation_token", None)
@@ -22163,6 +22169,19 @@ def _create_valid_response(self, response: ApiResponse, endpoint, kwargs):
         return ValidResponse(response.status_code, continuation_token, total_item_count,
                              items, headers, total, more_items_remaining)
 
+    def _create_file(self, response):
+        path = tempfile.mkdtemp(dir=self.config.temp_folder_path)
+
+        content_disposition = response.headers["Content-Disposition"]
+        if content_disposition:
+            filename = re.search(r'filename=[\'"]?([^\'"\s]+)[\'"]?',
+                                 content_disposition).group(1)
+            path = os.path.join(os.path.dirname(path), filename)
+
+        with open(path, "wb") as f:
+            f.write(response.data)
+
+        return path
 
     def _create_api_versions_response(self, response: ApiResponse, endpoint, kwargs):
         """