fleet-python 0.2.118__tar.gz → 0.2.119__tar.gz

{fleet_python-0.2.118/fleet_python.egg-info → fleet_python-0.2.119}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.118
+Version: 0.2.119
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0

{fleet_python-0.2.118 → fleet_python-0.2.119}/fleet/__init__.py

@@ -79,7 +79,7 @@ from . import env
 from . import global_client as _global_client
 from ._async import global_client as _async_global_client
 
-__version__ = "0.2.118"
+__version__ = "0.2.119"
 
 __all__ = [
     # Core classes

{fleet_python-0.2.118 → fleet_python-0.2.119}/fleet/_async/__init__.py

@@ -44,7 +44,7 @@ from ..types import VerifierFunction
 from .. import env
 from . import global_client as _async_global_client
 
-__version__ = "0.2.118"
+__version__ = "0.2.119"
 
 __all__ = [
     # Core classes

{fleet_python-0.2.118 → fleet_python-0.2.119}/fleet/_async/base.py

@@ -26,7 +26,7 @@ from .exceptions import (
 try:
     from .. import __version__
 except ImportError:
-    __version__ = "0.2.118"
+    __version__ = "0.2.119"
 
 logger = logging.getLogger(__name__)
 

{fleet_python-0.2.118 → fleet_python-0.2.119}/fleet/base.py

@@ -27,7 +27,7 @@ from .exceptions import (
 try:
     from . import __version__
 except ImportError:
-    __version__ = "0.2.118"
+    __version__ = "0.2.119"
 
 logger = logging.getLogger(__name__)
 

{fleet_python-0.2.118 → fleet_python-0.2.119}/fleet/verifiers/db.py

@@ -891,9 +891,413 @@ class SnapshotDiff:
         return diff
 
     # ------------------------------------------------------------------
+    def _can_use_targeted_queries(self, allowed_changes: List[Dict[str, Any]]) -> bool:
+        """Check if we can use targeted queries for optimization."""
+        for change in allowed_changes:
+            if "table" not in change or "pk" not in change:
+                return False
+        return True
+
+    def _query_row(self, db_path: str, table: str, pk_columns: List[str], pk: Any) -> Optional[Dict[str, Any]]:
+        """Query a single row by primary key from a SQLite database."""
+        conn = sqlite3.connect(db_path)
+        conn.row_factory = sqlite3.Row
+        try:
+            if len(pk_columns) == 1:
+                where_sql = f"{pk_columns[0]} = ?"
+                params = [pk]
+            else:
+                parts = []
+                params = []
+                pk_vals = pk if isinstance(pk, tuple) else (pk,)
+                for col, val in zip(pk_columns, pk_vals):
+                    parts.append(f"{col} = ?")
+                    params.append(val)
+                where_sql = " AND ".join(parts)
+            cursor = conn.execute(
+                f"SELECT rowid, * FROM {table} WHERE {where_sql}", params
+            )
+            row = cursor.fetchone()
+            return dict(row) if row else None
+        finally:
+            conn.close()
+
+    def _get_row_count(self, db_path: str, table: str) -> int:
+        """Get row count for a table."""
+        conn = sqlite3.connect(db_path)
+        try:
+            cursor = conn.execute(f"SELECT COUNT(*) FROM {table}")
+            return cursor.fetchone()[0]
+        finally:
+            conn.close()
+
+    def _get_pk_columns(self, table: str) -> List[str]:
+        """Get primary key columns for a table."""
+        return self._differ.get_primary_key_columns(self._differ.before_db, table) or ["id"]
+
+    def _expect_only_targeted(self, allowed_changes: List[Dict[str, Any]]):
+        """Optimized version that only queries specific rows mentioned in allowed_changes.
+
+        Matches the behavior of the production SyncSnapshotDiff._expect_only_targeted
+        in fleet/resources/sqlite.py: checks specified rows for expected changes, then
+        verifies tables not mentioned in allowed_changes have no row count changes.
+        """
+        # Group allowed changes by table
+        changes_by_table: Dict[str, List[Dict[str, Any]]] = {}
+        for change in allowed_changes:
+            table = change["table"]
+            if table not in changes_by_table:
+                changes_by_table[table] = []
+            changes_by_table[table].append(change)
+
+        errors: List[Exception] = []
+
+        # Check each specified row
+        for table, table_changes in changes_by_table.items():
+            if self.ignore_config.should_ignore_table(table):
+                continue
+
+            pk_columns = self._get_pk_columns(table)
+            pks_to_check = {change["pk"] for change in table_changes}
+
+            for pk in pks_to_check:
+                before_row = self._query_row(self.before.db_path, table, pk_columns, pk)
+                after_row = self._query_row(self.after.db_path, table, pk_columns, pk)
+
+                if before_row and after_row:
+                    # Modified row - check fields
+                    for field in set(before_row.keys()) | set(after_row.keys()):
+                        if self.ignore_config.should_ignore_field(table, field):
+                            continue
+                        before_val = before_row.get(field)
+                        after_val = after_row.get(field)
+                        if not _values_equivalent(before_val, after_val):
+                            # Check if this field change is allowed
+                            allowed = False
+                            for tc in table_changes:
+                                tc_pk = tc.get("pk")
+                                pk_match = (
+                                    str(tc_pk) == str(pk) if tc_pk is not None else False
+                                )
+                                if (
+                                    pk_match
+                                    and tc.get("field") == field
+                                    and _values_equivalent(tc.get("after"), after_val)
+                                ):
+                                    allowed = True
+                                    break
+                            if not allowed:
+                                errors.append(
+                                    AssertionError(
+                                        f"Unexpected change in table '{table}', "
+                                        f"row {pk}, field '{field}': "
+                                        f"{repr(before_val)} -> {repr(after_val)}"
+                                    )
+                                )
+                                break  # Stop checking this row
+                elif not before_row and after_row:
+                    # Added row - check if allowed
+                    allowed = False
+                    for tc in table_changes:
+                        tc_pk = tc.get("pk")
+                        pk_match = (
+                            str(tc_pk) == str(pk) if tc_pk is not None else False
+                        )
+                        if pk_match and _values_equivalent(tc.get("after"), "__added__"):
+                            allowed = True
+                            break
+                    if not allowed:
+                        errors.append(
+                            AssertionError(f"Unexpected row added in table '{table}': {pk}")
+                        )
+                elif before_row and not after_row:
+                    # Removed row - check if allowed
+                    allowed = False
+                    for tc in table_changes:
+                        tc_pk = tc.get("pk")
+                        pk_match = (
+                            str(tc_pk) == str(pk) if tc_pk is not None else False
+                        )
+                        if pk_match and _values_equivalent(tc.get("after"), "__removed__"):
+                            allowed = True
+                            break
+                    if not allowed:
+                        errors.append(
+                            AssertionError(f"Unexpected row removed from table '{table}': {pk}")
+                        )
+
+        if errors:
+            raise errors[0]
+
+        # Check tables not mentioned in allowed_changes for row count changes
+        all_tables = set(self.before.tables()) | set(self.after.tables())
+        for table in all_tables:
+            if table in changes_by_table:
+                continue
+            if self.ignore_config.should_ignore_table(table):
+                continue
+            before_count = self._get_row_count(self.before.db_path, table)
+            after_count = self._get_row_count(self.after.db_path, table)
+            if before_count != after_count:
+                errors.append(
+                    AssertionError(
+                        f"Unexpected change in table '{table}': "
+                        f"row count changed from {before_count} to {after_count}"
+                    )
+                )
+
+        if errors:
+            raise errors[0]
+
+        return self
+
+    def _expect_only_targeted_v2(self, allowed_changes: List[Dict[str, Any]]):
+        """Targeted version of expect_only_v2 that only queries specific rows.
+
+        Matches the behavior of the production SyncSnapshotDiff._expect_only_targeted_v2
+        in fleet/resources/sqlite.py.
+        """
+        # Helper functions for v2 spec validation
+        def _parse_fields_spec(
+            fields_spec: List[tuple],
+        ) -> Dict[str, tuple]:
+            spec_map: Dict[str, tuple] = {}
+            for spec_tuple in fields_spec:
+                if len(spec_tuple) != 2:
+                    raise ValueError(
+                        f"Invalid field spec tuple: {spec_tuple}. "
+                        f"Expected 2-tuple like ('field', value), ('field', None), or ('field', ...)"
+                    )
+                field_name, expected_value = spec_tuple
+                if expected_value is ...:
+                    spec_map[field_name] = (False, None)
+                else:
+                    spec_map[field_name] = (True, expected_value)
+            return spec_map
+
+        def _get_all_specs_for_pk(table: str, pk: Any) -> List[Dict[str, Any]]:
+            specs = []
+            for allowed in allowed_changes:
+                if (
+                    allowed["table"] == table
+                    and str(allowed.get("pk")) == str(pk)
+                ):
+                    specs.append(allowed)
+            return specs
+
+        def _validate_insert_row(
+            table: str, pk: Any, row_data: Dict[str, Any], specs: List[Dict[str, Any]]
+        ) -> Optional[str]:
+            for spec in specs:
+                if spec.get("type") == "insert":
+                    fields_spec = spec.get("fields")
+                    if fields_spec is not None:
+                        spec_map = _parse_fields_spec(fields_spec)
+                        for field_name, field_value in row_data.items():
+                            if field_name == "rowid":
+                                continue
+                            if self.ignore_config.should_ignore_field(table, field_name):
+                                continue
+                            if field_name not in spec_map:
+                                return f"Field '{field_name}' not in insert spec for table '{table}' pk={pk}"
+                            should_check, expected_value = spec_map[field_name]
+                            if should_check and not _values_equivalent(expected_value, field_value):
+                                return (
+                                    f"Insert mismatch in table '{table}' pk={pk}, "
+                                    f"field '{field_name}': expected {repr(expected_value)}, got {repr(field_value)}"
+                                )
+                    return None
+            for spec in specs:
+                if spec.get("fields") is None and spec.get("after") == "__added__":
+                    return None
+            return f"Unexpected row added in table '{table}': pk={pk}"
+
+        def _validate_delete_row(
+            table: str, pk: Any, row_data: Dict[str, Any], specs: List[Dict[str, Any]]
+        ) -> Optional[str]:
+            for spec in specs:
+                if spec.get("type") == "delete":
+                    fields_spec = spec.get("fields")
+                    if fields_spec is not None:
+                        spec_map = _parse_fields_spec(fields_spec)
+                        for field_name, (should_check, expected_value) in spec_map.items():
+                            if field_name not in row_data:
+                                return f"Field '{field_name}' in delete spec not found in row for table '{table}' pk={pk}"
+                            if should_check and not _values_equivalent(expected_value, row_data[field_name]):
+                                return (
+                                    f"Delete mismatch in table '{table}' pk={pk}, "
+                                    f"field '{field_name}': expected {repr(expected_value)}, got {repr(row_data[field_name])}"
+                                )
+                    return None
+            for spec in specs:
+                if spec.get("fields") is None and spec.get("after") == "__removed__":
+                    return None
+            return f"Unexpected row removed from table '{table}': pk={pk}"
+
+        def _validate_modify_row(
+            table: str,
+            pk: Any,
+            before_row: Dict[str, Any],
+            after_row: Dict[str, Any],
+            specs: List[Dict[str, Any]],
+        ) -> Optional[str]:
+            changed_fields: Dict[str, Dict[str, Any]] = {}
+            for field in set(before_row.keys()) | set(after_row.keys()):
+                if self.ignore_config.should_ignore_field(table, field):
+                    continue
+                before_val = before_row.get(field)
+                after_val = after_row.get(field)
+                if not _values_equivalent(before_val, after_val):
+                    changed_fields[field] = {"before": before_val, "after": after_val}
+            if not changed_fields:
+                return None
+            for spec in specs:
+                if spec.get("type") == "modify":
+                    resulting_fields = spec.get("resulting_fields")
+                    if resulting_fields is not None:
+                        if "no_other_changes" not in spec:
+                            raise ValueError(
+                                f"Modify spec for table '{table}' pk={pk} "
+                                f"has 'resulting_fields' but missing required 'no_other_changes' field."
+                            )
+                        no_other_changes = spec["no_other_changes"]
+                        if not isinstance(no_other_changes, bool):
+                            raise ValueError(
+                                f"Modify spec for table '{table}' pk={pk} "
+                                f"'no_other_changes' must be boolean, got {type(no_other_changes).__name__}"
+                            )
+                        spec_map = _parse_fields_spec(resulting_fields)
+                        for field_name, vals in changed_fields.items():
+                            after_val = vals["after"]
+                            if field_name not in spec_map:
+                                if no_other_changes:
+                                    return (
+                                        f"Unexpected field change in table '{table}' pk={pk}: "
+                                        f"field '{field_name}' not in resulting_fields"
+                                    )
+                            else:
+                                should_check, expected_value = spec_map[field_name]
+                                if should_check and not _values_equivalent(expected_value, after_val):
+                                    return (
+                                        f"Modify mismatch in table '{table}' pk={pk}, "
+                                        f"field '{field_name}': expected {repr(expected_value)}, got {repr(after_val)}"
+                                    )
+                        return None
+                    else:
+                        return None
+            # Legacy single-field specs
+            for field_name, vals in changed_fields.items():
+                after_val = vals["after"]
+                field_allowed = False
+                for spec in specs:
+                    if (
+                        spec.get("field") == field_name
+                        and _values_equivalent(spec.get("after"), after_val)
+                    ):
+                        field_allowed = True
+                        break
+                if not field_allowed:
+                    return (
+                        f"Unexpected change in table '{table}' pk={pk}, "
+                        f"field '{field_name}': {repr(vals['before'])} -> {repr(after_val)}"
+                    )
+            return None
+
+        # Group allowed changes by table
+        changes_by_table: Dict[str, List[Dict[str, Any]]] = {}
+        for change in allowed_changes:
+            table = change["table"]
+            if table not in changes_by_table:
+                changes_by_table[table] = []
+            changes_by_table[table].append(change)
+
+        errors: List[Exception] = []
+
+        # Check each specified row
+        for table, table_changes in changes_by_table.items():
+            if self.ignore_config.should_ignore_table(table):
+                continue
+
+            pk_columns = self._get_pk_columns(table)
+            pks_to_check = {change["pk"] for change in table_changes}
+
+            for pk in pks_to_check:
+                before_row = self._query_row(self.before.db_path, table, pk_columns, pk)
+                after_row = self._query_row(self.after.db_path, table, pk_columns, pk)
+                specs = _get_all_specs_for_pk(table, pk)
+
+                if before_row and after_row:
+                    error = _validate_modify_row(table, pk, before_row, after_row, specs)
+                    if error:
+                        errors.append(AssertionError(error))
+                elif not before_row and after_row:
+                    error = _validate_insert_row(table, pk, after_row, specs)
+                    if error:
+                        errors.append(AssertionError(error))
+                elif before_row and not after_row:
+                    error = _validate_delete_row(table, pk, before_row, specs)
+                    if error:
+                        errors.append(AssertionError(error))
+
+        if errors:
+            raise errors[0]
+
+        # Check tables not mentioned in allowed_changes for row count changes
+        all_tables = set(self.before.tables()) | set(self.after.tables())
+        for table in all_tables:
+            if table in changes_by_table:
+                continue
+            if self.ignore_config.should_ignore_table(table):
+                continue
+            before_count = self._get_row_count(self.before.db_path, table)
+            after_count = self._get_row_count(self.after.db_path, table)
+            if before_count != after_count:
+                errors.append(
+                    AssertionError(
+                        f"Unexpected change in table '{table}': "
+                        f"row count changed from {before_count} to {after_count}"
+                    )
+                )
+
+        if errors:
+            raise errors[0]
+
+        return self
+
     def expect_only(self, allowed_changes: List[Dict[str, Any]]):
         """Allowed changes is a list of {table, pk, field, after} (before optional)."""
+        # Normalize pk values
+        for change in allowed_changes:
+            if "pk" in change and isinstance(change["pk"], list):
+                change["pk"] = tuple(change["pk"])
+
+        # Special case: empty allowed_changes means no changes should have occurred
+        if not allowed_changes:
+            diff = self._collect()
+            for tbl, report in diff.items():
+                total = (
+                    len(report.get("added_rows", []))
+                    + len(report.get("removed_rows", []))
+                    + len(report.get("modified_rows", []))
+                )
+                if total > 0:
+                    raise AssertionError(
+                        f"Expected no changes but found {total} change(s) in table '{tbl}'"
+                    )
+            return self
+
+        # Use targeted queries when possible (matches production behavior)
+        if self._can_use_targeted_queries(allowed_changes):
+            return self._expect_only_targeted(allowed_changes)
+
+        # Fall back to full diff for complex cases
         diff = self._collect()
+        return self._validate_diff_against_allowed_changes(diff, allowed_changes)
+
+    def _validate_diff_against_allowed_changes(
+        self, diff: Dict[str, Any], allowed_changes: List[Dict[str, Any]]
+    ):
+        """Validate a collected diff against allowed changes (full-diff fallback)."""
 
         def _is_change_allowed(
             table: str, row_id: str, field: Optional[str], after_value: Any
@@ -1061,6 +1465,31 @@ class SnapshotDiff:
         For modifications, use "resulting_fields" with explicit "no_other_changes".
         For deletions with "fields", all specified fields are validated against the deleted row.
         """
+        # Normalize pk values
+        for change in allowed_changes:
+            if "pk" in change and isinstance(change["pk"], list):
+                change["pk"] = tuple(change["pk"])
+
+        # Special case: empty allowed_changes means no changes should have occurred
+        if not allowed_changes:
+            diff = self._collect()
+            for tbl, report in diff.items():
+                total = (
+                    len(report.get("added_rows", []))
+                    + len(report.get("removed_rows", []))
+                    + len(report.get("modified_rows", []))
+                )
+                if total > 0:
+                    raise AssertionError(
+                        f"Expected no changes but found {total} change(s) in table '{tbl}'"
+                    )
+            return self
+
+        # Use targeted queries when possible (matches production behavior)
+        if self._can_use_targeted_queries(allowed_changes):
+            return self._expect_only_targeted_v2(allowed_changes)
+
+        # Fall back to full diff for complex cases
         diff = self._collect()
 
         def _is_change_allowed(

{fleet_python-0.2.118 → fleet_python-0.2.119/fleet_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.118
+Version: 0.2.119
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0

{fleet_python-0.2.118 → fleet_python-0.2.119}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "fleet-python"
 
-version = "0.2.118"
+version = "0.2.119"
 description = "Python SDK for Fleet environments"
 authors = [
     {name = "Fleet AI", email = "nic@fleet.so"},

{fleet_python-0.2.118 → fleet_python-0.2.119}/tests/test_expect_only.py

@@ -97,7 +97,7 @@ def test_field_level_specs_with_wrong_values():
         after = DatabaseSnapshot(after_db)
 
         # Should fail because status value is wrong
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -195,7 +195,7 @@ def test_modification_with_bulk_fields_spec_wrong_value():
         after = DatabaseSnapshot(after_db)
 
         # Should fail because status value is wrong
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -263,7 +263,7 @@ def test_modification_with_bulk_fields_spec_missing_field():
             )
 
         assert "status" in str(exc_info.value)
-        assert "NOT_IN_RESULTING_FIELDS" in str(exc_info.value)
+        assert "NOT_IN_RESULTING_FIELDS" in str(exc_info.value) or "not in resulting_fields" in str(exc_info.value)
 
     finally:
         os.unlink(before_db)
@@ -431,7 +431,7 @@ def test_modification_no_other_changes_false_still_validates_specified():
         after = DatabaseSnapshot(after_db)
 
         # Should fail because name value is wrong, even with no_other_changes=False
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -662,7 +662,7 @@ def test_partial_field_specs_with_unexpected_changes():
         after = DatabaseSnapshot(after_db)
 
         # Only specify price change, but stock also changed - should fail
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only(
                 [
                     {"table": "products", "pk": 1, "field": "price", "after": 12.99},
@@ -903,7 +903,7 @@ def test_missing_field_specs():
         after = DatabaseSnapshot(after_db)
 
         # Should fail because status field is missing from the fields spec
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -953,7 +953,7 @@ def test_modified_row_with_unauthorized_field_change():
         after = DatabaseSnapshot(after_db)
 
         # Should fail because status change is not allowed
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only(
                 [
                     {
@@ -1272,7 +1272,7 @@ def test_fields_spec_missing_field_fails():
             )
 
         assert "status" in str(exc_info.value)
-        assert "NOT_IN_FIELDS_SPEC" in str(exc_info.value)
+        assert "NOT_IN_FIELDS_SPEC" in str(exc_info.value) or "not in insert spec" in str(exc_info.value)
 
     finally:
         os.unlink(before_db)
@@ -1473,7 +1473,7 @@ def test_security_field_level_specs_catch_wrong_role():
         after = DatabaseSnapshot(after_db)
 
         # expect_only_v2 correctly FAILS because role is 'admin' not 'user'
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -1533,7 +1533,7 @@ def test_financial_data_validation():
         )
 
         # expect_only_v2 with bulk field specs catches unexpected discount
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -1593,7 +1593,7 @@ def test_permissions_validation():
         )
 
         # expect_only_v2 with bulk field specs catches unexpected delete permission
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -1661,7 +1661,7 @@ def test_json_field_validation():
         )
 
         # expect_only_v2 with bulk field specs catches unexpected settings
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -1726,7 +1726,7 @@ def test_expect_only_ignores_field_specs_with_whole_row():
         )
 
         # expect_only_v2 with wrong field values fails
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -1786,7 +1786,7 @@ def test_expect_only_v2_validates_field_values():
         )
 
         # expect_only_v2 with wrong field values fails
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {
@@ -1846,7 +1846,7 @@ def test_expect_only_v2_validates_is_public():
         )
 
         # expect_only_v2 with wrong is_public value fails
-        with pytest.raises(AssertionError, match="Unexpected database changes"):
+        with pytest.raises(AssertionError):
             before.diff(after).expect_only_v2(
                 [
                     {