Modify, Fix, fix option field has default and default_factory value

example/proto_pydanticv1/demo_gen_code.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 1.10.7
 import typing
 from datetime import datetime

example/proto_pydanticv1/demo_gen_code_by_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 1.10.7
 import typing
 from datetime import datetime, timedelta

example/proto_pydanticv1/demo_gen_code_by_pgv.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 1.10.7
 import typing
 from datetime import datetime, timedelta

example/proto_pydanticv1/demo_gen_code_by_text_comment_protobuf_field.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 1.10.7
 import typing
 from datetime import datetime

example/proto_pydanticv1/demo_gen_code_by_text_comment_pyi.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 1.10.7
 import typing
 from datetime import datetime

example/proto_pydanticv1/example/example_proto/common/single_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 1.10.7
 from enum import IntEnum
 

example/proto_pydanticv1/example/example_proto/demo/demo_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 1.10.7
 import typing
 from datetime import datetime

example/proto_pydanticv1/example/example_proto/p2p_validate/demo_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 1.10.7
 import typing
 from datetime import datetime, timedelta

example/proto_pydanticv1/example/example_proto/validate/demo_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 1.10.7
 import typing
 from datetime import datetime, timedelta

example/proto_pydanticv2/demo_gen_code.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 2.0.3
 import typing
 from datetime import datetime

example/proto_pydanticv2/demo_gen_code_by_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 2.0.3
 import typing
 from datetime import datetime, timedelta

example/proto_pydanticv2/demo_gen_code_by_pgv.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 2.0.3
 import typing
 from datetime import datetime, timedelta

example/proto_pydanticv2/demo_gen_code_by_text_comment_protobuf_field.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 2.0.3
 import typing
 from datetime import datetime

example/proto_pydanticv2/demo_gen_code_by_text_comment_pyi.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 2.0.3
 import typing
 from datetime import datetime

example/proto_pydanticv2/example/example_proto/common/single_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 2.0.3
 from enum import IntEnum
 

example/proto_pydanticv2/example/example_proto/demo/demo_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 2.0.3
 import typing
 from datetime import datetime

example/proto_pydanticv2/example/example_proto/p2p_validate/demo_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 2.0.3
 import typing
 from datetime import datetime, timedelta

example/proto_pydanticv2/example/example_proto/validate/demo_p2p.py

@@ -1,6 +1,6 @@
 # This is an automatically generated file, please do not change
 # gen by protobuf_to_pydantic[v0.2.0.2](https://github.com/so1n/protobuf_to_pydantic)
-# Protobuf Version: 4.24.0
+# Protobuf Version: 4.24.4
 # Pydantic Version: 2.0.3
 import typing
 from datetime import datetime, timedelta

protobuf_to_pydantic/plugin/field_desc_proto_to_code.py

@@ -299,10 +299,9 @@ def _message_field_handle(
 
         if optional_dict.get(field.name, {}).get("is_proto3_optional", False):
             type_str = f"typing.Optional[{type_str}]"
-            if (
-                field_info_dict.get("default", _pydantic_adapter.PydanticUndefined)
-                is _pydantic_adapter.PydanticUndefined
-            ):
+            if field_info_dict.get(
+                "default", _pydantic_adapter.PydanticUndefined
+            ) is _pydantic_adapter.PydanticUndefined and not field_info_dict.get("default_factory", None):
                 field_info_dict["default"] = None
 
         # arranging  field info parameters
@@ -392,26 +391,24 @@ def _message(
         if desc.enum_type:
             class_head_content += self._enum(desc.enum_type, scl_prefix, indent + self.code_indent)
 
-        if desc.oneof_decl:
-            one_of_dict, optional_dict = self._gen_one_of_dict(desc)
-            if one_of_dict:
+        if one_of_dict:
+            class_head_content += (
+                f"{' ' * (indent + self.code_indent)}_one_of_dict = {self._get_value_code(one_of_dict)}\n"
+            )
+
+            self._add_import_code("protobuf_to_pydantic.customer_validator", "check_one_of")
+            if _pydantic_adapter.is_v1:
                 class_head_content += (
-                    f"{' ' * (indent + self.code_indent)}_one_of_dict = {self._get_value_code(one_of_dict)}\n"
+                    f"{' ' * (indent + self.code_indent)}"
+                    f"one_of_validator = root_validator(pre=True, allow_reuse=True)(check_one_of)\n"
                 )
-
-                self._add_import_code("protobuf_to_pydantic.customer_validator", "check_one_of")
-                if _pydantic_adapter.is_v1:
-                    class_head_content += (
-                        f"{' ' * (indent + self.code_indent)}"
-                        f"one_of_validator = root_validator(pre=True, allow_reuse=True)(check_one_of)\n"
-                    )
-                    self._add_import_code("pydantic", "root_validator")
-                else:
-                    class_head_content += (
-                        f"{' ' * (indent + self.code_indent)}"
-                        f'one_of_validator = model_validator(mode="before")(check_one_of)\n'
-                    )
-                    self._add_import_code("pydantic", "model_validator")
+                self._add_import_code("pydantic", "root_validator")
+            else:
+                class_head_content += (
+                    f"{' ' * (indent + self.code_indent)}"
+                    f'one_of_validator = model_validator(mode="before")(check_one_of)\n'
+                )
+                self._add_import_code("pydantic", "model_validator")
 
         if use_custom_type:
             if _pydantic_adapter.is_v1: