fleet-python 0.2.100__tar.gz → 0.2.102__tar.gz

{fleet_python-0.2.100/fleet_python.egg-info → fleet_python-0.2.102}/PKG-INFO

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

{fleet_python-0.2.100 → fleet_python-0.2.102}/fleet/__init__.py

@@ -73,7 +73,7 @@ from . import env
 from . import global_client as _global_client
 from ._async import global_client as _async_global_client
 
-__version__ = "0.2.100"
+__version__ = "0.2.102"
 
 __all__ = [
     # Core classes

{fleet_python-0.2.100 → fleet_python-0.2.102}/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.100"
+__version__ = "0.2.102"
 
 __all__ = [
     # Core classes

{fleet_python-0.2.100 → fleet_python-0.2.102}/fleet/_async/base.py

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

{fleet_python-0.2.100 → fleet_python-0.2.102}/fleet/_async/instance/client.py

@@ -166,8 +166,12 @@ class AsyncInstanceClient:
         if self._resources is None:
             response = await self.client.request("GET", "/resources")
             if response.status_code != 200:
-                self._resources = []
-                return
+                response_body = response.text[:500] if response.text else "empty"
+                self._resources = []  # Mark as loaded (empty) to prevent retries
+                raise FleetEnvironmentError(
+                    f"Failed to load instance resources: status_code={response.status_code} "
+                    f"(url={self.base_url}, response={response_body})"
+                )
 
             # Handle both old and new response formats
             response_data = response.json()

{fleet_python-0.2.100 → fleet_python-0.2.102}/fleet/_async/resources/sqlite.py

@@ -22,6 +22,7 @@ from fleet.verifiers.db import (
     _get_row_identifier,
     _format_row_for_error,
     _values_equivalent,
+    validate_diff_expect_exactly,
 )
 
 
@@ -1732,6 +1733,11 @@ class AsyncSnapshotDiff:
 
     async def expect_only(self, allowed_changes: List[Dict[str, Any]]):
         """Ensure only specified changes occurred."""
+        # Normalize pk values: convert lists to tuples for hashability and consistency
+        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:
             return await self._expect_no_changes()
@@ -1750,12 +1756,18 @@ class AsyncSnapshotDiff:
         This version supports field-level specifications for added/removed rows,
         allowing users to specify expected field values instead of just whole-row specs.
         """
+        # Normalize pk values: convert lists to tuples for hashability and consistency
+        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:
             return await self._expect_no_changes()
 
         resource = self.after.resource
-        if resource.client is not None and resource._mode == "http":
+        # Disabled: structured diff endpoint not yet available
+        if False and resource.client is not None and resource._mode == "http":
             api_diff = None
             try:
                 payload = {}
@@ -1779,7 +1791,7 @@ class AsyncSnapshotDiff:
                 # Fall back to local diff if API call fails
                 print(f"Warning: Failed to fetch structured diff from API: {e}")
                 print("Falling back to local diff computation...")
-            
+
             # Validate outside try block so AssertionError propagates
             if api_diff is not None:
                 return await self._validate_diff_against_allowed_changes_v2(api_diff, allowed_changes)
@@ -1794,6 +1806,81 @@ class AsyncSnapshotDiff:
             diff, allowed_changes
         )
 
+    async def expect_exactly(self, expected_changes: List[Dict[str, Any]]):
+        """Verify that EXACTLY the specified changes occurred.
+
+        This is stricter than expect_only_v2:
+        1. All changes in diff must match a spec (no unexpected changes)
+        2. All specs must have a matching change in diff (no missing expected changes)
+
+        This method is ideal for verifying that an agent performed exactly what was expected -
+        not more, not less.
+
+        Args:
+            expected_changes: List of expected change specs. Each spec requires:
+                - "type": "insert", "modify", or "delete" (required)
+                - "table": table name (required)
+                - "pk": primary key value (required)
+
+                Spec formats by type:
+                - Insert: {"type": "insert", "table": "t", "pk": 1, "fields": [...]}
+                - Modify: {"type": "modify", "table": "t", "pk": 1, "resulting_fields": [...], "no_other_changes": True/False}
+                - Delete: {"type": "delete", "table": "t", "pk": 1}
+
+                Field specs are 2-tuples: (field_name, expected_value)
+                - ("name", "Alice"): check field equals "Alice"
+                - ("name", ...): accept any value (ellipsis)
+                - ("name", None): check field is SQL NULL
+
+                Note: Legacy specs without explicit "type" are not supported.
+
+        Returns:
+            self for method chaining
+
+        Raises:
+            AssertionError: If there are unexpected changes OR if expected changes are missing
+            ValueError: If specs are missing required fields or have invalid format
+        """
+        # Get the diff (using HTTP if available, otherwise local)
+        resource = self.after.resource
+        diff = None
+
+        if resource.client is not None and resource._mode == "http":
+            try:
+                payload = {}
+                if self.ignore_config:
+                    payload["ignore_config"] = {
+                        "tables": list(self.ignore_config.tables),
+                        "fields": list(self.ignore_config.fields),
+                        "table_fields": {
+                            table: list(fields) for table, fields in self.ignore_config.table_fields.items()
+                        }
+                    }
+                response = await resource.client.request(
+                    "POST",
+                    "/diff/structured",
+                    json=payload,
+                )
+                result = response.json()
+                if result.get("success") and "diff" in result:
+                    diff = result["diff"]
+            except Exception as e:
+                print(f"Warning: Failed to fetch structured diff from API: {e}")
+                print("Falling back to local diff computation...")
+
+        if diff is None:
+            diff = await self._collect()
+
+        # Use shared validation logic
+        success, error_msg, _ = validate_diff_expect_exactly(
+            diff, expected_changes, self.ignore_config
+        )
+
+        if not success:
+            raise AssertionError(error_msg)
+
+        return self
+
     async def _ensure_all_fetched(self):
         """Fetch ALL data from ALL tables upfront (non-lazy loading).
         

{fleet_python-0.2.100 → fleet_python-0.2.102}/fleet/base.py

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

{fleet_python-0.2.100 → fleet_python-0.2.102}/fleet/instance/client.py

@@ -164,8 +164,12 @@ class InstanceClient:
         if self._resources is None:
             response = self.client.request("GET", "/resources")
             if response.status_code != 200:
-                self._resources = []
-                return
+                response_body = response.text[:500] if response.text else "empty"
+                self._resources = []  # Mark as loaded (empty) to prevent retries
+                raise FleetEnvironmentError(
+                    f"Failed to load instance resources: status_code={response.status_code} "
+                    f"(url={self.base_url}, response={response_body})"
+                )
 
             # Handle both old and new response formats
             response_data = response.json()

{fleet_python-0.2.100 → fleet_python-0.2.102}/fleet/resources/sqlite.py

@@ -21,6 +21,7 @@ from fleet.verifiers.db import (
     _get_row_identifier,
     _format_row_for_error,
     _values_equivalent,
+    validate_diff_expect_exactly,
 )
 
 
@@ -1780,6 +1781,11 @@ class SyncSnapshotDiff:
 
     def expect_only(self, allowed_changes: List[Dict[str, Any]]):
         """Ensure only specified changes occurred."""
+        # Normalize pk values: convert lists to tuples for hashability and consistency
+        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:
             return self._expect_no_changes()
@@ -1798,12 +1804,18 @@ class SyncSnapshotDiff:
         This version supports field-level specifications for added/removed rows,
         allowing users to specify expected field values instead of just whole-row specs.
         """
+        # Normalize pk values: convert lists to tuples for hashability and consistency
+        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:
             return self._expect_no_changes()
 
         resource = self.after.resource
-        if resource.client is not None and resource._mode == "http":
+        # Disabled: structured diff endpoint not yet available
+        if False and resource.client is not None and resource._mode == "http":
             api_diff = None
             try:
                 payload = {}
@@ -1827,7 +1839,7 @@ class SyncSnapshotDiff:
                 # Fall back to local diff if API call fails
                 print(f"Warning: Failed to fetch structured diff from API: {e}")
                 print("Falling back to local diff computation...")
-            
+
             # Validate outside try block so AssertionError propagates
             if api_diff is not None:
                 return self._validate_diff_against_allowed_changes_v2(api_diff, allowed_changes)
@@ -1840,6 +1852,81 @@ class SyncSnapshotDiff:
         diff = self._collect()
         return self._validate_diff_against_allowed_changes_v2(diff, allowed_changes)
 
+    def expect_exactly(self, expected_changes: List[Dict[str, Any]]):
+        """Verify that EXACTLY the specified changes occurred.
+
+        This is stricter than expect_only_v2:
+        1. All changes in diff must match a spec (no unexpected changes)
+        2. All specs must have a matching change in diff (no missing expected changes)
+
+        This method is ideal for verifying that an agent performed exactly what was expected -
+        not more, not less.
+
+        Args:
+            expected_changes: List of expected change specs. Each spec requires:
+                - "type": "insert", "modify", or "delete" (required)
+                - "table": table name (required)
+                - "pk": primary key value (required)
+
+                Spec formats by type:
+                - Insert: {"type": "insert", "table": "t", "pk": 1, "fields": [...]}
+                - Modify: {"type": "modify", "table": "t", "pk": 1, "resulting_fields": [...], "no_other_changes": True/False}
+                - Delete: {"type": "delete", "table": "t", "pk": 1}
+
+                Field specs are 2-tuples: (field_name, expected_value)
+                - ("name", "Alice"): check field equals "Alice"
+                - ("name", ...): accept any value (ellipsis)
+                - ("name", None): check field is SQL NULL
+
+                Note: Legacy specs without explicit "type" are not supported.
+
+        Returns:
+            self for method chaining
+
+        Raises:
+            AssertionError: If there are unexpected changes OR if expected changes are missing
+            ValueError: If specs are missing required fields or have invalid format
+        """
+        # Get the diff (using HTTP if available, otherwise local)
+        resource = self.after.resource
+        diff = None
+
+        if resource.client is not None and resource._mode == "http":
+            try:
+                payload = {}
+                if self.ignore_config:
+                    payload["ignore_config"] = {
+                        "tables": list(self.ignore_config.tables),
+                        "fields": list(self.ignore_config.fields),
+                        "table_fields": {
+                            table: list(fields) for table, fields in self.ignore_config.table_fields.items()
+                        }
+                    }
+                response = resource.client.request(
+                    "POST",
+                    "/diff/structured",
+                    json=payload,
+                )
+                result = response.json()
+                if result.get("success") and "diff" in result:
+                    diff = result["diff"]
+            except Exception as e:
+                print(f"Warning: Failed to fetch structured diff from API: {e}")
+                print("Falling back to local diff computation...")
+
+        if diff is None:
+            diff = self._collect()
+
+        # Use shared validation logic
+        success, error_msg, _ = validate_diff_expect_exactly(
+            diff, expected_changes, self.ignore_config
+        )
+
+        if not success:
+            raise AssertionError(error_msg)
+
+        return self
+
     def _ensure_all_fetched(self):
         """Fetch ALL data from ALL tables upfront (non-lazy loading).