els cache with function parameters

app.py

@@ -44,6 +44,20 @@ MAX_PHRASE_LENGTH_LIMIT = 20
 ELS_CACHE_DB = "els_cache.db"
 DATABASE_TIMEOUT = 60
 
+# --- ELS Cache Functions ---
+def create_els_cache_table():
+    if not os.path.exists(ELS_CACHE_DB):
+        with sqlite3.connect(ELS_CACHE_DB) as conn:
+            conn.execute('''
+                CREATE TABLE els_cache (
+                    query_hash TEXT PRIMARY KEY,
+                    function_name TEXT,
+                    args TEXT,
+                    kwargs TEXT,
+                    results TEXT
+                )
+            ''')
+
 # --- Database Initialization ---
 def initialize_database():
     global conn
@@ -58,7 +72,7 @@ def initialize_database():
         chapter INTEGER,
         verse INTEGER,
         phrase_length INTEGER,
-        word_position TEXT, 
+        word_position TEXT,
         PRIMARY KEY (gematria_sum, words, book, chapter, verse, word_position)
     )
     ''')
@@ -80,25 +94,53 @@ initialize_database()
 # --- ELS Cache Functions ---
 def create_els_cache_table():
     with sqlite3.connect(ELS_CACHE_DB) as conn:
-        conn.execute('''
-            CREATE TABLE IF NOT EXISTS els_cache (
-                query_hash TEXT PRIMARY KEY,
-                results TEXT
-            )
-        ''')
-
-def get_query_hash(func, *args, **kwargs):
-    key = (func.__name__, args, tuple(sorted(kwargs.items())))
+        try:
+            conn.execute('''
+                CREATE TABLE IF NOT EXISTS els_cache (
+                    query_hash TEXT PRIMARY KEY,
+                    function_name TEXT,
+                    args TEXT,
+                    kwargs TEXT,
+                    results TEXT
+                )
+            ''')
+        except sqlite3.OperationalError as e:
+            logger.error(f"Error creating table: {e}")
+
+def get_query_hash(func, args, kwargs):
+    key = (func.__name__, args, kwargs)
     return hashlib.sha256(json.dumps(key).encode()).hexdigest()
 
 
 def cached_process_json_files(func, *args, **kwargs):
-    query_hash = get_query_hash(func, *args, **kwargs)
+    # Create a dictionary to store the parameters
+    params = {
+        "function": f"{func.__module__}.{func.__name__}"
+    }
+
+    # Add the positional arguments with their names
+    arg_names = func.__code__.co_varnames[:func.__code__.co_argcount]
+    for name, value in zip(arg_names, args):
+        params[name] = value
+
+    # Add the keyword arguments
+    for name, value in kwargs.items():
+        params[name] = value
+
+    # Convert the parameters to a JSON string
+    params_json = json.dumps(params)
+
+    # Use the parameters JSON string to generate the query hash
+    query_hash = get_query_hash(func, params_json, "")
+
+    # Ensure the table exists before any operations
+    create_els_cache_table()
 
     try:
         with sqlite3.connect(ELS_CACHE_DB, timeout=DATABASE_TIMEOUT) as conn:
             cursor = conn.cursor()
-            cursor.execute("SELECT results FROM els_cache WHERE query_hash = ?", (query_hash,))
+            cursor.execute(
+                "SELECT results FROM els_cache WHERE query_hash = ?", (query_hash,))
             result = cursor.fetchone()
             if result:
                 logger.info(f"Cache hit for query: {query_hash}")
@@ -112,13 +154,15 @@ def cached_process_json_files(func, *args, **kwargs):
     try:
         with sqlite3.connect(ELS_CACHE_DB, timeout=DATABASE_TIMEOUT) as conn:
             cursor = conn.cursor()
-            cursor.execute("INSERT INTO els_cache (query_hash, results) VALUES (?, ?)", (query_hash, json.dumps(results)))
+            cursor.execute("INSERT INTO els_cache (query_hash, function_name, args, kwargs, results) VALUES (?, ?, ?, ?, ?)",
+                           (query_hash, params["function"], params_json, json.dumps({}), json.dumps(results)))
             conn.commit()
     except sqlite3.Error as e:
         logger.error(f"Database error caching results: {e}")
 
     return results
 
+
 # --- Helper Functions (from Network app.py) ---
 def flatten_text(text: List) -> str:
     if isinstance(text, list):
@@ -130,8 +174,8 @@ def search_gematria_in_db(gematria_sum: int, max_words: int) -> List[Tuple[str,
     with sqlite3.connect(DATABASE_FILE) as conn:
         cursor = conn.cursor()
         cursor.execute('''
