archunitpython 1.5.0__tar.gz → 1.6.0__tar.gz

{archunitpython-1.5.0 → archunitpython-1.6.0}/BACKLOG.md

@@ -19,8 +19,8 @@ This backlog collects product and maintenance ideas from project research.
 ## P1 - Python Import Semantics
 
 - Add support for namespace packages that do not contain `__init__.py`.
-- Detect dynamic imports such as `importlib.import_module()` and `__import__()`.
-- Detect conditional imports such as `try/except ImportError`.
+- [x] Detect dynamic imports such as `importlib.import_module()` and `__import__()`.
+- [x] Detect conditional imports such as `try/except ImportError`.
 - Add better `TYPE_CHECKING` import handling, including options to ignore, include, or report type-only imports separately.
 - Improve external dependency rules so users can express allowed and forbidden third-party packages at module or slice level.
 - Consider a public-interface rule inspired by Tach, where modules may only import through declared package APIs.
@@ -31,11 +31,11 @@ This backlog collects product and maintenance ideas from project research.
 - Auto-generate architecture documentation based on tests and rule rationales.
 - Make logged paths clickable in IDEs and common terminal integrations.
 - Add PlantUML or Mermaid export for discovered architecture graphs.
-- Improve metric export examples and document how metric thresholds should be selected.
+- [x] Improve metric export examples and document how metric thresholds should be selected.
 
 ## P2 - Rule Surface
 
-- Add first-class layered architecture helpers so common clean/hexagonal/layered rules require less boilerplate.
+- [x] Add first-class layered architecture helpers so common clean/hexagonal/layered rules require less boilerplate.
 - Add slice isolation helpers for bounded contexts and modular monoliths.
 - Add richer custom rule hooks for dependency edges, files, classes, and metrics.
 - Add transitive dependency checks, especially for "domain must not transitively reach infrastructure" style rules.
@@ -56,7 +56,7 @@ This backlog collects product and maintenance ideas from project research.
 
 ## P3 - Packaging And Docs
 
-- Publish to PyPI as part of the release pipeline if this is not already automated.
+- [x] Publish to PyPI as part of the release pipeline if this is not already automated.
 - Add a Sphinx or MkDocs documentation site.
 - Add a complete example repository or examples folder covering pytest, unittest, PlantUML, metrics, and CI.
 - Add contribution guidance for new rule types and metric implementations.

