Add typing.Any to kwargs in generated code

Author: yugokato

README.md

@@ -235,7 +235,7 @@ By default, each auto-generated API function will look like a stub function with
 ```python
 @endpoint.is_public
 @endpoint.post("/v1/auth/login")
-def login(self, *, username: str = Unset, password: str = Unset, **kwargs) -> RestResponse:
+def login(self, *, username: str = Unset, password: str = Unset, **kwargs: Any) -> RestResponse:
     """Login"""
     ...
 ```
@@ -278,7 +278,7 @@ def my_decorator(f):
 @my_decorator
 @endpoint.is_public
 @endpoint.post("/v1/auth/login")
-def login(self, *, username: str = Unset, password: str = Unset, **kwargs) -> RestResponse:
+def login(self, *, username: str = Unset, password: str = Unset, **kwargs: Any) -> RestResponse:
     """Login"""
     ...
 ```
@@ -416,13 +416,13 @@ class AuthAPI(DemoAppBaseAPI):
 
     @endpoint.is_public
     @endpoint.post("/v1/auth/login")
-    def login(self, *, username: str = Unset, password: str = Unset, **kwargs) -> RestResponse:
+    def login(self, *, username: str = Unset, password: str = Unset, **kwargs: Any) -> RestResponse:
         """Login"""
         ...
 
     @endpoint.is_public
     @endpoint.get("/v1/auth/logout")
-    def logout(self, **kwargs) -> RestResponse:
+    def logout(self, **kwargs: Any) -> RestResponse:
         """Logout"""
         ...
 
@@ -632,7 +632,7 @@ class UsersAPI(DemoAppBaseAPI):
         email: Annotated[str, Format("email")] = Unset,
         role: Literal["admin", "viewer", "support"] = Unset,
         metadata: Optional[Metadata] = Unset,
-        **kwargs,
+        **kwargs: Any,
     ) -> RestResponse:
         """Create a new user"""
         ...

images/generate.gif

@@ -1,3 +1,5 @@
+from typing import Any
+
 from common_libs.clients.rest_client import RestResponse
 
 from openapi_test_client.clients.demo_app.api.base import DemoAppBaseAPI
@@ -10,12 +12,12 @@ class AuthAPI(DemoAppBaseAPI):
 
     @endpoint.is_public
     @endpoint.post("/v1/auth/login")
-    def login(self, *, username: str = Unset, password: str = Unset, **kwargs) -> RestResponse:
+    def login(self, *, username: str = Unset, password: str = Unset, **kwargs: Any) -> RestResponse:
         """Login"""
         ...
 
     @endpoint.is_public
     @endpoint.get("/v1/auth/logout")
-    def logout(self, **kwargs) -> RestResponse:
+    def logout(self, **kwargs: Any) -> RestResponse:
         """Logout"""
         ...

images/update.gif

@@ -1,4 +1,4 @@
-from typing import Annotated, Literal
+from typing import Annotated, Any, Literal
 
 from common_libs.clients.rest_client import RestResponse
 
@@ -21,13 +21,13 @@ def create_user(
         email: Annotated[str, Format("email")] = Unset,
         role: Literal["admin", "viewer", "support"] = Unset,
         metadata: Optional[Metadata] = Unset,
-        **kwargs,
+        **kwargs: Any,
     ) -> RestResponse:
         """Create a new user"""
         ...
 
     @endpoint.get("/v1/users/{user_id}")
-    def get_user(self, user_id: int, /, **kwargs) -> RestResponse:
+    def get_user(self, user_id: int, /, **kwargs: Any) -> RestResponse:
         """Get user"""
         ...
 
@@ -38,18 +38,18 @@ def get_users(
         id: Optional[int] = Unset,
         email: Optional[Annotated[str, Format("email")]] = Unset,
         role: Optional[Literal["admin", "viewer", "support"]] = Unset,
-        **kwargs,
+        **kwargs: Any,
     ) -> RestResponse:
         """Get users"""
         ...
 
     @endpoint.content_type("multipart/form-data")
     @endpoint.post("/v1/users/images")
-    def upload_image(self, *, file: File = Unset, description: Optional[str] = Unset, **kwargs) -> RestResponse:
+    def upload_image(self, *, file: File = Unset, description: Optional[str] = Unset, **kwargs: Any) -> RestResponse:
         """Upload user image"""
         ...
 
     @endpoint.delete("/v1/users/{user_id}")
-    def delete_user(self, user_id: int, /, **kwargs) -> RestResponse:
+    def delete_user(self, user_id: int, /, **kwargs: Any) -> RestResponse:
         """Delete user"""
         ...

src/openapi_test_client/clients/demo_app/api/auth.py

@@ -121,9 +121,9 @@ def generate_func_signature_in_str(model: type[EndpointModel]) -> str:
         signatures.append("/")
 
     if any("kwargs:" in s for s in signatures):
-        signatures.append("**kwargs_")
+        signatures.append("**kwargs_: Any")
     else:
-        signatures.append("**kwargs")
+        signatures.append("**kwargs: Any")
     return ", ".join(signatures)
 
 

src/openapi_test_client/clients/demo_app/api/users.py

@@ -153,7 +153,7 @@ def generate_imports_code_from_model(
     :param model: A dataclass obj
     :param exclude_nested_models: Skip imports for nested models (to avoid define imports for models in the same file)
     """
-    imports_code = ""
+    imports_code = "from typing import Any\n"
     module_and_name_pairs = set()
     primitive_types = [int, float, str, bool]
     from openapi_test_client.libraries.api.api_client_generator import API_MODEL_CLASS_DIR_NAME