some improvements in terraform side and also app side

Signed-off-by: aalmoham <[email protected]>

Author: shanghoosh1

askme/askme.py

@@ -211,6 +211,7 @@ def render_vector_store_creation_chatbot():
                                 warning_message = "\n\n".join(vector_creation_output)
                                 st.warning(f"Something Went Wrong, Error: ({warning_message})")
                                 logger.warning(f"Something Went Wrong, Error: ({warning_message})")
+                                cleanup_vector_table_materials(SCHEMA_NAME, [st.session_state.askme_chatbot_vector_creation_table_name], BUCKET_DIR_PREFIX)
                                 st.session_state.askme_chatbot_vector_creation_table_name = ""
                                 st.button("OK")
 
@@ -274,7 +275,7 @@ def render_vector_store_management_main():
                             warning_message = "\n\n".join(vector_creation_output)
                             st.warning(f"Something Went Wrong, Error: ({warning_message})")
                             logger.warning(f"Something Went Wrong, Error: ({warning_message})")
-                            cleanup_vector_table_materials(bucket_dir_name)
+                            cleanup_vector_table_materials(SCHEMA_NAME, [st.session_state.askme_main_vector_creation_table_name], BUCKET_DIR_PREFIX)
                             clear_km_management_status()
                             st.button("OK")
 
@@ -295,8 +296,7 @@ def render_vector_store_management_main():
             col1, col2 = st.columns(2)
             with col1:
                 if st.button("Yes, Delete", type="primary"):
-                    bucket_folder_to_delete = f"{BUCKET_DIR_PREFIX}{table}"
-                    cleanup_vector_table_materials(SCHEMA_NAME, [table], bucket_folder_to_delete)
+                    cleanup_vector_table_materials(SCHEMA_NAME, [table], BUCKET_DIR_PREFIX)
                     update_table_list()
                     if not table in st.session_state.askme_knowledge[SCHEMA_NAME]:
                         st.success(f"Deleted successfully.")
@@ -318,7 +318,7 @@ def render_vector_store_management_main():
         deletion_flag = False
         with col1:
             if st.button("Reset Knowledge Base"):
-                cleanup_vector_table_materials(SCHEMA_NAME, st.session_state.askme_knowledge[SCHEMA_NAME], DEFAULT_USER_UPLOAD_BUCKET_DIR)
+                cleanup_vector_table_materials(SCHEMA_NAME, st.session_state.askme_knowledge[SCHEMA_NAME], BUCKET_DIR_PREFIX)
                 update_table_list()
                 deletion_flag = True
         if deletion_flag:

askme/terraform/constants.tf

@@ -4,7 +4,7 @@
 # Constants for setup
 locals {
     mysql_shape = "MySQL.8"
-    mysql_version = "9.2.1"
+    mysql_version = "9.2.2"
     mysql_username = "admin"
     heatwave_shape = "HeatWave.512GB"
     compute_shape = "VM.Standard.E4.Flex"

askme/terraform/instance.tf

@@ -35,6 +35,12 @@ resource "oci_core_instance" "askme_instance" {
     }
     preserve_boot_volume = false
     freeform_tags = {"${local.resource_tag_key}"="${local.resource_tag_value}"}
+    depends_on = [
+        oci_vault_secret.askme_mysql_host_ip_secret,
+        oci_vault_secret.askme_mysql_username_secret,
+        oci_vault_secret.askme_mysql_password_secret,
+        oci_mysql_heat_wave_cluster.askme_heatwave_cluster
+    ]
 }
 
 # Sleep time to make sure the instance user_data was executed

askme/utils/genai_helper.py

@@ -20,7 +20,7 @@ def get_connection(schema_name = DEFAULT_ASKME_SCHEMA_NAME):
         host=host,
         database=schema_name,
         port="3306",
-        connection_timeout=3,
+        connection_timeout=11,
         repeat=3
     )
     return conn
@@ -404,12 +404,14 @@ def group_relevant_chunks_by_url(relevant_chunks):
 
     return sorted_grouped_results
 
-def cleanup_vector_table_materials(schema, table_list, bucket_folder_to_delete):
+def cleanup_vector_table_materials(schema, table_list, bucket_folder_to_delete_prefix):
     conn = get_connection()
+    bucket_name = get_askme_bucket_name()
     for table in table_list:
         if table not in [DEFAULT_EMPTY_VECTOR_TABLE_NAME, HEATWAVE_MANUALS_VECTOR_TABLE_NAME]:
             response = delete_table_from_database(schema, table)
             logger.info(f"{schema}.{table} deletion: {response}")
-    bucket_name = get_askme_bucket_name()
-    delete_object_store_folder(bucket_name, bucket_folder_to_delete)
-    logger.info(f"All user data from the bucket {bucket_folder_to_delete} deletion.")
+            bucket_folder_to_delete = f"{bucket_folder_to_delete_prefix}{table}"
+            delete_object_store_folder(bucket_name, bucket_folder_to_delete)
+            logger.info(f"{bucket_folder_to_delete} deletion is done.")
+

askme/utils/mysql_helper.py

@@ -7,7 +7,7 @@
 from utils.exceptions import AskMEException, BackendConnectionException , UnknownException
 
 # Connection to the MySQL server
-def mysql_connect(username, password, host, database, port, connection_timeout=1, repeat=5):
+def mysql_connect(username, password, host, database, port, connection_timeout=11, repeat=5):
     for i in range(repeat):
         try:
             return mysql.connector.connect(