Fix for Database Alias (#179)

* Fix for Database Alias in State

Author: gotsysdba

src/client/content/config/settings.py

@@ -208,7 +208,7 @@ def spring_ai_obaas(src_dir, file_name, provider, ll_model):
         ctx_prompt=f"{ctx_prompt}",
         ll_model=state["user_settings"]["ll_model"] | state["ll_model_enabled"][ll_model],
         vector_search=state["user_settings"]["vector_search"],
-        database_config=state["database_config"][state["user_settings"]["vector_search"]["database"]],
+        database_config=state["database_config"][state["user_settings"]["database"]["alias"]],
     )
 
     if file_name.endswith(".yaml"):
@@ -219,7 +219,7 @@ def spring_ai_obaas(src_dir, file_name, provider, ll_model):
             ctx_prompt=ctx_prompt,
             ll_model=state["user_settings"]["ll_model"] | state["ll_model_enabled"][ll_model],
             vector_search=state["user_settings"]["vector_search"],
-            database_config=state["database_config"][state["user_settings"]["vector_search"]["database"]],
+            database_config=state["database_config"][state["user_settings"]["database"]["alias"]],
         )
 
         yaml_data = yaml.safe_load(formatted_content)

src/client/content/testbed.py

@@ -87,7 +87,7 @@ def create_gauge(value):
     st.dataframe(ll_settings_reversed, hide_index=True)
     if report["settings"]["vector_search"]["enabled"]:
         st.subheader("Vector Search Settings")
-        st.markdown(f"""**Database**: {report["settings"]["vector_search"]["database"]};
+        st.markdown(f"""**Database**: {report["settings"]["database"]["alias"]};
             **Vector Store**: {report["settings"]["vector_search"]["vector_store"]}
         """)
         embed_settings = pd.DataFrame(report["settings"]["vector_search"], index=[0])

src/client/content/tools/split_embed.py

@@ -291,7 +291,7 @@ def main() -> None:
     # Populate Vector Store
     ######################################
     st.header("Populate Vector Store", divider="red")
-    existing_vs = state["database_config"][state["user_settings"]["vector_search"]["database"]]["vector_stores"]
+    existing_vs = state["database_config"][state["user_settings"]["database"]["alias"]]["vector_stores"]
     # Mandatory Alias
     embed_alias_size, _ = st.columns([0.5, 0.5])
     embed_alias_invalid = False

src/client/utils/st_common.py

@@ -404,7 +404,7 @@ def vector_search_sidebar() -> None:
         st.sidebar.subheader("Vector Store", divider="red")
         # Create a DataFrame of all database vector storage tables
         vs_df = pd.DataFrame(
-            state.database_config[state.user_settings["vector_search"]["database"]].get("vector_stores")
+            state["database_config"][state["user_settings"]["database"]["alias"]].get("vector_stores")
         )
 
         def vs_reset() -> None:

src/server/utils/testbed.py

@@ -323,24 +323,22 @@ def clean(orig_html):
     # Main
     binds = {"eid": eid}
     sql = """
-        SELECT eid, to_char(evaluated), correctness, settings, rag_report
+        SELECT eid, to_char(evaluated) as evaluated, correctness, settings, rag_report
           FROM oai_evaluations WHERE eid=:eid
          ORDER BY evaluated
         """
     results = databases.execute_sql(db_conn, sql, binds)
-    pickled_report = results[0][4].read()
-
-    report = pickle.loads(pickled_report)
+    report = pickle.loads(results[0]["RAG_REPORT"])
     full_report = report.to_pandas()
     html_report = report.to_html()
     by_topic = report.correctness_by_topic()
     failures = report.failures
 
     evaluation_results = {
-        "eid": results[0][0].hex(),
-        "evaluated": results[0][1],
-        "correctness": results[0][2],
-        "settings": results[0][3],
+        "eid": results[0]["EID"].hex(),
+        "evaluated": results[0]["EVALUATED"],
+        "correctness": results[0]["CORRECTNESS"],
+        "settings": results[0]["SETTINGS"],
         "report": full_report.to_dict(),
         "correct_by_topic": by_topic.to_dict(),
         "failures": failures.to_dict(),

tests/client/content/tools/test_split_embed.py

@@ -220,7 +220,7 @@ def mock_get(endpoint=None, **kwargs):
         at.session_state.user_settings = {
             "client": "test_client",
             "oci": {"auth_profile": "DEFAULT"},
-            "vector_search": {"database": "DEFAULT"},
+            "database": {"alias": "DEFAULT"},
         }
 
         at.session_state.embed_model_enabled = {
@@ -281,7 +281,7 @@ def mock_get(endpoint=None, **kwargs):
         at.session_state.user_settings = {
             "client": "test_client",
             "oci": {"auth_profile": "DEFAULT"},
-            "vector_search": {"database": "DEFAULT"},
+            "database": {"alias": "DEFAULT"},
         }
 
         at.session_state.embed_model_enabled = {
@@ -342,7 +342,7 @@ def mock_get(endpoint=None, **kwargs):
         at.session_state.user_settings = {
             "client": "test_client",
             "oci": {"auth_profile": "DEFAULT"},
-            "vector_search": {"database": "DEFAULT"},
+            "database": {"alias": "DEFAULT"},
         }
 
         at.session_state.embed_model_enabled = {
@@ -412,7 +412,7 @@ def mock_get(endpoint=None, **kwargs):
         at.session_state.user_settings = {
             "client": "test_client",
             "oci": {"auth_profile": "DEFAULT"},
-            "vector_search": {"database": "DEFAULT"},
+            "database": {"alias": "DEFAULT"},
         }
         at.session_state.embed_model_enabled = {
             "test-model": {"url": "http://test.url", "max_chunk_size": 1000, "enabled": True}