Merge pull request #84 from so1n/83-conversion-fails-to-check-for-imports-for-types-inside-map

83 conversion fails to check for imports for types inside map

Author: so1n

example/example_proto/demo/diff_pkg_refer_1.proto

@@ -0,0 +1,4 @@
+syntax = "proto3";
+package diff_pkg_refer_1;
+
+message Demo1{};

example/example_proto/demo/diff_pkg_refer_2.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+import "example/example_proto/demo/diff_pkg_refer_1.proto";
+
+package diff_pkg_refer_2;
+
+message Demo2{
+  map<string, diff_pkg_refer_1.Demo1> myField = 1;
+};

example/gen_simple_code.py

@@ -16,15 +16,20 @@
 else:
     target_p += "_pydanticv2"
 
-module = importlib.import_module(f"example.{target_p}.example.example_proto.demo.demo_pb2")
+module_list = [
+    importlib.import_module(f"example.{target_p}.example.example_proto.demo.demo_pb2"),
+    importlib.import_module(f"example.{target_p}.example.example_proto.demo.diff_pkg_refer_1_pb2"),
+    importlib.import_module(f"example.{target_p}.example.example_proto.demo.diff_pkg_refer_2_pb2"),
+]
 message_class_list = []
-for module_name in dir(module):
-    message_class = getattr(module, module_name)
-    if not inspect.isclass(message_class):
-        continue
-    if not issubclass(message_class, Message):
-        continue
-    message_class_list.append(message_class)
+for module in module_list:
+    for module_name in dir(module):
+        message_class = getattr(module, module_name)
+        if not inspect.isclass(message_class):
+            continue
+        if not issubclass(message_class, Message):
+            continue
+        message_class_list.append(message_class)
 
 now_path: pathlib.Path = pathlib.Path(__file__).absolute()
 

example/proto_3_20_pydanticv1/demo_gen_code.py

@@ -1,5 +1,5 @@
 # This is an automatically generated file, please do not change
-# gen by protobuf_to_pydantic[0.0.0](https://github.com/so1n/protobuf_to_pydantic)
+# gen by protobuf_to_pydantic[v0.3.0.3](https://github.com/so1n/protobuf_to_pydantic)
 # Protobuf Version: 3.20.3
 # Pydantic Version: 1.10.7
 import typing
@@ -159,3 +159,16 @@ class Body(BaseModel):
         output_info: typing.Dict[str, str] = Field(default_factory=dict)
 
     body: Body = Field()
+
+
+class Demo1(BaseModel):
+    pass
+
+
+class ExampleExampleProtoDemoDiffPkgRefer1Demo1(BaseModel):
+    """Note: The current class does not belong to the package
+    ExampleExampleProtoDemoDiffPkgRefer1Demo1 protobuf path:example/example_proto/demo/diff_pkg_refer_1.proto"""
+
+
+class Demo2(BaseModel):
+    myField: typing.Dict[str, ExampleExampleProtoDemoDiffPkgRefer1Demo1] = Field(default_factory=dict)

example/proto_3_20_pydanticv1/demo_gen_code_by_p2p.py

@@ -1,5 +1,5 @@
 # This is an automatically generated file, please do not change
-# gen by protobuf_to_pydantic[0.0.0](https://github.com/so1n/protobuf_to_pydantic)
+# gen by protobuf_to_pydantic[v0.3.0.3](https://github.com/so1n/protobuf_to_pydantic)
 # Protobuf Version: 3.20.3
 # Pydantic Version: 1.10.7
 import typing

example/proto_3_20_pydanticv1/demo_gen_code_by_pgv.py

@@ -1,5 +1,5 @@
 # This is an automatically generated file, please do not change
-# gen by protobuf_to_pydantic[0.0.0](https://github.com/so1n/protobuf_to_pydantic)
+# gen by protobuf_to_pydantic[v0.3.0.3](https://github.com/so1n/protobuf_to_pydantic)
 # Protobuf Version: 3.20.3
 # Pydantic Version: 1.10.7
 import typing

example/proto_3_20_pydanticv1/demo_gen_code_by_text_comment_protobuf_field.py

@@ -1,5 +1,5 @@
 # This is an automatically generated file, please do not change
-# gen by protobuf_to_pydantic[0.0.0](https://github.com/so1n/protobuf_to_pydantic)
+# gen by protobuf_to_pydantic[v0.3.0.3](https://github.com/so1n/protobuf_to_pydantic)
 # Protobuf Version: 3.20.3
 # Pydantic Version: 1.10.7
 import typing

example/proto_3_20_pydanticv1/demo_gen_code_by_text_comment_pyi.py

@@ -1,5 +1,5 @@
 # This is an automatically generated file, please do not change
-# gen by protobuf_to_pydantic[0.0.0](https://github.com/so1n/protobuf_to_pydantic)
+# gen by protobuf_to_pydantic[v0.3.0.3](https://github.com/so1n/protobuf_to_pydantic)
 # Protobuf Version: 3.20.3
 # Pydantic Version: 1.10.7
 import typing

example/proto_3_20_pydanticv1/example/example_proto/common/single_p2p.py

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

example/proto_3_20_pydanticv1/example/example_proto/demo/alias_demo_p2p.py

@@ -1,5 +1,5 @@
 # This is an automatically generated file, please do not change
-# gen by protobuf_to_pydantic[0.0.0](https://github.com/so1n/protobuf_to_pydantic)
+# gen by protobuf_to_pydantic[v0.3.0.3](https://github.com/so1n/protobuf_to_pydantic)
 # Protobuf Version: 3.20.3
 # Pydantic Version: 1.10.7
 import typing