python-package-folder 3.0.1__py3-none-any.whl → 3.1.0__py3-none-any.whl

python_package_folder/manager.py

@@ -339,6 +339,13 @@ class BuildManager:
                 shutil.copy2(source, target)
                 self.copied_files.append(target)
                 print(f"Copied external file: {source} -> {target}")
+                # If copying a Python file, ensure parent directory has __init__.py
+                # This helps type checkers resolve imports correctly
+                if source.suffix == ".py" and target.parent != self.src_dir:
+                    init_file = target.parent / "__init__.py"
+                    if not init_file.exists():
+                        init_file.write_text("", encoding="utf-8")
+                        self.copied_files.append(init_file)
             elif source.is_dir():
                 if target.exists():
                     shutil.rmtree(target)
@@ -354,6 +361,8 @@ class BuildManager:
         Copy a directory tree, excluding certain patterns.
 
         Excludes directories matching patterns like _SS, __SS, _sandbox, etc.
+        Ensures __init__.py files exist in directories containing Python files
+        so that type checkers can resolve imports correctly.
 
         Args:
             src: Source directory
@@ -385,6 +394,9 @@ class BuildManager:
         # Create destination directory
         dst.mkdir(parents=True, exist_ok=True)
 
+        has_python_files = False
+        copied_python_files = []
+
         # Copy files and subdirectories, excluding patterns
         for item in src.iterdir():
             if should_exclude(item):
@@ -395,8 +407,39 @@ class BuildManager:
 
             if src_item.is_file():
                 shutil.copy2(src_item, dst_item)
+                if src_item.suffix == ".py":
+                    has_python_files = True
+                    copied_python_files.append(dst_item)
             elif src_item.is_dir():
                 self._copytree_excluding(src_item, dst_item)
