Merge branch 'main' into fix/url-encoding

Author: Robbie-Palmer

end_to_end_tests/docstrings-on-attributes-golden-record/my_test_api_client/client.py

@@ -58,7 +58,7 @@ def with_cookies(self, cookies: dict[str, str]) -> "Client":
         return evolve(self, cookies={**self._cookies, **cookies})
 
     def with_timeout(self, timeout: httpx.Timeout) -> "Client":
-        """Get a new client matching this one with a new timeout (in seconds)"""
+        """Get a new client matching this one with a new timeout configuration"""
         if self._client is not None:
             self._client.timeout = timeout
         if self._async_client is not None:
@@ -97,7 +97,7 @@ def __exit__(self, *args: Any, **kwargs: Any) -> None:
         self.get_httpx_client().__exit__(*args, **kwargs)
 
     def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "Client":
-        """Manually the underlying httpx.AsyncClient
+        """Manually set the underlying httpx.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """
@@ -188,7 +188,7 @@ def with_cookies(self, cookies: dict[str, str]) -> "AuthenticatedClient":
         return evolve(self, cookies={**self._cookies, **cookies})
 
     def with_timeout(self, timeout: httpx.Timeout) -> "AuthenticatedClient":
-        """Get a new client matching this one with a new timeout (in seconds)"""
+        """Get a new client matching this one with a new timeout configuration"""
         if self._client is not None:
             self._client.timeout = timeout
         if self._async_client is not None:
@@ -228,7 +228,7 @@ def __exit__(self, *args: Any, **kwargs: Any) -> None:
         self.get_httpx_client().__exit__(*args, **kwargs)
 
     def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "AuthenticatedClient":
-        """Manually the underlying httpx.AsyncClient
+        """Manually set the underlying httpx.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """

end_to_end_tests/golden-record/my_test_api_client/api/default/get_models_oneof_with_required_const.py

@@ -37,7 +37,7 @@ def _parse_response_200(
                 response_200_type_0 = GetModelsOneofWithRequiredConstResponse200Type0.from_dict(data)
 
                 return response_200_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             if not isinstance(data, dict):
                 raise TypeError()

end_to_end_tests/golden-record/my_test_api_client/client.py

@@ -62,7 +62,7 @@ def with_cookies(self, cookies: dict[str, str]) -> "Client":
         return evolve(self, cookies={**self._cookies, **cookies})
 
     def with_timeout(self, timeout: httpx.Timeout) -> "Client":
-        """Get a new client matching this one with a new timeout (in seconds)"""
+        """Get a new client matching this one with a new timeout configuration"""
         if self._client is not None:
             self._client.timeout = timeout
         if self._async_client is not None:
@@ -101,7 +101,7 @@ def __exit__(self, *args: Any, **kwargs: Any) -> None:
         self.get_httpx_client().__exit__(*args, **kwargs)
 
     def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "Client":
-        """Manually the underlying httpx.AsyncClient
+        """Manually set the underlying httpx.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """
@@ -196,7 +196,7 @@ def with_cookies(self, cookies: dict[str, str]) -> "AuthenticatedClient":
         return evolve(self, cookies={**self._cookies, **cookies})
 
     def with_timeout(self, timeout: httpx.Timeout) -> "AuthenticatedClient":
-        """Get a new client matching this one with a new timeout (in seconds)"""
+        """Get a new client matching this one with a new timeout configuration"""
         if self._client is not None:
             self._client.timeout = timeout
         if self._async_client is not None:
@@ -236,7 +236,7 @@ def __exit__(self, *args: Any, **kwargs: Any) -> None:
         self.get_httpx_client().__exit__(*args, **kwargs)
 
     def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "AuthenticatedClient":
-        """Manually the underlying httpx.AsyncClient
+        """Manually set the underlying httpx.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """

end_to_end_tests/golden-record/my_test_api_client/models/a_model.py

@@ -272,7 +272,7 @@ def _parse_a_camel_date_time(data: object) -> datetime.date | datetime.datetime:
                 a_camel_date_time_type_0 = isoparse(data)
 
                 return a_camel_date_time_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             if not isinstance(data, str):
                 raise TypeError()
@@ -293,7 +293,7 @@ def _parse_a_nullable_date(data: object) -> datetime.date | None:
                 a_nullable_date_type_0 = isoparse(data).date()
 
                 return a_nullable_date_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             return cast(datetime.date | None, data)
 
@@ -310,7 +310,7 @@ def _parse_a_nullable_uuid(data: object) -> None | UUID:
                 a_nullable_uuid_type_0 = UUID(data)
 
                 return a_nullable_uuid_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             return cast(None | UUID, data)
 
@@ -332,15 +332,15 @@ def _parse_one_of_models(data: object) -> Any | FreeFormModel | ModelWithUnionPr
                 one_of_models_type_0 = FreeFormModel.from_dict(data)
 
                 return one_of_models_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             try:
                 if not isinstance(data, dict):
                     raise TypeError()
                 one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)
 
                 return one_of_models_type_1
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             return cast(Any | FreeFormModel | ModelWithUnionProperty, data)
 
@@ -355,15 +355,15 @@ def _parse_nullable_one_of_models(data: object) -> FreeFormModel | ModelWithUnio
                 nullable_one_of_models_type_0 = FreeFormModel.from_dict(data)
 
                 return nullable_one_of_models_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             try:
                 if not isinstance(data, dict):
                     raise TypeError()
                 nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)
 
                 return nullable_one_of_models_type_1
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             return cast(FreeFormModel | ModelWithUnionProperty | None, data)
 
@@ -380,7 +380,7 @@ def _parse_nullable_model(data: object) -> ModelWithUnionProperty | None:
                 nullable_model_type_1 = ModelWithUnionProperty.from_dict(data)
 
                 return nullable_model_type_1
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             return cast(ModelWithUnionProperty | None, data)
 
@@ -395,17 +395,19 @@ def _parse_nullable_model(data: object) -> ModelWithUnionProperty | None:
         else:
             an_optional_allof_enum = AnAllOfEnum(_an_optional_allof_enum)
 
-        nested_list_of_enums = []
         _nested_list_of_enums = d.pop("nested_list_of_enums", UNSET)
-        for nested_list_of_enums_item_data in _nested_list_of_enums or []:
-            nested_list_of_enums_item = []
-            _nested_list_of_enums_item = nested_list_of_enums_item_data
-            for nested_list_of_enums_item_item_data in _nested_list_of_enums_item:
-                nested_list_of_enums_item_item = DifferentEnum(nested_list_of_enums_item_item_data)
+        nested_list_of_enums: list[list[DifferentEnum]] | Unset = UNSET
+        if _nested_list_of_enums is not UNSET:
+            nested_list_of_enums = []
+            for nested_list_of_enums_item_data in _nested_list_of_enums:
+                nested_list_of_enums_item = []
+                _nested_list_of_enums_item = nested_list_of_enums_item_data
+                for nested_list_of_enums_item_item_data in _nested_list_of_enums_item:
+                    nested_list_of_enums_item_item = DifferentEnum(nested_list_of_enums_item_item_data)
 
-                nested_list_of_enums_item.append(nested_list_of_enums_item_item)
+                    nested_list_of_enums_item.append(nested_list_of_enums_item_item)
 
-            nested_list_of_enums.append(nested_list_of_enums_item)
+                nested_list_of_enums.append(nested_list_of_enums_item)
 
         _a_not_required_date = d.pop("a_not_required_date", UNSET)
         a_not_required_date: datetime.date | Unset
@@ -445,7 +447,7 @@ def _parse_not_required_one_of_models(data: object) -> FreeFormModel | ModelWith
                 not_required_one_of_models_type_0 = FreeFormModel.from_dict(data)
 
                 return not_required_one_of_models_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             if not isinstance(data, dict):
                 raise TypeError()
@@ -468,15 +470,15 @@ def _parse_not_required_nullable_one_of_models(
                 not_required_nullable_one_of_models_type_0 = FreeFormModel.from_dict(data)
 
                 return not_required_nullable_one_of_models_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             try:
                 if not isinstance(data, dict):
                     raise TypeError()
                 not_required_nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)
 
                 return not_required_nullable_one_of_models_type_1
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             return cast(FreeFormModel | ModelWithUnionProperty | None | str | Unset, data)
 
@@ -502,7 +504,7 @@ def _parse_not_required_nullable_model(data: object) -> ModelWithUnionProperty |
                 not_required_nullable_model_type_1 = ModelWithUnionProperty.from_dict(data)
 
                 return not_required_nullable_model_type_1
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             return cast(ModelWithUnionProperty | None | Unset, data)
 

end_to_end_tests/golden-record/my_test_api_client/models/an_array_with_a_circular_ref_in_items_object_a_item.py

@@ -50,16 +50,18 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         )
 
         d = dict(src_dict)
-        circular = []
         _circular = d.pop("circular", UNSET)
