refactor: remove "experimental"

levydsa · levydsa · commit 3a439a149b99 · 2025-06-09T11:41:29.000-03:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.55"
 edition = "2021"
 
 [lib]
-name = "libsql_experimental"
+name = "libsql"
 crate-type = ["cdylib"]
 
 [dependencies]
diff --git a/README.md b/README.md
@@ -21,8 +21,8 @@
 </p>
 
 <p align="center">
-  <a href="https://pypi.org/project/libsql-experimental">
-    <img src="https://badge.fury.io/py/libsql-experimental.svg" alt="PyPI" title="PyPI" />
+  <a href="https://pypi.org/project/libsql">
+    <img src="https://badge.fury.io/py/libsql.svg" alt="PyPI" title="PyPI" />
   </a>
   <a href="https://discord.com/invite/4B5D7hYwub">
     <img src="https://dcbadge.vercel.app/api/server/4B5D7hYwub?style=flat" alt="discord activity" title="join us on discord" />
diff --git a/example.py b/example.py
@@ -1,6 +1,6 @@
-import libsql_experimental
+import libsql
 
-con = libsql_experimental.connect("hello.db", sync_url="http://localhost:8080",
+con = libsql.connect("hello.db", sync_url="http://localhost:8080",
                                   auth_token="")
 
 con.sync()
diff --git a/examples/batch/README.md b/examples/batch/README.md
@@ -5,7 +5,7 @@ This example demonstrates how to use libSQL to execute a batch of SQL statements
 ## Install Dependencies
 
 ```bash
-pip install libsql-experimental
+pip install libsql
 ```
 
 ## Running
diff --git a/examples/batch/main.py b/examples/batch/main.py
@@ -1,4 +1,4 @@
-import libsql_experimental as libsql
+import libsql
 
 conn = libsql.connect("local.db")
 cur = conn.cursor()
diff --git a/examples/encryption/README.md b/examples/encryption/README.md
@@ -5,7 +5,7 @@ This example demonstrates how to create and use an encrypted SQLite database wit
 ## Install Dependencies
 
 ```bash
-pip install libsql-experimental
+pip install libsql
 ```
 
 ## Running
diff --git a/examples/encryption/main.py b/examples/encryption/main.py
@@ -1,4 +1,4 @@
-import libsql_experimental as libsql
+import libsql
 
 # You should set the ENCRYPTION_KEY in a environment variable
 # For demo purposes, we're using a fixed key
diff --git a/examples/execute_script.py b/examples/execute_script.py
@@ -3,7 +3,7 @@
 """
 import os
 
-import libsql_experimental as libsql
+import libsql
 
 def execute_script(conn, file_path: os.PathLike):
     with open(file_path, 'r') as file:
diff --git a/examples/local/README.md b/examples/local/README.md
@@ -5,7 +5,7 @@ This example demonstrates how to use libSQL with a local SQLite file.
 ## Install Dependencies
 
 ```bash
-pip install libsql-experimental
+pip install libsql
 ```
 
 ## Running
diff --git a/examples/local/main.py b/examples/local/main.py
@@ -1,4 +1,4 @@
-import libsql_experimental as libsql
+import libsql
 
 conn = libsql.connect("local.db")
 cur = conn.cursor()
diff --git a/examples/memory/README.md b/examples/memory/README.md
@@ -5,7 +5,7 @@ This example demonstrates how to use libSQL with an in-memory SQLite database.
 ## Install Dependencies
 
 ```bash
-pip install libsql-experimental
+pip install libsql
 ```
 
 ## Running
diff --git a/examples/memory/main.py b/examples/memory/main.py
@@ -1,4 +1,4 @@
-import libsql_experimental as libsql
+import libsql
 
 conn = libsql.connect(":memory:")
 cur = conn.cursor()
diff --git a/examples/remote/README.md b/examples/remote/README.md
@@ -5,7 +5,7 @@ This example demonstrates how to use libSQL with a remote database.
 ## Install Dependencies
 
 ```bash
-pip install libsql-experimental
+pip install libsql
 ```
 
 ## Running
diff --git a/examples/remote/main.py b/examples/remote/main.py
@@ -1,4 +1,4 @@
-import libsql_experimental as libsql
+import libsql
 import os
 
 url = os.getenv("TURSO_DATABASE_URL")
diff --git a/examples/remote_connect.py b/examples/remote_connect.py
@@ -5,7 +5,7 @@
 """
 import os
 
-import libsql_experimental as libsql
+import libsql
 
 print(F"connecting to {os.getenv('LIBSQL_URL')}")
 conn = libsql.connect(database=os.getenv('LIBSQL_URL'),
diff --git a/examples/sqlalchemy/dialect.py b/examples/sqlalchemy/dialect.py
@@ -53,12 +53,12 @@ class SQLiteDialect_libsql(SQLiteDialect_pysqlite):
 
     @classmethod
     def import_dbapi(cls):
-        import libsql_experimental as libsql
+        import libsql
 
         return libsql
 
     def on_connect(self):
-        import libsql_experimental as libsql
+        import libsql
 
         sqlite3_connect = super().on_connect()
 
diff --git a/examples/sync/README.md b/examples/sync/README.md
@@ -5,7 +5,7 @@ This example demonstrates how to use libSQL with a synced database (local file s
 ## Install Dependencies
 
 ```bash
-pip install libsql-experimental
+pip install libsql
 ```
 
 ## Running
diff --git a/examples/sync/main.py b/examples/sync/main.py
@@ -1,4 +1,4 @@
-import libsql_experimental as libsql
+import libsql
 import os
 
 url = os.getenv("TURSO_DATABASE_URL")
diff --git a/examples/sync_write.py b/examples/sync_write.py
@@ -5,7 +5,7 @@
 """
 import os
 
-import libsql_experimental as libsql
+import libsql
 
 print(F"syncing with {os.getenv('LIBSQL_URL')}")
 conn = libsql.connect("hello.db", sync_url=os.getenv("LIBSQL_URL"),
diff --git a/examples/transaction/README.md b/examples/transaction/README.md
@@ -5,7 +5,7 @@ This example demonstrates how to create and use an encrypted SQLite database wit
 ## Install Dependencies
 
 ```bash
-pip install libsql-experimental
+pip install libsql
 ```
 
 ## Running
diff --git a/examples/transaction/main.py b/examples/transaction/main.py
@@ -1,4 +1,4 @@
-import libsql_experimental as libsql
+import libsql
 
 conn = libsql.connect("local.db")
 cur = conn.cursor()
diff --git a/examples/vector.py b/examples/vector.py
@@ -1,4 +1,4 @@
-import libsql_experimental as libsql
+import libsql
 
 conn = libsql.connect("vector.db")
 
diff --git a/examples/vector/README.md b/examples/vector/README.md
@@ -5,7 +5,7 @@ This example demonstrates how to use libSQL vector search with a local database.
 ## Install Dependencies
 
 ```bash
-pip install libsql-experimental
+pip install libsql
 ```
 
 ## Running
diff --git a/examples/vector/main.py b/examples/vector/main.py
@@ -1,4 +1,4 @@
-import libsql_experimental as libsql
+import libsql
 
 conn = libsql.connect("local.db")
 
diff --git a/perf-libsql.py b/perf-libsql.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-import libsql_experimental
+import libsql
 import pyperf
 import time
 
-con = libsql_experimental.connect(":memory:")
+con = libsql.connect(":memory:")
 cur = con.cursor()
 
 def func():
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["maturin>=1.1,<2.0"]
 build-backend = "maturin"
 
 [project]
-name = "libsql-experimental"
+name = "libsql"
 version = "0.0.55"
 requires-python = ">=3.7"
 classifiers = [
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,3 @@
-use ::libsql as libsql_core;
 use pyo3::create_exception;
 use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
@@ -23,7 +22,7 @@ fn rt() -> Handle {
     .clone()
 }
 
-fn to_py_err(error: libsql_core::errors::Error) -> PyErr {
+fn to_py_err(error: libsql::errors::Error) -> PyErr {
     let msg = match error {
         libsql::Error::SqliteFailure(_, err) => err,
         _ => error.to_string(),
@@ -170,17 +169,17 @@ fn _connect_core(
 }
 
 // We need to add a drop guard that runs when we finally drop our
-// only reference to libsql_core::Connection. This is because when
+// only reference to libsql::Connection. This is because when
 // hrana is enabled it needs access to the tokio api to spawn a close
 // call in the background. So this adds the ability that when drop is called
 // on ConnectionGuard it will drop the connection with a tokio context entered.
 struct ConnectionGuard {
-    conn: Option<libsql_core::Connection>,
+    conn: Option<libsql::Connection>,
     handle: tokio::runtime::Handle,
 }
 
 impl std::ops::Deref for ConnectionGuard {
-    type Target = libsql_core::Connection;
+    type Target = libsql::Connection;
 
     fn deref(&self) -> &Self::Target {
         &self.conn.as_ref().expect("Connection already dropped")
@@ -198,7 +197,7 @@ impl Drop for ConnectionGuard {
 
 #[pyclass]
 pub struct Connection {
-    db: libsql_core::Database,
+    db: libsql::Database,
     conn: RefCell<Option<Arc<ConnectionGuard>>>,
     isolation_level: Option<String>,
     autocommit: i32,
@@ -350,8 +349,8 @@ pub struct Cursor {
     #[pyo3(get, set)]
     arraysize: usize,
     conn: RefCell<Option<Arc<ConnectionGuard>>>,
-    stmt: RefCell<Option<libsql_core::Statement>>,
-    rows: RefCell<Option<libsql_core::Rows>>,
+    stmt: RefCell<Option<libsql::Statement>>,
+    rows: RefCell<Option<libsql::Rows>>,
     rowcount: RefCell<i64>,
     done: RefCell<bool>,
     isolation_level: Option<String>,
@@ -536,7 +535,7 @@ impl Cursor {
     }
 }
 
-async fn begin_transaction(conn: &libsql_core::Connection) -> PyResult<()> {
+async fn begin_transaction(conn: &libsql::Connection) -> PyResult<()> {
     conn.execute("BEGIN", ()).await.map_err(to_py_err)?;
     Ok(())
 }
@@ -555,23 +554,23 @@ async fn execute(cursor: &Cursor, sql: String, parameters: Option<&PyTuple>) ->
             let mut params = vec![];
             for param in parameters.iter() {
                 let param = if param.is_none() {
-                    libsql_core::Value::Null
+                    libsql::Value::Null
                 } else if let Ok(value) = param.extract::<i32>() {
-                    libsql_core::Value::Integer(value as i64)
+                    libsql::Value::Integer(value as i64)
                 } else if let Ok(value) = param.extract::<f64>() {
-                    libsql_core::Value::Real(value)
+                    libsql::Value::Real(value)
                 } else if let Ok(value) = param.extract::<&str>() {
-                    libsql_core::Value::Text(value.to_string())
+                    libsql::Value::Text(value.to_string())
                 } else if let Ok(value) = param.extract::<&[u8]>() {
-                    libsql_core::Value::Blob(value.to_vec())
+                    libsql::Value::Blob(value.to_vec())
                 } else {
                     return Err(PyValueError::new_err("Unsupported parameter type"));
                 };
                 params.push(param);
             }
-            libsql_core::params::Params::Positional(params)
+            libsql::params::Params::Positional(params)
         }
-        None => libsql_core::params::Params::None,
+        None => libsql::params::Params::None,
     };
     let mut stmt = cursor
         .conn
@@ -618,32 +617,33 @@ fn stmt_is_dml(sql: &str) -> bool {
     sql.starts_with("INSERT") || sql.starts_with("UPDATE") || sql.starts_with("DELETE")
 }
 
-fn convert_row(py: Python, row: libsql_core::Row, column_count: i32) -> PyResult<&PyTuple> {
+fn convert_row(py: Python, row: libsql::Row, column_count: i32) -> PyResult<&PyTuple> {
     let mut elements: Vec<Py<PyAny>> = vec![];
     for col_idx in 0..column_count {
         let libsql_value = row.get_value(col_idx).map_err(to_py_err)?;
         let value = match libsql_value {
-            libsql_core::Value::Integer(v) => {
+            libsql::Value::Integer(v) => {
                 let value = v as i64;
                 value.into_py(py)
             }
-            libsql_core::Value::Real(v) => v.into_py(py),
-            libsql_core::Value::Text(v) => v.into_py(py),
-            libsql_core::Value::Blob(v) => {
+            libsql::Value::Real(v) => v.into_py(py),
+            libsql::Value::Text(v) => v.into_py(py),
+            libsql::Value::Blob(v) => {
                 let value = v.as_slice();
                 value.into_py(py)
             }
-            libsql_core::Value::Null => py.None(),
+            libsql::Value::Null => py.None(),
         };
         elements.push(value);
     }
     Ok(PyTuple::new(py, elements))
 }
 
-create_exception!(libsql_experimental, Error, pyo3::exceptions::PyException);
+create_exception!(module, Error, pyo3::exceptions::PyException);
 
 #[pymodule]
-fn libsql_experimental(py: Python, m: &PyModule) -> PyResult<()> {
+#[pyo3(name = "libsql")]
+fn module(py: Python, m: &PyModule) -> PyResult<()> {
     let _ = tracing_subscriber::fmt::try_init();
     m.add("LEGACY_TRANSACTION_CONTROL", LEGACY_TRANSACTION_CONTROL)?;
     m.add("paramstyle", "qmark")?;
diff --git a/tests/test_suite.py b/tests/test_suite.py
@@ -2,7 +2,7 @@
 
 import sqlite3
 import sys
-import libsql_experimental
+import libsql
 import pytest
 
 
@@ -326,18 +326,18 @@ def connect(provider, database, isolation_level="DEFERRED", autocommit=-1):
             raise Exception("libsql-remote server is not running")
         if res.getcode() != 200:
             raise Exception("libsql-remote server is not running")
-        return libsql_experimental.connect(
+        return libsql.connect(
             database, sync_url="http://localhost:8080", auth_token=""
         )
     if provider == "libsql":
         if sys.version_info < (3, 12):
-            return libsql_experimental.connect(
+            return libsql.connect(
                 database, isolation_level=isolation_level
             )
         else:
             if autocommit == -1:
-                autocommit = libsql_experimental.LEGACY_TRANSACTION_CONTROL
-            return libsql_experimental.connect(
+                autocommit = libsql.LEGACY_TRANSACTION_CONTROL
+            return libsql.connect(
                 database, isolation_level=isolation_level, autocommit=autocommit
             )
     if provider == "sqlite":

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import libsql_experimental as libsql`
	`1`	`+import libsql`
`2`	`2`
`3`	`3`	`conn = libsql.connect("local.db")`
`4`	`4`	`cur = conn.cursor()`