Regenerate code using V7.4.0 of openapi generator

oricho123 · oricho123 · commit cc9946f2a941 · 2024-05-29T09:35:42.000+03:00
diff --git a/monday_code/api/environment_variables_api.py b/monday_code/api/environment_variables_api.py
@@ -17,7 +17,6 @@
 from typing_extensions import Annotated
 
 from pydantic import StrictStr
-from typing import List
 from monday_code.models.json_value import JsonValue
 
 from monday_code.api_client import ApiClient, RequestSerialized
@@ -253,7 +252,7 @@ def _get_environment_variable_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
@@ -494,7 +493,7 @@ def _get_environment_variable_keys_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
diff --git a/monday_code/api/logs_api.py b/monday_code/api/logs_api.py
@@ -248,7 +248,7 @@ def _write_log_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
diff --git a/monday_code/api/queue_api.py b/monday_code/api/queue_api.py
@@ -251,7 +251,7 @@ def _publish_message_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
@@ -518,7 +518,7 @@ def _validate_secret_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
diff --git a/monday_code/api/secrets_api.py b/monday_code/api/secrets_api.py
@@ -17,7 +17,6 @@
 from typing_extensions import Annotated
 
 from pydantic import StrictStr
-from typing import List
 
 from monday_code.api_client import ApiClient, RequestSerialized
 from monday_code.api_response import ApiResponse
@@ -252,7 +251,7 @@ def _get_secret_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
@@ -493,7 +492,7 @@ def _get_secret_keys_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
diff --git a/monday_code/api/secure_storage_api.py b/monday_code/api/secure_storage_api.py
@@ -17,7 +17,6 @@
 from typing_extensions import Annotated
 
 from pydantic import StrictStr
-from typing import Any
 from monday_code.models.secure_storage_data_contract import SecureStorageDataContract
 
 from monday_code.api_client import ApiClient, RequestSerialized
@@ -250,7 +249,7 @@ def _delete_secure_storage_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
@@ -501,7 +500,7 @@ def _get_secure_storage_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
@@ -768,7 +767,7 @@ def _put_secure_storage_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
diff --git a/monday_code/api/storage_api.py b/monday_code/api/storage_api.py
@@ -17,7 +17,7 @@
 from typing_extensions import Annotated
 
 from pydantic import StrictBool, StrictStr
-from typing import Any, Optional
+from typing import Optional
 from monday_code.models.increment_counter_params import IncrementCounterParams
 from monday_code.models.storage_data_contract import StorageDataContract
 