-        for componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item_data in _circular or []:
-            componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item = (
-                AnArrayWithACircularRefInItemsObjectBItem.from_dict(
-                    componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item_data
+        circular: list[AnArrayWithACircularRefInItemsObjectBItem] | Unset = UNSET
+        if _circular is not UNSET:
+            circular = []
+            for componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item_data in _circular:
+                componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item = (
+                    AnArrayWithACircularRefInItemsObjectBItem.from_dict(
+                        componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item_data
+                    )
                 )
-            )
 
-            circular.append(componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item)
+                circular.append(componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item)
 
         an_array_with_a_circular_ref_in_items_object_a_item = cls(
             circular=circular,

end_to_end_tests/golden-record/my_test_api_client/models/an_array_with_a_circular_ref_in_items_object_b_item.py

@@ -50,16 +50,18 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         )
 
         d = dict(src_dict)
-        circular = []
         _circular = d.pop("circular", UNSET)
-        for componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item_data in _circular or []:
-            componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item = (
-                AnArrayWithACircularRefInItemsObjectAItem.from_dict(
-                    componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item_data
+        circular: list[AnArrayWithACircularRefInItemsObjectAItem] | Unset = UNSET
+        if _circular is not UNSET:
+            circular = []
+            for componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item_data in _circular:
+                componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item = (
+                    AnArrayWithACircularRefInItemsObjectAItem.from_dict(
+                        componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item_data
+                    )
                 )
-            )
 
-            circular.append(componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item)
+                circular.append(componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item)
 
         an_array_with_a_circular_ref_in_items_object_b_item = cls(
             circular=circular,

end_to_end_tests/golden-record/my_test_api_client/models/an_array_with_a_recursive_ref_in_items_object_item.py

@@ -42,16 +42,18 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         d = dict(src_dict)
-        recursive = []
         _recursive = d.pop("recursive", UNSET)
-        for componentsschemas_an_array_with_a_recursive_ref_in_items_object_item_data in _recursive or []:
-            componentsschemas_an_array_with_a_recursive_ref_in_items_object_item = (
-                AnArrayWithARecursiveRefInItemsObjectItem.from_dict(
-                    componentsschemas_an_array_with_a_recursive_ref_in_items_object_item_data
+        recursive: list[AnArrayWithARecursiveRefInItemsObjectItem] | Unset = UNSET
+        if _recursive is not UNSET:
+            recursive = []
+            for componentsschemas_an_array_with_a_recursive_ref_in_items_object_item_data in _recursive:
+                componentsschemas_an_array_with_a_recursive_ref_in_items_object_item = (
+                    AnArrayWithARecursiveRefInItemsObjectItem.from_dict(
+                        componentsschemas_an_array_with_a_recursive_ref_in_items_object_item_data
+                    )
                 )
-            )
 
-            recursive.append(componentsschemas_an_array_with_a_recursive_ref_in_items_object_item)
+                recursive.append(componentsschemas_an_array_with_a_recursive_ref_in_items_object_item)
 
         an_array_with_a_recursive_ref_in_items_object_item = cls(
             recursive=recursive,

end_to_end_tests/golden-record/my_test_api_client/models/body_upload_file_tests_upload_post.py

@@ -276,7 +276,7 @@ def _parse_some_nullable_object(data: object) -> BodyUploadFileTestsUploadPostSo
                 some_nullable_object_type_0 = BodyUploadFileTestsUploadPostSomeNullableObject.from_dict(data)
 
                 return some_nullable_object_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             return cast(BodyUploadFileTestsUploadPostSomeNullableObject | None, data)
 
@@ -316,18 +316,20 @@ def _parse_some_nullable_number(data: object) -> float | None | Unset:
 
         some_nullable_number = _parse_some_nullable_number(d.pop("some_nullable_number", UNSET))
 
-        some_int_array = []
         _some_int_array = d.pop("some_int_array", UNSET)
-        for some_int_array_item_data in _some_int_array or []:
+        some_int_array: list[int | None] | Unset = UNSET
+        if _some_int_array is not UNSET:
+            some_int_array = []
+            for some_int_array_item_data in _some_int_array:
 
-            def _parse_some_int_array_item(data: object) -> int | None:
-                if data is None:
-                    return data
-                return cast(int | None, data)
+                def _parse_some_int_array_item(data: object) -> int | None:
+                    if data is None:
+                        return data
+                    return cast(int | None, data)
 
-            some_int_array_item = _parse_some_int_array_item(some_int_array_item_data)
+                some_int_array_item = _parse_some_int_array_item(some_int_array_item_data)
 
-            some_int_array.append(some_int_array_item)
+                some_int_array.append(some_int_array_item)
 
         def _parse_some_array(data: object) -> list[AFormData] | None | Unset:
             if data is None:
@@ -345,7 +347,7 @@ def _parse_some_array(data: object) -> list[AFormData] | None | Unset:
                     some_array_type_0.append(some_array_type_0_item)
 
                 return some_array_type_0
-            except:  # noqa: E722
+            except (TypeError, ValueError, AttributeError, KeyError):
                 pass
             return cast(list[AFormData] | None | Unset, data)