- Addressed Review comments.

Author: BinoyOza-okta

okta/api_client.py

@@ -599,9 +599,10 @@ def files_parameters(self, files: Dict[str, Union[str, bytes]]):
                     try:
                         from PIL import Image  # Lazy import — Pillow is optional
                         img = Image.open(io.BytesIO(filedata))
+                        img_format = img.format  # Read format before verify() resets the object
                         img.verify()  # Verify it's actually a valid image
                         format_to_ext = {'PNG': 'png', 'JPEG': 'jpg', 'GIF': 'gif'}
-                        ext = format_to_ext.get(img.format, 'png')
+                        ext = format_to_ext.get(img_format, 'png')
                         filename = f"{k}.{ext}"
                         mimetype = f"image/{ext if ext != 'jpg' else 'jpeg'}"
                         pil_validated = True
@@ -626,7 +627,7 @@ def files_parameters(self, files: Dict[str, Union[str, bytes]]):
                         mimetype = "application/octet-stream"
             else:
                 raise ValueError("Unsupported file value")
-            params.append(tuple([k, tuple([filename, filedata, mimetype])]))
+            params.append((k, (filename, filedata, mimetype)))
         return params
 
     def select_header_accept(self, accepts: List[str]) -> Optional[str]:

okta/http_client.py

@@ -135,11 +135,10 @@ async def send_request(self, request):
                         filename = ""
                         if isinstance(request["form"]["file"], str):
                             filename = request["form"]["file"].split("/")[-1]
-                        data = aiohttp.FormData()
-                        with open(request["form"]["file"], "rb") as f:
-                            file_data = f.read()
                         mimetype = mimetypes.guess_type(filename)[0] or "application/octet-stream"
-                        data.add_field("file", file_data, filename=filename, content_type=mimetype)
+                        data = aiohttp.FormData()
+                        file_handle = open(request["form"]["file"], "rb")
+                        data.add_field("file", file_handle, filename=filename, content_type=mimetype)
                         params["data"] = data
                         # Remove Content-Type header - aiohttp.FormData will set it with boundary
                         params["headers"] = _remove_content_type_header(request_headers)

openapi/templates/api_client.mustache

@@ -607,9 +607,10 @@ class ApiClient:
                     try:
                         from PIL import Image  # Lazy import — Pillow is optional
                         img = Image.open(io.BytesIO(filedata))
+                        img_format = img.format  # Read format before verify() resets the object
                         img.verify()  # Verify it's actually a valid image
                         format_to_ext = {'PNG': 'png', 'JPEG': 'jpg', 'GIF': 'gif'}
-                        ext = format_to_ext.get(img.format, 'png')
+                        ext = format_to_ext.get(img_format, 'png')
                         filename = f"{k}.{ext}"
                         mimetype = f"image/{ext if ext != 'jpg' else 'jpeg'}"
                         pil_validated = True
@@ -634,7 +635,7 @@ class ApiClient:
                         mimetype = "application/octet-stream"
             else:
                 raise ValueError("Unsupported file value")
-            params.append(tuple([k, tuple([filename, filedata, mimetype])]))
+            params.append((k, (filename, filedata, mimetype)))
         return params
 
     def select_header_accept(self, accepts: List[str]) -> Optional[str]:

openapi/templates/okta/http_client.mustache

@@ -123,11 +123,10 @@ class HTTPClient:
                         filename = ""
                         if isinstance(request["form"]["file"], str):
                             filename = request["form"]["file"].split("/")[-1]
-                        data = aiohttp.FormData()
-                        with open(request["form"]["file"], "rb") as f:
-                            file_data = f.read()
                         mimetype = mimetypes.guess_type(filename)[0] or "application/octet-stream"
-                        data.add_field("file", file_data, filename=filename, content_type=mimetype)
+                        data = aiohttp.FormData()
+                        file_handle = open(request["form"]["file"], "rb")
+                        data.add_field("file", file_handle, filename=filename, content_type=mimetype)
                         params["data"] = data
                         # Remove Content-Type header - aiohttp.FormData will set it with boundary
                         params["headers"] = _remove_content_type_header(request_headers)

openapi/templates/okta/request_executor.mustache

@@ -138,8 +138,6 @@ class RequestExecutor:
         oauth=False,
         keep_empty_params=False,
     ):
-    async def create_request(self, method: str, url: str, body: dict = None,
-                             headers: dict = None, form=None, oauth=False, keep_empty_params=False):
         """
         Creates request for request executor's HTTP client.
 

openapi/templates/setup.mustache

@@ -78,7 +78,7 @@ setup(
     keywords=["OpenAPI", "OpenAPI-Generator", "Okta Admin Management"],
     install_requires=REQUIRES,
     extras_require={
-        "images": ["pillow >= 9.0.0"],
+        "images": ["pillow >= 9.0.0, < 12"],
     },
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,

setup.py

@@ -78,7 +78,7 @@ def get_version():
     keywords=["OpenAPI", "OpenAPI-Generator", "Okta Admin Management"],
     install_requires=REQUIRES,
     extras_require={
-        "images": ["pillow >= 9.0.0"],
+        "images": ["pillow >= 9.0.0, < 12"],
     },
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,