fix: auto generate python files and fix module refs

Author: Scyrc

pyo3-stub-gen-derive/src/gen_stub/stub_type.rs

@@ -21,7 +21,7 @@ impl ToTokens for StubType {
             #[automatically_derived]
             impl ::pyo3_stub_gen::PyStubType for #ty {
                 fn type_output() -> ::pyo3_stub_gen::TypeInfo {
-                    ::pyo3_stub_gen::TypeInfo::with_module_fix(#name, #module_tt, true)
+                    ::pyo3_stub_gen::TypeInfo::with_type(#name, #module_tt)
                 }
             }
         })

pyo3-stub-gen/src/stub_type.rs

@@ -7,13 +7,17 @@ mod numpy;
 
 use maplit::hashset;
 use std::{collections::HashSet, fmt, ops};
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
+/**
+ * Indicates the dependent module or type;
+ * dependent module('import module', eg builtins): name="" , module = module name;
+ * dependent type(eg class enum)('from module import type'): name=type name , module = module name(which type defined).
+ */
+ #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Default, Hash)]
 pub struct  ModuleRef {
     pub name: String,
     pub module: String,
 }
-
+/// From the dependent module
 impl From<&str> for ModuleRef {
     fn from(m: &str) -> Self {
         Self{name:"".to_string(), module:m.to_string()}
@@ -124,23 +128,32 @@ impl TypeInfo {
     /// ```
     /// pyo3_stub_gen::TypeInfo::with_module("pathlib.Path", "pathlib".into());
     /// ```
-    pub fn with_module_fix(name: &str, module: ModuleRef, rust_flag: bool) -> Self {
+    pub fn with_module(name: &str, module: ModuleRef) -> Self
+    {
         let mut import = HashSet::new();
-        //println!("{}", format!("name: {}, module: {}", name.to_string(), module));
-        let mut module_fix = module.clone();
-        if rust_flag {
-            module_fix.name = name.to_string();
-        }
-        import.insert(module_fix);
+        import.insert(module);
         Self {
             name: name.to_string(),
             import,
         }
     }
 
-    pub fn with_module(name: &str, module: ModuleRef) -> Self
-    {
-        TypeInfo::with_module_fix(name, module, false)
+    /// A type annotation of a type that must be imported.
+    ///
+    /// ```
+    /// ClassA defined in ModuleA
+    /// pyo3_stub_gen::TypeInfo::with_type("ClassA", "ModuleA");
+    /// ```
+    pub fn with_type(type_name: &str, module: ModuleRef) -> Self {
+        let mut import = HashSet::new();
+        let mut type_ref: ModuleRef = module.clone();
+        type_ref.name = type_name.to_string();
+        import.insert(type_ref);
+
+        Self {
+            name: type_name.to_string(),
+            import,
+        }
     }
 }