modwire 11.0.1__tar.gz → 11.0.3__tar.gz

{modwire-11.0.1 → modwire-11.0.3}/.dev/modwire.egg-info/SOURCES.txt

@@ -10,7 +10,6 @@ setup.py
 uv.lock
 .github/workflows/ci.yml
 .github/workflows/release.yml
-docs/target-language-ownership.md
 scripts/check_extractors.py
 scripts/generate_docs.py
 scripts/verify_consumer.py
@@ -143,7 +142,12 @@ src/modwire/cli/initialization/services/initialization_service.py
 src/modwire/cli/pipeline/__init__.py
 src/modwire/cli/pipeline/application.py
 src/modwire/cli/pipeline/domain.py
+src/modwire/cli/pipeline/batching/balanced_planner.py
+src/modwire/cli/pipeline/batching/fixed_planner.py
+src/modwire/cli/pipeline/batching/plan.py
+src/modwire/cli/pipeline/batching/planner.py
 src/modwire/cli/pipeline/models/__init__.py
+src/modwire/cli/pipeline/models/command_name.py
 src/modwire/cli/pipeline/models/command_request.py
 src/modwire/cli/pipeline/models/extractor_batch_input.py
 src/modwire/cli/pipeline/models/extractor_command_input.py
@@ -168,11 +172,16 @@ src/modwire/cli/pipeline/services/source_manifest_builder.py
 src/modwire/cli/pipeline/services/success.py
 src/modwire/cli/pipeline/services/unknown_files_warning.py
 src/modwire/cli/pipeline/services/unused_exports_insight.py
+src/modwire/cli/pipeline/transport/json_lines_output_reader.py
+src/modwire/cli/pipeline/transport/json_output_reader.py
+src/modwire/cli/pipeline/transport/output_reader.py
+src/modwire/cli/pipeline/transport/source_file_factory.py
 src/modwire/cli/resources/__init__.py
 src/modwire/cli/resources/application.py
 src/modwire/cli/resources/models/__init__.py
 src/modwire/cli/resources/models/defaults.py
 src/modwire/cli/resources/models/init_asset.py
+src/modwire/cli/resources/models/init_target_base.py
 src/modwire/cli/resources/templates/AGENTS.md
 src/modwire/cli/resources/templates/ARCHITECTURE.md
 src/modwire/cli/resources/templates/INDEX.md
@@ -195,20 +204,95 @@ src/modwire/extraction/extractors/application.py
 src/modwire/extraction/extractors/domain.py
 src/modwire/extraction/extractors/models/__init__.py
 src/modwire/extraction/extractors/models/batch_config.py
+src/modwire/extraction/extractors/models/batch_output_format.py
 src/modwire/extraction/extractors/models/extraction_request.py
 src/modwire/extraction/extractors/models/extractor_resource.py
-src/modwire/extraction/extractors/models/extractor_resource_set.py
 src/modwire/extraction/extractors/models/extractor_runtime.py
+src/modwire/extraction/extractors/models/parsed_source_batch.py
+src/modwire/extraction/extractors/models/parsed_source_file.py
 src/modwire/extraction/extractors/php/__init__.py
 src/modwire/extraction/extractors/php/extractor.py
 src/modwire/extraction/extractors/python/__init__.py
-src/modwire/extraction/extractors/python/assigned_value_reader.py
-src/modwire/extraction/extractors/python/call_context.py
-src/modwire/extraction/extractors/python/call_reader.py
-src/modwire/extraction/extractors/python/domain.py
-src/modwire/extraction/extractors/python/expression_reference_reader.py
 src/modwire/extraction/extractors/python/extractor.py