@@ -264,7 +264,7 @@ def _delete_by_key_from_storage_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
@@ -546,7 +546,7 @@ def _get_by_key_from_storage_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
@@ -819,7 +819,7 @@ def _increment_counter_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
@@ -1140,7 +1140,7 @@ def _upsert_by_key_from_storage_serialize(
         _query_params: List[Tuple[str, str]] = []
         _header_params: Dict[str, Optional[str]] = _headers or {}
         _form_params: List[Tuple[str, str]] = []
-        _files: Dict[str, Union[str, bytes]] = {}
+        _files: Dict[str, str] = {}
         _body_params: Optional[bytes] = None
 
         # process the path parameters
diff --git a/monday_code/api_client.py b/monday_code/api_client.py
@@ -22,8 +22,7 @@
 import tempfile
 
 from urllib.parse import quote
-from typing import Tuple, Optional, List, Dict, Union
-from pydantic import SecretStr
+from typing import Tuple, Optional, List, Dict
 
 from monday_code.configuration import Configuration
 from monday_code.api_response import ApiResponse, T as ApiResponseT
@@ -208,8 +207,7 @@ def param_serialize(
                 post_params,
                 collection_formats
             )
-            if files:
-                post_params.extend(self.files_parameters(files))
+            post_params.extend(self.files_parameters(files))
 
         # auth setting
         self.update_params_for_auth(
@@ -314,10 +312,7 @@ def response_deserialize(
                     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)
         finally:
             if not 200 <= response_data.status <= 299:
                 raise ApiException.from_response(
@@ -337,7 +332,6 @@ def sanitize_for_serialization(self, obj):
         """Builds a JSON POST object.
 
         If obj is None, return None.
-        If obj is SecretStr, return obj.get_secret_value()
         If obj is str, int, long, float, bool, return directly.
         If obj is datetime.datetime, datetime.date
             convert to string in iso8601 format.
@@ -350,10 +344,6 @@ def sanitize_for_serialization(self, obj):
         """
         if obj is None:
             return None
-        elif isinstance(obj, Enum):
-            return obj.value
-        elif isinstance(obj, SecretStr):
-            return obj.get_secret_value()
         elif isinstance(obj, self.PRIMITIVE_TYPES):
             return obj
         elif isinstance(obj, list):
@@ -375,10 +365,7 @@ def sanitize_for_serialization(self, obj):
             # and attributes which value is not None.
             # Convert attribute name to json key in
             # model definition for request.
-            if hasattr(obj, 'to_dict') and callable(getattr(obj, 'to_dict')):
-                obj_dict = obj.to_dict()
-            else:
-                obj_dict = obj.__dict__
+            obj_dict = obj.to_dict()
 
         return {
             key: self.sanitize_for_serialization(val)
@@ -517,30 +504,31 @@ def parameters_to_url_query(self, params, collection_formats):
 
         return "&".join(["=".join(map(str, item)) for item in new_params])
 
-    def files_parameters(self, files: Dict[str, Union[str, bytes]]):
+    def files_parameters(self, files=None):
         """Builds form parameters.
 
         :param files: File parameters.
         :return: Form parameters with files.
         """
         params = []
-        for k, v in files.items():
-            if isinstance(v, str):
-                with open(v, 'rb') as f:
-                    filename = os.path.basename(f.name)
-                    filedata = f.read()
-            elif isinstance(v, bytes):
-                filename = k
-                filedata = v
-            else:
-                raise ValueError("Unsupported file value")
-            mimetype = (
-                mimetypes.guess_type(filename)[0]
-                or 'application/octet-stream'
-            )
-            params.append(
-                tuple([k, tuple([filename, filedata, mimetype])])
-            )
+
+        if files:
+            for k, v in files.items():
+                if not v:
+                    continue
+                file_names = v if type(v) is list else [v]
+                for n in file_names:
+                    with open(n, 'rb') as f:
+                        filename = os.path.basename(f.name)
+                        filedata = f.read()
+                        mimetype = (
+                            mimetypes.guess_type(filename)[0]
+                            or 'application/octet-stream'
+                        )
+                        params.append(
+                            tuple([k, tuple([filename, filedata, mimetype])])
+                        )
+
         return params
 
     def select_header_accept(self, accepts: List[str]) -> Optional[str]:
diff --git a/monday_code/models/json_value.py b/monday_code/models/json_value.py
@@ -19,7 +19,7 @@
 import re  # noqa: F401
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, ValidationError, field_validator
 from typing import Dict, List, Optional, Union
-from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
+from typing import Union, Any, List, TYPE_CHECKING, Optional, Dict
 from typing_extensions import Literal, Self
 from pydantic import Field
 
@@ -44,7 +44,7 @@ class JsonValue(BaseModel):
         actual_instance: Optional[Union[Dict[str, JsonValue], List[JsonValue], bool, float, str]] = None
     else:
         actual_instance: Any = None
-    any_of_schemas: Set[str] = { "Dict[str, JsonValue]", "List[JsonValue]", "bool", "float", "str" }
+    any_of_schemas: List[str] = Field(default=Literal["Dict[str, JsonValue]", "List[JsonValue]", "bool", "float", "str"])
 
     model_config = {
         "validate_assignment": True,
diff --git a/monday_code/models/write_log_request_body_error.py b/monday_code/models/write_log_request_body_error.py
@@ -19,7 +19,7 @@
 import re  # noqa: F401
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
 from typing import Any, Dict, Optional
-from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
+from typing import Union, Any, List, TYPE_CHECKING, Optional, Dict
 from typing_extensions import Literal, Self
 from pydantic import Field
 
@@ -38,7 +38,7 @@ class WriteLogRequestBodyError(BaseModel):
         actual_instance: Optional[Union[Dict[str, object], str]] = None
     else:
         actual_instance: Any = None
-    any_of_schemas: Set[str] = { "Dict[str, object]", "str" }
+    any_of_schemas: List[str] = Field(default=Literal["Dict[str, object]", "str"])
 
     model_config = {
         "validate_assignment": True,
diff --git a/monday_code/rest.py b/monday_code/rest.py
@@ -202,8 +202,6 @@ def request(
                     # Content-Type which generated by urllib3 will be
                     # overwritten.
                     del headers['Content-Type']
-                    # Ensures that dict objects are serialized
-                    post_params = [(a, json.dumps(b)) if isinstance(b, dict) else (a,b) for a, b in post_params]
                     r = self.pool_manager.request(
                         method,
                         url,
