Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Tests

on:
push:
branches: [ master, claude/* ]
pull_request:
branches: [ master ]

Expand Down
4 changes: 3 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
include README.md
include LICENSE
recursive-include nsv *.py
recursive-include nsv *.py
include rust/Cargo.toml
recursive-include rust/src *
8 changes: 8 additions & 0 deletions nsv/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,11 @@ def dumps(data: Iterable[Iterable[str]]) -> str:
lines.append(Writer.escape(cell))
lines.append('')
return ''.join(f'{line}\n' for line in lines)

# Try to use fast Rust implementation if available
try:
from ._rust import loads as _loads_rs, dumps as _dumps_rs
loads = _loads_rs
dumps = _dumps_rs
except ImportError:
pass
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools>=61.0", "setuptools-rust>=1.0"]
build-backend = "setuptools.build_meta"
313 changes: 313 additions & 0 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[package]
name = "_rust"
version = "0.1.0"
edition = "2021"

[lib]
name = "_rust"
crate-type = ["cdylib"]

[dependencies]
pyo3 = { version = "0.20", features = ["extension-module"] }
nsv = "0.0.12"
35 changes: 35 additions & 0 deletions rust/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
use pyo3::prelude::*;
use pyo3::types::PyList;

/// Parse NSV string into a list of lists of str
#[pyfunction]
fn loads(py: Python, s: &str) -> PyResult<PyObject> {
let data = nsv::decode(s);

// Convert Vec<Vec<String>> to Python list of lists
let result = PyList::empty(py);
for row in data {
let py_row = PyList::empty(py);
for cell in row {
py_row.append(cell)?;
}
result.append(py_row)?;
}

Ok(result.into())
}

/// Serialize data to NSV string
#[pyfunction]
fn dumps(data: Vec<Vec<String>>) -> PyResult<String> {
Ok(nsv::encode(&data))
}

/// A Python module implemented in Rust.
#[pymodule]
fn _rust(_py: Python, m: &PyModule) -> PyResult<()> {
m.add_function(wrap_pyfunction!(loads, m)?)?;
m.add_function(wrap_pyfunction!(dumps, m)?)?;
Ok(())
}

Loading
Loading