-src/modwire/extraction/extractors/python/syntax_parser.py
+src/modwire/extraction/extractors/python/observations/call_candidate.py
+src/modwire/extraction/extractors/python/observations/call_observation.py
+src/modwire/extraction/extractors/python/observations/call_reference.py
+src/modwire/extraction/extractors/python/observations/callable_candidate.py
+src/modwire/extraction/extractors/python/observations/class_candidate.py
+src/modwire/extraction/extractors/python/observations/export_candidate.py
+src/modwire/extraction/extractors/python/observations/function_candidate.py
+src/modwire/extraction/extractors/python/observations/import_candidate.py
+src/modwire/extraction/extractors/python/observations/inheritance_candidate.py
+src/modwire/extraction/extractors/python/observations/property_candidate.py
+src/modwire/extraction/extractors/python/observations/property_scope.py
+src/modwire/extraction/extractors/python/observations/source_context.py
+src/modwire/extraction/extractors/python/observations/source_observation.py
+src/modwire/extraction/extractors/python/observations/value_candidate.py
+src/modwire/extraction/extractors/python/pipeline/source_parser.py
+src/modwire/extraction/extractors/python/semantics/catalog.py
+src/modwire/extraction/extractors/python/semantics/contribution.py
+src/modwire/extraction/extractors/python/semantics/reader.py
+src/modwire/extraction/extractors/python/semantics/callables/classifier.py
+src/modwire/extraction/extractors/python/semantics/callables/constructor_rule.py
+src/modwire/extraction/extractors/python/semantics/callables/function_rule.py
+src/modwire/extraction/extractors/python/semantics/callables/instance_method_rule.py
+src/modwire/extraction/extractors/python/semantics/callables/static_method_rule.py
+src/modwire/extraction/extractors/python/semantics/callables/type_method_rule.py
+src/modwire/extraction/extractors/python/semantics/calls/classifier.py
+src/modwire/extraction/extractors/python/semantics/calls/constructor_target_rule.py
+src/modwire/extraction/extractors/python/semantics/calls/dynamic_target_rule.py
+src/modwire/extraction/extractors/python/semantics/calls/instance_target_rule.py
+src/modwire/extraction/extractors/python/semantics/calls/local_target_rule.py
+src/modwire/extraction/extractors/python/semantics/calls/qualified_target_rule.py
+src/modwire/extraction/extractors/python/semantics/calls/reference_reader.py
+src/modwire/extraction/extractors/python/semantics/calls/unresolved_target_rule.py
+src/modwire/extraction/extractors/python/semantics/classes/abstract_rule.py
+src/modwire/extraction/extractors/python/semantics/classes/classifier.py
+src/modwire/extraction/extractors/python/semantics/classes/concrete_rule.py
+src/modwire/extraction/extractors/python/semantics/contributors/call_contributor.py
+src/modwire/extraction/extractors/python/semantics/contributors/callable_contributor.py
+src/modwire/extraction/extractors/python/semantics/contributors/class_contributor.py
+src/modwire/extraction/extractors/python/semantics/contributors/export_contributor.py
+src/modwire/extraction/extractors/python/semantics/contributors/function_contributor.py
+src/modwire/extraction/extractors/python/semantics/contributors/import_contributor.py
+src/modwire/extraction/extractors/python/semantics/contributors/inheritance_contributor.py
+src/modwire/extraction/extractors/python/semantics/contributors/metric_contributor.py
+src/modwire/extraction/extractors/python/semantics/contributors/property_contributor.py
+src/modwire/extraction/extractors/python/semantics/contributors/value_contributor.py
+src/modwire/extraction/extractors/python/semantics/exports/classifier.py
+src/modwire/extraction/extractors/python/semantics/exports/explicit_rule.py
+src/modwire/extraction/extractors/python/semantics/exports/implicit_rule.py
+src/modwire/extraction/extractors/python/semantics/policies/annotation_reader.py
+src/modwire/extraction/extractors/python/semantics/policies/assigned_value_reader.py
+src/modwire/extraction/extractors/python/semantics/policies/declaration_identity_factory.py
+src/modwire/extraction/extractors/python/semantics/policies/expression_reference_reader.py
+src/modwire/extraction/extractors/python/semantics/policies/import_path_policy.py
+src/modwire/extraction/extractors/python/semantics/policies/module_identity_policy.py
+src/modwire/extraction/extractors/python/semantics/policies/parameter_reader.py
+src/modwire/extraction/extractors/python/semantics/policies/type_alias_classifier.py
+src/modwire/extraction/extractors/python/semantics/policies/visibility_policy.py
+src/modwire/extraction/extractors/python/semantics/properties/annotated_class_rule.py
+src/modwire/extraction/extractors/python/semantics/properties/annotated_instance_rule.py
+src/modwire/extraction/extractors/python/semantics/properties/assigned_class_rule.py
+src/modwire/extraction/extractors/python/semantics/properties/assigned_instance_rule.py
+src/modwire/extraction/extractors/python/semantics/properties/classifier.py
+src/modwire/extraction/extractors/python/semantics/properties/decorated_method_rule.py
+src/modwire/extraction/extractors/python/source_facts/call_contributor.py
+src/modwire/extraction/extractors/python/source_facts/callable_contributor.py
+src/modwire/extraction/extractors/python/source_facts/class_contributor.py
+src/modwire/extraction/extractors/python/source_facts/contribution.py
+src/modwire/extraction/extractors/python/source_facts/export_contributor.py
+src/modwire/extraction/extractors/python/source_facts/function_contributor.py
+src/modwire/extraction/extractors/python/source_facts/import_contributor.py
+src/modwire/extraction/extractors/python/source_facts/inheritance_contributor.py
+src/modwire/extraction/extractors/python/source_facts/metric_contributor.py
+src/modwire/extraction/extractors/python/source_facts/property_contributor.py
+src/modwire/extraction/extractors/python/source_facts/reader.py
+src/modwire/extraction/extractors/python/source_facts/value_contributor.py
+src/modwire/extraction/extractors/python/traversal/context.py
+src/modwire/extraction/extractors/python/traversal/observation_reader.py
+src/modwire/extraction/extractors/python/traversal/ordered_observation_visitor.py
+src/modwire/extraction/extractors/python/traversal/traversal_role.py
 src/modwire/extraction/extractors/resources/__init__.py
 src/modwire/extraction/extractors/resources/php/build.php
 src/modwire/extraction/extractors/resources/php/build.py
@@ -235,18 +319,20 @@ src/modwire/implementation/manifest/contracts/__init__.py
 src/modwire/implementation/manifest/contracts/manifest_compiler.py
 src/modwire/implementation/manifest/contracts/manifest_serializer.py
 src/modwire/implementation/manifest/models/__init__.py
-src/modwire/implementation/manifest/models/digest_algorithm.py
 src/modwire/implementation/manifest/models/implementation_manifest.py
 src/modwire/implementation/manifest/models/implementation_manifest_document.py
 src/modwire/implementation/manifest/models/manifest_annotation.py
+src/modwire/implementation/manifest/models/manifest_annotation_role.py
 src/modwire/implementation/manifest/models/manifest_attribute.py
 src/modwire/implementation/manifest/models/manifest_callable.py
 src/modwire/implementation/manifest/models/manifest_dependency.py
+src/modwire/implementation/manifest/models/manifest_dependency_target_kind.py
 src/modwire/implementation/manifest/models/manifest_format.py
 src/modwire/implementation/manifest/models/manifest_inheritance.py
 src/modwire/implementation/manifest/models/manifest_parameter.py
 src/modwire/implementation/manifest/models/manifest_span.py
 src/modwire/implementation/manifest/models/manifest_symbol.py
+src/modwire/implementation/manifest/models/manifest_symbol_kind.py
 src/modwire/implementation/manifest/services/__init__.py
 src/modwire/implementation/manifest/services/canonical_json_manifest_serializer.py
 src/modwire/implementation/manifest/services/code_map_manifest_compiler.py
@@ -265,13 +351,16 @@ src/modwire/shared/code/models/declaration_identity.py
 src/modwire/shared/code/models/dependency_edge_result.py
 src/modwire/shared/code/models/dependency_graph.py
 src/modwire/shared/code/models/dependency_node_result.py
+src/modwire/shared/code/models/digest_algorithm.py
 src/modwire/shared/code/models/duplicate_identity_error.py
 src/modwire/shared/code/models/edge.py
-src/modwire/shared/code/models/edge_resolution.py
 src/modwire/shared/code/models/extractor_descriptor.py
 src/modwire/shared/code/models/fact_capability.py
 src/modwire/shared/code/models/identity.py
+src/modwire/shared/code/models/identity_kind.py
+src/modwire/shared/code/models/import_crossing_type.py
 src/modwire/shared/code/models/node.py
+src/modwire/shared/code/models/node_kind.py
 src/modwire/shared/code/models/query_builder.py
 src/modwire/shared/code/models/query_types.py
 src/modwire/shared/code/models/queryable_code_map.py
@@ -282,12 +371,16 @@ src/modwire/shared/code/models/source_artifact.py
 src/modwire/shared/code/models/source_assigned_value.py
 src/modwire/shared/code/models/source_assigned_value_kind.py
 src/modwire/shared/code/models/source_call.py
+src/modwire/shared/code/models/source_call_resolution.py
 src/modwire/shared/code/models/source_callable.py
+src/modwire/shared/code/models/source_callable_kind.py
 src/modwire/shared/code/models/source_callable_symbol.py
 src/modwire/shared/code/models/source_class.py
 src/modwire/shared/code/models/source_class_method.py
 src/modwire/shared/code/models/source_class_property.py
+src/modwire/shared/code/models/source_dependency_resolution.py
 src/modwire/shared/code/models/source_export.py
+src/modwire/shared/code/models/source_export_kind.py
 src/modwire/shared/code/models/source_extraction.py
 src/modwire/shared/code/models/source_file.py
 src/modwire/shared/code/models/source_file_result.py
@@ -301,13 +394,17 @@ src/modwire/shared/code/models/source_manifest.py
 src/modwire/shared/code/models/source_manifest_identity.py
 src/modwire/shared/code/models/source_member_kind.py
 src/modwire/shared/code/models/source_parameter.py
+src/modwire/shared/code/models/source_parameter_kind.py
 src/modwire/shared/code/models/source_relation_kind.py
 src/modwire/shared/code/models/source_signature.py
+src/modwire/shared/code/models/source_signature_kind.py
 src/modwire/shared/code/models/source_symbol.py
 src/modwire/shared/code/models/source_type.py
 src/modwire/shared/code/models/source_value.py
+src/modwire/shared/code/models/source_value_declaration_kind.py
+src/modwire/shared/code/models/source_value_kind.py
 src/modwire/shared/code/models/source_value_scope.py
-src/modwire/shared/code/models/types.py
+src/modwire/shared/code/models/source_visibility.py
 src/modwire/shared/code/services/__init__.py
 src/modwire/shared/code/services/glob_path_matcher.py
 src/modwire/shared/code/services/identity_resolver.py

{modwire-11.0.1 → modwire-11.0.3}/Makefile

@@ -3,6 +3,7 @@ BUILD_DIR := $(DEV_DIR)/build
 DIST_DIR := $(DEV_DIR)/dist
 EGG_INFO_DIR := src/modwire.egg-info
 PROJECT_ROOT := $(CURDIR)
+BIG_PROJECT_ARGS ?=
 
 export PYTHONPYCACHEPREFIX := $(PROJECT_ROOT)/$(DEV_DIR)/cache/python
 export UV_CACHE_DIR := $(PROJECT_ROOT)/$(DEV_DIR)/cache/uv
@@ -26,7 +27,7 @@ test:
 	uv run pytest
 
 big-projects:
-	uv run python -m tests.extraction.big_projects.run
+	uv run python -u -m tests.extraction.big_projects.run $(BIG_PROJECT_ARGS)
 
 scan-benchmark-fixture:
 	uv run python -m tests.extraction.scan_benchmark.prepare --root .dev/benchmarks/scan-project --source-template "$(SCAN_BENCHMARK_SOURCE)"

{modwire-11.0.1 → modwire-11.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modwire
-Version: 11.0.1
+Version: 11.0.3
 Summary: Code extraction, architecture analysis and the Modwire CLI.
 Author: Tomasz Szpak
 License-Expression: MIT

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/application.py

@@ -17,7 +17,6 @@ from .cli.cache.models.cached_result import CachedResult
 from .cli.facade import CliFacade
 from .extraction.facade import ExtractionFacade
 from .implementation.facade import ImplementationFacade
-from .implementation.manifest.models.digest_algorithm import DigestAlgorithm
 from .implementation.manifest.models.implementation_manifest import ImplementationManifest
 from .implementation.manifest.models.implementation_manifest_document import ImplementationManifestDocument
 from .implementation.manifest.models.manifest_format import ManifestFormat
@@ -26,6 +25,7 @@ from .shared.code.models.capability_status import CapabilityStatus
 from .shared.code.models.code_map import CodeMap
 from .shared.code.models.declaration_family import DeclarationFamily
 from .shared.code.models.declaration_identity import DeclarationIdentity
+from .shared.code.models.digest_algorithm import DigestAlgorithm
 from .shared.code.models.fact_capability import FactCapability
 from .shared.code.models.queryable_code_map import QueryableCodeMap
 from .shared.code.models.scan_policy import ScanPolicy

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/architecture/boundaries/services/module_boundary_analyzer.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 
 from wireup import injectable
 
+from ....shared.code.models.source_dependency_resolution import SourceDependencyResolution
 from ...config.models.boundaries_config import BoundariesConfig
 from ...config.models.boundary_rule import BoundaryRule
 from ...map.models.architecture_map import ArchitectureMap
@@ -32,7 +33,7 @@ class ModuleBoundaryAnalyzer(FlowAnalyzerInterface):
         ]
         for dependency in architecture_map.code_map.dependency_edges().all():
             edge = dependency.edge
