fleet-python 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

fleet/verifiers/{database_snapshot.py → db.py}

@@ -1,4 +1,3 @@
-# database_dsl.py
 """A schema‑agnostic, SQL‑native DSL for snapshot validation and diff invariants.
 
 The module extends your original `DatabaseSnapshot` implementation with
@@ -11,11 +10,13 @@ The module extends your original `DatabaseSnapshot` implementation with
 The public API stays tiny yet composable; everything else is built on
 orthogonal primitives so it works for *any* relational schema.
 """
+
 from __future__ import annotations
 
 import sqlite3
 from datetime import datetime
 from typing import Any
+import json
 
 ################################################################################
 #  Low‑level helpers
@@ -26,6 +27,36 @@ Condition = tuple[str, str, SQLValue]  # (column, op, value)
 JoinSpec = tuple[str, dict[str, str]]  # (table, on mapping)
 
 
+def _is_json_string(value: Any) -> bool:
+    """Check if a value looks like a JSON string."""
+    if not isinstance(value, str):
+        return False
+    value = value.strip()
+    return (value.startswith("{") and value.endswith("}")) or (
+        value.startswith("[") and value.endswith("]")
+    )
+
+
+def _values_equivalent(val1: Any, val2: Any) -> bool:
+    """Compare two values, using JSON semantic comparison for JSON strings."""
+    # If both are exactly equal, return True
+    if val1 == val2:
+        return True
+
+    # If both look like JSON strings, try semantic comparison
+    if _is_json_string(val1) and _is_json_string(val2):
+        try:
+            parsed1 = json.loads(val1)
+            parsed2 = json.loads(val2)
+            return parsed1 == parsed2
+        except (json.JSONDecodeError, TypeError):
+            # If parsing fails, fall back to string comparison
+            pass
+
+    # Default to exact comparison
+    return val1 == val2
+
+
 class _CountResult:
     """Wraps an integer count so we can chain assertions fluently."""
 
@@ -96,9 +127,7 @@ class QueryBuilder:
     # ---------------------------------------------------------------------
     #  WHERE helpers (SQL‑like)
     # ---------------------------------------------------------------------
-    def _add_condition(
-        self, column: str, op: str, value: SQLValue
-    ) -> "QueryBuilder":  # noqa: UP037
+    def _add_condition(self, column: str, op: str, value: SQLValue) -> "QueryBuilder":  # noqa: UP037
         qb = self._clone()
         qb._conditions.append((column, op, value))
         return qb
@@ -126,9 +155,7 @@ class QueryBuilder:
         qb._conditions.append((column, "IN", tuple(values)))
         return qb
 
-    def not_in(
-        self, column: str, values: list[SQLValue]
-    ) -> "QueryBuilder":  # noqa: UP037
+    def not_in(self, column: str, values: list[SQLValue]) -> "QueryBuilder":  # noqa: UP037
         qb = self._clone()
         qb._conditions.append((column, "NOT IN", tuple(values)))
         return qb
@@ -147,9 +174,7 @@ class QueryBuilder:
     # ---------------------------------------------------------------------
     #  JOIN (simple inner join)
     # ---------------------------------------------------------------------
-    def join(
-        self, other_table: str, on: dict[str, str]
-    ) -> "QueryBuilder":  # noqa: UP037
+    def join(self, other_table: str, on: dict[str, str]) -> "QueryBuilder":  # noqa: UP037
         """`on` expects {local_col: remote_col}."""
         qb = self._clone()
         qb._joins.append((other_table, on))
@@ -166,7 +191,8 @@ class QueryBuilder:
         # Joins -------------------------------------------------------------
         for tbl, onmap in self._joins:
             join_clauses = [
-                f"{self._table}.{l} = {tbl}.{r}" for l, r in onmap.items()  # noqa: E741
+                f"{self._table}.{l} = {tbl}.{r}"
+                for l, r in onmap.items()  # noqa: E741
             ]
             sql.append(f"JOIN {tbl} ON {' AND '.join(join_clauses)}")
 
