graphlens-python 0.2.1__tar.gz → 0.3.0__tar.gz

{graphlens_python-0.2.1 → graphlens_python-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: graphlens-python
-Version: 0.2.1
+Version: 0.3.0
 Summary: Python language adapter for graphlens
 Requires-Dist: graphlens
 Requires-Dist: tree-sitter>=0.24

{graphlens_python-0.2.1 → graphlens_python-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "graphlens-python"
-version = "0.2.1"
+version = "0.3.0"
 description = "Python language adapter for graphlens"
 requires-python = ">=3.13"
 dependencies = ["graphlens", "tree-sitter>=0.24", "tree-sitter-python>=0.23"]

{graphlens_python-0.2.1 → graphlens_python-0.3.0}/src/graphlens_python/_adapter.py

@@ -14,6 +14,7 @@ from graphlens import (
     RelationKind,
 )
 from graphlens.utils import make_node_id
+from graphlens.utils.roots import filter_nested_root_files
 
 from graphlens_python._deps import (
     PYTHON_DEFAULT_DEP_PARSERS,
@@ -95,8 +96,14 @@ class PythonAdapter(LanguageAdapter):
                 self._dep_parsers,
             )
         else:
-            for py_root in find_python_roots(project_root):
+            py_roots = find_python_roots(project_root)
+            for py_root in py_roots:
                 root_files = self.collect_files(py_root)
+                root_files = filter_nested_root_files(
+                    root_files,
+                    py_root,
+                    py_roots,
+                )
                 _analyze_root(
                     graph,
                     project_root,

{graphlens_python-0.2.1 → graphlens_python-0.3.0}/src/graphlens_python/_project_detector.py

@@ -6,6 +6,8 @@ import configparser
 import tomllib
 from typing import TYPE_CHECKING
 
+from graphlens.utils import collect_marker_roots
+
 if TYPE_CHECKING:
     from pathlib import Path
 
@@ -47,38 +49,21 @@ def find_python_roots(search_root: Path) -> list[Path]:
     """
     Find the actual Python project roots within search_root.
 
-    If search_root itself has Python markers, returns ``[search_root]``.
-    Otherwise walks subdirectories for marker files and returns their parent
-    directories — one per distinct Python sub-project.  This ensures that
-    ``detect_project_name`` and source-root resolution use the *correct* root
-    rather than the monorepo root, giving accurate import mappings.
+    Walks for marker files and returns their parent directories — one per
+    distinct Python sub-project. A marker at ``search_root`` does not hide
+    nested marker roots. This ensures that ``detect_project_name`` and
+    source-root resolution use the *correct* root rather than treating the
+    whole monorepo as one project.
 
     Falls back to ``[search_root]`` when no markers are found anywhere (the
     directory contains only bare .py scripts with no packaging metadata).
     """
-    if _has_python_markers(search_root):
-        return [search_root]
-
-    roots: list[Path] = []
-    for marker in PYTHON_MARKERS:
-        for marker_file in sorted(search_root.rglob(marker)):
-            rel_parts = marker_file.relative_to(search_root).parts
-            if _EXCLUDED_DIRS & set(rel_parts):
-                continue
-            if marker == "pyproject.toml" and not (
-                _pyproject_has_project_section(marker_file)
-            ):
-                continue
-            candidate = marker_file.parent
-            # Skip if already covered by a previously found (ancestor) root
-            if any(
-                candidate == r or candidate.is_relative_to(r)
-                for r in roots
-            ):
-                continue
-            roots.append(candidate)
-
-    return sorted(roots) if roots else [search_root]
+    return collect_marker_roots(
+        search_root,
+        PYTHON_MARKERS,
+        excluded_dirs=_EXCLUDED_DIRS,
+        marker_filter=_is_valid_python_marker,
+    )
 
 
 def detect_project_name(project_root: Path) -> str:
@@ -121,14 +106,17 @@ def _has_python_markers(directory: Path) -> bool:
         path = directory / marker
         if not path.exists():
             continue
-        if marker == "pyproject.toml":
-            if _pyproject_has_project_section(path):
-                return True
-        else:
+        if _is_valid_python_marker(path):
             return True
     return False
 
 
+def _is_valid_python_marker(path: Path) -> bool:
+    if path.name == "pyproject.toml":
+        return _pyproject_has_project_section(path)
+    return True
+
+
 def _pyproject_has_project_section(path: Path) -> bool:
     try:
         with path.open("rb") as f: