diff --git a/.github/scripts/check_critical_coverage.py b/.github/scripts/check_critical_coverage.py index e9b555f..ea19640 100644 --- a/.github/scripts/check_critical_coverage.py +++ b/.github/scripts/check_critical_coverage.py @@ -12,15 +12,15 @@ # These are independent floors, not an average that another module can offset. # Keep the original three floors unchanged when extending the risk inventory. CRITICAL_FLOORS = { - "src/pt_snap_cli/core/snapshot_import_backend.py": 90, + "src/pt_snap_cli/core/importing/snapshot_import_backend.py": 90, "src/pt_snap_cli/snapshot/simulate/simulated_caching_allocator.py": 88, "src/pt_snap_cli/snapshot/simulate/snapshot_mutator.py": 84, - "src/pt_snap_cli/core/import_metadata_contract.py": 100, - "src/pt_snap_cli/core/import_metadata.py": 90, - "src/pt_snap_cli/core/split_service.py": 90, - "src/pt_snap_cli/core/focus_service.py": 90, - "src/pt_snap_cli/core/skill_service.py": 90, - "src/pt_snap_cli/core/snapshot_cache.py": 90, + "src/pt_snap_cli/core/importing/import_metadata_contract.py": 100, + "src/pt_snap_cli/core/importing/import_metadata.py": 90, + "src/pt_snap_cli/core/splitting/split_service.py": 90, + "src/pt_snap_cli/core/analysis/focus_service.py": 90, + "src/pt_snap_cli/core/analysis/skill_service.py": 90, + "src/pt_snap_cli/core/cache/snapshot_cache.py": 90, "src/pt_snap_cli/snapshot/representation.py": 95, } diff --git a/.github/workflows/AGENTS.md b/.github/workflows/AGENTS.md index 70ac847..a6a0e2f 100644 --- a/.github/workflows/AGENTS.md +++ b/.github/workflows/AGENTS.md @@ -31,15 +31,15 @@ inventory. A high average cannot compensate for a single file below its floor. | Runtime module (`src/pt_snap_cli/`) | Minimum line + branch coverage | | --- | --- | -| `core/snapshot_import_backend.py` | 90% | +| `core/importing/snapshot_import_backend.py` | 90% | | `snapshot/simulate/simulated_caching_allocator.py` | 88% | | `snapshot/simulate/snapshot_mutator.py` | 84% | -| `core/import_metadata_contract.py` | 100% | -| `core/import_metadata.py` | 90% | -| `core/split_service.py` | 90% | -| `core/focus_service.py` | 90% | -| `core/skill_service.py` | 90% | -| `core/snapshot_cache.py` | 90% | +| `core/importing/import_metadata_contract.py` | 100% | +| `core/importing/import_metadata.py` | 90% | +| `core/splitting/split_service.py` | 90% | +| `core/analysis/focus_service.py` | 90% | +| `core/analysis/skill_service.py` | 90% | +| `core/cache/snapshot_cache.py` | 90% | | `snapshot/representation.py` | 95% | The checker requires `.coverage`, branch data, every listed source file, measured diff --git a/AGENTS.md b/AGENTS.md index bd5ca9d..db7daea 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -69,7 +69,7 @@ may point to an existing Chromium executable instead of downloading one. - Type checking covers all `src/pt_snap_cli`, including `snapshot/`. Zero errors is the gate; warnings are informational. Preserve the file-level Any/Unknown - error gates in `api.py`, `core/models.py`, and `snapshot/representation.py`; + error gates in `api.py`, `core/common/models.py`, and `snapshot/representation.py`; do not downgrade snapshot through an `executionEnvironments` exception. - Pytest treats `ResourceWarning` and `PytestUnraisableExceptionWarning` as errors. Ownership/teardown guidance lives in [tests](tests/AGENTS.md). diff --git a/benchmarks/active_at_event_capacity.py b/benchmarks/active_at_event_capacity.py index ef43b43..e96e44d 100644 --- a/benchmarks/active_at_event_capacity.py +++ b/benchmarks/active_at_event_capacity.py @@ -18,12 +18,12 @@ from dataclasses import asdict from pathlib import Path -from pt_snap_cli.core.dataset_contract import ACTION_NAMES, BLOCK_STATES -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError -from pt_snap_cli.core.models import ImportMetadata -from pt_snap_cli.core.native_dataset_contract import NATIVE_FORMAT, cache_identity -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.common.models import ImportMetadata +from pt_snap_cli.core.dataset.dataset_contract import ACTION_NAMES, BLOCK_STATES +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget +from pt_snap_cli.core.dataset.native_dataset_contract import NATIVE_FORMAT, cache_identity SCHEMA = """CREATE TABLE dictionary ("table" TEXT,"column" TEXT,"key" TEXT,"value" TEXT); CREATE TABLE trace_entry_0 (id INTEGER PRIMARY KEY,action INTEGER,address INTEGER, diff --git a/benchmarks/baseline_import.py b/benchmarks/baseline_import.py index 4230039..8b5c05b 100644 --- a/benchmarks/baseline_import.py +++ b/benchmarks/baseline_import.py @@ -124,11 +124,11 @@ def _run_import_once(snapshot: Path, output_dir: Path, device: int) -> RunResult "-c", f""" import logging; logging.disable(logging.CRITICAL) -import pt_snap_cli.core.import_metadata as import_metadata +import pt_snap_cli.core.importing.import_metadata as import_metadata import resource import sys from benchmarks.baseline_import import _max_rss_kb -from pt_snap_cli.core.import_service import ImportOptions, ImportService +from pt_snap_cli.core.importing.import_service import ImportOptions, ImportService from pathlib import Path if not import_metadata.__version__: import_metadata.__version__ = "benchmark" @@ -273,7 +273,7 @@ def _correctness_summary(output_dir: Path, device: int) -> dict: def _profile_import(snapshot: Path, output_dir: Path, device: int, top_n: int = 20) -> str: - from pt_snap_cli.core.import_service import ImportOptions, ImportService + from pt_snap_cli.core.importing.import_service import ImportOptions, ImportService service = ImportService() options = ImportOptions( diff --git a/benchmarks/dataset_import_baseline.py b/benchmarks/dataset_import_baseline.py index be9f7df..bc2b36f 100644 --- a/benchmarks/dataset_import_baseline.py +++ b/benchmarks/dataset_import_baseline.py @@ -128,9 +128,10 @@ def require_owned_child(args, identity: dict) -> None: def child(args) -> dict: from pt_snap_cli.api import SnapshotAnalyzer - from pt_snap_cli.core import import_service, sharded_replay_service - from pt_snap_cli.core.import_service import ImportService - from pt_snap_cli.core.models import ImportOptions + from pt_snap_cli.core.common.models import ImportOptions + from pt_snap_cli.core.importing import import_service + from pt_snap_cli.core.importing.import_service import ImportService + from pt_snap_cli.core.splitting import sharded_replay_service from pt_snap_cli.snapshot.tools.adaptors import snapshot2db logging.disable(logging.CRITICAL) diff --git a/benchmarks/export_validation_memory.py b/benchmarks/export_validation_memory.py index 7bdc188..856a897 100644 --- a/benchmarks/export_validation_memory.py +++ b/benchmarks/export_validation_memory.py @@ -27,8 +27,8 @@ from contextlib import closing from pathlib import Path -from pt_snap_cli.core.msinsight_export import DEFAULT_CAPACITY, _validate_shards -from pt_snap_cli.core.sharded_replay_service import ShardedReplayResult +from pt_snap_cli.core.importing.msinsight_export import DEFAULT_CAPACITY, _validate_shards +from pt_snap_cli.core.splitting.sharded_replay_service import ShardedReplayResult from pt_snap_cli.snapshot.tools.adaptors.sharded_replay import ReplaySlice diff --git a/benchmarks/interop_acceptance.py b/benchmarks/interop_acceptance.py index 0f1182c..0afe5ae 100644 --- a/benchmarks/interop_acceptance.py +++ b/benchmarks/interop_acceptance.py @@ -245,7 +245,7 @@ def require(condition: bool, name: str) -> None: def compare_artifact(root: Path, device: int, reference: Path) -> dict: from pt_snap_cli.api import SnapshotAnalyzer - from pt_snap_cli.core.report_service import ReportService + from pt_snap_cli.core.analysis.report_service import ReportService root = canonical(root) reference = canonical(reference) diff --git a/benchmarks/lifecycle_query_plans.py b/benchmarks/lifecycle_query_plans.py index 89f6072..b428862 100644 --- a/benchmarks/lifecycle_query_plans.py +++ b/benchmarks/lifecycle_query_plans.py @@ -21,12 +21,12 @@ from pathlib import Path from unittest.mock import patch -from pt_snap_cli.core import dataset_lifecycle_sql -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_global import global_query -from pt_snap_cli.core.dataset_lifecycle_scratch import _ScratchSources -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver, QueryBudget +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver, QueryBudget +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_scratch import _ScratchSources +from pt_snap_cli.core.dataset.query.dataset_global import global_query from pt_snap_cli.query.registry import get_query diff --git a/docs/AGENTS.md b/docs/AGENTS.md index a28548d..6534026 100644 --- a/docs/AGENTS.md +++ b/docs/AGENTS.md @@ -11,7 +11,7 @@ in scoped AGENTS guides, not in user walkthroughs. | Topic | Source of truth | | --- | --- | -| Root commands/help/JSON | `cli.py`, `cli_output.py`, `core/json_codec.py`, `core/error_codes.py` | +| Root commands/help/JSON | `cli.py`, `cli_output.py`, `core/common/json_codec.py`, `core/common/error_codes.py` | | Reports and skill commands | `cli_reports.py`, `cli_skills.py` and owning core services | | API/lifecycle | `api.py`, core result models, CLI/API contract tests | | Focus and read-only inspection | `config.py`, `context.py`, focus/overview/metadata services | diff --git a/docs/en/sharded-snapshotdb.md b/docs/en/sharded-snapshotdb.md index 41e0926..48954d2 100644 --- a/docs/en/sharded-snapshotdb.md +++ b/docs/en/sharded-snapshotdb.md @@ -13,7 +13,7 @@ stack-statistics semantics are explicitly versioned in the querying guide. The P complete compatibility-v1 manifest or directory as focus. The `complete` gate applies only to datasets, not to legacy single-DB analysis. -`pt_snap_cli.core.dataset_contract` provides `parse_manifest`, +`pt_snap_cli.core.dataset.dataset_contract` provides `parse_manifest`, `validate_event_ids`, `validate_dataset`, immutable manifest/device/slice models, `QueryScope`, and `DatasetContractError` (`location`, `code`). Producers can share the same prepublication contract with readers. Validation never loads pickle, @@ -185,7 +185,7 @@ below; the explicit [P3 support matrix](querying.md#dataset-global-built-in-supp and [point-event sources](querying.md#dataset-point-event-attribution) define execution. ```python -from pt_snap_cli.core.dataset_contract import QueryScope, validate_dataset +from pt_snap_cli.core.dataset.dataset_contract import QueryScope, validate_dataset inspection = validate_dataset("/capture/snapshot.pkl.msinsight") QueryScope("event_range", device_id=0, start_event_id=1, end_event_id=3).validate( diff --git a/docs/en/snapshot-analyzer-api.md b/docs/en/snapshot-analyzer-api.md index 34f8728..90c417f 100644 --- a/docs/en/snapshot-analyzer-api.md +++ b/docs/en/snapshot-analyzer-api.md @@ -98,7 +98,7 @@ The caller must call `shared_cache.close()` after all borrowers have finished: ```python from contextlib import closing -from pt_snap_cli.core.context_cache import ContextCache +from pt_snap_cli.core.cache.context_cache import ContextCache with closing(ContextCache()) as shared_cache: with SnapshotAnalyzer(Path("/path/to/snapshot.db"), context_cache=shared_cache) as first: diff --git a/docs/zh/sharded-snapshotdb.md b/docs/zh/sharded-snapshotdb.md index e10008f..2c1059a 100644 --- a/docs/zh/sharded-snapshotdb.md +++ b/docs/zh/sharded-snapshotdb.md @@ -10,7 +10,7 @@ v1/v2 分析入口保留;P3 真实事件 peak/gap 与全部 action 完整文本栈统计语义在查询指南明确版本化。下述 P1 reader 新增将 complete 兼容 v1 manifest 或目录作为 focus;`complete` 门槛只约束数据集,不约束旧单库分析。 -`pt_snap_cli.core.dataset_contract` 提供 `parse_manifest`、`validate_event_ids`、 +`pt_snap_cli.core.dataset.dataset_contract` 提供 `parse_manifest`、`validate_event_ids`、 `validate_dataset`、不可变 manifest/device/slice 模型、`QueryScope` 和带 `location/code` 的 `DatasetContractError`。生产端可在发布前与读取端共用同一合同。 校验不加载 pickle、不创建缺失数据库、不迁移 SQLite、不写 focus。 @@ -150,7 +150,7 @@ dictionary 的十进制整数 key 以文本存储,使用真实带设备后缀 及[定点来源](querying.md#数据集定点事件归因)。 ```python -from pt_snap_cli.core.dataset_contract import QueryScope, validate_dataset +from pt_snap_cli.core.dataset.dataset_contract import QueryScope, validate_dataset inspection = validate_dataset("/capture/snapshot.pkl.msinsight") QueryScope("event_range", device_id=0, start_event_id=1, end_event_id=3).validate( diff --git a/docs/zh/snapshot-analyzer-api.md b/docs/zh/snapshot-analyzer-api.md index fa42efb..32e0427 100644 --- a/docs/zh/snapshot-analyzer-api.md +++ b/docs/zh/snapshot-analyzer-api.md @@ -87,7 +87,7 @@ with SnapshotAnalyzer(Path("/path/to/snapshot.db")) as scoped_analyzer: ```python from contextlib import closing -from pt_snap_cli.core.context_cache import ContextCache +from pt_snap_cli.core.cache.context_cache import ContextCache with closing(ContextCache()) as shared_cache: with SnapshotAnalyzer(Path("/path/to/snapshot.db"), context_cache=shared_cache) as first: diff --git a/src/pt_snap_cli/AGENTS.md b/src/pt_snap_cli/AGENTS.md index ce21fd1..a451bf2 100644 --- a/src/pt_snap_cli/AGENTS.md +++ b/src/pt_snap_cli/AGENTS.md @@ -32,8 +32,8 @@ Parent scope: [source/distribution](../AGENTS.md). Preserve `_safe_call` handling for argument parsing as well as domain errors; successful service calls are not enough to validate JSON mode. - Adapters may format or translate public errors, but service behavior belongs - in core. Use existing serializers in `core/json_codec.py` and - `core/query_service.py` instead of constructing a second template schema. + in core. Use existing serializers in `core/common/json_codec.py` and + `core/analysis/query_service.py` instead of constructing a second template schema. - `SnapshotAnalyzer.set_focus()` changes validated session state; CLI focus persistence goes through `FocusService`/`Config`. Preserve their normalized shared behavior without making the API write project focus implicitly. diff --git a/src/pt_snap_cli/api.py b/src/pt_snap_cli/api.py index 7b7cf12..01f25fc 100644 --- a/src/pt_snap_cli/api.py +++ b/src/pt_snap_cli/api.py @@ -23,8 +23,8 @@ QueryService, TemplateNotFoundError, ) -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.query_limits import QueryLimits +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.query_limits import QueryLimits class TemplateSummaryPayload(TypedDict): diff --git a/src/pt_snap_cli/cli.py b/src/pt_snap_cli/cli.py index 9222d02..9dcf803 100644 --- a/src/pt_snap_cli/cli.py +++ b/src/pt_snap_cli/cli.py @@ -94,9 +94,9 @@ json_error, json_success, ) -from pt_snap_cli.core.error_codes import DATABASE_NOT_FOUND, ERROR, INVALID_PARAMETER -from pt_snap_cli.core.errors import InvalidParameterError -from pt_snap_cli.core.query_limits import QueryLimits +from pt_snap_cli.core.common.error_codes import DATABASE_NOT_FOUND, ERROR, INVALID_PARAMETER +from pt_snap_cli.core.common.errors import InvalidParameterError +from pt_snap_cli.core.common.query_limits import QueryLimits from pt_snap_cli.query.config import OUTPUT_COLUMN_OPTIONAL from pt_snap_cli.query.executor import reported_sql_limit from pt_snap_cli.query.registry import discover_categories, get_query diff --git a/src/pt_snap_cli/cli_output.py b/src/pt_snap_cli/cli_output.py index 92994ec..1295ffd 100644 --- a/src/pt_snap_cli/cli_output.py +++ b/src/pt_snap_cli/cli_output.py @@ -19,13 +19,13 @@ dumps_json, json_error, ) -from pt_snap_cli.core.error_codes import ERROR -from pt_snap_cli.core.models import SKILL_RESTART_ACTIONS, SKILL_RESTART_HINT -from pt_snap_cli.core.skill_service import ( +from pt_snap_cli.core.analysis.skill_service import ( format_skill_install_target, format_skill_location, human_skill_summary, ) +from pt_snap_cli.core.common.error_codes import ERROR +from pt_snap_cli.core.common.models import SKILL_RESTART_ACTIONS, SKILL_RESTART_HINT # Typer 0.27+ vendors Click, so its context cannot be read via click.get_current_context. JSON_MODE: ContextVar[bool] = ContextVar("pt_snap_json_mode", default=False) diff --git a/src/pt_snap_cli/cli_reports.py b/src/pt_snap_cli/cli_reports.py index 838e36d..9344d95 100644 --- a/src/pt_snap_cli/cli_reports.py +++ b/src/pt_snap_cli/cli_reports.py @@ -36,9 +36,9 @@ TemplateNotFoundError, TemplateRenderError, ) -from pt_snap_cli.core.error_codes import DATABASE_NOT_FOUND, INVALID_PARAMETER -from pt_snap_cli.core.errors import PtSnapCoreError -from pt_snap_cli.core.query_limits import QueryLimits +from pt_snap_cli.core.common.error_codes import DATABASE_NOT_FOUND, INVALID_PARAMETER +from pt_snap_cli.core.common.errors import PtSnapCoreError +from pt_snap_cli.core.common.query_limits import QueryLimits from pt_snap_cli.memory_tree_render import render_memory_tree report_app = typer.Typer(help="Generate memory analysis reports") diff --git a/src/pt_snap_cli/cli_skills.py b/src/pt_snap_cli/cli_skills.py index 14e8ea9..f04bc91 100644 --- a/src/pt_snap_cli/cli_skills.py +++ b/src/pt_snap_cli/cli_skills.py @@ -31,8 +31,8 @@ SkillNotFoundError, SkillService, ) -from pt_snap_cli.core.error_codes import INVALID_PARAMETER -from pt_snap_cli.core.skill_service import parse_host_option +from pt_snap_cli.core.analysis.skill_service import parse_host_option +from pt_snap_cli.core.common.error_codes import INVALID_PARAMETER skill_app = typer.Typer(help="Manage bundled agent skills", no_args_is_help=True) diff --git a/src/pt_snap_cli/completion.py b/src/pt_snap_cli/completion.py index 749104c..846207b 100644 --- a/src/pt_snap_cli/completion.py +++ b/src/pt_snap_cli/completion.py @@ -26,8 +26,8 @@ def complete_categories() -> list[str]: def complete_skill_names() -> list[str]: """Return bundled agent skill names for shell completion.""" - from pt_snap_cli.core.errors import SkillCatalogError - from pt_snap_cli.core.skill_service import SkillService + from pt_snap_cli.core.analysis.skill_service import SkillService + from pt_snap_cli.core.common.errors import SkillCatalogError try: return [skill.name for skill in SkillService().list_catalog()] @@ -37,7 +37,7 @@ def complete_skill_names() -> list[str]: def complete_skill_targets() -> list[str]: """Return supported skill host names for shell completion.""" - from pt_snap_cli.core.models import SKILL_HOSTS + from pt_snap_cli.core.common.models import SKILL_HOSTS return list(SKILL_HOSTS) @@ -75,7 +75,7 @@ def complete_device_ids() -> list[str]: return [] try: - from pt_snap_cli.core.dataset_resolver import DatasetResolver + from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver devices = DatasetResolver().completion_device_ids(db_path) if devices is not None: diff --git a/src/pt_snap_cli/core/AGENTS.md b/src/pt_snap_cli/core/AGENTS.md index a03ddbc..fd15662 100644 --- a/src/pt_snap_cli/core/AGENTS.md +++ b/src/pt_snap_cli/core/AGENTS.md @@ -5,21 +5,37 @@ Parent scope: [package runtime](../AGENTS.md). Core owns product semantics over config, Context, queries and snapshot mechanisms. CLI/API adapters consume its results and errors; presentation stays in adapters. + +Core modules are grouped by responsibility: + +| Package | Responsibility | +| --- | --- | +| `common/` | Shared result/error contracts, serialization and query budgets | +| `analysis/` | Focus, query, overview, capability and report services | +| `cache/` | Context lifetime and snapshot cache identity | +| `dataset/` | Dataset contracts, source resolution and validation | +| `dataset/query/` | Dataset query reduction, attribution and frame trees | +| `dataset/lifecycle/` | Lifecycle SQL, attached connections and scratch storage | +| `importing/` | Import orchestration, metadata, publication, integrity and export | +| `splitting/` | Snapshot splitting and sharded replay | + +The public services and result types remain exported by `pt_snap_cli.core`. + ## Service Boundaries | Files | Responsibility | | --- | --- | -| `focus_service.py` | Resolve/validate database and device; explicit project/global focus writes | -| `context_cache.py` | Bounded persistent Context LRU with resolved-path and file-signature invalidation | -| `query_service.py` | Catalog contracts, focus/device selection, executor reuse, completeness and timeout budget | -| `capability_service.py`, `overview_service.py` | Full catalog and read-only database/device/event-bound/import-metadata probes | -| `report_service.py` | Compose named queries into peak-memory reports rather than duplicate SQL | -| `import_service.py`, `import_metadata.py` | Trusted-input import validation, source/cache identity, metadata, optional focus | -| `snapshot_import_backend.py` | Runtime adapter, temporary database, publication and rollback resources | -| `split_service.py` | Strategy/device validation, staging, replay validation and exclusive directory publication | -| `skill_service.py` | Skill discovery, status, install/upgrade/uninstall destination policy | -| `models.py`, `errors.py` | Shared dataclass results and normalized domain failures | -| `error_codes.py`, `json_codec.py` | Stable JSON error classification/hints and serializable envelopes | +| `analysis/focus_service.py` | Resolve/validate database and device; explicit project/global focus writes | +| `cache/context_cache.py` | Bounded persistent Context LRU with resolved-path and file-signature invalidation | +| `analysis/query_service.py` | Catalog contracts, focus/device selection, executor reuse, completeness and timeout budget | +| `analysis/capability_service.py`, `analysis/overview_service.py` | Full catalog and read-only database/device/event-bound/import-metadata probes | +| `analysis/report_service.py` | Compose named queries into peak-memory reports rather than duplicate SQL | +| `importing/import_service.py`, `importing/import_metadata.py` | Trusted-input import validation, source/cache identity, metadata, optional focus | +| `importing/snapshot_import_backend.py` | Runtime adapter, temporary database, publication and rollback resources | +| `splitting/split_service.py` | Strategy/device validation, staging, replay validation and exclusive directory publication | +| `analysis/skill_service.py` | Skill discovery, status, install/upgrade/uninstall destination policy | +| `common/models.py`, `common/errors.py` | Shared dataclass results and normalized domain failures | +| `common/error_codes.py`, `common/json_codec.py` | Stable JSON error classification/hints and serializable envelopes | ## Ownership and Query Lifetime @@ -75,6 +91,6 @@ concurrent destination creation must fail rather than replace another result. Use [service tests](../../../tests/core/AGENTS.md) for the owning suite. Shared result/error changes also require `tests/test_contract_cli_api.py` and JSON contracts; template metadata must flow through `template_info_to_dict` to both -adapters. Keep the `models.py` Any/Unknown type gates intact. Runtime changes +adapters. Keep the `common/models.py` Any/Unknown type gates intact. Runtime changes also follow [snapshot guidance](../snapshot/AGENTS.md), and skill content changes follow [authoring/evaluation](../../../skills/AGENTS.md). diff --git a/src/pt_snap_cli/core/__init__.py b/src/pt_snap_cli/core/__init__.py index c1c37b9..b980589 100644 --- a/src/pt_snap_cli/core/__init__.py +++ b/src/pt_snap_cli/core/__init__.py @@ -1,6 +1,13 @@ -from pt_snap_cli.core.capability_service import CapabilityService -from pt_snap_cli.core.error_codes import classify_error -from pt_snap_cli.core.errors import ( +"""Product services grouped into analysis, dataset, import and shared layers.""" + +from pt_snap_cli.core.analysis.capability_service import CapabilityService +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.analysis.overview_service import OverviewService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.analysis.report_service import ReportService +from pt_snap_cli.core.analysis.skill_service import SkillService +from pt_snap_cli.core.common.error_codes import classify_error +from pt_snap_cli.core.common.errors import ( DatabaseMissingError, DatabaseSchemaError, FocusFileInvalidError, @@ -26,10 +33,7 @@ TemplateNotFoundError, TemplateRenderError, ) -from pt_snap_cli.core.focus_service import FocusService -from pt_snap_cli.core.import_metadata import ImportMetadataService -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.json_codec import ( +from pt_snap_cli.core.common.json_codec import ( JSON_SCHEMA_VERSION, JsonValue, dumps_json, @@ -37,7 +41,7 @@ json_success, to_jsonable, ) -from pt_snap_cli.core.models import ( +from pt_snap_cli.core.common.models import ( CapabilityCatalog, DatabaseOverview, DeviceTraceBounds, @@ -58,12 +62,10 @@ TemplateParameter, TemplateSummary, ) -from pt_snap_cli.core.overview_service import OverviewService -from pt_snap_cli.core.query_limits import QueryLimits -from pt_snap_cli.core.query_service import QueryService -from pt_snap_cli.core.report_service import ReportService -from pt_snap_cli.core.skill_service import SkillService -from pt_snap_cli.core.split_service import SplitService +from pt_snap_cli.core.common.query_limits import QueryLimits +from pt_snap_cli.core.importing.import_metadata import ImportMetadataService +from pt_snap_cli.core.importing.import_service import ImportService +from pt_snap_cli.core.splitting.split_service import SplitService __all__ = [ "QueryCancelledError", diff --git a/src/pt_snap_cli/core/analysis/__init__.py b/src/pt_snap_cli/core/analysis/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pt_snap_cli/core/capability_service.py b/src/pt_snap_cli/core/analysis/capability_service.py similarity index 85% rename from src/pt_snap_cli/core/capability_service.py rename to src/pt_snap_cli/core/analysis/capability_service.py index fa52b58..f2dd694 100644 --- a/src/pt_snap_cli/core/capability_service.py +++ b/src/pt_snap_cli/core/analysis/capability_service.py @@ -3,9 +3,9 @@ from typing import Any from pt_snap_cli import __version__ -from pt_snap_cli.core.models import CapabilityCatalog -from pt_snap_cli.core.query_service import QueryService -from pt_snap_cli.core.skill_service import SkillService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.analysis.skill_service import SkillService +from pt_snap_cli.core.common.models import CapabilityCatalog class CapabilityService: diff --git a/src/pt_snap_cli/core/focus_service.py b/src/pt_snap_cli/core/analysis/focus_service.py similarity index 97% rename from src/pt_snap_cli/core/focus_service.py rename to src/pt_snap_cli/core/analysis/focus_service.py index 054e959..715a136 100644 --- a/src/pt_snap_cli/core/focus_service.py +++ b/src/pt_snap_cli/core/analysis/focus_service.py @@ -11,15 +11,15 @@ from pt_snap_cli.config import Config, FocusResolutionError from pt_snap_cli.context import Context, DatabaseNotFoundError, SchemaVersionError -from pt_snap_cli.core.dataset_resolver import DatasetResolver, ResolvedDataset -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.common.errors import ( DatabaseMissingError, DatabaseSchemaError, FocusFileInvalidError, FocusNotConfiguredError, InvalidDeviceError, ) -from pt_snap_cli.core.models import FocusState, ResolvedFocus +from pt_snap_cli.core.common.models import FocusState, ResolvedFocus +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver, ResolvedDataset class FocusService: @@ -150,7 +150,7 @@ def project_focus_transaction(self) -> Iterator[None]: compensation preserves the checkpoint and reports its recovery location. This is not a concurrency lock or an arbitrary-crash atomicity promise. """ - from .errors import ImportExecutionError + from pt_snap_cli.core.common.errors import ImportExecutionError path = self._config.project_focus_path() self._safe_focus_path(path) diff --git a/src/pt_snap_cli/core/overview_service.py b/src/pt_snap_cli/core/analysis/overview_service.py similarity index 91% rename from src/pt_snap_cli/core/overview_service.py rename to src/pt_snap_cli/core/analysis/overview_service.py index c8be173..8f80cdf 100644 --- a/src/pt_snap_cli/core/overview_service.py +++ b/src/pt_snap_cli/core/analysis/overview_service.py @@ -5,16 +5,16 @@ from typing import Any from pt_snap_cli.context import Context, DatabaseNotFoundError, SchemaVersionError -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import ( DatabaseMissingError, DatabaseSchemaError, FocusNotConfiguredError, ) -from pt_snap_cli.core.focus_service import FocusService -from pt_snap_cli.core.import_metadata import ImportMetadataService -from pt_snap_cli.core.models import DatabaseOverview, DeviceTraceBounds +from pt_snap_cli.core.common.models import DatabaseOverview, DeviceTraceBounds +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.importing.import_metadata import ImportMetadataService class OverviewService: diff --git a/src/pt_snap_cli/core/query_service.py b/src/pt_snap_cli/core/analysis/query_service.py similarity index 95% rename from src/pt_snap_cli/core/query_service.py rename to src/pt_snap_cli/core/analysis/query_service.py index 4229b89..5ccc8ff 100644 --- a/src/pt_snap_cli/core/query_service.py +++ b/src/pt_snap_cli/core/analysis/query_service.py @@ -9,15 +9,9 @@ from typing import Any from pt_snap_cli.context import Context, DatabaseNotFoundError, SchemaVersionError -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_attribution import event_attribution, summarize_dataset_stacks -from pt_snap_cli.core.dataset_contract import QueryScope -from pt_snap_cli.core.dataset_frame_tree import frame_tree -from pt_snap_cli.core.dataset_global import global_query -from pt_snap_cli.core.dataset_resolver import DatasetResolver, ResolvedDataset -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver, QueryBudget -from pt_snap_cli.core.dataset_support import dataset_support -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import ( DatabaseMissingError, DatabaseSchemaError, FocusNotConfiguredError, @@ -29,17 +23,26 @@ TemplateNotFoundError, TemplateRenderError, ) -from pt_snap_cli.core.focus_service import FocusService -from pt_snap_cli.core.latest_query import LatestQuery -from pt_snap_cli.core.models import ( +from pt_snap_cli.core.common.latest_query import LatestQuery +from pt_snap_cli.core.common.models import ( QueryResult, ResolvedFocus, TemplateInfo, TemplateParameter, TemplateSummary, ) -from pt_snap_cli.core.query_limits import QueryLimits, resolve_query_limits -from pt_snap_cli.core.stack_summary import summarize_stacks +from pt_snap_cli.core.common.query_limits import QueryLimits, resolve_query_limits +from pt_snap_cli.core.common.stack_summary import summarize_stacks +from pt_snap_cli.core.dataset.dataset_contract import QueryScope +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver, ResolvedDataset +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver, QueryBudget +from pt_snap_cli.core.dataset.dataset_support import dataset_support +from pt_snap_cli.core.dataset.query.dataset_attribution import ( + event_attribution, + summarize_dataset_stacks, +) +from pt_snap_cli.core.dataset.query.dataset_frame_tree import frame_tree +from pt_snap_cli.core.dataset.query.dataset_global import global_query from pt_snap_cli.query.executor import QueryExecutionError as ExecutorQueryExecutionError from pt_snap_cli.query.executor import QueryExecutor, cancellation_options from pt_snap_cli.query.executor import QueryTimeoutError as ExecutorQueryTimeoutError diff --git a/src/pt_snap_cli/core/report_service.py b/src/pt_snap_cli/core/analysis/report_service.py similarity index 95% rename from src/pt_snap_cli/core/report_service.py rename to src/pt_snap_cli/core/analysis/report_service.py index 6d5057e..10af5e0 100644 --- a/src/pt_snap_cli/core/report_service.py +++ b/src/pt_snap_cli/core/analysis/report_service.py @@ -3,11 +3,11 @@ from pathlib import Path from typing import Literal, cast -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.focus_service import FocusService -from pt_snap_cli.core.models import PeakMemoryReport, QueryResult -from pt_snap_cli.core.query_limits import QueryLimits -from pt_snap_cli.core.query_service import QueryService, _ResolvedQuery +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.analysis.query_service import QueryService, _ResolvedQuery +from pt_snap_cli.core.common.models import PeakMemoryReport, QueryResult +from pt_snap_cli.core.common.query_limits import QueryLimits +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget PeakMetric = Literal["active", "allocated", "reserved"] diff --git a/src/pt_snap_cli/core/skill_service.py b/src/pt_snap_cli/core/analysis/skill_service.py similarity index 99% rename from src/pt_snap_cli/core/skill_service.py rename to src/pt_snap_cli/core/analysis/skill_service.py index 069348a..c372000 100644 --- a/src/pt_snap_cli/core/skill_service.py +++ b/src/pt_snap_cli/core/analysis/skill_service.py @@ -13,13 +13,13 @@ import yaml -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.common.errors import ( InvalidSkillTargetError, SkillCatalogError, SkillInstallError, SkillNotFoundError, ) -from pt_snap_cli.core.models import ( +from pt_snap_cli.core.common.models import ( SKILL_CONFIG_ENV, SKILL_HOSTS, SKILL_RESTART_ACTIONS, diff --git a/src/pt_snap_cli/core/cache/__init__.py b/src/pt_snap_cli/core/cache/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pt_snap_cli/core/context_cache.py b/src/pt_snap_cli/core/cache/context_cache.py similarity index 100% rename from src/pt_snap_cli/core/context_cache.py rename to src/pt_snap_cli/core/cache/context_cache.py diff --git a/src/pt_snap_cli/core/snapshot_cache.py b/src/pt_snap_cli/core/cache/snapshot_cache.py similarity index 99% rename from src/pt_snap_cli/core/snapshot_cache.py rename to src/pt_snap_cli/core/cache/snapshot_cache.py index 49daccc..5bc65a6 100644 --- a/src/pt_snap_cli/core/snapshot_cache.py +++ b/src/pt_snap_cli/core/cache/snapshot_cache.py @@ -11,7 +11,7 @@ from pathlib import Path from typing import Any -from .validation_budget import ( +from pt_snap_cli.core.common.validation_budget import ( ValidationBudget, check_budget, sqlite_timeout, diff --git a/src/pt_snap_cli/core/common/__init__.py b/src/pt_snap_cli/core/common/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pt_snap_cli/core/error_codes.py b/src/pt_snap_cli/core/common/error_codes.py similarity index 99% rename from src/pt_snap_cli/core/error_codes.py rename to src/pt_snap_cli/core/common/error_codes.py index ec4ac72..c715c8b 100644 --- a/src/pt_snap_cli/core/error_codes.py +++ b/src/pt_snap_cli/core/common/error_codes.py @@ -4,7 +4,7 @@ import json -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.common.errors import ( DatabaseMissingError, DatabaseSchemaError, FocusFileInvalidError, diff --git a/src/pt_snap_cli/core/errors.py b/src/pt_snap_cli/core/common/errors.py similarity index 100% rename from src/pt_snap_cli/core/errors.py rename to src/pt_snap_cli/core/common/errors.py diff --git a/src/pt_snap_cli/core/frame_json.py b/src/pt_snap_cli/core/common/frame_json.py similarity index 100% rename from src/pt_snap_cli/core/frame_json.py rename to src/pt_snap_cli/core/common/frame_json.py diff --git a/src/pt_snap_cli/core/json_codec.py b/src/pt_snap_cli/core/common/json_codec.py similarity index 100% rename from src/pt_snap_cli/core/json_codec.py rename to src/pt_snap_cli/core/common/json_codec.py diff --git a/src/pt_snap_cli/core/latest_query.py b/src/pt_snap_cli/core/common/latest_query.py similarity index 96% rename from src/pt_snap_cli/core/latest_query.py rename to src/pt_snap_cli/core/common/latest_query.py index da3abf4..84d4109 100644 --- a/src/pt_snap_cli/core/latest_query.py +++ b/src/pt_snap_cli/core/common/latest_query.py @@ -4,7 +4,7 @@ from contextlib import contextmanager from threading import Event, Lock -from .errors import QueryCancelledError +from pt_snap_cli.core.common.errors import QueryCancelledError class LatestQuery: diff --git a/src/pt_snap_cli/core/models.py b/src/pt_snap_cli/core/common/models.py similarity index 100% rename from src/pt_snap_cli/core/models.py rename to src/pt_snap_cli/core/common/models.py diff --git a/src/pt_snap_cli/core/query_limits.py b/src/pt_snap_cli/core/common/query_limits.py similarity index 98% rename from src/pt_snap_cli/core/query_limits.py rename to src/pt_snap_cli/core/common/query_limits.py index 273458e..a3a3d64 100644 --- a/src/pt_snap_cli/core/query_limits.py +++ b/src/pt_snap_cli/core/common/query_limits.py @@ -6,7 +6,7 @@ import re from dataclasses import dataclass -from pt_snap_cli.core.errors import InvalidParameterError +from pt_snap_cli.core.common.errors import InvalidParameterError DEFAULT_MAX_WORK_ROWS = 100_000 DEFAULT_MAX_WORK_BYTES = 64 * 1024 * 1024 diff --git a/src/pt_snap_cli/core/stack_summary.py b/src/pt_snap_cli/core/common/stack_summary.py similarity index 100% rename from src/pt_snap_cli/core/stack_summary.py rename to src/pt_snap_cli/core/common/stack_summary.py diff --git a/src/pt_snap_cli/core/validation_budget.py b/src/pt_snap_cli/core/common/validation_budget.py similarity index 96% rename from src/pt_snap_cli/core/validation_budget.py rename to src/pt_snap_cli/core/common/validation_budget.py index 2bb0dc3..f05ae17 100644 --- a/src/pt_snap_cli/core/validation_budget.py +++ b/src/pt_snap_cli/core/common/validation_budget.py @@ -12,7 +12,7 @@ from contextlib import contextmanager from typing import Protocol, TypeVar -from .errors import QueryCancelledError, QueryTimeoutError +from pt_snap_cli.core.common.errors import QueryCancelledError, QueryTimeoutError class ValidationBudget(Protocol): diff --git a/src/pt_snap_cli/core/dataset/__init__.py b/src/pt_snap_cli/core/dataset/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pt_snap_cli/core/dataset_contract.py b/src/pt_snap_cli/core/dataset/dataset_contract.py similarity index 98% rename from src/pt_snap_cli/core/dataset_contract.py rename to src/pt_snap_cli/core/dataset/dataset_contract.py index ab8427d..c16f4ae 100644 --- a/src/pt_snap_cli/core/dataset_contract.py +++ b/src/pt_snap_cli/core/dataset/dataset_contract.py @@ -16,15 +16,15 @@ from pathlib import Path from typing import Literal, cast -from .dataset_files import readonly_member_uri, require_readonly_member -from .errors import DatabaseSchemaError -from .validation_budget import ( +from pt_snap_cli.core.common.errors import DatabaseSchemaError +from pt_snap_cli.core.common.validation_budget import ( ValidationBudget, check_budget, checked_rows, sqlite_timeout, validation_progress, ) +from pt_snap_cli.core.dataset.dataset_files import readonly_member_uri, require_readonly_member MANIFEST_SCHEMA_VERSION = 1 MSINSIGHT_REVISION = "101f65b877a267ffd5f66ea3834706057ba243e5" diff --git a/src/pt_snap_cli/core/dataset_files.py b/src/pt_snap_cli/core/dataset/dataset_files.py similarity index 95% rename from src/pt_snap_cli/core/dataset_files.py rename to src/pt_snap_cli/core/dataset/dataset_files.py index 6fd59f8..e7cad13 100644 --- a/src/pt_snap_cli/core/dataset_files.py +++ b/src/pt_snap_cli/core/dataset/dataset_files.py @@ -5,8 +5,8 @@ import hashlib from pathlib import Path -from .errors import DatabaseSchemaError -from .validation_budget import ValidationBudget, check_budget +from pt_snap_cli.core.common.errors import DatabaseSchemaError +from pt_snap_cli.core.common.validation_budget import ValidationBudget, check_budget def require_readonly_member(root: Path, member: Path, *, immutable: bool = False) -> None: diff --git a/src/pt_snap_cli/core/dataset_resolver.py b/src/pt_snap_cli/core/dataset/dataset_resolver.py similarity index 97% rename from src/pt_snap_cli/core/dataset_resolver.py rename to src/pt_snap_cli/core/dataset/dataset_resolver.py index 4004697..102d40e 100644 --- a/src/pt_snap_cli/core/dataset_resolver.py +++ b/src/pt_snap_cli/core/dataset/dataset_resolver.py @@ -18,7 +18,25 @@ from pathlib import Path from threading import RLock -from pt_snap_cli.core.dataset_contract import ( +from pt_snap_cli.core.cache.snapshot_cache import ( + parse_cache_manifest, + validate_cache, +) +from pt_snap_cli.core.common.errors import ( + DatabaseSchemaError, + InvalidDeviceError, + InvalidParameterError, + QueryCancelledError, + QueryTimeoutError, +) +from pt_snap_cli.core.common.validation_budget import ( + ValidationBudget, + check_budget, + checked_rows, + sqlite_timeout, + validation_progress, +) +from pt_snap_cli.core.dataset.dataset_contract import ( DatasetContractError, DatasetManifest, DatasetValidation, @@ -28,18 +46,13 @@ parse_manifest, validate_dataset, ) -from pt_snap_cli.core.dataset_files import hash_file as _hash_file -from pt_snap_cli.core.dataset_files import readonly_member_uri -from pt_snap_cli.core.dataset_files import require_readonly_member as _require_readonly_member -from pt_snap_cli.core.dataset_support import DATASET_SUPPORT -from pt_snap_cli.core.errors import ( - DatabaseSchemaError, - InvalidDeviceError, - InvalidParameterError, - QueryCancelledError, - QueryTimeoutError, +from pt_snap_cli.core.dataset.dataset_files import hash_file as _hash_file +from pt_snap_cli.core.dataset.dataset_files import readonly_member_uri +from pt_snap_cli.core.dataset.dataset_files import ( + require_readonly_member as _require_readonly_member, ) -from pt_snap_cli.core.native_dataset_contract import ( +from pt_snap_cli.core.dataset.dataset_support import DATASET_SUPPORT +from pt_snap_cli.core.dataset.native_dataset_contract import ( NATIVE_FORMAT, NativeManifest, NativeSlice, @@ -48,18 +61,7 @@ validate_native_dataset, validate_native_scope, ) -from pt_snap_cli.core.snapshot_cache import ( - parse_cache_manifest, - validate_cache, -) -from pt_snap_cli.core.validation_budget import ( - ValidationBudget, - check_budget, - checked_rows, - sqlite_timeout, - validation_progress, -) -from pt_snap_cli.core.validation_receipts import ( +from pt_snap_cli.core.importing.validation_receipts import ( import_validation_active, load_receipt, receipts_enabled, diff --git a/src/pt_snap_cli/core/dataset_sources.py b/src/pt_snap_cli/core/dataset/dataset_sources.py similarity index 96% rename from src/pt_snap_cli/core/dataset_sources.py rename to src/pt_snap_cli/core/dataset/dataset_sources.py index 5343ea5..052d830 100644 --- a/src/pt_snap_cli/core/dataset_sources.py +++ b/src/pt_snap_cli/core/dataset/dataset_sources.py @@ -18,24 +18,24 @@ from typing import cast from pt_snap_cli.context import DatabaseNotFoundError, SchemaVersionError -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_contract import SliceRecord, _unique_object -from pt_snap_cli.core.dataset_files import member_is_immutable, require_readonly_member -from pt_snap_cli.core.dataset_resolver import ResolvedDataset -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import ( DatabaseSchemaError, InvalidParameterError, QueryCancelledError, QueryExecutionError, QueryTimeoutError, ) -from pt_snap_cli.core.frame_json import _bounded_depth, _finite_float, _invalid_constant -from pt_snap_cli.core.query_limits import ( +from pt_snap_cli.core.common.frame_json import _bounded_depth, _finite_float, _invalid_constant +from pt_snap_cli.core.common.query_limits import ( DEFAULT_MAX_SCRATCH_DB_BYTES, DEFAULT_MAX_WORK_BYTES, DEFAULT_MAX_WORK_ROWS, QueryLimits, ) +from pt_snap_cli.core.dataset.dataset_contract import SliceRecord, _unique_object +from pt_snap_cli.core.dataset.dataset_files import member_is_immutable, require_readonly_member +from pt_snap_cli.core.dataset.dataset_resolver import ResolvedDataset from pt_snap_cli.query.executor import QueryExecutionError as ExecutorError from pt_snap_cli.query.executor import QueryExecutor, cancellation_options from pt_snap_cli.query.executor import QueryTimeoutError as ExecutorTimeout @@ -319,7 +319,7 @@ def _ensure_frames(self, item: SliceRecord, ids: list[int]) -> None: def _attach_frames(self, path: Path, ids: list[int], sources: dict[int, EventSource]) -> None: if self.dataset.ordered_frames_version == 2: - from .dataset_frames import attach_frames + from pt_snap_cli.core.dataset.query.dataset_frames import attach_frames decoded = attach_frames(self, path, ids) for event, (frames, digest) in decoded.items(): diff --git a/src/pt_snap_cli/core/dataset_support.py b/src/pt_snap_cli/core/dataset/dataset_support.py similarity index 96% rename from src/pt_snap_cli/core/dataset_support.py rename to src/pt_snap_cli/core/dataset/dataset_support.py index 3a712de..dd30d69 100644 --- a/src/pt_snap_cli/core/dataset_support.py +++ b/src/pt_snap_cli/core/dataset/dataset_support.py @@ -1,6 +1,6 @@ """One shared, explicit per-template dataset execution support matrix.""" -from pt_snap_cli.core.query_limits import QueryLimits +from pt_snap_cli.core.common.query_limits import QueryLimits DATASET_SUPPORT: dict[str, str] = { "event": "real_events_global_filter_sort_page", diff --git a/src/pt_snap_cli/core/dataset/lifecycle/__init__.py b/src/pt_snap_cli/core/dataset/lifecycle/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pt_snap_cli/core/dataset_lifecycle_connection.py b/src/pt_snap_cli/core/dataset/lifecycle/dataset_lifecycle_connection.py similarity index 91% rename from src/pt_snap_cli/core/dataset_lifecycle_connection.py rename to src/pt_snap_cli/core/dataset/lifecycle/dataset_lifecycle_connection.py index 2cf57b6..f09b5bc 100644 --- a/src/pt_snap_cli/core/dataset_lifecycle_connection.py +++ b/src/pt_snap_cli/core/dataset/lifecycle/dataset_lifecycle_connection.py @@ -6,10 +6,10 @@ import sqlite3 import time -from pt_snap_cli.core.dataset_contract import SliceRecord -from pt_snap_cli.core.dataset_files import readonly_member_uri, require_readonly_member -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver -from pt_snap_cli.core.errors import QueryExecutionError +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.dataset.dataset_contract import SliceRecord +from pt_snap_cli.core.dataset.dataset_files import readonly_member_uri, require_readonly_member +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver class _AttachedSources: diff --git a/src/pt_snap_cli/core/dataset_lifecycle_scratch.py b/src/pt_snap_cli/core/dataset/lifecycle/dataset_lifecycle_scratch.py similarity index 96% rename from src/pt_snap_cli/core/dataset_lifecycle_scratch.py rename to src/pt_snap_cli/core/dataset/lifecycle/dataset_lifecycle_scratch.py index 9f71521..4ce3356 100644 --- a/src/pt_snap_cli/core/dataset_lifecycle_scratch.py +++ b/src/pt_snap_cli/core/dataset/lifecycle/dataset_lifecycle_scratch.py @@ -14,10 +14,10 @@ from contextlib import contextmanager from pathlib import Path -from pt_snap_cli.core.dataset_files import readonly_member_uri, require_readonly_member -from pt_snap_cli.core.dataset_lifecycle_connection import _AttachedSources -from pt_snap_cli.core.errors import QueryExecutionError -from pt_snap_cli.core.query_limits import MAX_SCRATCH_DB_BYTES, MIN_SCRATCH_DB_BYTES +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.common.query_limits import MAX_SCRATCH_DB_BYTES, MIN_SCRATCH_DB_BYTES +from pt_snap_cli.core.dataset.dataset_files import readonly_member_uri, require_readonly_member +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_connection import _AttachedSources _PAGE_SIZE = MIN_SCRATCH_DB_BYTES _MAX_SCRATCH_BYTES = MAX_SCRATCH_DB_BYTES diff --git a/src/pt_snap_cli/core/dataset_lifecycle_sql.py b/src/pt_snap_cli/core/dataset/lifecycle/dataset_lifecycle_sql.py similarity index 97% rename from src/pt_snap_cli/core/dataset_lifecycle_sql.py rename to src/pt_snap_cli/core/dataset/lifecycle/dataset_lifecycle_sql.py index 753d5dd..64768a8 100644 --- a/src/pt_snap_cli/core/dataset_lifecycle_sql.py +++ b/src/pt_snap_cli/core/dataset/lifecycle/dataset_lifecycle_sql.py @@ -13,9 +13,9 @@ from contextlib import closing from typing import cast -from pt_snap_cli.core.dataset_contract import BLOCK_COLUMNS -from pt_snap_cli.core.dataset_lifecycle_connection import _AttachedSources -from pt_snap_cli.core.errors import QueryExecutionError +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.dataset.dataset_contract import BLOCK_COLUMNS +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_connection import _AttachedSources # A row threshold, not an ATTACH/shard-count heuristic. Same-artifact synthetic # measurements show scratch's fixed storage cost dominates tiny inputs, while @@ -165,7 +165,7 @@ def lifecycle_query(sources, items, template, params, scope, candidate_limit): predicate, values = _filter(template, params) scratch_enabled = sources.budget.max_scratch_db_bytes != 0 if scratch_enabled and (required is None or _large_observation_set(sources, items)): - from pt_snap_cli.core.dataset_lifecycle_scratch import scratch_lifecycles + from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_scratch import scratch_lifecycles # Once selected, storage/deadline failures must fail the whole operation; # falling back could hide exhaustion and redo unbounded expensive work. diff --git a/src/pt_snap_cli/core/native_dataset_contract.py b/src/pt_snap_cli/core/dataset/native_dataset_contract.py similarity index 97% rename from src/pt_snap_cli/core/native_dataset_contract.py rename to src/pt_snap_cli/core/dataset/native_dataset_contract.py index cc687ae..06a5728 100644 --- a/src/pt_snap_cli/core/native_dataset_contract.py +++ b/src/pt_snap_cli/core/dataset/native_dataset_contract.py @@ -14,7 +14,15 @@ from pathlib import Path from typing import cast -from .dataset_contract import ( +from pt_snap_cli.core.common.models import ImportMetadata +from pt_snap_cli.core.common.validation_budget import ( + ValidationBudget, + check_budget, + checked_rows, + sqlite_timeout, + validation_progress, +) +from pt_snap_cli.core.dataset.dataset_contract import ( ACTION_NAMES, BLOCK_COLUMNS, BLOCK_STATES, @@ -35,18 +43,12 @@ _text, _unique_object, ) -from .dataset_files import hash_file as _hash_file -from .dataset_files import require_readonly_member as _require_readonly_member -from .import_metadata_contract import metadata_from_mapping -from .models import ImportMetadata -from .sharded_replay_service import ShardedReplayResult -from .validation_budget import ( - ValidationBudget, - check_budget, - checked_rows, - sqlite_timeout, - validation_progress, +from pt_snap_cli.core.dataset.dataset_files import hash_file as _hash_file +from pt_snap_cli.core.dataset.dataset_files import ( + require_readonly_member as _require_readonly_member, ) +from pt_snap_cli.core.importing.import_metadata_contract import metadata_from_mapping +from pt_snap_cli.core.splitting.sharded_replay_service import ShardedReplayResult NATIVE_FORMAT = "pt-snap-native-v2" NATIVE_MANIFEST_VERSION = 1 diff --git a/src/pt_snap_cli/core/dataset/query/__init__.py b/src/pt_snap_cli/core/dataset/query/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pt_snap_cli/core/dataset_active_sql.py b/src/pt_snap_cli/core/dataset/query/dataset_active_sql.py similarity index 96% rename from src/pt_snap_cli/core/dataset_active_sql.py rename to src/pt_snap_cli/core/dataset/query/dataset_active_sql.py index 24768d6..f7466e3 100644 --- a/src/pt_snap_cli/core/dataset_active_sql.py +++ b/src/pt_snap_cli/core/dataset/query/dataset_active_sql.py @@ -11,10 +11,14 @@ import hashlib from typing import cast -from pt_snap_cli.core.dataset_contract import SliceRecord -from pt_snap_cli.core.dataset_lifecycle_connection import _AttachedSources -from pt_snap_cli.core.dataset_lifecycle_sql import _attachment_limit, _proof, _required_slices -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver +from pt_snap_cli.core.dataset.dataset_contract import SliceRecord +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_connection import _AttachedSources +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_sql import ( + _attachment_limit, + _proof, + _required_slices, +) def _active_cte( diff --git a/src/pt_snap_cli/core/dataset_attribution.py b/src/pt_snap_cli/core/dataset/query/dataset_attribution.py similarity index 97% rename from src/pt_snap_cli/core/dataset_attribution.py rename to src/pt_snap_cli/core/dataset/query/dataset_attribution.py index ec608c2..9a71b89 100644 --- a/src/pt_snap_cli/core/dataset_attribution.py +++ b/src/pt_snap_cli/core/dataset/query/dataset_attribution.py @@ -7,11 +7,11 @@ from contextlib import closing, contextmanager from typing import cast -from pt_snap_cli.core.dataset_active_sql import reduce_active -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver, EventSource -from pt_snap_cli.core.errors import QueryExecutionError -from pt_snap_cli.core.models import QueryResult -from pt_snap_cli.core.stack_summary import summarize_stacks +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.common.models import QueryResult +from pt_snap_cli.core.common.stack_summary import summarize_stacks +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver, EventSource +from pt_snap_cli.core.dataset.query.dataset_active_sql import reduce_active STATIC_LABEL = "[static] allocEventId=-1, freeEventId=-1" PREEXISTING_LABEL = "[preexisting live] allocEventId=-1" diff --git a/src/pt_snap_cli/core/dataset_frame_tree.py b/src/pt_snap_cli/core/dataset/query/dataset_frame_tree.py similarity index 97% rename from src/pt_snap_cli/core/dataset_frame_tree.py rename to src/pt_snap_cli/core/dataset/query/dataset_frame_tree.py index 3d23247..a4098ca 100644 --- a/src/pt_snap_cli/core/dataset_frame_tree.py +++ b/src/pt_snap_cli/core/dataset/query/dataset_frame_tree.py @@ -6,9 +6,9 @@ import json from typing import cast -from .dataset_attribution import _rounding_cursor, _scope -from .dataset_sources import DatasetSourceResolver -from .models import QueryResult +from pt_snap_cli.core.common.models import QueryResult +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver +from pt_snap_cli.core.dataset.query.dataset_attribution import _rounding_cursor, _scope METRICS = ( ("block_count", "self_block_count"), diff --git a/src/pt_snap_cli/core/dataset_frames.py b/src/pt_snap_cli/core/dataset/query/dataset_frames.py similarity index 96% rename from src/pt_snap_cli/core/dataset_frames.py rename to src/pt_snap_cli/core/dataset/query/dataset_frames.py index 58b7f6e..377ba85 100644 --- a/src/pt_snap_cli/core/dataset_frames.py +++ b/src/pt_snap_cli/core/dataset/query/dataset_frames.py @@ -8,8 +8,8 @@ from pathlib import Path from typing import Protocol, cast -from .dataset_contract import _unique_object -from .frame_json import _bounded_depth, _finite_float, _invalid_constant +from pt_snap_cli.core.common.frame_json import _bounded_depth, _finite_float, _invalid_constant +from pt_snap_cli.core.dataset.dataset_contract import _unique_object class FrameBudget(Protocol): diff --git a/src/pt_snap_cli/core/dataset_global.py b/src/pt_snap_cli/core/dataset/query/dataset_global.py similarity index 98% rename from src/pt_snap_cli/core/dataset_global.py rename to src/pt_snap_cli/core/dataset/query/dataset_global.py index fd8415c..a6ede29 100644 --- a/src/pt_snap_cli/core/dataset_global.py +++ b/src/pt_snap_cli/core/dataset/query/dataset_global.py @@ -11,11 +11,11 @@ import hashlib from typing import cast -from pt_snap_cli.core.dataset_contract import QueryScope, SliceRecord -from pt_snap_cli.core.dataset_lifecycle_sql import lifecycle_query -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver -from pt_snap_cli.core.errors import InvalidParameterError, QueryExecutionError -from pt_snap_cli.core.models import QueryResult +from pt_snap_cli.core.common.errors import InvalidParameterError, QueryExecutionError +from pt_snap_cli.core.common.models import QueryResult +from pt_snap_cli.core.dataset.dataset_contract import QueryScope, SliceRecord +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_sql import lifecycle_query METRICS = ("allocated", "active", "reserved") @@ -487,7 +487,7 @@ def _stacks(sources, low, high, items, params, scope): projection += ", t.callstack" weights = None if sources.dataset.ordered_frames_version == 2: - from .dataset_frames import attach_frames + from pt_snap_cli.core.dataset.query.dataset_frames import attach_frames path = sources.dataset.root / item.file attach_frames(sources, path, []) # Validate optional schema, no frame fetch. diff --git a/src/pt_snap_cli/core/importing/__init__.py b/src/pt_snap_cli/core/importing/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pt_snap_cli/core/dataset_import_backend.py b/src/pt_snap_cli/core/importing/dataset_import_backend.py similarity index 94% rename from src/pt_snap_cli/core/dataset_import_backend.py rename to src/pt_snap_cli/core/importing/dataset_import_backend.py index ab786d6..0641d3b 100644 --- a/src/pt_snap_cli/core/dataset_import_backend.py +++ b/src/pt_snap_cli/core/importing/dataset_import_backend.py @@ -8,12 +8,19 @@ from dataclasses import dataclass from pathlib import Path -from .dataset_contract import DatasetContractError -from .dataset_resolver import _hash_file -from .errors import ImportExecutionError -from .native_dataset_contract import NativeManifest, read_native_manifest, require_native_members -from .sharded_replay_service import ShardedReplayResult, ShardedReplayService -from .split_service import SplitService +from pt_snap_cli.core.common.errors import ImportExecutionError +from pt_snap_cli.core.dataset.dataset_contract import DatasetContractError +from pt_snap_cli.core.dataset.dataset_resolver import _hash_file +from pt_snap_cli.core.dataset.native_dataset_contract import ( + NativeManifest, + read_native_manifest, + require_native_members, +) +from pt_snap_cli.core.splitting.sharded_replay_service import ( + ShardedReplayResult, + ShardedReplayService, +) +from pt_snap_cli.core.splitting.split_service import SplitService DirectoryIdentity = tuple[int, int, int | None] diff --git a/src/pt_snap_cli/core/import_metadata.py b/src/pt_snap_cli/core/importing/import_metadata.py similarity index 95% rename from src/pt_snap_cli/core/import_metadata.py rename to src/pt_snap_cli/core/importing/import_metadata.py index 0d95f06..180d488 100644 --- a/src/pt_snap_cli/core/import_metadata.py +++ b/src/pt_snap_cli/core/importing/import_metadata.py @@ -10,20 +10,24 @@ from pt_snap_cli import __version__ from pt_snap_cli.context import Context, DatabaseNotFoundError, SchemaVersionError -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.errors import DatabaseMissingError, DatabaseSchemaError, ImportMetadataError -from pt_snap_cli.core.import_metadata_contract import ( - metadata_from_mapping, - validate_import_metadata, +from pt_snap_cli.core.cache.snapshot_cache import parse_cache_manifest +from pt_snap_cli.core.common.errors import ( + DatabaseMissingError, + DatabaseSchemaError, + ImportMetadataError, ) -from pt_snap_cli.core.models import ( +from pt_snap_cli.core.common.models import ( CacheDecision, ImportMetadata, MetadataInspection, ) -from pt_snap_cli.core.msinsight_export import inspect_owned_cache -from pt_snap_cli.core.native_dataset_contract import NativeManifest -from pt_snap_cli.core.snapshot_cache import parse_cache_manifest +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.native_dataset_contract import NativeManifest +from pt_snap_cli.core.importing.import_metadata_contract import ( + metadata_from_mapping, + validate_import_metadata, +) +from pt_snap_cli.core.importing.msinsight_export import inspect_owned_cache METADATA_TABLE = "pt_snap_metadata" METADATA_SCHEMA_VERSION = 1 diff --git a/src/pt_snap_cli/core/import_metadata_contract.py b/src/pt_snap_cli/core/importing/import_metadata_contract.py similarity index 97% rename from src/pt_snap_cli/core/import_metadata_contract.py rename to src/pt_snap_cli/core/importing/import_metadata_contract.py index b63cb73..9f9f313 100644 --- a/src/pt_snap_cli/core/import_metadata_contract.py +++ b/src/pt_snap_cli/core/importing/import_metadata_contract.py @@ -7,7 +7,7 @@ from datetime import datetime, timedelta from typing import cast -from .models import ImportMetadata +from pt_snap_cli.core.common.models import ImportMetadata def required_int(value: object) -> int: diff --git a/src/pt_snap_cli/core/import_service.py b/src/pt_snap_cli/core/importing/import_service.py similarity index 95% rename from src/pt_snap_cli/core/import_service.py rename to src/pt_snap_cli/core/importing/import_service.py index 0525fbc..a0351ab 100644 --- a/src/pt_snap_cli/core/import_service.py +++ b/src/pt_snap_cli/core/importing/import_service.py @@ -7,14 +7,13 @@ from dataclasses import replace from pathlib import Path -from pt_snap_cli.core.dataset_contract import parse_manifest -from pt_snap_cli.core.dataset_import_backend import DatasetImportBackend -from pt_snap_cli.core.dataset_resolver import ( - DatasetResolver, - ResolvedDataset, - _require_readonly_member, +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.cache.snapshot_cache import ( + parse_cache_manifest, + source_hashes, + validate_cache, ) -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.common.errors import ( DatabaseSchemaError, FocusFileInvalidError, ImportExecutionError, @@ -24,16 +23,30 @@ SnapshotFileInvalidError, SourceChangedError, ) -from pt_snap_cli.core.focus_service import FocusService -from pt_snap_cli.core.import_metadata import NATIVE_IMPORT_FORMAT_VERSION, ImportMetadataService -from pt_snap_cli.core.models import ( +from pt_snap_cli.core.common.models import ( CacheMissReason, FocusState, ImportMetadata, ImportOptions, ImportResult, ) -from pt_snap_cli.core.msinsight_export import ( +from pt_snap_cli.core.dataset.dataset_contract import parse_manifest +from pt_snap_cli.core.dataset.dataset_resolver import ( + DatasetResolver, + ResolvedDataset, + _require_readonly_member, +) +from pt_snap_cli.core.dataset.native_dataset_contract import ( + NATIVE_FORMAT, + build_native_manifest, + cache_identity, +) +from pt_snap_cli.core.importing.dataset_import_backend import DatasetImportBackend +from pt_snap_cli.core.importing.import_metadata import ( + NATIVE_IMPORT_FORMAT_VERSION, + ImportMetadataService, +) +from pt_snap_cli.core.importing.msinsight_export import ( COMPATIBILITY_FORMAT, DEFAULT_CAPACITY, MsinsightImportBackend, @@ -42,20 +55,17 @@ convert_shards, inspect_owned_cache, ) -from pt_snap_cli.core.native_dataset_contract import ( - NATIVE_FORMAT, - build_native_manifest, - cache_identity, +from pt_snap_cli.core.importing.ordered_frame_integrity import ( + frame_member_digest, + require_frame_declaration, ) -from pt_snap_cli.core.ordered_frame_integrity import frame_member_digest, require_frame_declaration -from pt_snap_cli.core.sharded_replay_service import ShardedReplayResult -from pt_snap_cli.core.snapshot_cache import ( - parse_cache_manifest, - source_hashes, - validate_cache, +from pt_snap_cli.core.importing.snapshot_import_backend import SnapshotImportBackend +from pt_snap_cli.core.importing.validation_receipts import ( + import_receipts, + load_receipt, + save_receipt, ) -from pt_snap_cli.core.snapshot_import_backend import SnapshotImportBackend -from pt_snap_cli.core.validation_receipts import import_receipts, load_receipt, save_receipt +from pt_snap_cli.core.splitting.sharded_replay_service import ShardedReplayResult logger = logging.getLogger(__name__) diff --git a/src/pt_snap_cli/core/msinsight_export.py b/src/pt_snap_cli/core/importing/msinsight_export.py similarity index 95% rename from src/pt_snap_cli/core/msinsight_export.py rename to src/pt_snap_cli/core/importing/msinsight_export.py index f1ec7df..ea4c7e5 100644 --- a/src/pt_snap_cli/core/msinsight_export.py +++ b/src/pt_snap_cli/core/importing/msinsight_export.py @@ -16,7 +16,14 @@ from pathlib import Path from typing import Any -from .dataset_contract import ( +from pt_snap_cli.core.cache.snapshot_cache import ( + parse_cache_manifest, + seal_manifest, + source_hashes, +) +from pt_snap_cli.core.common.errors import ImportExecutionError +from pt_snap_cli.core.common.models import ImportMetadata +from pt_snap_cli.core.dataset.dataset_contract import ( ACTION_NAMES, MANIFEST_SCHEMA_VERSION, MSINSIGHT_REVISION, @@ -25,19 +32,12 @@ DatasetManifest, parse_manifest, ) -from .dataset_files import readonly_member_uri, require_readonly_member -from .dataset_import_backend import DatasetImportBackend -from .dataset_resolver import DatasetResolver -from .errors import ImportExecutionError -from .import_metadata_contract import metadata_from_mapping -from .models import ImportMetadata -from .ordered_frame_integrity import require_frame_declaration -from .sharded_replay_service import ShardedReplayResult -from .snapshot_cache import ( - parse_cache_manifest, - seal_manifest, - source_hashes, -) +from pt_snap_cli.core.dataset.dataset_files import readonly_member_uri, require_readonly_member +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.importing.dataset_import_backend import DatasetImportBackend +from pt_snap_cli.core.importing.import_metadata_contract import metadata_from_mapping +from pt_snap_cli.core.importing.ordered_frame_integrity import require_frame_declaration +from pt_snap_cli.core.splitting.sharded_replay_service import ShardedReplayResult COMPATIBILITY_FORMAT = "compatibility-v1" DEFAULT_CAPACITY = 500000 diff --git a/src/pt_snap_cli/core/ordered_frame_integrity.py b/src/pt_snap_cli/core/importing/ordered_frame_integrity.py similarity index 93% rename from src/pt_snap_cli/core/ordered_frame_integrity.py rename to src/pt_snap_cli/core/importing/ordered_frame_integrity.py index e64a0d9..fa91be4 100644 --- a/src/pt_snap_cli/core/ordered_frame_integrity.py +++ b/src/pt_snap_cli/core/importing/ordered_frame_integrity.py @@ -8,10 +8,10 @@ from contextlib import closing from pathlib import Path -from .dataset_contract import _unique_object -from .dataset_files import readonly_member_uri, require_readonly_member -from .dataset_frames import SCHEMA -from .frame_json import _bounded_depth, _finite_float, _invalid_constant +from pt_snap_cli.core.common.frame_json import _bounded_depth, _finite_float, _invalid_constant +from pt_snap_cli.core.dataset.dataset_contract import _unique_object +from pt_snap_cli.core.dataset.dataset_files import readonly_member_uri, require_readonly_member +from pt_snap_cli.core.dataset.query.dataset_frames import SCHEMA def require_frame_declaration(manifest: dict[str, object]) -> None: diff --git a/src/pt_snap_cli/core/snapshot_import_backend.py b/src/pt_snap_cli/core/importing/snapshot_import_backend.py similarity index 98% rename from src/pt_snap_cli/core/snapshot_import_backend.py rename to src/pt_snap_cli/core/importing/snapshot_import_backend.py index 2317622..1993d81 100644 --- a/src/pt_snap_cli/core/snapshot_import_backend.py +++ b/src/pt_snap_cli/core/importing/snapshot_import_backend.py @@ -8,7 +8,7 @@ from contextlib import ExitStack, suppress from pathlib import Path -from pt_snap_cli.core.errors import ImportExecutionError, ImportToolMissingError +from pt_snap_cli.core.common.errors import ImportExecutionError, ImportToolMissingError from pt_snap_cli.snapshot.representation import UnsafePickleError diff --git a/src/pt_snap_cli/core/validation_receipts.py b/src/pt_snap_cli/core/importing/validation_receipts.py similarity index 100% rename from src/pt_snap_cli/core/validation_receipts.py rename to src/pt_snap_cli/core/importing/validation_receipts.py diff --git a/src/pt_snap_cli/core/splitting/__init__.py b/src/pt_snap_cli/core/splitting/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pt_snap_cli/core/sharded_replay_service.py b/src/pt_snap_cli/core/splitting/sharded_replay_service.py similarity index 93% rename from src/pt_snap_cli/core/sharded_replay_service.py rename to src/pt_snap_cli/core/splitting/sharded_replay_service.py index bb210c6..e028486 100644 --- a/src/pt_snap_cli/core/sharded_replay_service.py +++ b/src/pt_snap_cli/core/splitting/sharded_replay_service.py @@ -6,8 +6,8 @@ from pathlib import Path from typing import cast -from ..snapshot.representation import load_snapshot_representation -from ..snapshot.tools.adaptors.sharded_replay import ReplaySlice, build_shards +from pt_snap_cli.snapshot.representation import load_snapshot_representation +from pt_snap_cli.snapshot.tools.adaptors.sharded_replay import ReplaySlice, build_shards @dataclass(frozen=True) diff --git a/src/pt_snap_cli/core/split_service.py b/src/pt_snap_cli/core/splitting/split_service.py similarity index 98% rename from src/pt_snap_cli/core/split_service.py rename to src/pt_snap_cli/core/splitting/split_service.py index ba8287b..93834da 100644 --- a/src/pt_snap_cli/core/split_service.py +++ b/src/pt_snap_cli/core/splitting/split_service.py @@ -11,8 +11,8 @@ from stat import S_ISDIR, S_ISLNK from typing import NoReturn, cast -from pt_snap_cli.core.errors import SplitError, SplitPhase -from pt_snap_cli.core.models import SplitFormat, SplitOptions, SplitResult +from pt_snap_cli.core.common.errors import SplitError, SplitPhase +from pt_snap_cli.core.common.models import SplitFormat, SplitOptions, SplitResult from pt_snap_cli.snapshot.representation import ( UnsafePickleError, load_snapshot_representation, diff --git a/src/pt_snap_cli/memory_tree_render.py b/src/pt_snap_cli/memory_tree_render.py index a03c055..7254122 100644 --- a/src/pt_snap_cli/memory_tree_render.py +++ b/src/pt_snap_cli/memory_tree_render.py @@ -5,7 +5,7 @@ import json from typing import cast -from pt_snap_cli.core.models import QueryResult +from pt_snap_cli.core.common.models import QueryResult def render_memory_tree(result: QueryResult, event_id: int, *, html: bool = False) -> str: diff --git a/src/pt_snap_cli/models/AGENTS.md b/src/pt_snap_cli/models/AGENTS.md index 7a44982..dc4f2e0 100644 --- a/src/pt_snap_cli/models/AGENTS.md +++ b/src/pt_snap_cli/models/AGENTS.md @@ -3,7 +3,7 @@ Parent scope: [package runtime](../AGENTS.md). This scope owns exported dataclasses and allocator enums. It is separate from -`core/models.py` service payloads and `snapshot/base/entities.py` replay objects. +`core/common/models.py` service payloads and `snapshot/base/entities.py` replay objects. | File | Contract | | --- | --- | diff --git a/src/pt_snap_cli/query/AGENTS.md b/src/pt_snap_cli/query/AGENTS.md index e343f35..d8f57ee 100644 --- a/src/pt_snap_cli/query/AGENTS.md +++ b/src/pt_snap_cli/query/AGENTS.md @@ -5,7 +5,7 @@ Parent scope: [package runtime](../AGENTS.md). ## Data Flow and Ownership `templates//*.yaml` → `config.py` → `registry.py` → -`core/query_service.py` → `executor.py`/`Context` → mapped rows and adapter output. +`core/analysis/query_service.py` → `executor.py`/`Context` → mapped rows and adapter output. The [template guide](templates/AGENTS.md) owns SQL/metadata authoring rules. | Module | Boundary | diff --git a/src/pt_snap_cli/snapshot/AGENTS.md b/src/pt_snap_cli/snapshot/AGENTS.md index 12b0208..eddc813 100644 --- a/src/pt_snap_cli/snapshot/AGENTS.md +++ b/src/pt_snap_cli/snapshot/AGENTS.md @@ -32,7 +32,7 @@ before running code that loads committed pickle inputs. preconditions and hook sequencing as well as the happy-path final totals. - Callstack storage uses interning in the database adaptor; readers select v1/v2 through Context/query variants. Coordinate schema/index changes with those - readers, `core/import_metadata.py`, and English/Chinese database guides. + readers, `core/importing/import_metadata.py`, and English/Chinese database guides. - `util/sqlite_meta.py` must give `T | None` and `Optional[T]` the same scalar SQLite affinity; unsupported/multi-type unions retain their TEXT fallback. diff --git a/tests/core/dataset_lifecycle_fixtures.py b/tests/core/dataset_lifecycle_fixtures.py index 2e23c1e..a0fe6cd 100644 --- a/tests/core/dataset_lifecycle_fixtures.py +++ b/tests/core/dataset_lifecycle_fixtures.py @@ -11,9 +11,9 @@ import sqlite3 from contextlib import closing -from pt_snap_cli.core.dataset_contract import ACTION_NAMES, BLOCK_STATES, validate_dataset -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.native_dataset_contract import NATIVE_FORMAT, cache_identity +from pt_snap_cli.core.dataset.dataset_contract import ACTION_NAMES, BLOCK_STATES, validate_dataset +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.native_dataset_contract import NATIVE_FORMAT, cache_identity EVENT_COUNT = 80 CAPACITY = 10 diff --git a/tests/core/test_capability_service.py b/tests/core/test_capability_service.py index 39c4f63..0e69d42 100644 --- a/tests/core/test_capability_service.py +++ b/tests/core/test_capability_service.py @@ -3,7 +3,7 @@ import pytest -from pt_snap_cli.core.capability_service import CapabilityService +from pt_snap_cli.core.analysis.capability_service import CapabilityService from pt_snap_cli.query.registry import QueryRegistry diff --git a/tests/core/test_context_cache.py b/tests/core/test_context_cache.py index 0a7111f..990d8c6 100644 --- a/tests/core/test_context_cache.py +++ b/tests/core/test_context_cache.py @@ -9,7 +9,7 @@ import pytest from pt_snap_cli.context import Context, DatabaseNotFoundError, SchemaVersionError -from pt_snap_cli.core.context_cache import ContextCache +from pt_snap_cli.core.cache.context_cache import ContextCache def _make_db(tmp_path: Path, name: str = "sample.db") -> Path: diff --git a/tests/core/test_critical_coverage_cache.py b/tests/core/test_critical_coverage_cache.py index b2c5962..ed3bc51 100644 --- a/tests/core/test_critical_coverage_cache.py +++ b/tests/core/test_critical_coverage_cache.py @@ -10,8 +10,8 @@ import pytest -from pt_snap_cli.core import snapshot_cache -from pt_snap_cli.core.snapshot_cache import ( +from pt_snap_cli.core.cache import snapshot_cache +from pt_snap_cli.core.cache.snapshot_cache import ( parser_members, seal_manifest, source_hashes, diff --git a/tests/core/test_critical_coverage_focus.py b/tests/core/test_critical_coverage_focus.py index 35a1bc4..2870e3b 100644 --- a/tests/core/test_critical_coverage_focus.py +++ b/tests/core/test_critical_coverage_focus.py @@ -8,10 +8,10 @@ import pytest -import pt_snap_cli.core.focus_service as focus_module +import pt_snap_cli.core.analysis.focus_service as focus_module from pt_snap_cli.config import Config -from pt_snap_cli.core.errors import ImportExecutionError -from pt_snap_cli.core.focus_service import FocusService +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.common.errors import ImportExecutionError @pytest.fixture diff --git a/tests/core/test_critical_coverage_metadata.py b/tests/core/test_critical_coverage_metadata.py index 39894bb..c793be9 100644 --- a/tests/core/test_critical_coverage_metadata.py +++ b/tests/core/test_critical_coverage_metadata.py @@ -7,20 +7,20 @@ import pytest -import pt_snap_cli.core.import_metadata as metadata_module -from pt_snap_cli.core.errors import ( +import pt_snap_cli.core.importing.import_metadata as metadata_module +from pt_snap_cli.core.common.errors import ( DatabaseMissingError, DatabaseSchemaError, ImportMetadataError, ) -from pt_snap_cli.core.import_metadata import ImportMetadataService -from pt_snap_cli.core.import_metadata_contract import ( +from pt_snap_cli.core.common.models import ImportMetadata +from pt_snap_cli.core.importing.import_metadata import ImportMetadataService +from pt_snap_cli.core.importing.import_metadata_contract import ( metadata_from_mapping, required_int, required_str, validate_import_metadata, ) -from pt_snap_cli.core.models import ImportMetadata def metadata(**changes): diff --git a/tests/core/test_critical_coverage_skills.py b/tests/core/test_critical_coverage_skills.py index 1d3d4a4..f2d727f 100644 --- a/tests/core/test_critical_coverage_skills.py +++ b/tests/core/test_critical_coverage_skills.py @@ -4,9 +4,9 @@ import pytest -import pt_snap_cli.core.skill_service as skill_module -from pt_snap_cli.core.errors import SkillCatalogError, SkillInstallError -from pt_snap_cli.core.skill_service import SkillService +import pt_snap_cli.core.analysis.skill_service as skill_module +from pt_snap_cli.core.analysis.skill_service import SkillService +from pt_snap_cli.core.common.errors import SkillCatalogError, SkillInstallError @pytest.fixture diff --git a/tests/core/test_critical_coverage_split.py b/tests/core/test_critical_coverage_split.py index 9fc0231..45c8cc8 100644 --- a/tests/core/test_critical_coverage_split.py +++ b/tests/core/test_critical_coverage_split.py @@ -8,10 +8,10 @@ import pytest -import pt_snap_cli.core.split_service as split_module -from pt_snap_cli.core.errors import SplitError -from pt_snap_cli.core.models import SplitOptions -from pt_snap_cli.core.split_service import SplitService +import pt_snap_cli.core.splitting.split_service as split_module +from pt_snap_cli.core.common.errors import SplitError +from pt_snap_cli.core.common.models import SplitOptions +from pt_snap_cli.core.splitting.split_service import SplitService @pytest.fixture diff --git a/tests/core/test_dataset_active_sql.py b/tests/core/test_dataset_active_sql.py index d372db7..8ef8908 100644 --- a/tests/core/test_dataset_active_sql.py +++ b/tests/core/test_dataset_active_sql.py @@ -8,11 +8,11 @@ import pytest from benchmarks.active_at_event_capacity import build_case, run_case -from pt_snap_cli.core import dataset_active_sql -from pt_snap_cli.core.dataset_lifecycle_connection import _AttachedSources -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError, QueryTimeoutError -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.common.errors import QueryExecutionError, QueryTimeoutError +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_connection import _AttachedSources +from pt_snap_cli.core.dataset.query import dataset_active_sql from tests.core.test_dataset_attribution import case from tests.test_dataset_focus import hashes diff --git a/tests/core/test_dataset_attribution.py b/tests/core/test_dataset_attribution.py index 34eed1f..0c053f8 100644 --- a/tests/core/test_dataset_attribution.py +++ b/tests/core/test_dataset_attribution.py @@ -10,13 +10,17 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import SOURCE_BATCH_SIZE, DatasetSourceResolver, QueryBudget -from pt_snap_cli.core.errors import InvalidParameterError, QueryTimeoutError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.query_service import QueryService -from pt_snap_cli.core.report_service import ReportService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.analysis.report_service import ReportService +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import InvalidParameterError, QueryTimeoutError +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import ( + SOURCE_BATCH_SIZE, + DatasetSourceResolver, + QueryBudget, +) +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.test_dataset_import import source_options from tests.test_dataset_focus import hashes, make_dataset @@ -435,7 +439,7 @@ def test_native_same_event_active_sets_bytes_and_attribution_match_standalone(tm @pytest.mark.parametrize("ordered", [False, True]) def test_cross_owner_same_full_stack_merges_before_top_n_like_standalone(tmp_path, ordered): - from pt_snap_cli.core.models import ImportOptions + from pt_snap_cli.core.common.models import ImportOptions from tests.snapshot.test_sharded_replay import block, event, segment, write_source data = { @@ -650,7 +654,7 @@ def counted(self, path, sql, params=None): return original(self, path, sql, params) monkeypatch.setattr(DatasetSourceResolver, "read", counted) - from pt_snap_cli.core.dataset_lifecycle_connection import _AttachedSources + from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_connection import _AttachedSources original_attached = _AttachedSources.read diff --git a/tests/core/test_dataset_content_cache.py b/tests/core/test_dataset_content_cache.py index 1e43ad9..3bc7a3b 100644 --- a/tests/core/test_dataset_content_cache.py +++ b/tests/core/test_dataset_content_cache.py @@ -8,10 +8,10 @@ import pytest -from pt_snap_cli.core import dataset_resolver as resolver -from pt_snap_cli.core import native_dataset_contract as native -from pt_snap_cli.core.dataset_files import hash_file -from pt_snap_cli.core.errors import DatabaseSchemaError, QueryTimeoutError +from pt_snap_cli.core.common.errors import DatabaseSchemaError, QueryTimeoutError +from pt_snap_cli.core.dataset import dataset_resolver as resolver +from pt_snap_cli.core.dataset import native_dataset_contract as native +from pt_snap_cli.core.dataset.dataset_files import hash_file from tests.core.test_dataset_validation_cache import CancellableBudget from tests.test_dataset_focus import make_dataset from tests.test_native_dataset import dataset as native_dataset diff --git a/tests/core/test_dataset_differential_cases.py b/tests/core/test_dataset_differential_cases.py index f71c8de..5f93d54 100644 --- a/tests/core/test_dataset_differential_cases.py +++ b/tests/core/test_dataset_differential_cases.py @@ -7,8 +7,8 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core.dataset_support import DATASET_SUPPORT -from pt_snap_cli.core.errors import QueryExecutionError +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.dataset.dataset_support import DATASET_SUPPORT from pt_snap_cli.query import registry from tests.core.dataset_differential_assertions import compare_case from tests.core.dataset_differential_cases import ( diff --git a/tests/core/test_dataset_frame_tree.py b/tests/core/test_dataset_frame_tree.py index b047d6c..75b26da 100644 --- a/tests/core/test_dataset_frame_tree.py +++ b/tests/core/test_dataset_frame_tree.py @@ -12,15 +12,19 @@ import pytest from typer.testing import CliRunner -import pt_snap_cli.core.query_service as query_service_module +import pt_snap_cli.core.analysis.query_service as query_service_module from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.cli import app -from pt_snap_cli.core.dataset_frames import attach_frames -from pt_snap_cli.core.errors import InvalidParameterError, QueryCancelledError, QueryExecutionError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.models import ImportOptions -from pt_snap_cli.core.query_limits import QueryLimits -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.common.errors import ( + InvalidParameterError, + QueryCancelledError, + QueryExecutionError, +) +from pt_snap_cli.core.common.models import ImportOptions +from pt_snap_cli.core.common.query_limits import QueryLimits +from pt_snap_cli.core.dataset.query.dataset_frames import attach_frames +from pt_snap_cli.core.importing.import_service import ImportService from pt_snap_cli.snapshot.base import TraceEntry from pt_snap_cli.snapshot.representation import load_snapshot_representation from pt_snap_cli.snapshot.tools.adaptors.ordered_frames import OrderedFrameWriter diff --git a/tests/core/test_dataset_global.py b/tests/core/test_dataset_global.py index b267894..f6ba57b 100644 --- a/tests/core/test_dataset_global.py +++ b/tests/core/test_dataset_global.py @@ -14,19 +14,19 @@ from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.cli import app -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver, QueryBudget -from pt_snap_cli.core.dataset_support import DATASET_SUPPORT -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.analysis.report_service import ReportService +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import ( InvalidParameterError, QueryExecutionError, QueryTimeoutError, TemplateNotFoundError, ) -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.query_service import QueryService -from pt_snap_cli.core.report_service import ReportService +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver, QueryBudget +from pt_snap_cli.core.dataset.dataset_support import DATASET_SUPPORT +from pt_snap_cli.core.importing.import_service import ImportService from pt_snap_cli.query.registry import get_query, register_query from tests.core.test_dataset_attribution import add_frames, case, standalone from tests.core.test_dataset_import import source_options diff --git a/tests/core/test_dataset_id_pagination.py b/tests/core/test_dataset_id_pagination.py index 70d5aa8..0248f84 100644 --- a/tests/core/test_dataset_id_pagination.py +++ b/tests/core/test_dataset_id_pagination.py @@ -8,11 +8,11 @@ import pytest -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver, QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver, QueryBudget +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.test_dataset_attribution import case, standalone from tests.core.test_dataset_import import source_options from tests.core.test_dataset_source_reuse import framed_dataset diff --git a/tests/core/test_dataset_import.py b/tests/core/test_dataset_import.py index 005c5a4..3f2c979 100644 --- a/tests/core/test_dataset_import.py +++ b/tests/core/test_dataset_import.py @@ -10,14 +10,19 @@ import pytest -from pt_snap_cli.core import import_metadata, import_service, native_dataset_contract -from pt_snap_cli.core.dataset_import_backend import DatasetImportBackend -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.errors import ImportExecutionError, InvalidParameterError, SourceChangedError -from pt_snap_cli.core.focus_service import FocusService -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.models import ImportOptions -from pt_snap_cli.core.native_dataset_contract import NATIVE_FORMAT +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.common.errors import ( + ImportExecutionError, + InvalidParameterError, + SourceChangedError, +) +from pt_snap_cli.core.common.models import ImportOptions +from pt_snap_cli.core.dataset import native_dataset_contract +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.native_dataset_contract import NATIVE_FORMAT +from pt_snap_cli.core.importing import import_metadata, import_service +from pt_snap_cli.core.importing.dataset_import_backend import DatasetImportBackend +from pt_snap_cli.core.importing.import_service import ImportService from pt_snap_cli.snapshot.tools.adaptors import sharded_replay from tests.snapshot.test_sharded_replay import lifecycle_data, write_source @@ -209,7 +214,7 @@ def fail(*args, **kwargs): if phase == "load": monkeypatch.setattr( - "pt_snap_cli.core.sharded_replay_service.load_snapshot_representation", fail + "pt_snap_cli.core.splitting.sharded_replay_service.load_snapshot_representation", fail ) elif phase == "write": monkeypatch.setattr(sharded_replay.SnapshotDbHandler, "insert_event", fail) diff --git a/tests/core/test_dataset_import_failures.py b/tests/core/test_dataset_import_failures.py index 0c9fb2a..550ae2a 100644 --- a/tests/core/test_dataset_import_failures.py +++ b/tests/core/test_dataset_import_failures.py @@ -4,10 +4,10 @@ import pytest -from pt_snap_cli.core import sharded_replay_service -from pt_snap_cli.core.errors import ImportExecutionError, SourceChangedError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.split_service import SplitService +from pt_snap_cli.core.common.errors import ImportExecutionError, SourceChangedError +from pt_snap_cli.core.importing.import_service import ImportService +from pt_snap_cli.core.splitting import sharded_replay_service +from pt_snap_cli.core.splitting.split_service import SplitService from tests.core.test_dataset_import import assert_preserved, hashes, saved_state, source_options diff --git a/tests/core/test_dataset_integrity_modes.py b/tests/core/test_dataset_integrity_modes.py index d92338c..dcb6f87 100644 --- a/tests/core/test_dataset_integrity_modes.py +++ b/tests/core/test_dataset_integrity_modes.py @@ -11,11 +11,11 @@ import pytest -from pt_snap_cli.core import dataset_resolver as resolver -from pt_snap_cli.core import native_dataset_contract as native -from pt_snap_cli.core.dataset_files import hash_file -from pt_snap_cli.core.errors import DatabaseSchemaError, QueryTimeoutError -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.common.errors import DatabaseSchemaError, QueryTimeoutError +from pt_snap_cli.core.dataset import dataset_resolver as resolver +from pt_snap_cli.core.dataset import native_dataset_contract as native +from pt_snap_cli.core.dataset.dataset_files import hash_file from tests.core.test_dataset_validation_cache import CancellableBudget from tests.test_dataset_focus import make_dataset from tests.test_native_dataset import dataset as native_dataset @@ -218,7 +218,7 @@ def test_new_process_is_cold_even_after_parent_admission(artifact, mode): resolver.DatasetResolver().inspect(root) code = """ import sys -from pt_snap_cli.core import dataset_resolver as r +from pt_snap_cli.core.dataset import dataset_resolver as r assert not r._VALIDATED calls = [] for name in ('validate_dataset', 'validate_native_dataset'): diff --git a/tests/core/test_dataset_lifecycle_contract.py b/tests/core/test_dataset_lifecycle_contract.py index 3e064f6..9e929c8 100644 --- a/tests/core/test_dataset_lifecycle_contract.py +++ b/tests/core/test_dataset_lifecycle_contract.py @@ -8,11 +8,11 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core import dataset_global -from pt_snap_cli.core import dataset_lifecycle_scratch as scratch -from pt_snap_cli.core import dataset_lifecycle_sql as sql -from pt_snap_cli.core.dataset_contract import validate_dataset -from pt_snap_cli.core.query_limits import QueryLimits +from pt_snap_cli.core.common.query_limits import QueryLimits +from pt_snap_cli.core.dataset.dataset_contract import validate_dataset +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_scratch as scratch +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql as sql +from pt_snap_cli.core.dataset.query import dataset_global from tests.test_dataset_focus import hashes, make_dataset diff --git a/tests/core/test_dataset_lifecycle_routing.py b/tests/core/test_dataset_lifecycle_routing.py index ac5a7da..9e96c9f 100644 --- a/tests/core/test_dataset_lifecycle_routing.py +++ b/tests/core/test_dataset_lifecycle_routing.py @@ -6,11 +6,11 @@ import pytest -from pt_snap_cli.core import dataset_lifecycle_scratch as scratch -from pt_snap_cli.core import dataset_lifecycle_sql as sql -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver, QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError, QueryTimeoutError +from pt_snap_cli.core.common.errors import QueryExecutionError, QueryTimeoutError +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver, QueryBudget +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_scratch as scratch +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql as sql from tests.core.test_dataset_lifecycle_scratch import capture_storage from tests.core.test_dataset_sql_pushdown import run_resolved from tests.test_dataset_focus import hashes, make_dataset diff --git a/tests/core/test_dataset_lifecycle_scratch.py b/tests/core/test_dataset_lifecycle_scratch.py index 2f41356..5bab57d 100644 --- a/tests/core/test_dataset_lifecycle_scratch.py +++ b/tests/core/test_dataset_lifecycle_scratch.py @@ -9,11 +9,11 @@ import pytest -from pt_snap_cli.core import dataset_lifecycle_scratch as scratch -from pt_snap_cli.core import dataset_lifecycle_sql -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError, QueryTimeoutError +from pt_snap_cli.core.common.errors import QueryExecutionError, QueryTimeoutError +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_scratch as scratch +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql from tests.core.test_dataset_sql_pushdown import run_resolved from tests.test_dataset_focus import make_dataset diff --git a/tests/core/test_dataset_projections.py b/tests/core/test_dataset_projections.py index 6811d89..e7c3b06 100644 --- a/tests/core/test_dataset_projections.py +++ b/tests/core/test_dataset_projections.py @@ -6,8 +6,8 @@ import pytest -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget from tests.test_dataset_focus import make_dataset diff --git a/tests/core/test_dataset_realistic.py b/tests/core/test_dataset_realistic.py index f2b295e..a8610e5 100644 --- a/tests/core/test_dataset_realistic.py +++ b/tests/core/test_dataset_realistic.py @@ -15,15 +15,15 @@ from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.cli import app -from pt_snap_cli.core import dataset_attribution -from pt_snap_cli.core import dataset_lifecycle_scratch as scratch -from pt_snap_cli.core import dataset_lifecycle_sql as lifecycle_sql -from pt_snap_cli.core.dataset_contract import validate_dataset -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError, QueryTimeoutError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.models import ImportOptions -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.common.errors import QueryExecutionError, QueryTimeoutError +from pt_snap_cli.core.common.models import ImportOptions +from pt_snap_cli.core.dataset.dataset_contract import validate_dataset +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_scratch as scratch +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql as lifecycle_sql +from pt_snap_cli.core.dataset.query import dataset_attribution +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.dataset_differential_assertions import compare_case from tests.core.dataset_differential_cases import capacity_for_seed, configured_seeds, query_cases from tests.core.dataset_lifecycle_fixtures import build, db, member diff --git a/tests/core/test_dataset_route_scale_acceptance.py b/tests/core/test_dataset_route_scale_acceptance.py index aa0a6fa..cb9b97d 100644 --- a/tests/core/test_dataset_route_scale_acceptance.py +++ b/tests/core/test_dataset_route_scale_acceptance.py @@ -13,10 +13,10 @@ import pytest from pt_snap_cli.api import QueryLimits, SnapshotAnalyzer -from pt_snap_cli.core import dataset_lifecycle_scratch as scratch -from pt_snap_cli.core import dataset_lifecycle_sql as sql -from pt_snap_cli.core.dataset_lifecycle_connection import _AttachedSources -from pt_snap_cli.core.errors import QueryExecutionError +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_scratch as scratch +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql as sql +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_connection import _AttachedSources from tests.dataset_failure_support import ( ENV_NAMES, child_environment, diff --git a/tests/core/test_dataset_scale_acceptance.py b/tests/core/test_dataset_scale_acceptance.py index d0ccbd5..e62b82f 100644 --- a/tests/core/test_dataset_scale_acceptance.py +++ b/tests/core/test_dataset_scale_acceptance.py @@ -16,10 +16,10 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core.dataset_contract import ACTION_NAMES, BLOCK_STATES -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError -from pt_snap_cli.core.msinsight_export import DEFAULT_CAPACITY +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.dataset.dataset_contract import ACTION_NAMES, BLOCK_STATES +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget +from pt_snap_cli.core.importing.msinsight_export import DEFAULT_CAPACITY from tests.core.dataset_lifecycle_fixtures import SCHEMA from tests.core.wheel_scale_acceptance import ( API_QUERIES, diff --git a/tests/core/test_dataset_scale_workload.py b/tests/core/test_dataset_scale_workload.py index dba0232..cfd789d 100644 --- a/tests/core/test_dataset_scale_workload.py +++ b/tests/core/test_dataset_scale_workload.py @@ -4,8 +4,8 @@ from pathlib import Path from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.models import ImportOptions +from pt_snap_cli.core.common.models import ImportOptions +from pt_snap_cli.core.importing.import_service import ImportService from pt_snap_cli.query import registry from pt_snap_cli.snapshot.representation import load_snapshot_representation from pt_snap_cli.snapshot.simulate import SimulateDeviceSnapshot diff --git a/tests/core/test_dataset_source_reuse.py b/tests/core/test_dataset_source_reuse.py index ff3db50..58f4044 100644 --- a/tests/core/test_dataset_source_reuse.py +++ b/tests/core/test_dataset_source_reuse.py @@ -7,11 +7,11 @@ import pytest -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver, QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver, QueryBudget from tests.test_dataset_focus import make_dataset @@ -122,7 +122,7 @@ def test_shared_long_text_reduction_is_small_but_full_sources_remain_budgeted(tm def test_fallback_still_charges_distinct_blocks_and_sources(tmp_path, monkeypatch): - from pt_snap_cli.core import dataset_attribution + from pt_snap_cli.core.dataset.query import dataset_attribution monkeypatch.setattr(dataset_attribution, "reduce_active", lambda *args: None) root = dataset(tmp_path, 100, blocks=True) diff --git a/tests/core/test_dataset_sql_pushdown.py b/tests/core/test_dataset_sql_pushdown.py index b5f4ffc..e7f80cb 100644 --- a/tests/core/test_dataset_sql_pushdown.py +++ b/tests/core/test_dataset_sql_pushdown.py @@ -9,14 +9,14 @@ import pytest -from pt_snap_cli.core import dataset_lifecycle_sql -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_global import global_query -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver, QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError, QueryTimeoutError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import QueryExecutionError, QueryTimeoutError +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver, QueryBudget +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql +from pt_snap_cli.core.dataset.query.dataset_global import global_query +from pt_snap_cli.core.importing.import_service import ImportService from pt_snap_cli.query.registry import get_query from tests.core.test_dataset_attribution import case from tests.core.test_dataset_import import source_options diff --git a/tests/core/test_dataset_validation_cache.py b/tests/core/test_dataset_validation_cache.py index 527c6f9..8a90eca 100644 --- a/tests/core/test_dataset_validation_cache.py +++ b/tests/core/test_dataset_validation_cache.py @@ -9,12 +9,16 @@ import pytest from pt_snap_cli.completion import complete_device_ids -from pt_snap_cli.core import dataset_contract, dataset_resolver, native_dataset_contract -from pt_snap_cli.core.dataset_contract import validate_dataset -from pt_snap_cli.core.dataset_files import hash_file -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.errors import DatabaseSchemaError, QueryCancelledError, QueryTimeoutError -from pt_snap_cli.core.validation_budget import validation_progress +from pt_snap_cli.core.common.errors import ( + DatabaseSchemaError, + QueryCancelledError, + QueryTimeoutError, +) +from pt_snap_cli.core.common.validation_budget import validation_progress +from pt_snap_cli.core.dataset import dataset_contract, dataset_resolver, native_dataset_contract +from pt_snap_cli.core.dataset.dataset_contract import validate_dataset +from pt_snap_cli.core.dataset.dataset_files import hash_file +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver from tests.test_dataset_focus import make_dataset from tests.test_native_dataset import dataset as native_dataset @@ -69,7 +73,7 @@ def changed(*args, **kwargs): def test_historical_digests_do_not_reject_valid_content_changes( tmp_path, monkeypatch, cache_mode, seal ): - from pt_snap_cli.core.snapshot_cache import seal_manifest + from pt_snap_cli.core.cache.snapshot_cache import seal_manifest if cache_mode is None: monkeypatch.delenv("PT_SNAP_DATASET_CACHE", raising=False) @@ -379,7 +383,7 @@ def test_cold_query_passes_shared_deadline_and_cli_keeps_timeout_code(tmp_path, from typer.testing import CliRunner from pt_snap_cli.cli import app - from pt_snap_cli.core.query_service import QueryService + from pt_snap_cli.core.analysis.query_service import QueryService root = make_dataset(tmp_path / "dataset", devices=(0,), slices=1) original = dataset_resolver._hash_file @@ -416,7 +420,7 @@ def expire(path, *, budget=None): def test_native_lock_wait_respects_deadline(tmp_path): import time - from pt_snap_cli.core.dataset_sources import QueryBudget + from pt_snap_cli.core.dataset.dataset_sources import QueryBudget root = native_dataset(tmp_path) member = sorted(root.glob("*/*.db"))[0] diff --git a/tests/core/test_dataset_zero_rank.py b/tests/core/test_dataset_zero_rank.py index f247249..ca3cb4f 100644 --- a/tests/core/test_dataset_zero_rank.py +++ b/tests/core/test_dataset_zero_rank.py @@ -6,8 +6,8 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core import dataset_attribution -from pt_snap_cli.core.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.query import dataset_attribution from tests.core.dataset_lifecycle_fixtures import db, native_dataset, row diff --git a/tests/core/test_focus_checkpoint_cleanup.py b/tests/core/test_focus_checkpoint_cleanup.py index 1e3c6f4..5a6f5c8 100644 --- a/tests/core/test_focus_checkpoint_cleanup.py +++ b/tests/core/test_focus_checkpoint_cleanup.py @@ -7,9 +7,9 @@ import pytest -import pt_snap_cli.core.focus_service as focus_module +import pt_snap_cli.core.analysis.focus_service as focus_module from pt_snap_cli.config import Config -from pt_snap_cli.core.focus_service import FocusService +from pt_snap_cli.core.analysis.focus_service import FocusService @pytest.fixture diff --git a/tests/core/test_import_backend_failures.py b/tests/core/test_import_backend_failures.py index 3d12044..7881787 100644 --- a/tests/core/test_import_backend_failures.py +++ b/tests/core/test_import_backend_failures.py @@ -3,8 +3,8 @@ import pytest -from pt_snap_cli.core.errors import ImportExecutionError -from pt_snap_cli.core.snapshot_import_backend import SnapshotImportBackend +from pt_snap_cli.core.common.errors import ImportExecutionError +from pt_snap_cli.core.importing.snapshot_import_backend import SnapshotImportBackend @pytest.fixture @@ -29,7 +29,7 @@ def dump(snapshot_file, dump_dir, device): monkeypatch.setattr(backend, "_load_run_dump_to_db", lambda: dump) monkeypatch.setattr( - "pt_snap_cli.core.snapshot_import_backend.tempfile.mkstemp", tracked_mkstemp + "pt_snap_cli.core.importing.snapshot_import_backend.tempfile.mkstemp", tracked_mkstemp ) yield backend, source, output, destination, descriptors # Leak detection is deterministic even on Python versions without ResourceWarning. @@ -53,14 +53,14 @@ def fail(*args, **kwargs): def post_publish(path): assert path.read_bytes() == b"new database" if failure == "rollback": - monkeypatch.setattr("pt_snap_cli.core.snapshot_import_backend.os.read", fail) + monkeypatch.setattr("pt_snap_cli.core.importing.snapshot_import_backend.os.read", fail) if failure in ("focus", "rollback"): raise RuntimeError("focus failed") if failure == "backup": - monkeypatch.setattr("pt_snap_cli.core.snapshot_import_backend.os.write", fail) + monkeypatch.setattr("pt_snap_cli.core.importing.snapshot_import_backend.os.write", fail) elif failure == "publish": - monkeypatch.setattr("pt_snap_cli.core.snapshot_import_backend.os.replace", fail) + monkeypatch.setattr("pt_snap_cli.core.importing.snapshot_import_backend.os.replace", fail) with pytest.raises((ImportExecutionError, RuntimeError), match="failed") as error: backend.dump_to_db(source, output, post_publish=post_publish) backups = list(output.glob("*.rollback")) @@ -79,7 +79,7 @@ def test_short_backup_writes_preserve_complete_rollback(staged_backend, monkeypa original = destination.read_bytes() real_write = os.write monkeypatch.setattr( - "pt_snap_cli.core.snapshot_import_backend.os.write", + "pt_snap_cli.core.importing.snapshot_import_backend.os.write", lambda fd, data: real_write(fd, data[:3]), ) @@ -112,7 +112,9 @@ def fail_publish(*args, **kwargs): raise OSError("publication failed") monkeypatch.setattr(Path, "unlink", require_closed) - monkeypatch.setattr("pt_snap_cli.core.snapshot_import_backend.os.replace", fail_publish) + monkeypatch.setattr( + "pt_snap_cli.core.importing.snapshot_import_backend.os.replace", fail_publish + ) with pytest.raises(ImportExecutionError, match="publication failed"): backend.dump_to_db(source, output, post_publish=lambda path: None) assert len(removed) == 1 @@ -122,7 +124,9 @@ def fail_publish(*args, **kwargs): def test_zero_backup_write_fails_without_publishing(staged_backend, monkeypatch): backend, source, output, destination, _ = staged_backend - monkeypatch.setattr("pt_snap_cli.core.snapshot_import_backend.os.write", lambda *args: 0) + monkeypatch.setattr( + "pt_snap_cli.core.importing.snapshot_import_backend.os.write", lambda *args: 0 + ) with pytest.raises(ImportExecutionError, match="backup"): backend.dump_to_db(source, output, post_publish=lambda path: None) assert destination.read_bytes() == b"previous database" diff --git a/tests/core/test_import_errors.py b/tests/core/test_import_errors.py index c3a16a9..9f949e4 100644 --- a/tests/core/test_import_errors.py +++ b/tests/core/test_import_errors.py @@ -2,7 +2,7 @@ from __future__ import annotations -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.common.errors import ( ImportExecutionError, ImportToolMissingError, PtSnapCoreError, diff --git a/tests/core/test_import_metadata.py b/tests/core/test_import_metadata.py index 3a1f0fc..331ec0d 100644 --- a/tests/core/test_import_metadata.py +++ b/tests/core/test_import_metadata.py @@ -7,12 +7,12 @@ import pytest -from pt_snap_cli.core.import_metadata import ( +from pt_snap_cli.core.common.models import ImportMetadata +from pt_snap_cli.core.importing.import_metadata import ( IMPORT_FORMAT_VERSION, METADATA_SCHEMA_VERSION, ImportMetadataService, ) -from pt_snap_cli.core.models import ImportMetadata def _create_snapshot_db(path: Path) -> Path: @@ -72,7 +72,7 @@ def test_write_and_inspect_metadata(tmp_path: Path) -> None: def test_write_closes_database_connection(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None: from unittest.mock import MagicMock - import pt_snap_cli.core.import_metadata as metadata_module + import pt_snap_cli.core.importing.import_metadata as metadata_module db_path = _create_snapshot_db(tmp_path / "snapshot.db") connection = sqlite3.connect(db_path) @@ -259,7 +259,7 @@ def test_force_missing_database_reports_database_missing(tmp_path: Path) -> None def test_import_format_change_invalidates_cache( monkeypatch: pytest.MonkeyPatch, tmp_path: Path ) -> None: - import pt_snap_cli.core.import_metadata as metadata_module + import pt_snap_cli.core.importing.import_metadata as metadata_module db_path = _create_snapshot_db(tmp_path / "snapshot.db") service = ImportMetadataService() diff --git a/tests/core/test_import_metadata_properties.py b/tests/core/test_import_metadata_properties.py index e904918..6dc52ea 100644 --- a/tests/core/test_import_metadata_properties.py +++ b/tests/core/test_import_metadata_properties.py @@ -17,12 +17,12 @@ from hypothesis import given, settings from hypothesis import strategies as st -from pt_snap_cli.core.import_metadata import ( +from pt_snap_cli.core.importing.import_metadata import ( IMPORT_FORMAT_VERSION, METADATA_SCHEMA_VERSION, ImportMetadataService, ) -from pt_snap_cli.core.import_metadata_contract import metadata_from_mapping +from pt_snap_cli.core.importing.import_metadata_contract import metadata_from_mapping PROPERTY_SETTINGS = settings( max_examples=35, derandomize=True, database=None, deadline=None, print_blob=True diff --git a/tests/core/test_import_models.py b/tests/core/test_import_models.py index 6f1c7ef..621ab54 100644 --- a/tests/core/test_import_models.py +++ b/tests/core/test_import_models.py @@ -5,8 +5,11 @@ import dataclasses from pathlib import Path -from pt_snap_cli.core.import_metadata import IMPORT_FORMAT_VERSION, METADATA_SCHEMA_VERSION -from pt_snap_cli.core.models import ImportMetadata, ImportOptions, ImportResult +from pt_snap_cli.core.common.models import ImportMetadata, ImportOptions, ImportResult +from pt_snap_cli.core.importing.import_metadata import ( + IMPORT_FORMAT_VERSION, + METADATA_SCHEMA_VERSION, +) def _metadata() -> ImportMetadata: diff --git a/tests/core/test_import_service.py b/tests/core/test_import_service.py index 80bd173..02701b9 100644 --- a/tests/core/test_import_service.py +++ b/tests/core/test_import_service.py @@ -10,13 +10,13 @@ from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.context import Context -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.common.errors import ( ImportExecutionError, ImportToolMissingError, InvalidDeviceError, SnapshotFileInvalidError, ) -from pt_snap_cli.core.models import ImportOptions +from pt_snap_cli.core.common.models import ImportOptions from tests.snapshot.test_file_util import UNSAFE_PICKLE_PAYLOAD, write_unsafe_reduce_pickle FIXTURE_DIR = Path(__file__).parents[1] / "fixtures" / "snapshots" @@ -36,7 +36,7 @@ def isolate_focus_state( def _import_service_type(): - from pt_snap_cli.core.import_service import ImportService + from pt_snap_cli.core.importing.import_service import ImportService return ImportService @@ -166,7 +166,9 @@ def test_import_replaces_destination_errors_are_wrapped( def fail_replace(*args: object) -> None: raise OSError("cannot replace") - monkeypatch.setattr("pt_snap_cli.core.snapshot_import_backend.os.replace", fail_replace) + monkeypatch.setattr( + "pt_snap_cli.core.importing.snapshot_import_backend.os.replace", fail_replace + ) with pytest.raises(ImportExecutionError, match="cannot replace"): service.import_snapshot( @@ -175,11 +177,11 @@ def fail_replace(*args: object) -> None: def test_snapshot_import_backend_lazy_loads_exact_runtime_module() -> None: - sys.modules.pop("pt_snap_cli.core.snapshot_import_backend", None) + sys.modules.pop("pt_snap_cli.core.importing.snapshot_import_backend", None) runtime_module = "pt_snap_cli.snapshot.tools.adaptors.snapshot2db" sys.modules.pop(runtime_module, None) - importlib.import_module("pt_snap_cli.core.snapshot_import_backend") + importlib.import_module("pt_snap_cli.core.importing.snapshot_import_backend") assert runtime_module not in sys.modules @@ -402,7 +404,7 @@ def test_legacy_database_rebuilds_once_then_reuses(tmp_path: Path) -> None: def test_metadata_write_failure_preserves_existing_database( monkeypatch: pytest.MonkeyPatch, tmp_path: Path ) -> None: - from pt_snap_cli.core.errors import ImportMetadataError + from pt_snap_cli.core.common.errors import ImportMetadataError import_service_cls = _import_service_type() service = import_service_cls() @@ -431,7 +433,7 @@ def fail_write(*args: object, **kwargs: object) -> None: def test_initial_hash_failure_preserves_existing_database( monkeypatch: pytest.MonkeyPatch, tmp_path: Path ) -> None: - from pt_snap_cli.core.errors import ImportMetadataError + from pt_snap_cli.core.common.errors import ImportMetadataError import_service_cls = _import_service_type() service = import_service_cls() @@ -461,7 +463,7 @@ def test_initial_hash_failure_preserves_existing_database( def test_import_format_change_rebuilds_database( monkeypatch: pytest.MonkeyPatch, tmp_path: Path ) -> None: - import pt_snap_cli.core.import_metadata as metadata_module + import pt_snap_cli.core.importing.import_metadata as metadata_module import_service_cls = _import_service_type() service = import_service_cls() @@ -511,7 +513,7 @@ def test_device_change_rebuilds_database(tmp_path: Path) -> None: def test_source_change_during_import_preserves_existing_database( monkeypatch: pytest.MonkeyPatch, tmp_path: Path ) -> None: - from pt_snap_cli.core.errors import SourceChangedError + from pt_snap_cli.core.common.errors import SourceChangedError import_service_cls = _import_service_type() service = import_service_cls() @@ -554,7 +556,7 @@ def test_focus_failure_after_publish_restores_existing_database( def fail_focus_write(*args: object, **kwargs: object) -> Path: raise OSError("focus write failed") - from pt_snap_cli.core.focus_service import FocusService + from pt_snap_cli.core.analysis.focus_service import FocusService focus_service = FocusService() monkeypatch.setattr(focus_service._config, "write_project_focus", fail_focus_write) @@ -578,7 +580,7 @@ def test_focus_failure_after_first_publish_removes_database( monkeypatch: pytest.MonkeyPatch, tmp_path: Path, ) -> None: - from pt_snap_cli.core.focus_service import FocusService + from pt_snap_cli.core.analysis.focus_service import FocusService import_service_cls = _import_service_type() focus_service = FocusService() @@ -609,7 +611,7 @@ def test_focus_transaction_falls_back_when_hard_links_are_unavailable( ImportOptions(snapshot_file=EMPTY_CACHE_SNAPSHOT, output_dir=tmp_path, set_focus=False) ) monkeypatch.setattr( - "pt_snap_cli.core.snapshot_import_backend.os.link", + "pt_snap_cli.core.importing.snapshot_import_backend.os.link", lambda *args: (_ for _ in ()).throw(OSError("hard links unavailable")), ) @@ -625,7 +627,7 @@ def test_focus_transaction_falls_back_when_hard_links_are_unavailable( def test_invalid_focus_device_is_normalized_as_import_error( monkeypatch: pytest.MonkeyPatch, tmp_path: Path ) -> None: - from pt_snap_cli.core.focus_service import FocusService + from pt_snap_cli.core.analysis.focus_service import FocusService focus_service = FocusService() monkeypatch.setattr( @@ -647,7 +649,7 @@ def test_rollback_backup_writes_through_secure_mkstemp_fd( import os import tempfile - import pt_snap_cli.core.snapshot_import_backend as backend_module + import pt_snap_cli.core.importing.snapshot_import_backend as backend_module import_service_cls = _import_service_type() service = import_service_cls() @@ -688,7 +690,7 @@ def racing_mkstemp(*args, **kwargs): def fail_focus_write(*args, **kwargs): raise OSError("focus write failed") - from pt_snap_cli.core.focus_service import FocusService + from pt_snap_cli.core.analysis.focus_service import FocusService focus_service = FocusService() monkeypatch.setattr(focus_service._config, "write_project_focus", fail_focus_write) diff --git a/tests/core/test_import_validation_receipts.py b/tests/core/test_import_validation_receipts.py index 3f65ff0..c1fdbfd 100644 --- a/tests/core/test_import_validation_receipts.py +++ b/tests/core/test_import_validation_receipts.py @@ -9,10 +9,15 @@ import pytest -from pt_snap_cli.core import dataset_resolver, import_service -from pt_snap_cli.core.errors import ImportExecutionError, QueryTimeoutError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.validation_receipts import import_receipts, load_receipt, save_receipt +from pt_snap_cli.core.common.errors import ImportExecutionError, QueryTimeoutError +from pt_snap_cli.core.dataset import dataset_resolver +from pt_snap_cli.core.importing import import_service +from pt_snap_cli.core.importing.import_service import ImportService +from pt_snap_cli.core.importing.validation_receipts import ( + import_receipts, + load_receipt, + save_receipt, +) from tests.core.test_dataset_validation_cache import CancellableBudget from tests.core.test_msinsight_export import options diff --git a/tests/core/test_json_codec.py b/tests/core/test_json_codec.py index 5b8bda2..be31211 100644 --- a/tests/core/test_json_codec.py +++ b/tests/core/test_json_codec.py @@ -5,13 +5,13 @@ import pytest -from pt_snap_cli.core.json_codec import ( +from pt_snap_cli.core.common.json_codec import ( JSON_SCHEMA_VERSION, json_error, json_success, to_jsonable, ) -from pt_snap_cli.core.models import FocusState, ImportMetadata, ImportResult +from pt_snap_cli.core.common.models import FocusState, ImportMetadata, ImportResult def test_to_jsonable_converts_paths_and_nested_models(tmp_path: Path) -> None: diff --git a/tests/core/test_latest_query.py b/tests/core/test_latest_query.py index 71a842c..688fd2e 100644 --- a/tests/core/test_latest_query.py +++ b/tests/core/test_latest_query.py @@ -9,11 +9,11 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.errors import QueryCancelledError, QueryTimeoutError -from pt_snap_cli.core.latest_query import LatestQuery -from pt_snap_cli.core.query_service import QueryService -from pt_snap_cli.core.validation_budget import validation_progress +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.common.errors import QueryCancelledError, QueryTimeoutError +from pt_snap_cli.core.common.latest_query import LatestQuery +from pt_snap_cli.core.common.validation_budget import validation_progress +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget from pt_snap_cli.query.config import QueryParameter, QueryTemplate from pt_snap_cli.query.executor import QueryExecutor @@ -21,7 +21,7 @@ @pytest.mark.parametrize("supplied_budget", [False, True]) def test_queued_tree_timeout_includes_wait_and_does_not_start_worker(monkeypatch, supplied_budget): now = [100.0] - monkeypatch.setattr("pt_snap_cli.core.query_service.time.monotonic", lambda: now[0]) + monkeypatch.setattr("pt_snap_cli.core.analysis.query_service.time.monotonic", lambda: now[0]) waiting = Event() work = Lock() work.acquire() diff --git a/tests/core/test_lightweight_compatible_import.py b/tests/core/test_lightweight_compatible_import.py index 535b9ba..a94b0ec 100644 --- a/tests/core/test_lightweight_compatible_import.py +++ b/tests/core/test_lightweight_compatible_import.py @@ -10,9 +10,10 @@ from typer.testing import CliRunner from pt_snap_cli.cli import app -from pt_snap_cli.core import dataset_resolver, import_service -from pt_snap_cli.core.errors import ImportExecutionError -from pt_snap_cli.core.import_service import ImportService +from pt_snap_cli.core.common.errors import ImportExecutionError +from pt_snap_cli.core.dataset import dataset_resolver +from pt_snap_cli.core.importing import import_service +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.test_msinsight_export import options diff --git a/tests/core/test_msinsight_export.py b/tests/core/test_msinsight_export.py index 54764f5..5bdb9a6 100644 --- a/tests/core/test_msinsight_export.py +++ b/tests/core/test_msinsight_export.py @@ -13,7 +13,10 @@ from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.cli import _safe_call, app -from pt_snap_cli.core.dataset_contract import ( +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.common.errors import ImportExecutionError, SourceChangedError +from pt_snap_cli.core.common.models import ImportOptions +from pt_snap_cli.core.dataset.dataset_contract import ( ACTION_NAMES, BLOCK_COLUMNS, BLOCK_STATES, @@ -22,11 +25,8 @@ TRACE_COLUMNS, validate_dataset, ) -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.errors import ImportExecutionError, SourceChangedError -from pt_snap_cli.core.focus_service import FocusService -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.models import ImportOptions +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.test_dataset_import import hashes from tests.snapshot.test_sharded_replay import lifecycle_data, write_source @@ -295,8 +295,8 @@ def test_external_insight_artifact_reuses_without_claiming_metadata( def test_queries_validate_semantics_but_cache_import_does_not_scan( tmp_path, monkeypatch, sealed, external, set_focus, slice_index, mutation, diagnostic ): - from pt_snap_cli.core.errors import DatabaseSchemaError - from pt_snap_cli.core.snapshot_cache import seal_manifest, validate_cache + from pt_snap_cli.core.cache.snapshot_cache import seal_manifest, validate_cache + from pt_snap_cli.core.common.errors import DatabaseSchemaError request = options(tmp_path, focus=False) service = ImportService() @@ -380,7 +380,7 @@ def test_external_cache_cli_failure_preserves_artifact_and_focus(tmp_path, monke focus.write_bytes(b'{"db_path":"/previous/project.db","device_id":0}') focus_before = focus.read_bytes() monkeypatch.setattr( - "pt_snap_cli.core.msinsight_export.MsinsightImportBackend.dump_to_dataset", + "pt_snap_cli.core.importing.msinsight_export.MsinsightImportBackend.dump_to_dataset", lambda *a, **k: pytest.fail("rejected external cache must not replay or publish"), ) args = [ @@ -428,7 +428,7 @@ def test_invalid_compatible_cache_is_preserved(tmp_path, monkeypatch, external): def test_owned_cache_inspection_normalizes_deep_json(tmp_path): - from pt_snap_cli.core.msinsight_export import inspect_owned_cache + from pt_snap_cli.core.importing.msinsight_export import inspect_owned_cache (tmp_path / "manifest.json").write_text("[" * 200000 + "0" + "]" * 200000) with pytest.raises(ValueError, match="nesting"): @@ -436,8 +436,8 @@ def test_owned_cache_inspection_normalizes_deep_json(tmp_path): def test_query_and_metadata_reject_deep_manifest_without_traceback(tmp_path): - from pt_snap_cli.core.errors import DatabaseSchemaError - from pt_snap_cli.core.import_metadata import ImportMetadataService + from pt_snap_cli.core.common.errors import DatabaseSchemaError + from pt_snap_cli.core.importing.import_metadata import ImportMetadataService result = ImportService().import_snapshot(options(tmp_path, focus=False)) path = result.db_path / "manifest.json" @@ -721,11 +721,11 @@ def fail(*a, **k): raise OSError("injected " + phase) if phase == "conversion": - monkeypatch.setattr("pt_snap_cli.core.import_service.convert_shards", fail) + monkeypatch.setattr("pt_snap_cli.core.importing.import_service.convert_shards", fail) elif phase == "metadata": monkeypatch.setattr(service._metadata_service, "write", fail) elif phase == "validation": - monkeypatch.setattr("pt_snap_cli.core.import_service.inspect_owned_cache", fail) + monkeypatch.setattr("pt_snap_cli.core.importing.import_service.inspect_owned_cache", fail) elif phase == "source": monkeypatch.setattr( service, diff --git a/tests/core/test_msinsight_export_validation.py b/tests/core/test_msinsight_export_validation.py index 2d63f1b..c60bf48 100644 --- a/tests/core/test_msinsight_export_validation.py +++ b/tests/core/test_msinsight_export_validation.py @@ -5,9 +5,9 @@ import pytest -from pt_snap_cli.core.dataset_contract import DatasetContractError -from pt_snap_cli.core.msinsight_export import _validate_shards, convert_shards -from pt_snap_cli.core.sharded_replay_service import ShardedReplayResult +from pt_snap_cli.core.dataset.dataset_contract import DatasetContractError +from pt_snap_cli.core.importing.msinsight_export import _validate_shards, convert_shards +from pt_snap_cli.core.splitting.sharded_replay_service import ShardedReplayResult from pt_snap_cli.snapshot.tools.adaptors.sharded_replay import ReplaySlice from tests.core.test_dataset_import import hashes diff --git a/tests/core/test_ordered_frame_integrity.py b/tests/core/test_ordered_frame_integrity.py index 55e1b53..de8c0d5 100644 --- a/tests/core/test_ordered_frame_integrity.py +++ b/tests/core/test_ordered_frame_integrity.py @@ -10,10 +10,10 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core import import_service -from pt_snap_cli.core.errors import ImportExecutionError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.models import ImportOptions +from pt_snap_cli.core.common.errors import ImportExecutionError +from pt_snap_cli.core.common.models import ImportOptions +from pt_snap_cli.core.importing import import_service +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.test_dataset_import import hashes from tests.core.test_msinsight_export import options from tests.snapshot.test_sharded_replay import lifecycle_data, write_source diff --git a/tests/core/test_overview_service.py b/tests/core/test_overview_service.py index 93b5517..d6274d5 100644 --- a/tests/core/test_overview_service.py +++ b/tests/core/test_overview_service.py @@ -5,7 +5,7 @@ import pytest from pt_snap_cli.core import DatabaseSchemaError, FocusNotConfiguredError, OverviewService -from pt_snap_cli.core.import_metadata import ImportMetadataService +from pt_snap_cli.core.importing.import_metadata import ImportMetadataService pytestmark = pytest.mark.usefixtures("owned_service_instances") diff --git a/tests/core/test_query_error_wrapping.py b/tests/core/test_query_error_wrapping.py index a9f5124..66fe022 100644 --- a/tests/core/test_query_error_wrapping.py +++ b/tests/core/test_query_error_wrapping.py @@ -6,13 +6,13 @@ import pytest -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_lifecycle_connection import _AttachedSources -from pt_snap_cli.core.dataset_lifecycle_scratch import scratch_lifecycles -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver, QueryBudget -from pt_snap_cli.core.errors import QueryExecutionError -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver, QueryBudget +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_connection import _AttachedSources +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_scratch import scratch_lifecycles from tests.test_dataset_focus import make_dataset diff --git a/tests/core/test_query_limits.py b/tests/core/test_query_limits.py index a326d9b..b23eae7 100644 --- a/tests/core/test_query_limits.py +++ b/tests/core/test_query_limits.py @@ -7,9 +7,13 @@ import pytest from pt_snap_cli.core import QueryLimits, QueryService, ReportService -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.errors import InvalidParameterError, QueryExecutionError, QueryTimeoutError -from pt_snap_cli.core.query_limits import resolve_query_limits +from pt_snap_cli.core.common.errors import ( + InvalidParameterError, + QueryExecutionError, + QueryTimeoutError, +) +from pt_snap_cli.core.common.query_limits import resolve_query_limits +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget from tests.core.test_dataset_attribution import case from tests.core.test_dataset_lifecycle_scratch import limited_connections, many_owners from tests.core.test_dataset_sql_pushdown import large_dataset diff --git a/tests/core/test_report_content_integrity.py b/tests/core/test_report_content_integrity.py index 5c5e8cc..2819804 100644 --- a/tests/core/test_report_content_integrity.py +++ b/tests/core/test_report_content_integrity.py @@ -13,12 +13,12 @@ import pytest -from pt_snap_cli.core import dataset_resolver as resolver -from pt_snap_cli.core import native_dataset_contract as native -from pt_snap_cli.core import query_service as queries -from pt_snap_cli.core.dataset_files import hash_file -from pt_snap_cli.core.errors import DatabaseSchemaError, QueryTimeoutError -from pt_snap_cli.core.report_service import ReportService +from pt_snap_cli.core.analysis import query_service as queries +from pt_snap_cli.core.analysis.report_service import ReportService +from pt_snap_cli.core.common.errors import DatabaseSchemaError, QueryTimeoutError +from pt_snap_cli.core.dataset import dataset_resolver as resolver +from pt_snap_cli.core.dataset import native_dataset_contract as native +from pt_snap_cli.core.dataset.dataset_files import hash_file from tests.test_dataset_focus import make_dataset from tests.test_native_dataset import dataset as native_dataset diff --git a/tests/core/test_report_reuse.py b/tests/core/test_report_reuse.py index 0773a32..74eab50 100644 --- a/tests/core/test_report_reuse.py +++ b/tests/core/test_report_reuse.py @@ -7,14 +7,18 @@ import pytest -import pt_snap_cli.core.query_service as query_service_module -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.errors import DatabaseSchemaError, QueryExecutionError, QueryTimeoutError -from pt_snap_cli.core.focus_service import FocusService -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.query_service import QueryService -from pt_snap_cli.core.report_service import ReportService +import pt_snap_cli.core.analysis.query_service as query_service_module +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.analysis.report_service import ReportService +from pt_snap_cli.core.common.errors import ( + DatabaseSchemaError, + QueryExecutionError, + QueryTimeoutError, +) +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.test_dataset_attribution import case from tests.core.test_dataset_import import source_options from tests.test_dataset_focus import make_dataset diff --git a/tests/core/test_report_service.py b/tests/core/test_report_service.py index e692970..dcb3b58 100644 --- a/tests/core/test_report_service.py +++ b/tests/core/test_report_service.py @@ -6,8 +6,8 @@ import pytest -from pt_snap_cli.core.query_service import QueryService -from pt_snap_cli.core.report_service import ReportService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.analysis.report_service import ReportService from pt_snap_cli.query.registry import QueryRegistry, _load_all_templates pytestmark = pytest.mark.usefixtures("owned_service_instances") diff --git a/tests/core/test_sharded_replay_service.py b/tests/core/test_sharded_replay_service.py index 3965f9b..e890840 100644 --- a/tests/core/test_sharded_replay_service.py +++ b/tests/core/test_sharded_replay_service.py @@ -2,8 +2,8 @@ import pytest -from pt_snap_cli.core import sharded_replay_service -from pt_snap_cli.core.sharded_replay_service import ShardedReplayService +from pt_snap_cli.core.splitting import sharded_replay_service +from pt_snap_cli.core.splitting.sharded_replay_service import ShardedReplayService from pt_snap_cli.snapshot.tools.adaptors import sharded_replay from ..snapshot.test_sharded_replay import lifecycle_data, write_source diff --git a/tests/core/test_skill_service.py b/tests/core/test_skill_service.py index 445c987..b80c799 100644 --- a/tests/core/test_skill_service.py +++ b/tests/core/test_skill_service.py @@ -4,18 +4,18 @@ import pytest -from pt_snap_cli.core.errors import ( - InvalidSkillTargetError, - SkillCatalogError, - SkillInstallError, - SkillNotFoundError, -) -from pt_snap_cli.core.skill_service import ( +from pt_snap_cli.core.analysis.skill_service import ( SkillService, default_catalog_dir, human_skill_summary, skill_dir_digest, ) +from pt_snap_cli.core.common.errors import ( + InvalidSkillTargetError, + SkillCatalogError, + SkillInstallError, + SkillNotFoundError, +) def _write_skill(root: Path, name: str, description: str, body: str = "body\n") -> Path: diff --git a/tests/core/test_snapshot_cache.py b/tests/core/test_snapshot_cache.py index 850621e..5bd320b 100644 --- a/tests/core/test_snapshot_cache.py +++ b/tests/core/test_snapshot_cache.py @@ -8,7 +8,7 @@ from contextlib import closing from pathlib import Path -from pt_snap_cli.core.snapshot_cache import ( +from pt_snap_cli.core.cache.snapshot_cache import ( seal_manifest, source_hashes, validate_cache, @@ -66,7 +66,7 @@ def save(self): (self.directory / "manifest.json").write_text(json.dumps(self.manifest), encoding="utf-8") def test_readonly_transport_observes_writer_started_after_uri_creation(self): - from pt_snap_cli.core.dataset_files import member_is_immutable, readonly_member_uri + from pt_snap_cli.core.dataset.dataset_files import member_is_immutable, readonly_member_uri uri = readonly_member_uri(self.db) self.assertNotIn("immutable=1", uri) @@ -81,7 +81,7 @@ def test_readonly_transport_observes_writer_started_after_uri_creation(self): def test_consumer_write_after_sidecar_check_is_allowed(self): from unittest.mock import patch - from pt_snap_cli.core import snapshot_cache + from pt_snap_cli.core.cache import snapshot_cache connect = sqlite3.connect writers = [] @@ -231,7 +231,7 @@ def test_duplicate_json_keys_are_rejected(self): def test_manifest_changed_during_validation_is_rejected(self): from unittest.mock import patch - from pt_snap_cli.core import snapshot_cache + from pt_snap_cli.core.cache import snapshot_cache original = snapshot_cache.parser_members diff --git a/tests/core/test_snapshot_validation_properties.py b/tests/core/test_snapshot_validation_properties.py index 175f616..c1183c1 100644 --- a/tests/core/test_snapshot_validation_properties.py +++ b/tests/core/test_snapshot_validation_properties.py @@ -17,8 +17,8 @@ from hypothesis import given, settings from hypothesis import strategies as st -from pt_snap_cli.core.errors import ImportExecutionError -from pt_snap_cli.core.snapshot_import_backend import SnapshotImportBackend +from pt_snap_cli.core.common.errors import ImportExecutionError +from pt_snap_cli.core.importing.snapshot_import_backend import SnapshotImportBackend PROPERTY_SETTINGS = settings( max_examples=25, derandomize=True, database=None, deadline=None, print_blob=True diff --git a/tests/core/test_split_service.py b/tests/core/test_split_service.py index 44c85d2..50302cb 100644 --- a/tests/core/test_split_service.py +++ b/tests/core/test_split_service.py @@ -9,11 +9,11 @@ import pytest -import pt_snap_cli.core.split_service as split_module +import pt_snap_cli.core.splitting.split_service as split_module from pt_snap_cli.core import SplitResult as ExportedSplitResult -from pt_snap_cli.core.errors import SplitError -from pt_snap_cli.core.models import SplitOptions -from pt_snap_cli.core.split_service import SplitService +from pt_snap_cli.core.common.errors import SplitError +from pt_snap_cli.core.common.models import SplitOptions +from pt_snap_cli.core.splitting.split_service import SplitService from pt_snap_cli.snapshot.representation import ( canonical_snapshot_bytes, canonical_snapshot_sha256, @@ -327,7 +327,9 @@ def unexpected_engine(*args: object, **kwargs: object) -> None: nonlocal called called = True - monkeypatch.setattr("pt_snap_cli.core.split_service.replay_snapshot", unexpected_engine) + monkeypatch.setattr( + "pt_snap_cli.core.splitting.split_service.replay_snapshot", unexpected_engine + ) with pytest.raises(SplitError, match=phase): SplitService().split(_options(tmp_path, **changes)) assert not called @@ -369,7 +371,7 @@ def unexpected_load(*args: object, **kwargs: object) -> None: called = True monkeypatch.setattr( - "pt_snap_cli.core.split_service.load_snapshot_representation", unexpected_load + "pt_snap_cli.core.splitting.split_service.load_snapshot_representation", unexpected_load ) for options in cases: with pytest.raises(SplitError): @@ -496,7 +498,7 @@ def test_engine_failure_is_mapped_and_cleans_owned_stage( def fail_engine(*args: object, **kwargs: object) -> None: raise RuntimeError("engine failed") - monkeypatch.setattr("pt_snap_cli.core.split_service.replay_snapshot", fail_engine) + monkeypatch.setattr("pt_snap_cli.core.splitting.split_service.replay_snapshot", fail_engine) with pytest.raises(SplitError, match="load/engine"): SplitService().split(_options(tmp_path, device=0)) assert not (tmp_path / "split").exists() @@ -533,7 +535,7 @@ def test_cleanup_failure_never_masks_primary_error( ) -> None: if failure == "engine": monkeypatch.setattr( - "pt_snap_cli.core.split_service.replay_snapshot", + "pt_snap_cli.core.splitting.split_service.replay_snapshot", lambda *args, **kwargs: (_ for _ in ()).throw(RuntimeError(detail)), ) elif failure == "generated": @@ -562,7 +564,9 @@ def fail_stage_cleanup(path: Path, *args: object, **kwargs: object) -> None: raise OSError("cleanup secondary") real_rmtree(path, *args, **kwargs) # type: ignore[arg-type] - monkeypatch.setattr("pt_snap_cli.core.split_service.shutil.rmtree", fail_stage_cleanup) + monkeypatch.setattr( + "pt_snap_cli.core.splitting.split_service.shutil.rmtree", fail_stage_cleanup + ) with pytest.raises(SplitError) as caught: SplitService().split(_options(tmp_path, device=0)) assert caught.value.phase == phase diff --git a/tests/core/wheel_scale_acceptance.py b/tests/core/wheel_scale_acceptance.py index 4313f14..34b6f50 100644 --- a/tests/core/wheel_scale_acceptance.py +++ b/tests/core/wheel_scale_acceptance.py @@ -21,7 +21,7 @@ from dataclasses import asdict from pathlib import Path import pt_snap_cli, typer, yaml, jinja2 -from pt_snap_cli.core.query_limits import QueryLimits +from pt_snap_cli.core.common.query_limits import QueryLimits print(json.dumps({ "python": sys.version, "executable": sys.executable, "prefix": sys.prefix, "base_prefix": sys.base_prefix, @@ -41,8 +41,8 @@ import json, sys from dataclasses import asdict from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core.error_codes import classify_error -from pt_snap_cli.core.report_service import ReportService +from pt_snap_cli.core.common.error_codes import classify_error +from pt_snap_cli.core.analysis.report_service import ReportService root, cases_file, event = sys.argv[1], sys.argv[2], int(sys.argv[3]) results, errors = {}, {} with SnapshotAnalyzer(root) as analyzer: diff --git a/tests/dataset_cli_resource_probe.py b/tests/dataset_cli_resource_probe.py index d359aa9..31015a5 100644 --- a/tests/dataset_cli_resource_probe.py +++ b/tests/dataset_cli_resource_probe.py @@ -13,8 +13,8 @@ from pathlib import Path, PurePath from pt_snap_cli.cli import _safe_call -from pt_snap_cli.core import dataset_files, dataset_resolver, native_dataset_contract -from pt_snap_cli.core import query_service as queries +from pt_snap_cli.core.analysis import query_service as queries +from pt_snap_cli.core.dataset import dataset_files, dataset_resolver, native_dataset_contract def relative_evidence_path(path: PurePath, root: PurePath) -> str: diff --git a/tests/dataset_concurrency_support.py b/tests/dataset_concurrency_support.py index 5cbf969..f38771e 100644 --- a/tests/dataset_concurrency_support.py +++ b/tests/dataset_concurrency_support.py @@ -13,9 +13,9 @@ from unittest.mock import patch from pt_snap_cli.api import QueryLimits, SnapshotAnalyzer -from pt_snap_cli.core import dataset_lifecycle_scratch as scratch -from pt_snap_cli.core import dataset_lifecycle_sql as sql -from pt_snap_cli.core.dataset_lifecycle_connection import _AttachedSources +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_scratch as scratch +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql as sql +from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_connection import _AttachedSources WAIT_SECONDS = 30 QUERY_PARAMS = {"order_by": "id", "order_dir": "ASC", "limit": -1} diff --git a/tests/dataset_failure_support.py b/tests/dataset_failure_support.py index e6c215c..24cb472 100644 --- a/tests/dataset_failure_support.py +++ b/tests/dataset_failure_support.py @@ -158,9 +158,9 @@ def run_cli(tmp_path, args, env=None, fault=None, evidence=None): @contextmanager def fault_hooks(kind, evidence): """Fault real execution boundaries; never fabricate rows or query results.""" - from pt_snap_cli.core import dataset_lifecycle_scratch as scratch - from pt_snap_cli.core import dataset_lifecycle_sql as sql - from pt_snap_cli.core.dataset_lifecycle_connection import _AttachedSources + from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_scratch as scratch + from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql as sql + from pt_snap_cli.core.dataset.lifecycle.dataset_lifecycle_connection import _AttachedSources connections, directories = [], [] events = [] diff --git a/tests/query/test_callstack_schema_compat.py b/tests/query/test_callstack_schema_compat.py index 7280feb..793b14a 100644 --- a/tests/query/test_callstack_schema_compat.py +++ b/tests/query/test_callstack_schema_compat.py @@ -10,7 +10,7 @@ import pytest from pt_snap_cli.context import Context -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService from pt_snap_cli.query.config import QueryTemplate from pt_snap_cli.query.executor import QueryExecutionError, QueryExecutor from pt_snap_cli.query.registry import QueryRegistry, _load_all_templates, get_query diff --git a/tests/query/test_frame_tree.py b/tests/query/test_frame_tree.py index e10b4de..87c463b 100644 --- a/tests/query/test_frame_tree.py +++ b/tests/query/test_frame_tree.py @@ -5,8 +5,8 @@ import pytest -from pt_snap_cli.core.errors import QueryExecutionError -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.common.errors import QueryExecutionError from tests.frame_tree_helpers import create_frame_tree_db @@ -185,7 +185,7 @@ def test_inline_text_database_retains_queries_but_cannot_supply_original_frames( @pytest.mark.parametrize("name", ["event_frames"]) @pytest.mark.parametrize("slice_index", [None, 0]) def test_dataset_root_never_implicitly_selects_a_shard(tmp_path: Path, name: str, slice_index): - from pt_snap_cli.core.dataset_support import DATASET_SUPPORT + from pt_snap_cli.core.dataset.dataset_support import DATASET_SUPPORT from tests.test_dataset_focus import hashes, make_dataset root = make_dataset(tmp_path / "dataset") diff --git a/tests/query/test_memory_peak_cte.py b/tests/query/test_memory_peak_cte.py index a0165bf..353e61a 100644 --- a/tests/query/test_memory_peak_cte.py +++ b/tests/query/test_memory_peak_cte.py @@ -202,7 +202,7 @@ def test_memory_peak_null_start_and_end_runs_via_query_service( the QueryService -> QueryExecutor pipeline used by the CLI and SnapshotAnalyzer.""" from pt_snap_cli.config import Config - from pt_snap_cli.core.query_service import QueryService + from pt_snap_cli.core.analysis.query_service import QueryService config = Config() config.write_project_focus(memory_peak_db, device_id=0) diff --git a/tests/query/test_pagination_properties.py b/tests/query/test_pagination_properties.py index b712a9c..d37a194 100644 --- a/tests/query/test_pagination_properties.py +++ b/tests/query/test_pagination_properties.py @@ -17,8 +17,8 @@ from hypothesis import example, given, settings from hypothesis import strategies as st -from pt_snap_cli.core.query_limits import QueryLimits -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.common.query_limits import QueryLimits from pt_snap_cli.query import registry from pt_snap_cli.query.config import QueryConfig diff --git a/tests/query/test_query_completeness.py b/tests/query/test_query_completeness.py index e98c1aa..40d7a23 100644 --- a/tests/query/test_query_completeness.py +++ b/tests/query/test_query_completeness.py @@ -16,8 +16,12 @@ from pt_snap_cli.cli import app from pt_snap_cli.config import Config from pt_snap_cli.context import Context -from pt_snap_cli.core.errors import InvalidParameterError, QueryTimeoutError -from pt_snap_cli.core.query_service import QUERY_TIMEOUT_ENV, QueryService, resolve_query_timeout +from pt_snap_cli.core.analysis.query_service import ( + QUERY_TIMEOUT_ENV, + QueryService, + resolve_query_timeout, +) +from pt_snap_cli.core.common.errors import InvalidParameterError, QueryTimeoutError from pt_snap_cli.query.config import QueryParameter, QueryTemplate from pt_snap_cli.query.executor import ( QueryExecutor, diff --git a/tests/query/test_query_max_rows_pushdown.py b/tests/query/test_query_max_rows_pushdown.py index 3230b77..a2d09ee 100644 --- a/tests/query/test_query_max_rows_pushdown.py +++ b/tests/query/test_query_max_rows_pushdown.py @@ -15,7 +15,7 @@ from pt_snap_cli.config import Config from pt_snap_cli.context import Context -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.query_service import QueryService from pt_snap_cli.query.executor import QueryExecutor from pt_snap_cli.query.registry import QueryRegistry, _load_all_templates diff --git a/tests/query/test_stack_summary.py b/tests/query/test_stack_summary.py index 60b36fc..153ac8a 100644 --- a/tests/query/test_stack_summary.py +++ b/tests/query/test_stack_summary.py @@ -12,8 +12,8 @@ from typer.testing import CliRunner from pt_snap_cli.cli import app -from pt_snap_cli.core.query_service import QueryService -from pt_snap_cli.core.report_service import ReportService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.analysis.report_service import ReportService from pt_snap_cli.query.registry import QueryRegistry, _load_all_templates LONG_STACK = '训练.py:12 forward("模型🚀")\n' * 800 diff --git a/tests/skills/test_preflight_contract.py b/tests/skills/test_preflight_contract.py index a60b073..a8c36b4 100644 --- a/tests/skills/test_preflight_contract.py +++ b/tests/skills/test_preflight_contract.py @@ -11,7 +11,7 @@ from typer.testing import CliRunner from pt_snap_cli.cli import app -from pt_snap_cli.core.import_metadata import ImportMetadataService +from pt_snap_cli.core.importing.import_metadata import ImportMetadataService from pt_snap_cli.query import registry ROOT = Path(__file__).resolve().parents[2] diff --git a/tests/snapshot/test_sharded_replay.py b/tests/snapshot/test_sharded_replay.py index f836f43..7bcd44e 100644 --- a/tests/snapshot/test_sharded_replay.py +++ b/tests/snapshot/test_sharded_replay.py @@ -6,7 +6,7 @@ import pytest -from pt_snap_cli.core.sharded_replay_service import ShardedReplayService +from pt_snap_cli.core.splitting.sharded_replay_service import ShardedReplayService from pt_snap_cli.snapshot.base import Block, BlockState from pt_snap_cli.snapshot.representation import save_snapshot_representation from pt_snap_cli.snapshot.simulate import SimulateDeviceSnapshot diff --git a/tests/test_analyzer_lifecycle.py b/tests/test_analyzer_lifecycle.py index 1d41ff8..bcaf661 100644 --- a/tests/test_analyzer_lifecycle.py +++ b/tests/test_analyzer_lifecycle.py @@ -12,9 +12,9 @@ from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.cli import app from pt_snap_cli.core import DatabaseSchemaError, QueryExecutionError, TemplateNotFoundError -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.overview_service import OverviewService -from pt_snap_cli.core.query_service import QueryService +from pt_snap_cli.core.analysis.overview_service import OverviewService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.cache.context_cache import ContextCache @pytest.fixture(autouse=True) diff --git a/tests/test_api.py b/tests/test_api.py index d792cb4..74641ed 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -286,7 +286,7 @@ def test_get_database_metadata_unavailable(self, valid_db: Path) -> None: def test_get_database_metadata_available(self, valid_db: Path) -> None: from dataclasses import replace - from pt_snap_cli.core.import_metadata import ImportMetadataService + from pt_snap_cli.core.importing.import_metadata import ImportMetadataService source = valid_db.parent / "snapshot.pkl" source.write_bytes(b"snapshot") diff --git a/tests/test_bundled_skills.py b/tests/test_bundled_skills.py index ed7034c..271d188 100644 --- a/tests/test_bundled_skills.py +++ b/tests/test_bundled_skills.py @@ -2,7 +2,7 @@ from pathlib import Path -from pt_snap_cli.core.skill_service import list_catalog_skills +from pt_snap_cli.core.analysis.skill_service import list_catalog_skills REPO_ROOT = Path(__file__).resolve().parents[1] REPO_SKILLS = REPO_ROOT / "skills" diff --git a/tests/test_cli.py b/tests/test_cli.py index 684b06d..d11c94f 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1242,7 +1242,7 @@ def test_import_missing_tool_message( self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch ) -> None: """Test import reports built-in backend packaging guidance when unavailable.""" - from pt_snap_cli.core.errors import ImportToolMissingError + from pt_snap_cli.core.common.errors import ImportToolMissingError snapshot = tmp_path / "sample.pkl" snapshot.write_bytes(b"not a real snapshot") @@ -1253,7 +1253,7 @@ def raise_missing_tool(*args: object, **kwargs: object) -> object: ) monkeypatch.setattr( - "pt_snap_cli.core.import_service.ImportService.import_snapshot", + "pt_snap_cli.core.importing.import_service.ImportService.import_snapshot", raise_missing_tool, ) diff --git a/tests/test_cli_json.py b/tests/test_cli_json.py index b4362f8..b064d43 100644 --- a/tests/test_cli_json.py +++ b/tests/test_cli_json.py @@ -14,7 +14,7 @@ from pt_snap_cli.cli import app from pt_snap_cli.config import ENV_DB_PATH -from pt_snap_cli.core.json_codec import JSON_SCHEMA_VERSION +from pt_snap_cli.core.common.json_codec import JSON_SCHEMA_VERSION from pt_snap_cli.query.config import QueryTemplate from pt_snap_cli.query.registry import QueryRegistry, register_query diff --git a/tests/test_contract_cli_api.py b/tests/test_contract_cli_api.py index 8f02699..56bc348 100644 --- a/tests/test_contract_cli_api.py +++ b/tests/test_contract_cli_api.py @@ -23,12 +23,12 @@ from pt_snap_cli.api import FocusState, SnapshotAnalyzer from pt_snap_cli.cli import app from pt_snap_cli.core import InvalidDeviceError, QueryExecutionError, TemplateRenderError -from pt_snap_cli.core.dataset_sources import QueryBudget -from pt_snap_cli.core.error_codes import classify_error -from pt_snap_cli.core.errors import QueryCancelledError, QueryTimeoutError -from pt_snap_cli.core.json_codec import JSON_SCHEMA_VERSION -from pt_snap_cli.core.query_service import QueryService -from pt_snap_cli.core.report_service import ReportService +from pt_snap_cli.core.analysis.query_service import QueryService +from pt_snap_cli.core.analysis.report_service import ReportService +from pt_snap_cli.core.common.error_codes import classify_error +from pt_snap_cli.core.common.errors import QueryCancelledError, QueryTimeoutError +from pt_snap_cli.core.common.json_codec import JSON_SCHEMA_VERSION +from pt_snap_cli.core.dataset.dataset_sources import QueryBudget from pt_snap_cli.query.config import QueryParameter, QueryTemplate from pt_snap_cli.query.registry import QueryRegistry, register_query from tests.test_dataset_focus import make_dataset @@ -47,7 +47,7 @@ def test_cancelled_query_has_a_distinct_non_timeout_error_code(tmp_path, monkeyp def cancelled_tree(*args, **kwargs): raise error - monkeypatch.setattr("pt_snap_cli.core.query_service.frame_tree", cancelled_tree) + monkeypatch.setattr("pt_snap_cli.core.analysis.query_service.frame_tree", cancelled_tree) with SnapshotAnalyzer(root) as analyzer: with pytest.raises(QueryCancelledError): analyzer.execute_query("active_memory_frame_tree_at_event", {"event_id": 1}) @@ -1091,7 +1091,7 @@ def test_compatible_import_focus_metadata_query_contract(tmp_path: Path, monkeyp def test_dataset_point_event_sources_cli_api_report_contract( tmp_path: Path, template: str, frames: bool ) -> None: - from pt_snap_cli.core.report_service import ReportService + from pt_snap_cli.core.analysis.report_service import ReportService from tests.core.test_dataset_attribution import add_frames, case root = case(tmp_path) diff --git a/tests/test_critical_coverage_gate.py b/tests/test_critical_coverage_gate.py index 76ccc7c..4721a31 100644 --- a/tests/test_critical_coverage_gate.py +++ b/tests/test_critical_coverage_gate.py @@ -71,15 +71,15 @@ def write_evidence(guard, root, *, missing=None, uncovered=None, branches=True): def test_critical_floor_inventory_preserves_existing_and_adds_risky_modules(guard): assert guard.CRITICAL_FLOORS == { - "src/pt_snap_cli/core/snapshot_import_backend.py": 90, + "src/pt_snap_cli/core/importing/snapshot_import_backend.py": 90, "src/pt_snap_cli/snapshot/simulate/simulated_caching_allocator.py": 88, "src/pt_snap_cli/snapshot/simulate/snapshot_mutator.py": 84, - "src/pt_snap_cli/core/import_metadata_contract.py": 100, - "src/pt_snap_cli/core/import_metadata.py": 90, - "src/pt_snap_cli/core/split_service.py": 90, - "src/pt_snap_cli/core/focus_service.py": 90, - "src/pt_snap_cli/core/skill_service.py": 90, - "src/pt_snap_cli/core/snapshot_cache.py": 90, + "src/pt_snap_cli/core/importing/import_metadata_contract.py": 100, + "src/pt_snap_cli/core/importing/import_metadata.py": 90, + "src/pt_snap_cli/core/splitting/split_service.py": 90, + "src/pt_snap_cli/core/analysis/focus_service.py": 90, + "src/pt_snap_cli/core/analysis/skill_service.py": 90, + "src/pt_snap_cli/core/cache/snapshot_cache.py": 90, "src/pt_snap_cli/snapshot/representation.py": 95, } @@ -128,7 +128,7 @@ def test_guard_rejects_unusable_evidence(guard, tmp_path, failure, coverage_conn @pytest.mark.parametrize("failure", ["unmeasured", "deleted", "no-statements", "below-floor"]) def test_one_critical_file_cannot_be_hidden_by_other_full_coverage(guard, tmp_path, failure): - relative = "src/pt_snap_cli/core/focus_service.py" + relative = "src/pt_snap_cli/core/analysis/focus_service.py" write_evidence( guard, tmp_path, @@ -139,7 +139,7 @@ def test_one_critical_file_cannot_be_hidden_by_other_full_coverage(guard, tmp_pa (tmp_path / relative).unlink() elif failure == "no-statements": (tmp_path / relative).write_text("# no executable source\n", encoding="utf-8") - with pytest.raises(guard.CoverageGuardError, match="core/focus_service.py"): + with pytest.raises(guard.CoverageGuardError, match="core/analysis/focus_service.py"): guard.check_coverage(tmp_path) @@ -148,7 +148,7 @@ def test_guard_compares_unrounded_percentage(guard, tmp_path, monkeypatch): real_report = guard.Coverage.report def almost_passes(coverage, **kwargs): - if Path(kwargs["morfs"][0]).as_posix().endswith("core/focus_service.py"): + if Path(kwargs["morfs"][0]).as_posix().endswith("core/analysis/focus_service.py"): return 89.9999 return real_report(coverage, **kwargs) diff --git a/tests/test_dataset_cli_resources.py b/tests/test_dataset_cli_resources.py index 96121b9..7b9203c 100644 --- a/tests/test_dataset_cli_resources.py +++ b/tests/test_dataset_cli_resources.py @@ -10,7 +10,7 @@ import pytest import pt_snap_cli -from pt_snap_cli.core.native_dataset_contract import NATIVE_FORMAT +from pt_snap_cli.core.dataset.native_dataset_contract import NATIVE_FORMAT from tests.dataset_cli_resource_probe import relative_evidence_path from tests.test_dataset_focus import make_dataset from tests.test_native_dataset import dataset as native_dataset diff --git a/tests/test_dataset_contract.py b/tests/test_dataset_contract.py index 34e7520..84ff570 100644 --- a/tests/test_dataset_contract.py +++ b/tests/test_dataset_contract.py @@ -9,7 +9,7 @@ import pytest from pt_snap_cli.context import Context -from pt_snap_cli.core.dataset_contract import ( +from pt_snap_cli.core.dataset.dataset_contract import ( ACTION_NAMES, BLOCK_STATES, DatasetContractError, @@ -314,7 +314,7 @@ def test_missing_slice_does_not_create_database(tmp_path): def test_compatibility_appended_columns_do_not_relax_native_schema(tmp_path): - from pt_snap_cli.core.dataset_contract import TRACE_COLUMNS, _schema + from pt_snap_cli.core.dataset.dataset_contract import TRACE_COLUMNS, _schema root = make_dataset(tmp_path / "dataset") mutate_db(root, "ALTER TABLE trace_entry_0 ADD COLUMN consumer_note TEXT") @@ -325,8 +325,8 @@ def test_compatibility_appended_columns_do_not_relax_native_schema(tmp_path): def test_unsealed_index_corruption_is_rejected_before_query(tmp_path): - from pt_snap_cli.core.dataset_resolver import DatasetResolver - from pt_snap_cli.core.errors import DatabaseSchemaError + from pt_snap_cli.core.common.errors import DatabaseSchemaError + from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver root = make_dataset(tmp_path / "dataset") member = root / "device_0/slice_00001.db" @@ -347,8 +347,8 @@ def test_unsealed_index_corruption_is_rejected_before_query(tmp_path): @pytest.mark.parametrize("resolver", [False, True]) def test_deep_manifest_uses_domain_diagnostic(tmp_path, resolver): - from pt_snap_cli.core.dataset_resolver import DatasetResolver - from pt_snap_cli.core.errors import DatabaseSchemaError + from pt_snap_cli.core.common.errors import DatabaseSchemaError + from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver root = make_dataset(tmp_path / "dataset") (root / "manifest.json").write_text("[" * 200000 + "0" + "]" * 200000) diff --git a/tests/test_dataset_failure_acceptance.py b/tests/test_dataset_failure_acceptance.py index ccbfda1..cd47819 100644 --- a/tests/test_dataset_failure_acceptance.py +++ b/tests/test_dataset_failure_acceptance.py @@ -5,7 +5,7 @@ import pytest from pt_snap_cli.api import QueryLimits, SnapshotAnalyzer -from pt_snap_cli.core.errors import QueryExecutionError, QueryTimeoutError +from pt_snap_cli.core.common.errors import QueryExecutionError, QueryTimeoutError from tests.dataset_failure_support import ( ENV_NAMES, fault_hooks, diff --git a/tests/test_dataset_focus.py b/tests/test_dataset_focus.py index e8c2622..bdc2ea6 100644 --- a/tests/test_dataset_focus.py +++ b/tests/test_dataset_focus.py @@ -13,16 +13,9 @@ from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.cli import app from pt_snap_cli.completion import complete_device_ids -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_contract import ( - ACTION_NAMES, - BLOCK_STATES, - DatasetContractError, - QueryScope, - validate_dataset, -) -from pt_snap_cli.core.dataset_resolver import DatasetResolver -from pt_snap_cli.core.errors import ( +from pt_snap_cli.core.analysis.focus_service import FocusService +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import ( DatabaseSchemaError, InvalidDeviceError, InvalidParameterError, @@ -30,7 +23,14 @@ TemplateNotFoundError, TemplateRenderError, ) -from pt_snap_cli.core.focus_service import FocusService +from pt_snap_cli.core.dataset.dataset_contract import ( + ACTION_NAMES, + BLOCK_STATES, + DatasetContractError, + QueryScope, + validate_dataset, +) +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver runner = CliRunner() @@ -484,7 +484,7 @@ def open_path(path, *args, **kwargs): def test_manifest_change_during_validation_fails(tmp_path, monkeypatch): - import pt_snap_cli.core.dataset_resolver as module + import pt_snap_cli.core.dataset.dataset_resolver as module root = make_dataset(tmp_path / "dataset") original = module.validate_dataset diff --git a/tests/test_dataset_mutation_acceptance.py b/tests/test_dataset_mutation_acceptance.py index 40b0258..662d903 100644 --- a/tests/test_dataset_mutation_acceptance.py +++ b/tests/test_dataset_mutation_acceptance.py @@ -14,9 +14,9 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core import dataset_resolver as resolver -from pt_snap_cli.core.dataset_sources import DatasetSourceResolver -from pt_snap_cli.core.errors import QueryTimeoutError +from pt_snap_cli.core.common.errors import QueryTimeoutError +from pt_snap_cli.core.dataset import dataset_resolver as resolver +from pt_snap_cli.core.dataset.dataset_sources import DatasetSourceResolver from tests.core.dataset_lifecycle_fixtures import build from tests.dataset_concurrency_support import ISOLATED_ENV, WAIT_SECONDS from tests.test_dataset_focus import hashes diff --git a/tests/test_frame_import_isolation.py b/tests/test_frame_import_isolation.py index 03d7b6f..cc88f2b 100644 --- a/tests/test_frame_import_isolation.py +++ b/tests/test_frame_import_isolation.py @@ -8,11 +8,11 @@ import pytest -from pt_snap_cli.core import import_metadata -from pt_snap_cli.core.errors import ImportExecutionError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.models import ImportOptions -from pt_snap_cli.core.native_dataset_contract import NATIVE_FORMAT +from pt_snap_cli.core.common.errors import ImportExecutionError +from pt_snap_cli.core.common.models import ImportOptions +from pt_snap_cli.core.dataset.native_dataset_contract import NATIVE_FORMAT +from pt_snap_cli.core.importing import import_metadata +from pt_snap_cli.core.importing.import_service import ImportService from pt_snap_cli.snapshot.tools.adaptors import snapshot2db from tests.snapshot.test_sharded_replay import lifecycle_data, write_source diff --git a/tests/test_interop_acceptance.py b/tests/test_interop_acceptance.py index 6a7b204..dfebf2e 100644 --- a/tests/test_interop_acceptance.py +++ b/tests/test_interop_acceptance.py @@ -24,9 +24,9 @@ ) from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.cli import app -from pt_snap_cli.core.dataset_support import DATASET_SUPPORT -from pt_snap_cli.core.errors import ImportExecutionError -from pt_snap_cli.core.import_service import ImportService +from pt_snap_cli.core.common.errors import ImportExecutionError +from pt_snap_cli.core.dataset.dataset_support import DATASET_SUPPORT +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.test_dataset_attribution import add_frames, case from tests.core.test_msinsight_export import options diff --git a/tests/test_interop_three_shard.py b/tests/test_interop_three_shard.py index 14a6cf6..3dcc743 100644 --- a/tests/test_interop_three_shard.py +++ b/tests/test_interop_three_shard.py @@ -19,8 +19,8 @@ import pytest -from pt_snap_cli.core.dataset_contract import QueryScope -from pt_snap_cli.core.dataset_resolver import DatasetResolver +from pt_snap_cli.core.dataset.dataset_contract import QueryScope +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver from tests.fixtures.interop.generate_three_shard import ( FORMATS, SOURCE, diff --git a/tests/test_memory_tree_browser.py b/tests/test_memory_tree_browser.py index f9c70bc..201a5ff 100644 --- a/tests/test_memory_tree_browser.py +++ b/tests/test_memory_tree_browser.py @@ -11,7 +11,7 @@ import pytest -from pt_snap_cli.core.models import QueryResult +from pt_snap_cli.core.common.models import QueryResult from pt_snap_cli.memory_tree_render import render_memory_tree from tests._browser_support import browser_expect as expect diff --git a/tests/test_memory_tree_report.py b/tests/test_memory_tree_report.py index 0b4a106..eb0a4d8 100644 --- a/tests/test_memory_tree_report.py +++ b/tests/test_memory_tree_report.py @@ -7,7 +7,7 @@ from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.cli import app -from pt_snap_cli.core.report_service import ReportService +from pt_snap_cli.core.analysis.report_service import ReportService from pt_snap_cli.memory_tree_render import render_memory_tree from tests.frame_tree_helpers import create_frame_tree_db diff --git a/tests/test_native_dataset.py b/tests/test_native_dataset.py index 07672f6..2cc8238 100644 --- a/tests/test_native_dataset.py +++ b/tests/test_native_dataset.py @@ -7,12 +7,16 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core.context_cache import ContextCache -from pt_snap_cli.core.dataset_contract import DatasetContractError, QueryScope, parse_manifest -from pt_snap_cli.core.dataset_resolver import DatasetResolver, _hash_file -from pt_snap_cli.core.errors import DatabaseSchemaError, InvalidParameterError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.native_dataset_contract import parse_native_manifest +from pt_snap_cli.core.cache.context_cache import ContextCache +from pt_snap_cli.core.common.errors import DatabaseSchemaError, InvalidParameterError +from pt_snap_cli.core.dataset.dataset_contract import ( + DatasetContractError, + QueryScope, + parse_manifest, +) +from pt_snap_cli.core.dataset.dataset_resolver import DatasetResolver, _hash_file +from pt_snap_cli.core.dataset.native_dataset_contract import parse_native_manifest +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.test_dataset_import import hashes, source_options diff --git a/tests/test_platform_contracts.py b/tests/test_platform_contracts.py index 53100e7..3f920d4 100644 --- a/tests/test_platform_contracts.py +++ b/tests/test_platform_contracts.py @@ -20,11 +20,11 @@ from pt_snap_cli.api import SnapshotAnalyzer from pt_snap_cli.context import Context -from pt_snap_cli.core import dataset_lifecycle_scratch as scratch -from pt_snap_cli.core import dataset_lifecycle_sql -from pt_snap_cli.core.errors import QueryExecutionError -from pt_snap_cli.core.import_service import ImportService -from pt_snap_cli.core.query_limits import QueryLimits +from pt_snap_cli.core.common.errors import QueryExecutionError +from pt_snap_cli.core.common.query_limits import QueryLimits +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_scratch as scratch +from pt_snap_cli.core.dataset.lifecycle import dataset_lifecycle_sql +from pt_snap_cli.core.importing.import_service import ImportService from tests.core.test_dataset_import import hashes, source_options ROOT = Path(__file__).resolve().parents[1] diff --git a/tests/test_query_limits.py b/tests/test_query_limits.py index 9c0ce09..0abe040 100644 --- a/tests/test_query_limits.py +++ b/tests/test_query_limits.py @@ -9,8 +9,8 @@ from pt_snap_cli.api import QueryLimits, SnapshotAnalyzer from pt_snap_cli.cli import app -from pt_snap_cli.core.errors import InvalidParameterError, QueryExecutionError -from pt_snap_cli.core.report_service import ReportService +from pt_snap_cli.core.analysis.report_service import ReportService +from pt_snap_cli.core.common.errors import InvalidParameterError, QueryExecutionError from tests.core.test_dataset_attribution import case from tests.test_dataset_focus import make_dataset @@ -156,7 +156,7 @@ def test_invalid_limit_environment_is_json_error_for_capabilities(monkeypatch): def test_memory_tree_forwards_limits_without_capping_standalone_output(tmp_path, monkeypatch): - from pt_snap_cli.core.query_service import QueryService + from pt_snap_cli.core.analysis.query_service import QueryService from tests.frame_tree_helpers import create_frame_tree_db path = create_frame_tree_db(tmp_path / "frames.db") diff --git a/tests/test_snapshot_analyzer_cache.py b/tests/test_snapshot_analyzer_cache.py index a93cdc0..0e2c1f2 100644 --- a/tests/test_snapshot_analyzer_cache.py +++ b/tests/test_snapshot_analyzer_cache.py @@ -21,7 +21,7 @@ import pytest from pt_snap_cli.api import SnapshotAnalyzer -from pt_snap_cli.core.context_cache import ContextCache +from pt_snap_cli.core.cache.context_cache import ContextCache @pytest.fixture