@@ -430,10 +456,27 @@ class SnapshotDiff:
     def expect_only(self, allowed_changes: list[dict[str, Any]]):
         """Allowed changes is a list of {table, pk, field, after} (before optional)."""
         diff = self._collect()
-        allowed_set = {
-            (c["table"], c.get("pk"), c.get("field"), c.get("after"))
-            for c in allowed_changes
-        }
+
+        def _is_change_allowed(
+            table: str, row_id: str, field: str | None, after_value: Any
+        ) -> bool:
+            """Check if a change is in the allowed list using semantic comparison."""
+            for allowed in allowed_changes:
+                allowed_pk = allowed.get("pk")
+                # Handle type conversion for primary key comparison
+                # Convert both to strings for comparison to handle int/string mismatches
+                pk_match = (
+                    str(allowed_pk) == str(row_id) if allowed_pk is not None else False
+                )
+
+                if (
+                    allowed["table"] == table
+                    and pk_match
+                    and allowed.get("field") == field
+                    and _values_equivalent(allowed.get("after"), after_value)
+                ):
+                    return True
+            return False
 
         # Collect all unexpected changes for detailed reporting
         unexpected_changes = []
@@ -443,8 +486,7 @@ class SnapshotDiff:
                 for f, vals in row["changes"].items():
                     if self.ignore_config.should_ignore_field(tbl, f):
                         continue