-        SELECT words, book, chapter, verse, phrase_length, word_position 
-        FROM results 
+        SELECT words, book, chapter, verse, phrase_length, word_position
+        FROM results
         WHERE gematria_sum = ? AND phrase_length <= ?
         ''', (gematria_sum, max_words))
         results = cursor.fetchall()
@@ -174,40 +218,50 @@ def perform_els_search(step, rounds_combination, tlang, strip_spaces, strip_in_b
     length = 0
 
     selected_language_long = tlang  # From the Gradio dropdown (long form)
-    tlang = LANGUAGES_SUPPORTED.get(selected_language_long) #Get the short code.
-    if tlang is None: # Handle unsupported languages
+    # Get the short code.
+    tlang = LANGUAGES_SUPPORTED.get(selected_language_long)
+    if tlang is None:  # Handle unsupported languages
         tlang = "en"
-        logger.warning(f"Unsupported language selected: {selected_language_long}. Defaulting to English (en).")
+        logger.warning(
+            f"Unsupported language selected: {selected_language_long}. Defaulting to English (en).")
 
+    # Cache Update: Pass parameters individually
     if include_torah:
-        logger.debug(f"Arguments for Torah: {(1, 39, step, rounds_combination, length, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)}")
-        results["Torah"] = cached_process_json_files(torah.process_json_files, 1, 39, step, rounds_combination, length, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)
+        logger.debug(
+            f"Arguments for Torah: {(1, 39, step, rounds_combination, length, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)}")
+        results["Torah"] = cached_process_json_files(torah.process_json_files, 1, 39, step, rounds_combination, length,
+                                                     tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)
     else:
         results["Torah"] = []
 
     if include_bible:
-        results["Bible"] = cached_process_json_files(bible.process_json_files, 40, 66, step, rounds_combination, length, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)
+        results["Bible"] = cached_process_json_files(bible.process_json_files, 40, 66, step, rounds_combination, length,
+                                                     tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)
     else:
         results["Bible"] = []
 
     if include_quran:
-        results["Quran"] = cached_process_json_files(quran.process_json_files, 1, 114, step, rounds_combination, length, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)
+        results["Quran"] = cached_process_json_files(quran.process_json_files, 1, 114, step, rounds_combination, length,
+                                                     tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)
     else:
         results["Quran"] = []
 
     if include_hindu:
-        results["Rig Veda"] = cached_process_json_files(hindu.process_json_files, 1, 10, step, rounds_combination, length, tlang, False, strip_in_braces, strip_diacritics_chk)
+        results["Rig Veda"] = cached_process_json_files(
+            hindu.process_json_files, 1, 10, step, rounds_combination, length, tlang, False, strip_in_braces, strip_diacritics_chk)
     else:
         results["Rig Veda"] = []
 
     if include_tripitaka:
-        results["Tripitaka"] = cached_process_json_files(tripitaka.process_json_files, 1, 52, step, rounds_combination, length, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)
+        results["Tripitaka"] = cached_process_json_files(
+            tripitaka.process_json_files, 1, 52, step, rounds_combination, length, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk)
     else:
         results["Tripitaka"] = []
 
     return results
 
 
+
 def add_24h_projection(results_dict): #Now takes a dictionary of results
     for book_name, results in results_dict.items():  # Iterate per book
         num_results = len(results)
@@ -304,14 +358,14 @@ with gr.Blocks() as app:
 
         with gr.Row():
             step = gr.Number(label="Jump Width (Steps) for ELS")
-            float_step = gr.Number(visible=False, value=1) 
+            float_step = gr.Number(visible=False, value=1)
             half_step_btn = gr.Button("Steps / 2")
             double_step_btn = gr.Button("Steps * 2")
-        
+
             with gr.Column():
                 round_x = gr.Number(label="Round (1)", value=1)
                 round_y = gr.Number(label="Round (2)", value=-1)
-            
+
             rounds_combination = gr.Textbox(label="Combined Rounds", value="1,-1")
 
         with gr.Row():
@@ -320,7 +374,7 @@ with gr.Blocks() as app:
             include_quran_chk = gr.Checkbox(label="Include Quran", value=True)
             include_hindu_chk = gr.Checkbox(label="Include Rigveda", value=False)
             include_tripitaka_chk = gr.Checkbox(label="Include Tripitaka", value=False)
-        
+
             strip_spaces = gr.Checkbox(label="Strip Spaces from Books", value=True)
             strip_in_braces = gr.Checkbox(label="Strip Text in Braces from Books", value=True)
             strip_diacritics_chk = gr.Checkbox(label="Strip Diacritics from Books", value=True)

els_cache.db

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66db30b6eccaaaed442d806a1c1300f62238946ecc0bf09b77e9e385a4ad3458
-size 12288

els_cache.db.initial

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66db30b6eccaaaed442d806a1c1300f62238946ecc0bf09b77e9e385a4ad3458
-size 12288