archunitpython 1.6.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

archunitpython/__init__.py

@@ -1,6 +1,6 @@
 """ArchUnitPython - Architecture testing library for Python projects."""
 
-__version__ = "1.6.0"
+__version__ = "1.7.0"
 
 # Files API
 # Common

archunitpython/common/extraction/extract_graph.py

@@ -45,6 +45,7 @@ class _LocatedImport:
     line_number: int
     resolution_kind: ImportKind | None = None
     fallback_module_name: str | None = None
+    aliases: tuple[str, ...] = ()
 
 
 @dataclass(frozen=True)
@@ -177,39 +178,28 @@ def _extract_graph_uncached(
 
         imports = _extract_located_imports(file_path)
         for located_import in imports:
-            module_name = located_import.module_name
             import_kind = located_import.import_kind
             if (
                 ignore_type_checking_imports
                 and import_kind == ImportKind.TYPE_IMPORT
             ):
                 continue
-            resolution_kind = located_import.resolution_kind or import_kind
-            resolved, is_external = _resolve_import(
-                module_name, file_path, project_path, resolution_kind
-            )
-            if is_external and located_import.fallback_module_name is not None:
-                fallback, fallback_is_external = _resolve_import(
-                    located_import.fallback_module_name,
-                    file_path,
-                    project_path,
-                    resolution_kind,
-                )
-                if fallback and not fallback_is_external:
-                    resolved, is_external = fallback, False
-            if resolved and resolved != _normalize(file_path):
-                # Check if the resolved path is in our project
-                if not is_external and resolved not in normalized_py_file_set:
-                    continue
-
-                edges.append(
-                    Edge(
-                        source=_normalize(file_path),
-                        target=resolved,
-                        external=is_external,
-                        import_kinds=_edge_import_kinds(located_import),
+            for resolved, is_external in _resolve_import_targets(
+                located_import, file_path, project_path
+            ):
+                if resolved and resolved != _normalize(file_path):
+                    # Check if the resolved path is in our project
+                    if not is_external and resolved not in normalized_py_file_set:
+                        continue
+
+                    edges.append(
+                        Edge(
+                            source=_normalize(file_path),
+                            target=resolved,
+                            external=is_external,
+                            import_kinds=_edge_import_kinds(located_import),
+                        )
                     )
-                )
 
     return _merge_edges(edges)
 
@@ -342,14 +332,16 @@ def _extract_located_imports(file_path: str) -> list[_LocatedImport]:
             fallback_module_name = (
                 "." * node.level if node.level and node.module is None else None
             )
+            aliases = _module_aliases(node) if node.module else ()
             for module_name in _import_from_module_names(node):
                 imports.append(
                     _LocatedImport(
-                        module_name,
-                        kind,
-                        node.lineno,
-                        syntax_kind,
-                        fallback_module_name,
+                        module_name=module_name,
+                        import_kind=kind,
+                        line_number=node.lineno,
+                        resolution_kind=syntax_kind,
+                        fallback_module_name=fallback_module_name,
+                        aliases=aliases,
                     )
                 )
 
@@ -429,6 +421,11 @@ def _extract_dynamic_import_names(node: ast.Call) -> list[str]:
     return []
 
 
+def _module_aliases(node: ast.ImportFrom) -> tuple[str, ...]:
+    """Return aliases that may refer to imported submodules."""
+    return tuple(alias.name for alias in node.names if alias.name != "*")
+
+
 def _import_from_module_names(node: ast.ImportFrom) -> tuple[str, ...]:
     """Return resolvable module names for a from-import statement."""
     dots = "." * (node.level or 0)
@@ -573,6 +570,58 @@ def _resolve_import(
     return _resolve_absolute_import(import_name, project_root)
 
 
+def _resolve_import_targets(
+    import_: _LocatedImport,
+    source_file: str,
+    project_root: str,
+) -> list[tuple[str, bool]]:
+    """Resolve an import, including namespace-package submodule aliases."""
+    resolution_kind = import_.resolution_kind or import_.import_kind
+    resolved, is_external = _resolve_import(
+        import_.module_name,
+        source_file,
+        project_root,
+        resolution_kind,
+    )
+    if is_external and import_.fallback_module_name is not None:
+        fallback, fallback_is_external = _resolve_import(
+            import_.fallback_module_name,
+            source_file,
+            project_root,
+            resolution_kind,
+        )
+        if fallback and not fallback_is_external:
+            resolved, is_external = fallback, False
+    if not is_external or not import_.aliases:
+        return [(resolved, is_external)]
+
+    alias_targets: list[tuple[str, bool]] = []
+    found_internal_alias = False
+    for alias in import_.aliases:
+        alias_module = _join_import_alias(import_.module_name, alias)
+        alias_resolved, alias_is_external = _resolve_import(
+            alias_module,
+            source_file,
+            project_root,
+            resolution_kind,
+        )
+        alias_targets.append((alias_resolved, alias_is_external))
+        found_internal_alias = found_internal_alias or not alias_is_external
+
+    if found_internal_alias:
+        return alias_targets
+    return [(resolved, is_external)]
+
+
+def _join_import_alias(module_name: str, alias: str) -> str:
+    """Join a from-import module name with a candidate submodule alias."""
+    if not module_name:
+        return alias
+    if set(module_name) == {"."}:
+        return f"{module_name}{alias}"
+    return f"{module_name}.{alias}"
+
+
 def _resolve_relative_import(
     import_name: str,
     source_file: str,

{archunitpython-1.6.0.dist-info → archunitpython-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: archunitpython
-Version: 1.6.0
+Version: 1.7.0
 Summary: Architecture testing library for Python projects. Enforce dependency rules, detect cycles, validate metrics.
 Project-URL: Homepage, https://github.com/LukasNiessen/ArchUnitPython
 Project-URL: Repository, https://github.com/LukasNiessen/ArchUnitPython.git
@@ -377,6 +377,12 @@ ArchUnitPython detects string-based dynamic imports such as `importlib.import_mo
 from my_app.adapters.sql import Repository  # archunit: ignore
 ```
 
+### Namespace Packages
+
+ArchUnitPython resolves imports from namespace packages that do not contain
+`__init__.py` files. For example, `from my_app.domain import model` is resolved
+to `my_app/domain/model.py` when `my_app/domain/` is a namespace package.
+
 ### Conditional Imports
 
 Imports inside `try` blocks that handle `ImportError` or

{archunitpython-1.6.0.dist-info → archunitpython-1.7.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-archunitpython/__init__.py,sha256=CU7R2ZvgfwPhbYLR99lt6Jy6NXLqXpYtf5M91Yo8i3Y,1282
+archunitpython/__init__.py,sha256=2GNl1l7I8BSz7KehGw8thDEMYr09vjFDgfcnVXxaK9I,1282
 archunitpython/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 archunitpython/common/__init__.py,sha256=TKL39Z0kBpWqMH99jU4LsDSUZ5lQ_rcAJfLnmUTDTOI,656
 archunitpython/common/pattern_matching.py,sha256=HMAfo8GsooHvA4d2IxCi3btrYTdwfOQXw4bDNr117P0,2669
@@ -9,7 +9,7 @@ archunitpython/common/assertion/violation.py,sha256=TnMOykN3kPoGrSf1KcxBXYRfaxfX
 archunitpython/common/error/__init__.py,sha256=UWcdIKpGAJvo4WEGOVSaUjQQnKoPi8R496uDGXBWKsE,116
 archunitpython/common/error/errors.py,sha256=y7mcXoZPyK7uD2dMMO1qBt1y7KcIeGlRYiVeI6bjms4,249
 archunitpython/common/extraction/__init__.py,sha256=RkJOcxJoLYQxEagh3uWhjsUCprK3Nr3Bn3o7nmzk4_Q,284
-archunitpython/common/extraction/extract_graph.py,sha256=SZ3-ZYI1RlIIF3saDoduXXzEHMwmflmhN60oWISeFOM,21608
+archunitpython/common/extraction/extract_graph.py,sha256=wxLpOtEIOjpXTUU0LXAcwsGiup9sh2W3NgjykuYX-gI,23268
 archunitpython/common/extraction/graph.py,sha256=s4QW0WYfwjqXteBNygaNBdTgSC1XKil8cBFLtxl5rJE,1124
 archunitpython/common/fluentapi/__init__.py,sha256=LeS7qS2p9-FqqBhDL8xRPex__W5Qk0UWfcpl7nVVLfI,178
 archunitpython/common/fluentapi/checkable.py,sha256=BJFYibVhHLMFlnWdISPCIL3DYI1_3JN2-1jEQOaVaGE,1547
@@ -79,7 +79,7 @@ archunitpython/testing/common/__init__.py,sha256=Wc4bC-N4t6giChKjj6wuTGKkb39thcY
 archunitpython/testing/common/color_utils.py,sha256=2I8Z1SZfWhhgudMgmXY6PPydGxGl35cK_To-GXnSyJg,1226
 archunitpython/testing/common/violation_factory.py,sha256=yWlvv2U7u-7KoTMfp1QCeJXxTLpPEagKqDHZmPSyrlk,4677
 archunitpython/testing/pytest_plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-archunitpython-1.6.0.dist-info/METADATA,sha256=Xi6XRsySw9v7D_T4pyNDQs2qGvZPenNKUMy8nqX4XW4,34913
-archunitpython-1.6.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-archunitpython-1.6.0.dist-info/licenses/LICENSE,sha256=kaQWfzfHk45CNIx4sIW7Uf1sNW5rmo6BpZ-R8GruuK0,1102
-archunitpython-1.6.0.dist-info/RECORD,,
+archunitpython-1.7.0.dist-info/METADATA,sha256=KSwZ_XskzaMaiY0ZK1VxbfSiadBtKyq0u5ycdyZ6PZ4,35168
+archunitpython-1.7.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+archunitpython-1.7.0.dist-info/licenses/LICENSE,sha256=kaQWfzfHk45CNIx4sIW7Uf1sNW5rmo6BpZ-R8GruuK0,1102
+archunitpython-1.7.0.dist-info/RECORD,,