feat: upgrade dependencies, thread safety

Author: nohehf

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
       - name: Install python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.11.9"
+          python-version: "3.12"
 
       - name: Run tests
         run: make setup test

.github/workflows/release.yaml

@@ -47,7 +47,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -74,7 +74,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
           architecture: ${{ matrix.platform.target }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
@@ -101,7 +101,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:

Cargo.lock

@@ -9,7 +9,7 @@ name = "stack_graphs_python"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = "0.20.0"
+pyo3 = "0.24.2"
 stack-graphs = { version = "0.14.1", features = ["storage"] }
 tree-sitter-stack-graphs = { version = "0.10.0", features = ["cli"] }
 tree-sitter-stack-graphs-java = "0.5.0"

Cargo.toml

@@ -96,7 +96,7 @@ export const foo = "bar"
 ### Requirements
 
 - Rust
-- Python 3.11+
+- Python 3.12+
 
 ### Setup
 

README.md

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "stack-graphs-python-bindings"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 classifiers = [
     "Programming Language :: Rust",
     "Programming Language :: Python :: Implementation :: CPython",

pyproject.toml

@@ -1,4 +1,5 @@
 use std::fmt::Display;
+use std::sync::{Arc, Mutex};
 
 use pyo3::prelude::*;
 
@@ -10,17 +11,17 @@ use crate::stack_graphs_wrapper::{
     get_status, get_status_all, index_all, new_loader, query_definition,
 };
 
-#[pyclass]
-#[derive(Clone)]
+#[pyclass(eq, eq_int)]
+#[derive(Clone, PartialEq)]
 pub enum Language {
     Python,
     JavaScript,
     TypeScript,
     Java,
 }
 
-#[pyclass]
-#[derive(Clone)]
+#[pyclass(eq, eq_int)]
+#[derive(Clone, PartialEq)]
 pub enum FileStatus {
     Missing,
     Indexed,
@@ -103,7 +104,7 @@ pub struct Position {
 
 #[pyclass]
 pub struct Querier {
-    db_reader: SQLiteReader,
+    db_reader: Arc<Mutex<SQLiteReader>>,
     db_path: String,
 }
 
@@ -113,13 +114,15 @@ impl Querier {
     pub fn new(db_path: String) -> Self {
         println!("Opening database: {}", db_path);
         Querier {
-            db_reader: SQLiteReader::open(db_path.clone()).unwrap(),
+            db_reader: Arc::new(Mutex::new(
+                SQLiteReader::open(db_path.clone()).unwrap().into(),
+            )),
             db_path: db_path,
         }
     }
 
     pub fn definitions(&mut self, reference: Position) -> PyResult<Vec<Position>> {
-        let result = query_definition(reference.into(), &mut self.db_reader)?;
+        let result = query_definition(reference.into(), &mut *self.db_reader.lock().unwrap())?;
 
         let positions: Vec<Position> = result
             .into_iter()
@@ -138,8 +141,8 @@ impl Querier {
 
 #[pyclass]
 pub struct Indexer {
-    db_writer: SQLiteWriter,
-    db_reader: SQLiteReader,
+    db_writer: Arc<Mutex<SQLiteWriter>>,
+    db_reader: Arc<Mutex<SQLiteReader>>,
     db_path: String,
     loader: Loader,
 }
@@ -149,8 +152,8 @@ impl Indexer {
     #[new]
     pub fn new(db_path: String, languages: Vec<Language>) -> Self {
         Indexer {
-            db_writer: SQLiteWriter::open(db_path.clone()).unwrap(),
-            db_reader: SQLiteReader::open(db_path.clone()).unwrap(),
+            db_writer: Arc::new(Mutex::new(SQLiteWriter::open(db_path.clone()).unwrap())),
+            db_reader: Arc::new(Mutex::new(SQLiteReader::open(db_path.clone()).unwrap())),
             db_path: db_path,
             loader: new_loader(languages),
         }
@@ -160,7 +163,11 @@ impl Indexer {
         let paths: Vec<std::path::PathBuf> =
             paths.iter().map(|p| std::path::PathBuf::from(p)).collect();
 
-        match index_all(paths, &mut self.loader, &mut self.db_writer) {
+        match index_all(
+            paths,
+            &mut self.loader,
+            &mut *self.db_writer.lock().unwrap(),
+        ) {
             Ok(_) => Ok(()),
             Err(e) => Err(e.into()),
         }
@@ -170,14 +177,14 @@ impl Indexer {
         let paths: Vec<std::path::PathBuf> =
             paths.iter().map(|p| std::path::PathBuf::from(p)).collect();
 
-        get_status(paths, &mut self.db_reader)?
+        get_status(paths, &mut *self.db_reader.lock().unwrap())?
             .into_iter()
             .map(|e| Ok(e.into()))
             .collect()
     }
 
     pub fn status_all(&mut self) -> PyResult<Vec<FileEntry>> {
-        get_status_all(&mut self.db_reader)?
+        get_status_all(&mut *self.db_reader.lock().unwrap())?
             .into_iter()
             .map(|e| Ok(e.into()))
             .collect()

src/classes.rs

@@ -24,7 +24,7 @@ fn index(paths: Vec<String>, db_path: String, language: Language) -> PyResult<()
 
 /// A Python module implemented in Rust.
 #[pymodule]
-fn stack_graphs_python(_py: Python, m: &PyModule) -> PyResult<()> {
+fn stack_graphs_python(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(index, m)?)?;
     m.add_class::<Position>()?;
     m.add_class::<Language>()?;

src/lib.rs

@@ -18,9 +18,6 @@
 """
 
 
-@pytest.mark.skip(
-    "Stack-graphs python module resolution is currently broken. See issue: https://github.com/github/stack-graphs/issues/430"
-)
 def test_py_ok():
     with string_to_virtual_files(code) as (dir, positions):
         db_path = os.path.join(dir, "db.sqlite")