-            if edge.resolution != "resolved" or edge.to_id is None:
+            if edge.resolution is not SourceDependencyResolution.RESOLVED or edge.to_id is None:
                 continue
             source_tags = architecture_map.tag_map.tags_for(edge.from_id)
             target_tags = architecture_map.tag_map.tags_for(edge.to_id)

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/architecture/boundaries/services/no_cycles_flow_analyzer.py

@@ -38,11 +38,11 @@ class NoCyclesFlowAnalyzer(FlowAnalyzerInterface, BaseFlowAnalyzer):
 
     def module_adjacency(self, architecture_map: ArchitectureMap) -> dict[str, set[str]]:
         adjacency: dict[str, set[str]] = {}
-        for dependency in architecture_map.code_map.dependency_edges().all():
-            if dependency.edge.to_id is None:
+        for edge in architecture_map.code_map.cm.dependency_graph.edges:
+            if edge.to_id is None:
                 continue
-            source = self.module_for(architecture_map, dependency.edge.from_id)
-            target = self.module_for(architecture_map, dependency.edge.to_id)
+            source = self.module_for(architecture_map, edge.from_id)
+            target = self.module_for(architecture_map, edge.to_id)
             if not source or not target or source == target:
                 continue
             adjacency.setdefault(source, set()).add(target)

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/architecture/boundaries/services/no_reentry_flow_analyzer.py

@@ -43,10 +43,9 @@ class NoReentryFlowAnalyzer(FlowAnalyzerInterface, BaseFlowAnalyzer):
         return self.dedupe(violations)
 
     def roots(self, architecture_map: ArchitectureMap) -> tuple[str, ...]:
+        graph = architecture_map.code_map.cm.dependency_graph
         roots = tuple(
-            source_id
-            for source_id in architecture_map.code_map.source_ids()
-            if architecture_map.code_map.incoming_dependencies(FileId(source_id)).count() == 0
+            source_id for source_id in architecture_map.code_map.source_ids() if not graph.incoming(FileId(source_id))
         )
         if roots:
             return tuple(sorted(roots))
@@ -66,16 +65,17 @@ class NoReentryFlowAnalyzer(FlowAnalyzerInterface, BaseFlowAnalyzer):
             return
         visited.add(state)
         source_module = self.module_for(architecture_map, source_id)