-                    tup = (tbl, row["row_id"], f, vals["after"])
-                    if tup not in allowed_set:
+                    if not _is_change_allowed(tbl, row["row_id"], f, vals["after"]):
                         unexpected_changes.append(
                             {
                                 "type": "modification",
@@ -458,8 +500,7 @@ class SnapshotDiff:
                         )
 
             for row in report.get("added_rows", []):
-                tup = (tbl, row["row_id"], None, "__added__")
-                if tup not in allowed_set:
+                if not _is_change_allowed(tbl, row["row_id"], None, "__added__"):
                     unexpected_changes.append(
                         {
                             "type": "insertion",
@@ -472,8 +513,7 @@ class SnapshotDiff:
                     )
 
             for row in report.get("removed_rows", []):
-                tup = (tbl, row["row_id"], None, "__removed__")
-                if tup not in allowed_set:
+                if not _is_change_allowed(tbl, row["row_id"], None, "__removed__"):
                     unexpected_changes.append(
                         {
                             "type": "deletion",
@@ -663,4 +703,4 @@ class DatabaseSnapshot:
 
     # ---------------------------------------------------------------------
     def __repr__(self):
-        return f"<DatabaseSnapshot {self.name} at {self.db_path}>"
+        return f"<DatabaseSnapshot {self.name} at {self.db_path}>"

fleet/verifiers/sql_differ.py

@@ -184,4 +184,4 @@ class SQLiteDiffer:
             except Exception as e:
                 results[table] = {"error": str(e)}
 
-        return results
+        return results

{fleet_python-0.2.2.dist-info → fleet_python-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fleet-python
-Version: 0.2.2
+Version: 0.2.3
 Summary: Python SDK for Fleet environments
 Author-email: Fleet AI <nic@fleet.so>
 License: Apache-2.0
@@ -31,6 +31,8 @@ Requires-Dist: black>=22.0.0; extra == "dev"
 Requires-Dist: isort>=5.0.0; extra == "dev"
 Requires-Dist: mypy>=1.0.0; extra == "dev"
 Requires-Dist: ruff>=0.1.0; extra == "dev"
+Provides-Extra: playwright
+Requires-Dist: playwright>=1.40.0; extra == "playwright"
 Dynamic: license-file
 
 # Fleet SDK

fleet_python-0.2.3.dist-info/RECORD

@@ -0,0 +1,31 @@
+examples/dsl_example.py,sha256=W-g0RR7qOTGUSHYiFhcwL3MsrHB-C6t3UHQg6XTxxss,5259
+examples/example.py,sha256=G_UC4fD55QKPPMAKINtsJs0U6b0wg-GbpaeIGwLnhWw,933
+examples/json_tasks_example.py,sha256=fz1hGaJ_VukH2gwJFvhQmyWRO8ocN9ptFnplTJSOrbA,2348
+examples/nova_act_example.py,sha256=EwTivGRpJ4ZGicJw0eK46lvjgjN0_x3FJavafzdVkfc,777
+examples/openai_example.py,sha256=ebaGIs1OFhohUdtQ0fHcMUqvmCd0vJa45_FUo58eTh4,8486
+examples/openai_simple_example.py,sha256=16u_g9vD8mHNTZhta6Qdq_qAQs-wU6FaPVkhGUPnSIs,1788
+examples/quickstart.py,sha256=lVRzbnWIweU9ioe7uk6R2Rm7oSpt4mt8Jq_VUUp1zKg,4696
+fleet/__init__.py,sha256=AjkbRVYzfIUYEw1PvCceGhHBCPOu_c6Qx5KweoNmAQM,1747
+fleet/base.py,sha256=5JnzMMyT1Ey8SrYs4Ydka3bUoYRRA-wxHx1yCURAM48,2009
+fleet/client.py,sha256=RFOEhxJa_de3N6JP48p8xMYhsGVRv5V4U4OWINKpQ8Y,7392
+fleet/exceptions.py,sha256=yG3QWprCw1OnF-vdFBFJWE4m3ftBLBng31Dr__VbjI4,2249
+fleet/models.py,sha256=Jf6Zmk689TPXhTSnVENK_VCw0VsujWzEWsN3T29MQ0k,3713
+fleet/playwright.py,sha256=5MLFPE5P_-MpzAQ3EJ6GsLthuJiWwYkNuvhPE_rwe_E,8914
+fleet/env/__init__.py,sha256=_zcEf-sukzVblsTfzQbc9ixDC47bsTts2fHlKyu3OMc,81
+fleet/env/client.py,sha256=I2ja8upwdRcBnehn4GRtkRgWPCLz0cJpbSvQmSuKVrc,423
+fleet/instance/__init__.py,sha256=pKuX6zPpTKmJD0c-Qg_hRdnQuiWNohQdYhlHElxilQE,562
+fleet/instance/base.py,sha256=bm6BGd81TnTDqE_qG6S50Xhikf9DwNqEEk1uKFY7dEk,1540
+fleet/instance/client.py,sha256=Tybjm0jbxM_lnTvQ-Gtm2e8u2qvk9vjDfBwns-DpQhw,9872
+fleet/instance/models.py,sha256=ZTiue0YOuhuwX8jYfJAoCzGfqjLqqXRLqK1LVFhq6rQ,4183
+fleet/resources/base.py,sha256=203gD54NP1IvjuSqFo-f7FvrkhtjChggtzrxJK7xf2E,667
+fleet/resources/browser.py,sha256=x11y4aKHogIEv83FByHtExerjV-cDWI3U62349Guq_Q,1368
+fleet/resources/sqlite.py,sha256=sRiII_qJ8X6-FSemlBsXThz4ZPjkNy9wDT8g5UAz2XM,1501
+fleet/verifiers/__init__.py,sha256=sNlURjry8FYFa-0qFy6boRCcNjXAtMPFaAfpaRqpOPk,394
+fleet/verifiers/code.py,sha256=YB96SPncu9emO-udQh7zYf_UR1aPz7nBjPtKf5O6fD8,4356
+fleet/verifiers/db.py,sha256=tssmvJjDHuBIy8qlL_P5-UdmEFUw2DZcqLsWZ8ot3Xw,27766
+fleet/verifiers/sql_differ.py,sha256=dmiGCFXVMEMbAX519OjhVqgA8ZvhnvdmC1BVpL7QCF0,6490
+fleet_python-0.2.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fleet_python-0.2.3.dist-info/METADATA,sha256=jdYK3MqjugV1mQ4Bl0Uw-ZH1HQL6Vzr0vTFcnP2xATw,3153
+fleet_python-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fleet_python-0.2.3.dist-info/top_level.txt,sha256=AOyXOrBXUjPcH4BumElz_D95kiWKNIpUbUPFP_9gCLk,15
+fleet_python-0.2.3.dist-info/RECORD,,

fleet_python-0.2.2.dist-info/RECORD

@@ -1,27 +0,0 @@
-examples/dsl_example.py,sha256=LKqm2f2BHZh3Z3MWhpi4L87l5qt2TR0Ol1Mdb4mQ3bA,3297
-examples/example.py,sha256=G_UC4fD55QKPPMAKINtsJs0U6b0wg-GbpaeIGwLnhWw,933
-examples/nova_act_example.py,sha256=Z-LtSpAP4QCRg4zh-e-MQw5L8bdfZ6ev3fB5ExYToao,6443
-examples/openai_example.py,sha256=BWiDQrQCcyKgveVBXmyD7V2xypoPnumF5T5WvuOCpJ0,15258
-examples/quickstart.py,sha256=m5i5gJ0RdHJgBUlOeUSkLPHjj2GVhNvm7BP6g_A9mzA,4691
-fleet/__init__.py,sha256=D8aNOSGc-kUGrgPTVGtRhmz_Lov5yyqSX9-iBQv6Y4A,1361
-fleet/base.py,sha256=5JnzMMyT1Ey8SrYs4Ydka3bUoYRRA-wxHx1yCURAM48,2009
-fleet/client.py,sha256=5QKsCSmVhR10lcEIky5heL2NFZbmSvej19VXtfVuq14,6980
-fleet/exceptions.py,sha256=yG3QWprCw1OnF-vdFBFJWE4m3ftBLBng31Dr__VbjI4,2249
-fleet/models.py,sha256=Jf6Zmk689TPXhTSnVENK_VCw0VsujWzEWsN3T29MQ0k,3713
-fleet/env/__init__.py,sha256=_zcEf-sukzVblsTfzQbc9ixDC47bsTts2fHlKyu3OMc,81
-fleet/env/client.py,sha256=I2ja8upwdRcBnehn4GRtkRgWPCLz0cJpbSvQmSuKVrc,423
-fleet/manager/__init__.py,sha256=KXs3cz8_524XwG-MwizeEwsaX65HL8ueZieXFb7RItw,467
-fleet/manager/base.py,sha256=bm6BGd81TnTDqE_qG6S50Xhikf9DwNqEEk1uKFY7dEk,1540
-fleet/manager/client.py,sha256=s0EZcFolQyrTscbWVnvcVJpovMmWQFBR-NOBNFjgSBY,8571
-fleet/manager/models.py,sha256=oSWZ893tRhPTLyPybrk1c5AOYduWEGIKEGZjUQa1vGw,3910
-fleet/resources/base.py,sha256=eFo3wnzfPt6UoMxZSLdklvnPTDgqvjS870u8RcOEAvU,666
-fleet/resources/browser.py,sha256=H8wgabP4lxSoN2q3iFQ35qYU3nwSG-gOVQcQ8ot3DqU,1522
-fleet/resources/sqlite.py,sha256=Y30EcelvRGip0jyFEr9wxt3_EfwWS_Edt3O_qiha-pU,1498
-fleet/verifiers/__init__.py,sha256=CLw9-6bshvX7PgLcQ5KYCG9hmCLx83pi3ZS4FZPauAU,163
-fleet/verifiers/database_snapshot.py,sha256=8-DkYVEvHCwBEhKKAfMJBQmE2146z2aZvIaRtZRCk1s,26147
-fleet/verifiers/sql_differ.py,sha256=4o6Gt9472x8rcbhA58OMXdaczJiWjpYwR7LeB32D4QE,6489
-fleet_python-0.2.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fleet_python-0.2.2.dist-info/METADATA,sha256=qwWJ_66gEeJeWSDcQt8SGkCNJfB0-6Y6dqFXyDDRu-0,3069
-fleet_python-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fleet_python-0.2.2.dist-info/top_level.txt,sha256=AOyXOrBXUjPcH4BumElz_D95kiWKNIpUbUPFP_9gCLk,15
-fleet_python-0.2.2.dist-info/RECORD,,