dirsql 0.3.67__tar.gz → 0.3.69__tar.gz

{dirsql-0.3.67 → dirsql-0.3.69}/Cargo.lock

@@ -500,7 +500,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.3.67"
+version = "0.3.69"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.3.67 → dirsql-0.3.69}/PKG-INFO

@@ -1,14 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.3.67
-Requires-Dist: pytest>=8 ; extra == 'dev'
-Requires-Dist: pytest-describe>=2 ; extra == 'dev'
-Requires-Dist: pytest-asyncio>=0.23 ; extra == 'dev'
-Requires-Dist: pytest-cov>=5 ; extra == 'dev'
-Requires-Dist: ruff>=0.4 ; extra == 'dev'
-Requires-Dist: maturin>=1.0 ; extra == 'dev'
-Requires-Dist: ty==0.0.42 ; extra == 'dev'
-Provides-Extra: dev
+Version: 0.3.69
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index
 Author: Kevin Scott

{dirsql-0.3.67 → dirsql-0.3.69}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.3.67"
+version = "0.3.69"
 edition.workspace = true
 publish = false
 readme = "README.md"

{dirsql-0.3.67 → dirsql-0.3.69}/packages/python/e2e-attestation.json

@@ -1,6 +1,6 @@
 {
   "command": "uv run python -m pytest tests/e2e/ -x -q",
-  "ran_at": 1783215074,
+  "ran_at": 1783257990,
   "exit_code": 0,
-  "commit": "c5d752734907f27497b28b3448bad19247c3482e"
+  "commit": "cb8d663ecb72a808f4ab99589af16949e9449f3b"
 }

{dirsql-0.3.67 → dirsql-0.3.69}/packages/python/src/lib.rs

@@ -257,57 +257,93 @@ mod python {
         PyRuntimeError::new_err(e.to_string())
     }
 