+                # Check if the subdirectory has Python files
+                if any(dst_item.rglob("*.py")):
+                    has_python_files = True
+
+        # Ensure __init__.py exists in directories containing Python files
+        # This is needed for type checkers to resolve imports correctly
+        # Also ensure all parent directories in the path have __init__.py
+        if has_python_files:
+            init_file = dst / "__init__.py"
+            if not init_file.exists():
+                # Create an empty __init__.py file
+                init_file.write_text("", encoding="utf-8")
+                self.copied_files.append(init_file)
+
+            # Ensure all parent directories up to src_dir also have __init__.py
+            # This helps type checkers resolve nested imports like:
+            # from empty_drawing_detection.models.Information_extraction._shared_ie.ie_enums import ...
+            current = dst
+            while current != self.src_dir and current.is_relative_to(self.src_dir):
+                parent_init = current.parent / "__init__.py"
+                if (
+                    parent_init.parent != self.src_dir
+                    and not parent_init.exists()
+                    and any(current.parent.rglob("*.py"))
+                ):
+                    parent_init.write_text("", encoding="utf-8")
+                    self.copied_files.append(parent_init)
+                current = current.parent
 
     def _get_package_name_from_import(self, module_name: str) -> str | None:
         """

python_package_folder/subfolder_build.py

@@ -140,7 +140,9 @@ class SubfolderBuildConfig:
         lines = content.split("\n")
         result = []
         in_hatch_build = False
+        in_hatch_build_section = False
         packages_set = False
+        paths_exclude_set = False
 
         for line in lines:
             # Detect hatch build section
@@ -148,6 +150,10 @@ class SubfolderBuildConfig:
                 in_hatch_build = True
                 result.append(line)
                 continue
+            elif line.strip().startswith("[tool.hatch.build]"):
+                in_hatch_build_section = True
+                result.append(line)
+                continue
             elif line.strip().startswith("[") and in_hatch_build:
                 # End of hatch build section, add packages if not set
                 if not packages_set and correct_packages_path:
@@ -155,6 +161,15 @@ class SubfolderBuildConfig:
                     result.append(f"packages = [{packages_str}]")
                 in_hatch_build = False
                 result.append(line)
+            elif line.strip().startswith("[") and in_hatch_build_section:
+                # End of hatch build section
+                in_hatch_build_section = False
+                result.append(line)
+            elif in_hatch_build_section:
+                # Track if paths-exclude already exists
+                if re.match(r"^\s*paths-exclude\s*=", line):
+                    paths_exclude_set = True
+                result.append(line)
             elif in_hatch_build:
                 # Modify packages path if found
                 if re.match(r"^\s*packages\s*=", line):
@@ -194,6 +209,43 @@ class SubfolderBuildConfig:
                 packages_str = f'"{correct_packages_path}"'
                 result.append(f"packages = [{packages_str}]")
 
+        # Add file exclusion patterns to prevent including non-package files
+        # Only add if paths-exclude wasn't already set (we merged it above)
+        if not paths_exclude_set:
+            result.append("")
+            result.append("[tool.hatch.build]")
+            result.append("paths-exclude = [")
+            result.append('    ".cursor/**",')
+            result.append('    ".github/**",')
+            result.append('    ".vscode/**",')
+            result.append('    ".idea/**",')
+            result.append('    "data/**",')
+            result.append('    "docs/**",')
+            result.append('    "references/**",')
+            result.append('    "reports/**",')
+            result.append('    "scripts/**",')
+            result.append('    "tests/**",')
+            result.append('    "test/**",')
+            result.append('    "dist/**",')
+            result.append('    "build/**",')
+            result.append('    "*.egg-info/**",')
+            result.append('    "__pycache__/**",')
+            result.append('    ".pytest_cache/**",')
+            result.append('    ".mypy_cache/**",')
+            result.append('    ".venv/**",')
+            result.append('    "venv/**",')
+            result.append('    ".git/**",')
+            result.append('    ".gitignore",')
+            result.append('    ".gitattributes",')
+            result.append('    "Dockerfile",')
+            result.append('    ".dockerignore",')
+            result.append('    ".pylintrc",')
+            result.append('    "pyrightconfig.json",')
+            result.append('    "git-filter-repo",')
+            result.append('    "pyproject.toml.original",')
+            result.append('    "README.md.backup",')
+            result.append("]")
+
         return "\n".join(result)
 
     def create_temp_pyproject(self) -> Path | None:
@@ -532,6 +584,42 @@ class SubfolderBuildConfig:
             packages_str = ", ".join(f'"{p}"' for p in package_dirs)
             result.append(f"packages = [{packages_str}]")
 
+        # Add file exclusion patterns to prevent including non-package files
+        # This ensures only the subfolder code is included, not project root files
+        result.append("")
+        result.append("[tool.hatch.build]")
+        result.append("paths-exclude = [")
+        result.append('    ".cursor/**",')
+        result.append('    ".github/**",')
+        result.append('    ".vscode/**",')
+        result.append('    ".idea/**",')
+        result.append('    "data/**",')
+        result.append('    "docs/**",')
+        result.append('    "references/**",')
+        result.append('    "reports/**",')
+        result.append('    "scripts/**",')
+        result.append('    "tests/**",')
+        result.append('    "test/**",')
+        result.append('    "dist/**",')
+        result.append('    "build/**",')
+        result.append('    "*.egg-info/**",')
+        result.append('    "__pycache__/**",')
+        result.append('    ".pytest_cache/**",')
+        result.append('    ".mypy_cache/**",')
+        result.append('    ".venv/**",')
+        result.append('    "venv/**",')
+        result.append('    ".git/**",')
+        result.append('    ".gitignore",')
+        result.append('    ".gitattributes",')
+        result.append('    "Dockerfile",')
+        result.append('    ".dockerignore",')
+        result.append('    ".pylintrc",')
+        result.append('    "pyrightconfig.json",')
+        result.append('    "git-filter-repo",')
+        result.append('    "pyproject.toml.original",')
+        result.append('    "README.md.backup",')
+        result.append("]")
+
         # Add dependency group if specified
         if dependency_group:
             # Find where to insert dependency-groups section

{python_package_folder-3.0.1.dist-info → python_package_folder-3.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 3.0.1
+Version: 3.1.0
 Summary: Python package to automatically package and build a folder, fetching all relevant dependencies.
 Project-URL: Repository, https://github.com/alelom/python-package-folder
 Author-email: Alessio Lombardi <work@alelom.com>

{python_package_folder-3.0.1.dist-info → python_package_folder-3.1.0.dist-info}/RECORD

@@ -2,16 +2,16 @@ python_package_folder/__init__.py,sha256=DQt-uldOEKfh0MUqCvKdeNKOnpuOvpb7blYvXMy
 python_package_folder/__main__.py,sha256=a-__-VLhYw-J7S7CsHdhtEvQr3RiAZxiYDvKhKTgMX4,291
 python_package_folder/analyzer.py,sha256=cmTNUDCWBIh3XZ_mShlQVG1P9NN_oe3FUBTirVtYfTQ,16709
 python_package_folder/finder.py,sha256=RPidZ7LKCFuQ_KgCFIZdHWPXsZIDor3M4C0hKeYW7EI,11799
-python_package_folder/manager.py,sha256=L-NRTUd0q-qhhEXUCPcddRyR736-GpPf2gwznmnMWDs,41268
+python_package_folder/manager.py,sha256=kyULmS948uW3yWUcabc2EVK_Nic3wrWMj8qCs18jj2Q,43526
 python_package_folder/publisher.py,sha256=TSjdOvxvnWLbJCnduTK_xZBRfvsrq9kpEH-sfebeWkU,13507
 python_package_folder/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_package_folder/python_package_folder.py,sha256=RPsqRcIy_LjzzTHdp4qdtFJ4-4xhtR_0YLIC0RlUxFo,8841
-python_package_folder/subfolder_build.py,sha256=VDWgrXgUa7qTXl2Sjbn7vEqbo8vP_aHtHPiUIGfqvug,35862
+python_package_folder/subfolder_build.py,sha256=m9a7exvDEwtz_tuNlPF_bagXtcwNq9PHiJswVkbn2PM,39866
 python_package_folder/types.py,sha256=3yeSRR5p_3PDKEAaehW_RJ7NwJHexOIeA08bGaT1iSY,2368
 python_package_folder/utils.py,sha256=lIkWsFKeAYAJ9TDUM99T4pUBHJVbUvCdUgkWQN-LUho,3111
 python_package_folder/version.py,sha256=kIDP6S9trEfs9gj7lBYGxrWm4RPssRla24UtlO9Jkh4,9111
-python_package_folder-3.0.1.dist-info/METADATA,sha256=8vHC065eFngdamxOli4Ss6n2ydvAalypii38vxdeYf8,33282
-python_package_folder-3.0.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-python_package_folder-3.0.1.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
-python_package_folder-3.0.1.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
-python_package_folder-3.0.1.dist-info/RECORD,,
+python_package_folder-3.1.0.dist-info/METADATA,sha256=qNQ9k_yP2w7Tyxo6F8btfZRCckzheWU4HN78ETtGpaY,33282
+python_package_folder-3.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+python_package_folder-3.1.0.dist-info/entry_points.txt,sha256=ttu4wAhoYSHGhWQNercLz9IVTTpXxhVlRA9vSTvaLe0,91
+python_package_folder-3.1.0.dist-info/licenses/LICENSE,sha256=vNgRJh8YiecqZoZld7TtwPI5I72HIymKD9g32fiJjCE,1073
+python_package_folder-3.1.0.dist-info/RECORD,,