{archunitpython-1.5.0 → archunitpython-1.6.0}/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [1.6.0](https://github.com/LukasNiessen/ArchUnitPython/compare/v1.5.0...v1.6.0) (2026-09-12)
+
+
+### Bug Fixes
+
+* preserve package targets for relative imports ([09c9d19](https://github.com/LukasNiessen/ArchUnitPython/commit/09c9d199dec095aaa60be227bfd7b5c2b7ffb107))
+* preserve relative conditional import targets ([0ae22bb](https://github.com/LukasNiessen/ArchUnitPython/commit/0ae22bbed008c39f39b80ac6428fa1207115a394))
+
+
+### Features
+
+* classify conditional imports ([5f0f600](https://github.com/LukasNiessen/ArchUnitPython/commit/5f0f600e02d82249e0735738b43cc75317eff790))
+
 # [1.5.0](https://github.com/LukasNiessen/ArchUnitPython/compare/v1.4.0...v1.5.0) (2026-07-18)
 
 

{archunitpython-1.5.0 → archunitpython-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: archunitpython
-Version: 1.5.0
+Version: 1.6.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
@@ -41,7 +41,6 @@ Description-Content-Type: text/markdown
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![Build & tests](https://img.shields.io/github/actions/workflow/status/LukasNiessen/ArchUnitPython/integrate.yaml?branch=main&label=build%20%26%20tests)](https://github.com/LukasNiessen/ArchUnitPython/actions/workflows/integrate.yaml) [![GitHub stars](https://img.shields.io/github/stars/LukasNiessen/ArchUnitPython.svg)](https://github.com/LukasNiessen/ArchUnitPython)<br>
 [![PyPI downloads](https://static.pepy.tech/badge/archunitpython/month)](https://pepy.tech/project/archunitpython) [![PyPI total downloads](https://img.shields.io/pepy/dt/archunitpython?label=total%20downloads&color=007ec6)](https://pepy.tech/project/archunitpython)
-<!-- [![PyPI version](https://img.shields.io/pypi/v/archunitpython.svg)](https://pypi.org/project/archunitpython/) -->
 
 </div>
 
@@ -51,7 +50,7 @@ The #1 ArchUnit-style architecture testing library for Python, measured by GitHu
 
 _Inspired by the amazing ArchUnit library but we are not affiliated with ArchUnit._
 
-[Setup](#-setup) • [Use Cases](#-use-cases) • [Features](#-features) • [Why ArchUnitPython?](#-library-comparison) • [Sponsor](https://github.com/sponsors/LukasNiessen) • [Contributing](CONTRIBUTING.md)
+[Setup](#-setup) • [Use Cases](#-use-cases) • [Features](#-features) • [Why ArchUnitPython?](#-library-comparison) • [Sponsor](https://github.com/sponsors/LukasNiessen) • [Contributing](CONTRIBUTING.md) • [Documentation](https://lukasniessen.github.io/ArchUnitPython/)
 
 ## ⚡ 5 min Quickstart
 
@@ -378,6 +377,17 @@ ArchUnitPython detects string-based dynamic imports such as `importlib.import_mo
 from my_app.adapters.sql import Repository  # archunit: ignore
 ```
 
+### Conditional Imports
+
+Imports inside `try` blocks that handle `ImportError` or
+`ModuleNotFoundError` are marked as conditional dependencies. This helps graph
+reports distinguish optional imports and fallback implementations from regular
+runtime imports. Conditional dependencies remain part of architecture checks;
+relative and dynamic imports also retain their original import kind in graph
+reports. An edge may therefore have multiple kinds: CSV reports use
+pipe-delimited values such as `relative|conditional`, while HTML reports list
+both values separately.
+
 ### Naming Conventions
 
 ```python
@@ -393,6 +403,10 @@ def test_naming_patterns():
 
 ### Code Metrics
 
+Metric rules evaluate every matching file or class independently. Use filters such as
+`in_folder()`, `with_name()`, and `for_classes_matching()` when different parts of the
+project need different limits.
+
 ```python
 def test_no_large_files():
     rule = metrics("src/").count().lines_of_code().should_be_below(1000)
@@ -403,7 +417,7 @@ def test_high_class_cohesion():
     assert_passes(rule)
 
 def test_method_count():
-    rule = metrics("src/").count().method_count().should_be_below(20)
+    rule = metrics("src/").count().method_count().should_be_below_or_equal(20)
     assert_passes(rule)
 
 def test_field_count_for_data_classes():
@@ -417,6 +431,45 @@ def test_field_count_for_data_classes():
     assert_passes(rule)
 ```
 
+#### Comparison Semantics
+
+Metric comparisons are exact. In particular, `should_be_below(20)` means `< 20`, so
+a value of exactly `20` is a violation. Use the inclusive form when the limit itself
+should be accepted.
+
+| Method | Passing values |
+| --- | --- |
+| `should_be_below(n)` | `< n` |
+| `should_be_below_or_equal(n)` | `<= n` |
+| `should_be_above(n)` | `> n` |
+| `should_be_above_or_equal(n)` | `>= n` |
+| `should_be(n)` | exactly `n` |
+
+Not every metric builder exposes every comparison. The available methods are shown
+by the fluent API after selecting a metric.
+
+#### Choosing Thresholds
+
+There is no universal correct limit for every codebase. Treat thresholds as
+architecture decisions that should reflect the role and maturity of the code:
+
+1. Measure the current project before enabling a new rule.
+2. Start at the current maximum, or slightly above it, to prevent further regression.
+3. Use narrower filters when generated code, data classes, or adapters need different limits.
+4. Lower the threshold gradually as existing violations are removed.
+5. Record the reason with `.because(...)` so future maintainers understand the limit.
+
+| Metric | Interpretation | Useful starting point |
+| --- | --- | --- |
+| Lines of code | File size and review burden | Current maximum for hand-written files |
+| Method or field count | Class responsibility and size | Current maximum, split by class role |
+| LCOM | Lack of class cohesion; lower is generally better | Baseline one LCOM variant and keep it consistent |
+| Instability | Dependence on outgoing versus incoming dependencies | Compare files with similar architectural roles |
+| Distance from main sequence | Balance between abstractness and instability; closer to zero is better | Observe the current distribution before tightening |
+
+Thresholds are guardrails, not quality scores. A metric violation is a prompt to inspect
+the design; it does not automatically mean the code is incorrect.
+
 ### Distance Metrics
 
 ```python
@@ -512,13 +565,13 @@ from archunitpython import project_graph
 def test_export_dependency_graph_reports():
     graph = project_graph("src/requests").titled("Application Architecture")
 
-    graph.collapse_to_folder_depth(2).export_as_mermaid("reports/dependencies.md")
+    graph.collapse_to_folder_depth(2).export_as_mermaid("reports/dependencies.mmd")
 
 if __name__ == "__main__":
     test_export_dependency_graph_reports()
 ```
-**Exported mermaid diagram**
-``` mermaid
+**Exported Mermaid diagram**
+```mermaid
 flowchart LR
   n0["__init__.py"]
   n1["__version__.py"]
@@ -636,20 +689,36 @@ When you create reports through `project_graph("src/")`, internal file paths are
 
 ### Reports
 
-Generate HTML reports for your metrics. _Note that this feature is in beta._
+Generate an HTML report from metric values collected by your tests or build tooling.
+`MetricsExporter` formats the supplied dictionary; it does not execute metric rules or
+calculate the values itself. _This feature is in beta._
 
 ```python
 from archunitpython.metrics.fluentapi.export_utils import MetricsExporter, ExportOptions
 
-MetricsExporter.export_as_html(
-    {"MethodCount": 5, "FieldCount": 3, "LinesOfCode": 150},
+metric_summary = {
+    "Maximum method count": "18 (limit: <= 20)",
+    "Maximum field count": "9 (limit: <= 10)",
+    "Maximum lines of code": "420 (limit: < 500)",
+    "Highest LCOM96b": "0.24 (limit: < 0.30)",
+}
+
+html = MetricsExporter.export_as_html(
+    metric_summary,
     ExportOptions(
         output_path="reports/metrics.html",
         title="Architecture Metrics Dashboard",
+        include_timestamp=False,
     ),
 )
+
+assert "Maximum method count" in html
 ```
 
+Keep labels and units stable if these reports are stored as CI artifacts and compared
+between builds. Continue using executable metric rules with `assert_passes()` as the
+enforcement mechanism.
+
 ## 🔎 Pattern Matching System
 
 We offer three targeting options for pattern matching across all modules:
@@ -984,7 +1053,7 @@ If ArchUnitPython helps your project, please consider:
 
 ### Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=LukasNiessen/ArchUnitPython&type=Date)](https://www.star-history.com/#LukasNiessen/ArchUnitPython&Date)
+[![Star History Chart](https://star-history.dera.page/svg?repos=LukasNiessen/ArchUnitPython&type=Date)](https://star-history.dera.page/#LukasNiessen/ArchUnitPython&Date)
 
 ## 📄 License
 

{archunitpython-1.5.0 → archunitpython-1.6.0}/README.md

@@ -8,7 +8,6 @@
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![Build & tests](https://img.shields.io/github/actions/workflow/status/LukasNiessen/ArchUnitPython/integrate.yaml?branch=main&label=build%20%26%20tests)](https://github.com/LukasNiessen/ArchUnitPython/actions/workflows/integrate.yaml) [![GitHub stars](https://img.shields.io/github/stars/LukasNiessen/ArchUnitPython.svg)](https://github.com/LukasNiessen/ArchUnitPython)<br>
 [![PyPI downloads](https://static.pepy.tech/badge/archunitpython/month)](https://pepy.tech/project/archunitpython) [![PyPI total downloads](https://img.shields.io/pepy/dt/archunitpython?label=total%20downloads&color=007ec6)](https://pepy.tech/project/archunitpython)
-<!-- [![PyPI version](https://img.shields.io/pypi/v/archunitpython.svg)](https://pypi.org/project/archunitpython/) -->
 
 </div>
 
@@ -18,7 +17,7 @@ The #1 ArchUnit-style architecture testing library for Python, measured by GitHu
 
 _Inspired by the amazing ArchUnit library but we are not affiliated with ArchUnit._
 
-[Setup](#-setup) • [Use Cases](#-use-cases) • [Features](#-features) • [Why ArchUnitPython?](#-library-comparison) • [Sponsor](https://github.com/sponsors/LukasNiessen) • [Contributing](CONTRIBUTING.md)
+[Setup](#-setup) • [Use Cases](#-use-cases) • [Features](#-features) • [Why ArchUnitPython?](#-library-comparison) • [Sponsor](https://github.com/sponsors/LukasNiessen) • [Contributing](CONTRIBUTING.md) • [Documentation](https://lukasniessen.github.io/ArchUnitPython/)
 
 ## ⚡ 5 min Quickstart
 
@@ -345,6 +344,17 @@ ArchUnitPython detects string-based dynamic imports such as `importlib.import_mo
 from my_app.adapters.sql import Repository  # archunit: ignore
 ```
 
+### Conditional Imports
+
+Imports inside `try` blocks that handle `ImportError` or
+`ModuleNotFoundError` are marked as conditional dependencies. This helps graph
+reports distinguish optional imports and fallback implementations from regular
+runtime imports. Conditional dependencies remain part of architecture checks;
+relative and dynamic imports also retain their original import kind in graph
+reports. An edge may therefore have multiple kinds: CSV reports use
+pipe-delimited values such as `relative|conditional`, while HTML reports list
+both values separately.
+
 ### Naming Conventions
 
 ```python
@@ -360,6 +370,10 @@ def test_naming_patterns():
 
 ### Code Metrics
 
+Metric rules evaluate every matching file or class independently. Use filters such as
+`in_folder()`, `with_name()`, and `for_classes_matching()` when different parts of the
+project need different limits.
+
 ```python
 def test_no_large_files():
     rule = metrics("src/").count().lines_of_code().should_be_below(1000)
@@ -370,7 +384,7 @@ def test_high_class_cohesion():
     assert_passes(rule)
 
 def test_method_count():
-    rule = metrics("src/").count().method_count().should_be_below(20)
+    rule = metrics("src/").count().method_count().should_be_below_or_equal(20)
     assert_passes(rule)
 
 def test_field_count_for_data_classes():
@@ -384,6 +398,45 @@ def test_field_count_for_data_classes():
     assert_passes(rule)
 ```
 
+#### Comparison Semantics
+
+Metric comparisons are exact. In particular, `should_be_below(20)` means `< 20`, so
+a value of exactly `20` is a violation. Use the inclusive form when the limit itself
+should be accepted.
+
+| Method | Passing values |
+| --- | --- |
+| `should_be_below(n)` | `< n` |
+| `should_be_below_or_equal(n)` | `<= n` |
+| `should_be_above(n)` | `> n` |
+| `should_be_above_or_equal(n)` | `>= n` |
+| `should_be(n)` | exactly `n` |
+
+Not every metric builder exposes every comparison. The available methods are shown
+by the fluent API after selecting a metric.
+
+#### Choosing Thresholds
+
+There is no universal correct limit for every codebase. Treat thresholds as
+architecture decisions that should reflect the role and maturity of the code:
+
+1. Measure the current project before enabling a new rule.
+2. Start at the current maximum, or slightly above it, to prevent further regression.
+3. Use narrower filters when generated code, data classes, or adapters need different limits.
+4. Lower the threshold gradually as existing violations are removed.
+5. Record the reason with `.because(...)` so future maintainers understand the limit.
+
+| Metric | Interpretation | Useful starting point |
+| --- | --- | --- |
+| Lines of code | File size and review burden | Current maximum for hand-written files |
+| Method or field count | Class responsibility and size | Current maximum, split by class role |
+| LCOM | Lack of class cohesion; lower is generally better | Baseline one LCOM variant and keep it consistent |
+| Instability | Dependence on outgoing versus incoming dependencies | Compare files with similar architectural roles |
+| Distance from main sequence | Balance between abstractness and instability; closer to zero is better | Observe the current distribution before tightening |
+
+Thresholds are guardrails, not quality scores. A metric violation is a prompt to inspect
+the design; it does not automatically mean the code is incorrect.
+
 ### Distance Metrics
 
 ```python
@@ -479,13 +532,13 @@ from archunitpython import project_graph
 def test_export_dependency_graph_reports():
     graph = project_graph("src/requests").titled("Application Architecture")
 
-    graph.collapse_to_folder_depth(2).export_as_mermaid("reports/dependencies.md")
+    graph.collapse_to_folder_depth(2).export_as_mermaid("reports/dependencies.mmd")
 
 if __name__ == "__main__":
     test_export_dependency_graph_reports()
 ```
-**Exported mermaid diagram**
-``` mermaid
+**Exported Mermaid diagram**
+```mermaid
 flowchart LR
   n0["__init__.py"]
   n1["__version__.py"]
@@ -603,20 +656,36 @@ When you create reports through `project_graph("src/")`, internal file paths are
 
 ### Reports
 
-Generate HTML reports for your metrics. _Note that this feature is in beta._
+Generate an HTML report from metric values collected by your tests or build tooling.
+`MetricsExporter` formats the supplied dictionary; it does not execute metric rules or
+calculate the values itself. _This feature is in beta._
 
 ```python
 from archunitpython.metrics.fluentapi.export_utils import MetricsExporter, ExportOptions
 
-MetricsExporter.export_as_html(
-    {"MethodCount": 5, "FieldCount": 3, "LinesOfCode": 150},
+metric_summary = {
+    "Maximum method count": "18 (limit: <= 20)",
+    "Maximum field count": "9 (limit: <= 10)",
+    "Maximum lines of code": "420 (limit: < 500)",
+    "Highest LCOM96b": "0.24 (limit: < 0.30)",
+}
+
+html = MetricsExporter.export_as_html(
+    metric_summary,
     ExportOptions(
         output_path="reports/metrics.html",
         title="Architecture Metrics Dashboard",
+        include_timestamp=False,
     ),
 )
+
+assert "Maximum method count" in html
 ```
 
+Keep labels and units stable if these reports are stored as CI artifacts and compared
+between builds. Continue using executable metric rules with `assert_passes()` as the
+enforcement mechanism.
+
 ## 🔎 Pattern Matching System
 
 We offer three targeting options for pattern matching across all modules:
@@ -951,7 +1020,7 @@ If ArchUnitPython helps your project, please consider:
 
 ### Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=LukasNiessen/ArchUnitPython&type=Date)](https://www.star-history.com/#LukasNiessen/ArchUnitPython&Date)
+[![Star History Chart](https://star-history.dera.page/svg?repos=LukasNiessen/ArchUnitPython&type=Date)](https://star-history.dera.page/#LukasNiessen/ArchUnitPython&Date)
 
 ## 📄 License
 

{archunitpython-1.5.0 → archunitpython-1.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "archunitpython"
-version = "1.5.0"
+version = "1.6.0"
 description = "Architecture testing library for Python projects. Enforce dependency rules, detect cycles, validate metrics."
 readme = "README.md"
 license = "MIT"

{archunitpython-1.5.0 → archunitpython-1.6.0}/src/archunitpython/__init__.py

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

{archunitpython-1.5.0 → archunitpython-1.6.0}/src/archunitpython/common/extraction/extract_graph.py

@@ -43,6 +43,8 @@ class _LocatedImport:
     module_name: str
     import_kind: ImportKind
     line_number: int
+    resolution_kind: ImportKind | None = None
+    fallback_module_name: str | None = None
 
 
 @dataclass(frozen=True)
@@ -182,9 +184,19 @@ def _extract_graph_uncached(
                 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, import_kind
+                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:
@@ -195,7 +207,7 @@ def _extract_graph_uncached(
                         source=_normalize(file_path),
                         target=resolved,
                         external=is_external,
-                        import_kinds=(import_kind,),
+                        import_kinds=_edge_import_kinds(located_import),
                     )
                 )
 
@@ -299,32 +311,60 @@ def _extract_located_imports(file_path: str) -> list[_LocatedImport]:
     imports: list[_LocatedImport] = []
     ignore_directives = _find_ignore_directives(source)
     type_checking_ranges = _find_type_checking_ranges(tree)
+    conditional_import_ranges = _find_conditional_import_ranges(tree)
 
     for node in ast.walk(tree):
         if isinstance(node, ast.Import):
-            is_type = _in_type_checking(node, type_checking_ranges)
-            kind = ImportKind.TYPE_IMPORT if is_type else ImportKind.IMPORT
+            syntax_kind = ImportKind.IMPORT
+            kind = _classify_import(
+                node,
+                syntax_kind,
+                type_checking_ranges,
+                conditional_import_ranges,
+            )
             for alias in node.names:
-                imports.append(_LocatedImport(alias.name, kind, node.lineno))
+                imports.append(
+                    _LocatedImport(alias.name, kind, node.lineno, syntax_kind)
+                )
 
         elif isinstance(node, ast.ImportFrom):
-            is_type = _in_type_checking(node, type_checking_ranges)
-            if node.level and node.level > 0:
-                # Relative import
-                kind = ImportKind.TYPE_IMPORT if is_type else ImportKind.RELATIVE_IMPORT
-                module = node.module or ""
-                dots = "." * node.level
-                imports.append(_LocatedImport(f"{dots}{module}", kind, node.lineno))
-            else:
-                kind = ImportKind.TYPE_IMPORT if is_type else ImportKind.FROM_IMPORT
-                if node.module:
-                    imports.append(_LocatedImport(node.module, kind, node.lineno))
+            syntax_kind = (
+                ImportKind.RELATIVE_IMPORT
+                if node.level and node.level > 0
+                else ImportKind.FROM_IMPORT
+            )
+            kind = _classify_import(
+                node,
+                syntax_kind,
+                type_checking_ranges,
+                conditional_import_ranges,
+            )
+            fallback_module_name = (
+                "." * node.level if node.level and node.module is None else None
+            )
+            for module_name in _import_from_module_names(node):
+                imports.append(
+                    _LocatedImport(
+                        module_name,
+                        kind,
+                        node.lineno,
+                        syntax_kind,
+                        fallback_module_name,
+                    )
+                )
 
         elif isinstance(node, ast.Call):
-            is_type = _in_type_checking(node, type_checking_ranges)
-            kind = ImportKind.TYPE_IMPORT if is_type else ImportKind.DYNAMIC_IMPORT
+            syntax_kind = ImportKind.DYNAMIC_IMPORT
+            kind = _classify_import(
+                node,
+                syntax_kind,
+                type_checking_ranges,
+                conditional_import_ranges,
+            )
             for module_name in _extract_dynamic_import_names(node):
-                imports.append(_LocatedImport(module_name, kind, node.lineno))
+                imports.append(
+                    _LocatedImport(module_name, kind, node.lineno, syntax_kind)
+                )
 
     return [
         import_
@@ -389,6 +429,43 @@ def _extract_dynamic_import_names(node: ast.Call) -> list[str]:
     return []
 
 
+def _import_from_module_names(node: ast.ImportFrom) -> tuple[str, ...]:
+    """Return resolvable module names for a from-import statement."""
+    dots = "." * (node.level or 0)
+    if node.module:
+        return (f"{dots}{node.module}",)
+
+    aliases = tuple(alias.name for alias in node.names if alias.name != "*")
+    if dots and aliases:
+        return tuple(f"{dots}{alias}" for alias in aliases)
+    return (dots,) if dots else ()
+
+
+def _edge_import_kinds(import_: _LocatedImport) -> tuple[ImportKind, ...]:
+    """Return graph labels without losing syntax for conditional imports."""
+    resolution_kind = import_.resolution_kind or import_.import_kind
+    if (
+        import_.import_kind == ImportKind.CONDITIONAL_IMPORT
+        and resolution_kind != import_.import_kind
+    ):
+        return (resolution_kind, import_.import_kind)
+    return (import_.import_kind,)
+
+
+def _classify_import(
+    node: ast.AST,
+    default_kind: ImportKind,
+    type_checking_ranges: list[tuple[int, int]],
+    conditional_import_ranges: list[tuple[int, int]],
+) -> ImportKind:
+    """Classify an import node by special context before syntax kind."""
+    if _in_type_checking(node, type_checking_ranges):
+        return ImportKind.TYPE_IMPORT
+    if _in_conditional_import(node, conditional_import_ranges):
+        return ImportKind.CONDITIONAL_IMPORT
+    return default_kind
+
+
 def _find_type_checking_ranges(tree: ast.Module) -> list[tuple[int, int]]:
     """Find line ranges of TYPE_CHECKING blocks."""
     ranges: list[tuple[int, int]] = []
@@ -414,6 +491,46 @@ def _find_type_checking_ranges(tree: ast.Module) -> list[tuple[int, int]]:
     return sorted(ranges, key=lambda ele: ele[0])
 
 
+def _find_conditional_import_ranges(tree: ast.Module) -> list[tuple[int, int]]:
+    """Find try/except ImportError ranges that contain optional imports."""
+    ranges: list[tuple[int, int]] = []
+
+    for node in ast.walk(tree):
+        if not isinstance(node, ast.Try):
+            continue
+        if not any(_handles_import_error(handler.type) for handler in node.handlers):
+            continue
+
+        ranges.extend(_statement_ranges(node.body))
+        for handler in node.handlers:
+            if _handles_import_error(handler.type):
+                ranges.extend(_statement_ranges(handler.body))
+
+    return sorted(ranges, key=lambda ele: ele[0])
+
+
+def _handles_import_error(node: ast.expr | None) -> bool:
+    """Return True if an except handler catches import-related errors."""
+    if node is None:
+        return False
+    if isinstance(node, ast.Name):
+        return node.id in {"ImportError", "ModuleNotFoundError"}
+    if isinstance(node, ast.Attribute):
+        return node.attr in {"ImportError", "ModuleNotFoundError"}
+    if isinstance(node, ast.Tuple):
+        return any(_handles_import_error(elt) for elt in node.elts)
+    return False
+
+
+def _statement_ranges(statements: list[ast.stmt]) -> list[tuple[int, int]]:
+    """Return line ranges covered by statement blocks."""
+    if not statements:
+        return []
+    start = statements[0].lineno
+    end = max(getattr(statement, "end_lineno", statement.lineno) for statement in statements)
+    return [(start, end)]
+
+
 def _in_type_checking(node: ast.AST, ranges: list[tuple[int, int]]) -> bool:
     """Check if a node is inside a TYPE_CHECKING block."""
     if not hasattr(node, "lineno"):
@@ -422,6 +539,14 @@ def _in_type_checking(node: ast.AST, ranges: list[tuple[int, int]]) -> bool:
     return any(start <= lineno <= end for start, end in ranges)
 
 
+def _in_conditional_import(node: ast.AST, ranges: list[tuple[int, int]]) -> bool:
+    """Check if a node is inside a try/except ImportError block."""
+    if not hasattr(node, "lineno"):
+        return False
+    lineno = node.lineno
+    return any(start <= lineno <= end for start, end in ranges)
+
+
 def _resolve_import(
     import_name: str,
     source_file: str,
@@ -433,7 +558,14 @@ def _resolve_import(
     Returns (resolved_path, is_external).
     The path is normalized with forward slashes.
     """
-    if kind in (ImportKind.RELATIVE_IMPORT, ImportKind.TYPE_IMPORT) and import_name.startswith("."):
+    if (
+        kind
+        in (
+            ImportKind.RELATIVE_IMPORT,
+            ImportKind.TYPE_IMPORT,
+        )
+        and import_name.startswith(".")
+    ):
         # Relative import
         return _resolve_relative_import(import_name, source_file, project_root)
 

{archunitpython-1.5.0 → archunitpython-1.6.0}/src/archunitpython/common/extraction/graph.py

@@ -14,6 +14,7 @@ class ImportKind(Enum):
     RELATIVE_IMPORT = "relative"  # from . import bar / from ..foo import bar
     DYNAMIC_IMPORT = "dynamic"  # __import__('foo') / importlib.import_module()
     TYPE_IMPORT = "type"  # inside TYPE_CHECKING block
+    CONDITIONAL_IMPORT = "conditional"  # inside try/except ImportError
 
 
 @dataclass(frozen=True)