-    fn row_event_to_py(py: Python<'_>, event: &RowEvent) -> PyResult<PyRowEvent> {
-        Ok(match event {
+    /// Pure, GIL-free intermediate for a row event. [`row_event_to_plain`]
+    /// builds it from a core [`RowEvent`] (unit-testable without a Python
+    /// interpreter); [`row_event_to_py`] then marshals it into the
+    /// Python-facing [`PyRowEvent`] (the GIL step). Splitting the two keeps the
+    /// variant -> action / field-selection mapping testable at the unit tier,
+    /// mirroring the napi binding's pure `row_event_to_js`. The value-level
+    /// `Row -> PyDict` conversion stays GIL-bound (binding-tier covered).
+    struct PlainRowEvent {
+        table: Option<String>,
+        action: &'static str,
+        row: Option<Row>,
+        old_row: Option<Row>,
+        error: Option<String>,
+        file_path: String,
+    }
+
+    fn row_event_to_plain(event: &RowEvent) -> PlainRowEvent {
+        match event {
             RowEvent::Insert {
                 table,
                 row,
                 file_path,
-            } => PyRowEvent {
+            } => PlainRowEvent {
                 table: Some(table.clone()),
-                action: "insert".to_string(),
-                row: Some(value_row_to_py_dict(py, row)?),
+                action: "insert",
+                row: Some(row.clone()),
                 old_row: None,
                 error: None,
-                file_path: Some(file_path.clone()),
+                file_path: file_path.clone(),
             },
             RowEvent::Update {
                 table,
                 old_row,
                 new_row,
                 file_path,
-            } => PyRowEvent {
+            } => PlainRowEvent {
                 table: Some(table.clone()),
-                action: "update".to_string(),
-                row: Some(value_row_to_py_dict(py, new_row)?),
-                old_row: Some(value_row_to_py_dict(py, old_row)?),
+                action: "update",
+                row: Some(new_row.clone()),
+                old_row: Some(old_row.clone()),
                 error: None,
-                file_path: Some(file_path.clone()),
+                file_path: file_path.clone(),
             },
             RowEvent::Delete {
                 table,
                 row,
                 file_path,
-            } => PyRowEvent {
+            } => PlainRowEvent {
                 table: Some(table.clone()),
-                action: "delete".to_string(),
-                row: Some(value_row_to_py_dict(py, row)?),
+                action: "delete",
+                row: Some(row.clone()),
                 old_row: None,
                 error: None,
-                file_path: Some(file_path.clone()),
+                file_path: file_path.clone(),
             },
             RowEvent::Error {
                 table,
                 file_path,
                 error,
-            } => PyRowEvent {
+            } => PlainRowEvent {
                 table: table.clone(),
-                action: "error".to_string(),
+                action: "error",
                 row: None,
                 old_row: None,
                 error: Some(error.clone()),
-                file_path: Some(file_path.to_string_lossy().to_string()),
+                file_path: file_path.to_string_lossy().to_string(),
             },
+        }
+    }
+
+    fn row_event_to_py(py: Python<'_>, event: &RowEvent) -> PyResult<PyRowEvent> {
+        let plain = row_event_to_plain(event);
+        Ok(PyRowEvent {
+            table: plain.table,
+            action: plain.action.to_string(),
+            row: plain
+                .row
+                .as_ref()
+                .map(|r| value_row_to_py_dict(py, r))
+                .transpose()?,
+            old_row: plain
+                .old_row
+                .as_ref()
+                .map(|r| value_row_to_py_dict(py, r))
+                .transpose()?,
+            error: plain.error,
+            file_path: Some(plain.file_path),
         })
     }
 
@@ -381,4 +417,84 @@ mod python {
         m.add_class::<PyRowEvent>()?;
         Ok(())
     }
+
+    #[cfg(test)]
+    mod tests {
+        use super::*;
+
+        fn one_row() -> HashMap<String, Value> {
+            HashMap::from([("k".to_string(), Value::Integer(7))])
+        }
+
+        #[test]
+        fn plain_insert_maps_row_and_action() {
+            let p = row_event_to_plain(&RowEvent::Insert {
+                table: "t".into(),
+                row: one_row(),
+                file_path: "/f".into(),
+            });
+            assert_eq!(p.action, "insert");
+            assert_eq!(p.table.as_deref(), Some("t"));
+            assert_eq!(
+                p.row.as_ref().and_then(|r| r.get("k")),
+                Some(&Value::Integer(7))
+            );
+            assert!(p.old_row.is_none());
+            assert!(p.error.is_none());
+            assert_eq!(p.file_path, "/f");
+        }
+
+        #[test]
+        fn plain_update_carries_old_and_new() {
+            let mut new = one_row();
+            new.insert("k".to_string(), Value::Integer(9));
+            let p = row_event_to_plain(&RowEvent::Update {
+                table: "t".into(),
+                old_row: one_row(),
+                new_row: new,
+                file_path: "/f".into(),
+            });
+            assert_eq!(p.action, "update");
+            assert_eq!(
+                p.row.as_ref().and_then(|r| r.get("k")),
+                Some(&Value::Integer(9))
+            );
+            assert_eq!(
+                p.old_row.as_ref().and_then(|r| r.get("k")),
+                Some(&Value::Integer(7))
+            );
+        }
+
+        #[test]
+        fn plain_delete_has_row_no_old() {
+            let p = row_event_to_plain(&RowEvent::Delete {
+                table: "t".into(),
+                row: one_row(),
+                file_path: "/f".into(),
+            });
+            assert_eq!(p.action, "delete");
+            assert!(p.row.is_some());
+            assert!(p.old_row.is_none());
+        }
+
+        #[test]
+        fn plain_error_has_no_row_and_optional_table() {
+            let p = row_event_to_plain(&RowEvent::Error {
+                table: None,
+                file_path: std::path::PathBuf::from("/f"),
+                error: "boom".into(),
+            });
+            assert_eq!(p.action, "error");
+            assert!(p.table.is_none());
+            assert!(p.row.is_none());
+            assert!(p.old_row.is_none());
+            assert_eq!(p.error.as_deref(), Some("boom"));
+            assert_eq!(p.file_path, "/f");
+        }
+
+        #[test]
+        fn extract_error_displays_inner() {
+            assert_eq!(ExtractError("bad".to_string()).to_string(), "bad");
+        }
+    }
 }

{dirsql-0.3.67 → dirsql-0.3.69}/pyproject.toml

@@ -19,7 +19,13 @@ repository = "https://github.com/thekevinscott/dirsql"
 keywords = ["sql", "filesystem", "directory", "sqlite", "index"]
 readme = "README.md"
 
-[project.optional-dependencies]
+# Dev/test dependencies live in a PEP 735 dependency-group (not a
+# `[project.optional-dependencies]` extra) so a plain `uv sync` installs them
+# by default -- the reusable testing-conventions coverage/mutation jobs run
+# `uv sync` with no `--extra`, and our colocated suite needs pytest-describe /
+# pytest-asyncio to collect at all. Every in-repo flow is uv-based and now uses
+# plain `uv sync`; the old `pip install .[dev]` extra is intentionally dropped.
+[dependency-groups]
 dev = [
     "pytest>=8",
     "pytest-describe>=2",