PR feedback fixes

Author: ParticularlyPythonicBS

temoa/core/config.py

@@ -161,12 +161,48 @@ def __init__(
         self.output_threshold_cost = output_threshold_cost
         self.sqlite_inputs = sqlite or {}
 
-        # SQLite performance defaults
-        self.sqlite_journal_mode = str(self.sqlite_inputs.get('journal_mode', 'WAL'))
-        self.sqlite_synchronous = str(self.sqlite_inputs.get('synchronous', 'NORMAL'))
-        self.sqlite_temp_store = str(self.sqlite_inputs.get('temp_store', 'MEMORY'))
-        self.sqlite_mmap_size = int(self.sqlite_inputs.get('mmap_size', 8589934592))
-        self.sqlite_cache_size = int(self.sqlite_inputs.get('cache_size', -512000))
+        # SQLite performance settings
+        # journal_mode: DELETE | TRUNCATE | PERSIST | MEMORY | WAL | OFF
+        jm_allowed = {'DELETE', 'TRUNCATE', 'PERSIST', 'MEMORY', 'WAL', 'OFF'}
+        jm = self.sqlite_inputs.get('journal_mode', 'WAL')
+        if isinstance(jm, str) and jm.upper() in jm_allowed:
+            self.sqlite_journal_mode: str | int = jm.upper()
+        elif isinstance(jm, (int, float, str)) and str(jm).isdigit():
+            self.sqlite_journal_mode = int(jm)
+        else:
+            self.sqlite_journal_mode = 'WAL'
+
+        # synchronous: OFF (0) | NORMAL (1) | FULL (2) | EXTRA (3)
+        sync_allowed = {'OFF', 'NORMAL', 'FULL', 'EXTRA'}
+        sync = self.sqlite_inputs.get('synchronous', 'NORMAL')
+        if isinstance(sync, str) and sync.upper() in sync_allowed:
+            self.sqlite_synchronous: str | int = sync.upper()
+        elif isinstance(sync, (int, float, str)) and str(sync).isdigit():
+            self.sqlite_synchronous = int(sync)
+        else:
+            self.sqlite_synchronous = 'NORMAL'
+
+        # temp_store: DEFAULT (0) | FILE (1) | MEMORY (2)
+        temp_allowed = {'DEFAULT', 'FILE', 'MEMORY'}
+        ts = self.sqlite_inputs.get('temp_store', 'MEMORY')
+        if isinstance(ts, str) and ts.upper() in temp_allowed:
+            self.sqlite_temp_store: str | int = ts.upper()
+        elif isinstance(ts, (int, float, str)) and str(ts).isdigit():
+            self.sqlite_temp_store = int(ts)
+        else:
+            self.sqlite_temp_store = 'MEMORY'
+
+        mmap_size = self.sqlite_inputs.get('mmap_size', 8589934592)
+        if isinstance(mmap_size, (int, float, str)):
+            self.sqlite_mmap_size = int(mmap_size)
+        else:
+            self.sqlite_mmap_size = 8589934592
+
+        cache_size = self.sqlite_inputs.get('cache_size', -512000)
+        if isinstance(cache_size, (int, float, str)):
+            self.sqlite_cache_size = int(cache_size)
+        else:
+            self.sqlite_cache_size = -512000
 
         # Cycle detection limits
         if not isinstance(cycle_count_limit, int) or cycle_count_limit < -1:
@@ -317,8 +353,11 @@ def __repr__(self) -> str:
         msg += spacer
         msg += '{:>{}s}: {}\n'.format('SQLite journal mode', width, self.sqlite_journal_mode)
         msg += '{:>{}s}: {}\n'.format('SQLite synchronous', width, self.sqlite_synchronous)
+        msg += '{:>{}s}: {}\n'.format('SQLite temp store', width, self.sqlite_temp_store)
         msg += '{:>{}s}: {}\n'.format('SQLite mmap size (bytes)', width, self.sqlite_mmap_size)
-        msg += '{:>{}s}: {}\n'.format('SQLite cache size (pages)', width, self.sqlite_cache_size)
+        msg += '{:>{}s}: {}\n'.format(
+            'SQLite cache size (pages or KiB if negative)', width, self.sqlite_cache_size
+        )
 
         msg += spacer
         msg += '{:>{}s}: {}\n'.format('Time sequencing', width, self.time_sequencing)

temoa/utilities/sqlite_utils.py

@@ -33,20 +33,17 @@ def tune_sqlite_connection(con: sqlite3.Connection, config: 'TemoaConfig | None'
         mmap_size = getattr(config, 'sqlite_mmap_size', mmap_size)
         cache_size = getattr(config, 'sqlite_cache_size', cache_size)
 
-    try:
-        con.execute(f'PRAGMA journal_mode = {journal_mode}')
-        con.execute(f'PRAGMA synchronous = {synchronous}')
-        con.execute(f'PRAGMA temp_store = {temp_store}')
-        con.execute(f'PRAGMA mmap_size = {mmap_size}')
-        con.execute(f'PRAGMA cache_size = {cache_size}')
-        logger.debug(
-            'SQLite tuned: journal_mode=%s, synchronous=%s, temp_store=%s, '
-            'mmap_size=%d, cache_size=%d',
-            journal_mode,
-            synchronous,
-            temp_store,
-            mmap_size,
-            cache_size,
-        )
-    except sqlite3.Error as e:
-        logger.warning('Failed to apply some SQLite performance PRAGMAs: %s', e)
+    pragmas = [
+        ('journal_mode', journal_mode),
+        ('synchronous', synchronous),
+        ('temp_store', temp_store),
+        ('mmap_size', mmap_size),
+        ('cache_size', cache_size),
+    ]
+
+    for name, value in pragmas:
+        try:
+            con.execute(f'PRAGMA {name} = {value}')
+            logger.debug('Applied SQLite PRAGMA: %s = %s', name, value)
+        except sqlite3.Error as e:
+            logger.warning('Failed to apply SQLite PRAGMA %s: %s', name, e)