release: abi3 wheels for py3.9+

Author: sigridjineth

.cargo/config.toml

@@ -0,0 +1,6 @@
+[target.aarch64-apple-darwin]
+rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"]
+
+[target.x86_64-apple-darwin]
+rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"]
+

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "agentjson"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Probabilistic JSON repair library powered by Rust"
@@ -14,5 +14,5 @@ crate-type = ["cdylib"]
 path = "rust-pyo3/src/lib.rs"
 
 [dependencies]
-pyo3 = { version = "0.23", features = ["extension-module"] }
+pyo3 = { version = "0.23", features = ["extension-module", "abi3-py39"] }
 json_prob_parser = { package = "agentjson-core", path = "rust" }

Cargo.toml

@@ -56,6 +56,8 @@ uv add agentjson
 # or: python -m pip install agentjson
 ```
 
+Note: `agentjson` ships **abi3** wheels (Python **3.9+**) so the same wheel works across CPython versions (e.g. 3.11, 3.12).
+
 ### Build from source (development)
 
 #### 1) Install Rust toolchain

README.md

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "agentjson"
-version = "0.1.1"
+version = "0.1.2"
 description = "Probabilistic JSON repair library powered by Rust - fixes broken JSON from LLMs"
 readme = "README.md"
 requires-python = ">=3.9"

pyproject.toml

@@ -1,7 +1,7 @@
 use pyo3::prelude::*;
-use pyo3::buffer::PyBuffer;
-use pyo3::types::{PyByteArray, PyBytes, PyDict, PyList};
+use pyo3::types::{PyBytes, PyDict, PyList};
 use pyo3::IntoPyObjectExt;
+use std::borrow::Cow;
 
 use json_prob_parser::beam;
 use json_prob_parser::json::JsonValue;
@@ -36,57 +36,23 @@ fn json_to_py(py: Python<'_>, v: &JsonValue) -> PyObject {
 
 #[pyfunction]
 fn strict_loads_py(py: Python<'_>, input: &Bound<'_, PyAny>) -> PyResult<PyObject> {
-    let parsed = if let Ok(s) = input.extract::<&str>() {
-        strict::strict_parse(s)
-            .map_err(|e| pyo3::exceptions::PyValueError::new_err((e.message, e.pos)))?
-    } else if let Ok(b) = input.downcast::<PyBytes>() {
-        let s = std::str::from_utf8(b.as_bytes()).map_err(|_| {
+    let parsed = if let Ok(s) = input.extract::<Cow<str>>() {
+        strict::strict_parse(s.as_ref())
+    } else if let Ok(b) = input.extract::<Cow<[u8]>>() {
+        let s = std::str::from_utf8(b.as_ref()).map_err(|_| {
             pyo3::exceptions::PyValueError::new_err((
                 "str is not valid UTF-8: surrogates not allowed".to_string(),
                 0_usize,
             ))
         })?;
         strict::strict_parse(s)
-            .map_err(|e| pyo3::exceptions::PyValueError::new_err((e.message, e.pos)))?
-    } else if let Ok(ba) = input.downcast::<PyByteArray>() {
-        let parsed = {
-            // SAFETY: We do not call back into Python while using this slice.
-            let bytes = unsafe { ba.as_bytes() };
-            let s = std::str::from_utf8(bytes).map_err(|_| {
-                pyo3::exceptions::PyValueError::new_err((
-                    "str is not valid UTF-8: surrogates not allowed".to_string(),
-                    0_usize,
-                ))
-            })?;
-            strict::strict_parse(s)
-        };
-        parsed.map_err(|e| pyo3::exceptions::PyValueError::new_err((e.message, e.pos)))?
-    } else if let Ok(buf) = PyBuffer::<u8>::get(input) {
-        let parsed = {
-            let cells = buf.as_slice(py).ok_or_else(|| {
-                pyo3::exceptions::PyValueError::new_err((
-                    "input buffer must be C-contiguous".to_string(),
-                    0_usize,
-                ))
-            })?;
-
-            // ReadOnlyCell<u8> is repr(transparent) over UnsafeCell<u8>, so this is safe.
-            let bytes = unsafe { std::slice::from_raw_parts(cells.as_ptr() as *const u8, cells.len()) };
-            let s = std::str::from_utf8(bytes).map_err(|_| {
-                pyo3::exceptions::PyValueError::new_err((
-                    "str is not valid UTF-8: surrogates not allowed".to_string(),
-                    0_usize,
-                ))
-            })?;
-            strict::strict_parse(s)
-        };
-        parsed.map_err(|e| pyo3::exceptions::PyValueError::new_err((e.message, e.pos)))?
     } else {
         return Err(pyo3::exceptions::PyValueError::new_err((
             "input must be bytes, bytearray, memoryview, or str".to_string(),
             0_usize,
         )));
-    };
+    }
+    .map_err(|e| pyo3::exceptions::PyValueError::new_err((e.message, e.pos)))?;
 
     Ok(json_to_py(py, &parsed))
 }