sonusai 1.0.10__tar.gz → 1.0.11__tar.gz

{sonusai-1.0.10 → sonusai-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sonusai
-Version: 1.0.10
+Version: 1.0.11
 Summary: Framework for building deep neural network models for sound, speech, and voice AI
 Home-page: https://aaware.com
 License: GPL-3.0-only

{sonusai-1.0.10 → sonusai-1.0.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sonusai"
-version = "1.0.10"
+version = "1.0.11"
 description = "Framework for building deep neural network models for sound, speech, and voice AI"
 authors = ["Chris Eddington <chris@aaware.com>", "Jason Calderwood <jason@aaware.com>"]
 maintainers = ["Chris Eddington <chris@aaware.com>", "Jason Calderwood <jason@aaware.com>"]

{sonusai-1.0.10 → sonusai-1.0.11}/sonusai/mixture/__init__.py

@@ -28,4 +28,4 @@ from .helpers import inverse_transform
 from .helpers import write_mixture_metadata
 from .log_duration_and_sizes import log_duration_and_sizes
 from .mixdb import MixtureDatabase
-from .db_file import db_file
+from .db import db_file

{sonusai-1.0.10 → sonusai-1.0.11}/sonusai/mixture/db.py

@@ -2,12 +2,21 @@ import contextlib
 import sqlite3
 from os import remove
 from os.path import exists
+from os.path import join
+from os.path import normpath
 from sqlite3 import Connection
 from sqlite3 import Cursor
 from typing import Any
 
-from .. import logger_db
-from .db_file import db_file
+from sonusai import logger_db
+
+
+def db_file(location: str, test: bool = False) -> str:
+    from .constants import MIXDB_NAME
+    from .constants import TEST_MIXDB_NAME
+
+    name = TEST_MIXDB_NAME if test else MIXDB_NAME
+    return normpath(join(location, name))
 
 
 class SQLiteDatabase:
@@ -15,9 +24,6 @@ class SQLiteDatabase:
 
     # Constants for database configuration
     READONLY_MODE = "?mode=ro"
-    WRITE_OPTIMIZED_PRAGMAS = (
-        "?_journal_mode=OFF&_synchronous=OFF&_cache_size=10000&_temp_store=MEMORY&_locking_mode=EXCLUSIVE"
-    )
     CONNECTION_TIMEOUT = 20
 
     def __init__(
@@ -39,7 +45,7 @@ class SQLiteDatabase:
         """
         self.location = location
         self.create = create
-        self.readonly = readonly
+        self.readonly = readonly and not create
         self.test = test
         self.verbose = verbose
         self.con: Connection | None = None
@@ -61,6 +67,7 @@ class SQLiteDatabase:
             raise
 
         if self.cur:
+            self.cur.execute("BEGIN TRANSACTION")
             return self.cur
         raise sqlite3.Error("Failed to connect to database")
 
@@ -78,9 +85,13 @@ class SQLiteDatabase:
             exc_tb: The exception traceback, if any.
         """
         if self.con:
-            if exc_type is None and not self.readonly:
-                # Commit only on successful exit if not readonly
-                self.con.commit()
+            if not self.readonly:
+                if exc_type is None:
+                    # Commit only on successful exit
+                    self.con.commit()
+                else:
+                    # Rollback on exception
+                    self.con.rollback()
             self._close_resources()
 
     def _close_resources(self) -> None:
@@ -107,9 +118,21 @@ class SQLiteDatabase:
         uri = self._build_connection_uri(db_path)
 
         try:
-            self.con = sqlite3.connect(f"file:{uri}", uri=True, timeout=self.CONNECTION_TIMEOUT)
+            self.con = sqlite3.connect(
+                f"file:{uri}",
+                uri=True,
+                timeout=self.CONNECTION_TIMEOUT,
+                isolation_level=None,
+            )
             if self.verbose and self.con:
                 self.con.set_trace_callback(logger_db.debug)
+            if self.create or not self.readonly:
+                self.con.execute("PRAGMA journal_mode=wal")
+                self.con.execute("PRAGMA synchronous=0")  # off
+                self.con.execute("PRAGMA cache_size=10000")
+                self.con.execute("PRAGMA temp_store=2")  # memory
+                self.con.execute("PRAGMA locking_mode=exclusive")
+                self.con.commit()
         except sqlite3.Error as e:
             raise sqlite3.Error(f"Failed to connect to database: {e}") from e
 
@@ -153,11 +176,4 @@ class SQLiteDatabase:
         if not self.create and self.readonly:
             uri += self.READONLY_MODE
 
-        # Add optimized pragmas for write mode
-        if not self.readonly:
-            if "?" in uri:
-                uri = uri.replace("?", f"{self.WRITE_OPTIMIZED_PRAGMAS}&")
-            else:
-                uri += self.WRITE_OPTIMIZED_PRAGMAS
-
         return uri

{sonusai-1.0.10 → sonusai-1.0.11}/sonusai/mixture/mixdb.py

@@ -30,7 +30,7 @@ from ..datatypes import TruthsConfigs
 from ..datatypes import TruthsDict
 from ..datatypes import UniversalSNR
 from .db import SQLiteDatabase
-from .db_file import db_file
+from .db import db_file
 
 
 class MixtureDatabase:

sonusai-1.0.10/sonusai/mixture/db_file.py

@@ -1,10 +0,0 @@
-from os.path import join
-from os.path import normpath
-
-from .constants import MIXDB_NAME
-from .constants import TEST_MIXDB_NAME
-
-
-def db_file(location: str, test: bool = False) -> str:
-    name = TEST_MIXDB_NAME if test else MIXDB_NAME
-    return normpath(join(location, name))