+        graph = architecture_map.code_map.cm.dependency_graph
         dependencies = sorted(
-            architecture_map.code_map.outgoing_dependencies(FileId(source_id)).all(),
-            key=lambda dependency: (
-                dependency.edge.to_id or "",
-                dependency.edge.specifier,
-                dependency.edge.kind,
+            graph.outgoing(FileId(source_id)),
+            key=lambda edge: (
+                edge.to_id or "",
+                edge.specifier,
+                edge.kind,
             ),
         )
-        for dependency in dependencies:
-            target_id = dependency.edge.to_id
+        for edge in dependencies:
+            target_id = edge.to_id
             if target_id is None:
                 continue
             target_module = self.module_for(architecture_map, target_id)

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/architecture/config/models/shape_rules.py

@@ -1,5 +1,6 @@
 from pydantic import Field
 
+from ....shared.code.models.import_crossing_type import ImportCrossingType
 from .configuration_value import ConfigurationValue
 
 
@@ -20,4 +21,7 @@ class ShapeRules(ConfigurationValue):
     allow_optional_class_properties: bool = False
     allow_import_aliases: bool = False
     require_joined_imports: bool = True
-    allowed_import_crossing_types: tuple[str, ...] = ("module", "symbol")
+    allowed_import_crossing_types: tuple[ImportCrossingType, ...] = (
+        ImportCrossingType.MODULE,
+        ImportCrossingType.SYMBOL,
+    )

modwire-11.0.3/src/modwire/architecture/insights/models/exports_report_item.py

@@ -0,0 +1,11 @@
+from ....shared.code.models.import_crossing_type import ImportCrossingType
+from ....shared.code.models.source_export_kind import SourceExportKind
+from ....shared.values.models.value_model import ValueModel
+
+
+class ExportsReportItem(ValueModel):
+    source_id: str
+    name: str
+    kind: SourceExportKind
+    crossing_type: ImportCrossingType
+    reason: str

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/architecture/insights/services/clusters_reporter.py

@@ -26,14 +26,37 @@ class ClustersReporter(InsightReporterInterface):
 
     def collect(self, architecture_map: ArchitectureMap) -> ClustersReport:
         source_ids = architecture_map.code_map.source_ids()
+        tracked_source_ids = set(source_ids)
         file_sets: dict[str, list[str]] = {}
+        cluster_by_source_id: dict[str, str] = {}
         for source_id in source_ids:
-            file_sets.setdefault(self.cluster_name(source_id), []).append(source_id)
+            cluster_name = self.cluster_name(source_id)
+            file_sets.setdefault(cluster_name, []).append(source_id)
+            cluster_by_source_id[source_id] = cluster_name
+
+        incoming_by_cluster = dict.fromkeys(file_sets, 0)
+        outgoing_by_cluster = dict.fromkeys(file_sets, 0)
+        pressure_by_file: dict[str, int] = dict.fromkeys(source_ids, 0)
+        for edge in architecture_map.code_map.cm.dependency_graph.edges:
+            if edge.from_id in tracked_source_ids:
+                pressure_by_file[edge.from_id] += 1
+            if edge.to_id is None or edge.to_id not in tracked_source_ids:
+                continue
+
+            pressure_by_file[edge.to_id] += 1
+            target_cluster = cluster_by_source_id[edge.to_id]
+            source_cluster = cluster_by_source_id.get(edge.from_id)
+            if source_cluster == target_cluster:
+                continue
+            incoming_by_cluster[target_cluster] += 1
+            if source_cluster is not None:
+                outgoing_by_cluster[source_cluster] += 1
+
         clusters: list[ClustersReportItem] = []
         for name, files in sorted(file_sets.items()):
             file_tuple = tuple(sorted(files))
-            incoming_count = self.incoming_count(architecture_map, file_tuple)
-            outgoing_count = self.outgoing_count(architecture_map, file_tuple)
+            incoming_count = incoming_by_cluster[name]
+            outgoing_count = outgoing_by_cluster[name]
             clusters.append(
                 ClustersReportItem(
                     name=name,
@@ -41,7 +64,11 @@ class ClustersReporter(InsightReporterInterface):
                     incoming_count=incoming_count,
                     outgoing_count=outgoing_count,
                     pressure_score=incoming_count + outgoing_count,
-                    top_files=self.top_files(architecture_map, file_tuple),
+                    top_files=tuple(
+                        sorted(files, key=lambda source_id: (-pressure_by_file[source_id], source_id))[
+                            : self.top_file_limit
+                        ]
+                    ),
                 )
             )
         return self.report_type(
@@ -78,7 +105,5 @@ class ClustersReporter(InsightReporterInterface):
         )
 
     def file_pressure(self, architecture_map: ArchitectureMap, source_id: str) -> int:
-        return (
-            architecture_map.code_map.incoming_dependencies(FileId(source_id)).count()
-            + architecture_map.code_map.outgoing_dependencies(FileId(source_id)).count()
-        )
+        graph = architecture_map.code_map.cm.dependency_graph
+        return len(graph.incoming(FileId(source_id))) + len(graph.outgoing(FileId(source_id)))

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/architecture/insights/services/coherence_reporter.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from wireup import injectable
 
 from ....shared.code.models.identity import FileId
+from ....shared.code.models.source_dependency_resolution import SourceDependencyResolution
 from ...map.models.architecture_map import ArchitectureMap
 from ..domain import InsightReporterInterface
 from ..models.coherence_report import CoherenceReport
@@ -21,12 +22,13 @@ class CoherenceReporter(InsightReporterInterface):
 
     def collect(self, architecture_map: ArchitectureMap) -> CoherenceReport:
         source_ids = set(architecture_map.code_map.source_ids())
+        graph = architecture_map.code_map.cm.dependency_graph
         roots: list[str] = []
         leaves: list[str] = []
         isolated: list[str] = []
         for source_id in sorted(source_ids):
-            has_incoming = architecture_map.code_map.incoming_dependencies(FileId(source_id)).count() > 0
-            has_outgoing = architecture_map.code_map.outgoing_dependencies(FileId(source_id)).count() > 0
+            has_incoming = len(graph.incoming(FileId(source_id))) > 0
+            has_outgoing = len(graph.outgoing(FileId(source_id))) > 0
             if not has_incoming:
                 roots.append(source_id)
             if not has_outgoing:
@@ -34,9 +36,9 @@ class CoherenceReporter(InsightReporterInterface):
             if not has_incoming and (not has_outgoing):
                 isolated.append(source_id)
         external_dependencies = {
-            edge_result.edge.specifier
-            for edge_result in architecture_map.code_map.external_dependency_edges().all()
-            if edge_result.edge.resolution == "external"
+            edge.specifier
+            for edge in graph.external_edges(source_ids)
+            if edge.resolution is SourceDependencyResolution.EXTERNAL
         }
         return self.report_type(
             roots=tuple(roots),

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/architecture/insights/services/hotspots_reporter.py

@@ -30,8 +30,9 @@ class HotspotsReporter(InsightReporterInterface):
         return self.report_type(hotspots=hotspots)
 
     def hotspot_for(self, architecture_map: ArchitectureMap, source_id: str) -> HotspotsReportItem:
-        incoming_count = architecture_map.code_map.incoming_dependencies(FileId(source_id)).count()
-        outgoing_count = architecture_map.code_map.outgoing_dependencies(FileId(source_id)).count()
+        graph = architecture_map.code_map.cm.dependency_graph
+        incoming_count = len(graph.incoming(FileId(source_id)))
+        outgoing_count = len(graph.outgoing(FileId(source_id)))
         return HotspotsReportItem(
             source_id=source_id,
             incoming_count=incoming_count,

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/architecture/shape/services/file_resolver.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from wireup import injectable
 
 from ....shared.code.models.identity import FileId
+from ....shared.code.models.source_value_declaration_kind import SourceValueDeclarationKind
 from ....shared.code.models.source_value_scope import SourceValueScope
 from ...config.models.shape_rules import ShapeRules
 from ..domain import BaseShapeResolver, ShapeResolverInterface
@@ -75,7 +76,8 @@ class FileResolver(ShapeResolverInterface, BaseShapeResolver):
                         source_id=source_id,
                         rule_name="max_variables_per_file",
                         actual=sum(
-                            value.scope == SourceValueScope.MODULE and value.declaration_kind == "assignment"
+                            value.scope is SourceValueScope.MODULE
+                            and value.declaration_kind is SourceValueDeclarationKind.ASSIGNMENT
                             for value in source_file.values
                         ),
                         limit=config.max_variables_per_file,

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/architecture/shape/services/import_resolver.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 
 from wireup import injectable
 
+from ....shared.code.models.import_crossing_type import ImportCrossingType
 from ...config.models.shape_rules import ShapeRules
 from ..domain import BaseShapeResolver, ShapeResolverInterface
 from ..models.shape_realm_architecture_map import ShapeRealmArchitectureMap
@@ -49,7 +50,7 @@ class ImportResolver(ShapeResolverInterface, BaseShapeResolver):
                 )
             if (
                 config.require_joined_imports
-                and source_import.crossing_type != "module"
+                and source_import.crossing_type is not ImportCrossingType.MODULE
                 and (not source_import.uses_joined_import)
             ):
                 violations.append(

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/cli/cache/application.py

@@ -11,6 +11,7 @@ from ...extraction.extractors.models.extraction_request import ExtractionRequest
 from ...shared.code.models.code_map import CodeMap
 from ...shared.code.models.duplicate_identity_error import DuplicateIdentityError
 from ...shared.code.models.identity import FileId, ModuleId
+from ...shared.code.models.identity_kind import IdentityKind
 from ...shared.code.models.scan_policy import ScanPolicy
 from ...shared.code.models.source_extraction import SourceExtraction
 from ...shared.code.models.source_file import SourceFile
@@ -103,7 +104,7 @@ class CacheApplication:
         for file_id, source_file in ordered_files.items():
             existing = modules.get(source_file.module_id)
             if existing is not None:
-                raise DuplicateIdentityError("module", source_file.module_id, existing, file_id)
+                raise DuplicateIdentityError(IdentityKind.MODULE, source_file.module_id, existing, file_id)
             modules[source_file.module_id] = file_id
 
         extraction = SourceExtraction(

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/cli/cache/services/cache_identity.py

@@ -98,7 +98,9 @@ class CacheIdentity:
 
     def runtime_identity(self, request: ExtractionRequest, observation: RuntimeObservation) -> dict[str, object]:
         return {
-            "runtime": request.runtime.model_dump(mode="json"),
+            "descriptor": request.runtime.descriptor.model_dump(mode="json"),
+            "capabilities": [item.model_dump(mode="json") for item in request.runtime.capabilities],
+            "file_extensions": list(request.runtime.file_extensions),
             "batch": request.batch_config.model_dump(mode="json"),
             "observation": observation.model_dump(mode="json"),
         }

{modwire-11.0.1 → modwire-11.0.3}/src/modwire/cli/facade.py

@@ -8,6 +8,7 @@ from ..architecture.config.models.architecture_config import ArchitectureConfig
 from ..architecture.facade import ArchitectureFacade
 from ..architecture.report.models.report_node import ReportNode
 from ..extraction.extractors.models.extraction_request import ExtractionRequest
+from ..extraction.extractors.models.parsed_source_batch import ParsedSourceBatch
 from ..extraction.facade import ExtractionFacade
 from ..shared.code.models.code_map import CodeMap
 from ..shared.code.models.queryable_code_map import QueryableCodeMap
@@ -21,6 +22,7 @@ from .cache.models.cached_result import CachedResult
 from .documentation.application import DocumentationApplication
 from .initialization.application import InitializationApplication
 from .pipeline.application import PipelineApplication
+from .pipeline.models.command_name import CommandName
 from .pipeline.models.command_request import CommandRequest
 from .pipeline.models.extractor_command_input import ExtractorCommandInput
 
@@ -99,8 +101,8 @@ class CliFacade:
     def read_sources(self, language: str) -> ExtractorCommandInput | None:
         return self.pipeline.read_sources(language)
 
-    def write_sources(self, result: dict[str, object]) -> int:
-        return self.pipeline.write_sources(result)
+    def write_sources(self, document: str) -> int:
+        return self.pipeline.write_sources(document)
 
     def generate_documentation(self, readme: str, public_interfaces: tuple[type[object], ...], check: bool) -> int:
         return self.documentation.generate(Path(readme), public_interfaces, check)
@@ -110,28 +112,33 @@ class CliFacade:
         if request is None:
             return 1
         if request.batch:
-            result: dict[str, object] = {
-                source.source_id: self.extraction.parse_source(
-                    language, source.content, str(source.path), str(source.root), source.source_id
-                )
-                for source in request.sources
-            }
-            return self.write_sources(result)
+            return self.write_sources(
+                ParsedSourceBatch(
+                    sources={
+                        source.source_id: self.extraction.parse_source(
+                            language, source.content, str(source.path), str(source.root), source.source_id
+                        )
+                        for source in request.sources
+                    }
+                ).document()
+            )
         source = request.sources[0]
         return self.write_sources(
-            self.extraction.parse_source(language, source.content, str(source.path), str(source.root), source.source_id)
+            self.extraction.parse_source(
+                language, source.content, str(source.path), str(source.root), source.source_id
+            ).model_dump_json()
         )
 
     def run(self, argv: Sequence[str]) -> int:
         request = self.parse(argv)
-        if request.command == "init":
+        if request.command is CommandName.INIT:
             return self.initialize(self.working_directory(), str(request.dot_dir), request.force)
         cache_options = CacheOptions(
             directory=str(request.cache_directory),
             namespace=request.cache_namespace,
             max_bytes=request.cache_max_bytes,
         )
-        if request.command == "cache-clear":
+        if request.command is CommandName.CACHE_CLEAR:
             self.clear_cache(cache_options)
             return 0
         config = self.load_configuration(str(request.dot_dir))