fix(native): keep the finished analysis session out of CompiledProject and gate on session proofs

Author: kvlonge

src/sqlbuild/compiler/compile/_helpers/assembly/project.py

@@ -498,7 +498,6 @@ def assemble_compiled_project(
         ),
         external_sql_reference_resolver=inputs.external_sql_reference_resolver,
         scope_index=scope_index,
-        native_session=native_session,
     )
     return complete_semantic_diagnostics(
         project=project,

src/sqlbuild/rule_engine/_helpers/engine/custom_rules.py

@@ -277,7 +277,6 @@ def host_project(project: CompiledProject) -> CompiledProject:
     return replace(
         project,
         binding_catalog=None,
-        native_session=None,
         sql_expansions={},
         loaded_macros={},
         loader_functions=(),

tests/e2e/src/sqlbuild/cli/commands/main/compile/test_native_analysis_seams.py

@@ -93,7 +93,6 @@ def test_given_project_when_compiling_with_each_engine_then_native_seams_answer_
         len(planned_artifacts)
     ]
     assert isinstance(preview_seams["complete_native_semantic_diagnostics"][0], CompiledProject)
-    assert preview_seams["complete_native_semantic_diagnostics"][0].native_session is not None
     assert isinstance(preview_seams["evaluate_native_model_contracts"][0], ContractValidationResult)
     assert (native_run.returncode, preview_run.returncode) == (0, 0)
     assert report_without_engine(native_run) == report_without_engine(python_run)

tests/integration/src/sqlbuild/compiler/analysis_session/_test_types.py

@@ -48,13 +48,5 @@ class StandalonePivotProofTestCase:
     description: str
     analysed_models: frozenset[str]
     expected_native_proofs: int
-    expected_session_answers: list[bool]
+    expected_session_proofs: int
     expected_proven_by_model: dict[str, bool | None]
-
-
-@dataclass(frozen=True)
-class HostPayloadTestCase:
-    """A natively analysed project that custom-rule hosts receive without its native session."""
-
-    description: str
-    expected_models: tuple[str, ...]

tests/integration/src/sqlbuild/compiler/analysis_session/helpers.py

@@ -307,10 +307,10 @@ def pivot_project_files() -> dict[str, str]:
 
 @dataclass
 class NativePivotProofs:
-    """Every standalone native pivot proof assembly took, and whether a session answered it."""
+    """Every native pivot proof assembly took, and how many a finished session proved."""
 
     proofs: list[DynamicColumnContractProof | None] = field(default_factory=list)
-    session_answers: list[bool] = field(default_factory=list)
+    session_proofs: int = 0
 
 
 def native_pivot_proofs(*, monkeypatch: pytest.MonkeyPatch) -> NativePivotProofs:
@@ -324,7 +324,8 @@ def native_pivot_proofs(*, monkeypatch: pytest.MonkeyPatch) -> NativePivotProofs
     def recorded(**keywords: Any) -> tuple[DynamicColumnContractProof | None, ...]:
         proofs: tuple[DynamicColumnContractProof | None, ...] = native_proofs(**keywords)
         recorded_proofs.proofs.extend(proofs)
-        recorded_proofs.session_answers.extend([keywords["session"] is not None] * len(proofs))
+        proven: int = sum(proof is not None for proof in proofs)
+        recorded_proofs.session_proofs += proven * (keywords["session"] is not None)
         return proofs
 
     python_proof: Callable[..., DynamicColumnContractProof | None] = (

tests/integration/src/sqlbuild/compiler/analysis_session/test_native_model_analysis.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import pickle
 import random
 from collections import Counter
 from dataclasses import replace
@@ -23,12 +22,9 @@
 from sqlbuild.compiler.frontier.constants import COMPILER_ENGINE_ENV_VAR
 from sqlbuild.compiler.frontier.types import CompilerEngine
 from sqlbuild.compiler.sql_analysis.constants import ANALYSIS_RECORD_DIR_ENV_VAR
-from sqlbuild.rule_engine._helpers.engine.custom_rules import host_project
-from sqlbuild.rule_engine._helpers.host.custom_host_pool import host_payload_project
 from tests.integration.src.sqlbuild.compiler.analysis_session._test_types import (
     AnalysisFallbackTestCase,
     GeneratedAnalysisParityTestCase,
-    HostPayloadTestCase,
     SessionFailureTestCase,
     StandalonePivotProofTestCase,
 )
@@ -204,7 +200,7 @@ def test_given_session_failure_after_deferrals_when_analysing_then_records_only_
             description="a selection that leaves the pivots out of model analysis",
             analysed_models=frozenset({"orders_list"}),
             expected_native_proofs=2,
-            expected_session_answers=[True, True],
+            expected_session_proofs=2,
             expected_proven_by_model={
                 "orders_list": None,
                 "status_amounts": True,
@@ -215,7 +211,7 @@ def test_given_session_failure_after_deferrals_when_analysing_then_records_only_
             description="no model analysis, so the proofs run without a session",
             analysed_models=frozenset(),
             expected_native_proofs=2,
-            expected_session_answers=[False, False],
+            expected_session_proofs=0,
             expected_proven_by_model={
                 "orders_list": None,
                 "status_amounts": True,
@@ -243,50 +239,18 @@ def test_given_unanalysed_pivot_model_when_assembling_then_native_proves_it_with
     assert (
         all(proof is not None for proof in recorded.proofs),
         len(recorded.proofs),
-        recorded.session_answers,
+        recorded.session_proofs,
         {
             model.name: getattr(model.dynamic_column_contract, "output_proven", None)
             for model in project.models
         },
     ) == (
         True,
         test_case.expected_native_proofs,
-        test_case.expected_session_answers,
+        test_case.expected_session_proofs,
         test_case.expected_proven_by_model,
     )
 
 
-@pytest.mark.parametrize(
-    "test_case",
-    [
-        HostPayloadTestCase(
-            description="a pivot project analysed in one native session",
-            expected_models=("orders_list", "status_amounts", "status_passthrough"),
-        )
-    ],
-    ids=lambda case: case.description,
-)
-def test_given_native_session_when_publishing_rule_host_payload_then_session_is_dropped(
-    test_case: HostPayloadTestCase, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    inputs: CompileProjectInputs = compile_inputs(
-        project_dir=tmp_path / "project", files=pivot_project_files()
-    )
-    monkeypatch.setenv(COMPILER_ENGINE_ENV_VAR, CompilerEngine.NATIVE_PREVIEW.value)
-    project: CompiledProject = assemble_compiled_project(
-        inputs=inputs, inference_profile=ExpressionInferenceProfile(sql_analysis_dialect="duckdb")
-    )
-
-    payload: CompiledProject = pickle.loads(
-        pickle.dumps(host_payload_project(host_project(project)))
-    )
-
-    assert project.native_session is not None
-    assert (payload.native_session, tuple(sorted(model.name for model in payload.models))) == (
-        None,
-        test_case.expected_models,
-    )
-
-
 if __name__ == "__main__":
     pytest.main([__file__, "-vv"])

tests/integration/src/sqlbuild/rule_engine/host_payload/test_host_payload_facts.py

@@ -100,7 +100,7 @@
                     "SELECT 1\n"
                 ),
             },
-            expected_unpopulated_trimmed_fields=frozenset({"native_session"}),
+            expected_unpopulated_trimmed_fields=frozenset(),
         ),
     ),
     ids=lambda case: case.description,