Merge pull request #72 from oracle-samples/cdb-fix

fix spring-ai version

Author: corradodebari

app/src/modules/metadata.py

@@ -152,6 +152,19 @@ def ll_models():
             "frequency_penalty": [0.0, 0.0, -1.0, 1.0],
             "presence_penalty": [0.0, 0.0, -2.0, 2.0],
         },
+        "meta-llama/Llama-3.2-3B-Instruct": {
+            "enabled": False,
+            "api": "OpenAI",
+            "url": "http://127.0.0.1:8080",
+            "api_key": "",
+            "openai_compat": True,
+            "context_length": 127072,
+            "temperature": [1.0, 1.0, 0.0, 2.0],
+            "top_p": [0.99, .99, 0.0, 0.99],
+            "max_tokens": [256, 256, 1, 8191],
+            "frequency_penalty": [0.0, 0.0, -1.0, 1.0],
+            "presence_penalty": [0.0, 0.0, -2.0, 2.0],
+        },
         "gpt-4o": {
             "enabled": os.getenv("OPENAI_API_KEY") is not None,
             "api": "OpenAI",

app/src/modules/st_common.py

@@ -334,15 +334,15 @@ def get_yaml_obaas(session_state_json,provider):
 
 def get_yaml_env(session_state_json,provider):
 
-    OLLAMA_MODEL="llama3.1"
+    OLLAMA_MODEL=["llama3.1","llama3.2"]
 
     instr_context=session_state_json["lm_instr_config"][session_state_json["lm_instr_prompt"]]["prompt"]
     vector_table,_= utilities.get_vs_table(session_state_json["rag_params"]["model"],session_state_json["rag_params"]["chunk_size"],session_state_json["rag_params"]["chunk_overlap"],session_state_json["rag_params"]["distance_metric"])
 
     logger.info("ll_model selected: %s",session_state_json["ll_model"])
-    logger.info(session_state_json["ll_model"] != OLLAMA_MODEL)
+    logger.info(session_state_json["ll_model"] not in OLLAMA_MODEL)
 
-    if session_state_json["ll_model"] != OLLAMA_MODEL:
+    if session_state_json["ll_model"] not in OLLAMA_MODEL:
         env_vars_LLM= f"""
     export OPENAI_CHAT_MODEL={session_state_json["ll_model"]}
     export OPENAI_EMBEDDING_MODEL={session_state_json["rag_params"]["model"]}
@@ -386,7 +386,7 @@ def get_yaml_env(session_state_json,provider):
     export DB_USERNAME=\"{session_state_json["db_config"]["user"]}\"
     export DB_PASSWORD=\"{session_state_json["db_config"]["password"]}\"
     export DISTANCE_TYPE={session_state_json["rag_params"]["distance_metric"]}
-    export OLLAMA_BASE_URL=\"{session_state_json["ll_model_config"][OLLAMA_MODEL]["url"]}\"
+    export OLLAMA_BASE_URL=\"{session_state_json["ll_model_config"][session_state_json["ll_model"]]["url"]}\"
     export CONTEXT_INSTR=\"{instr_context}\"
     export TOP_K={session_state_json.get("rag_params", {}).get("top_k",4)}  
 

app/src/modules/utilities.py

@@ -216,6 +216,37 @@ def execute_sql(conn, run_sql):
     finally:
         cursor.close()
 
+def check_index(conn, index):
+    """Execute SQL against Oracle Database to check the presence of an index"""
+
+    run_sql=f"SELECT index_name FROM all_indexes WHERE index_name = '{index}'"
+    logger.info(run_sql)
+    result = False
+    try:
+        cursor = conn.cursor()
+        cursor.execute(run_sql)
+        result = cursor.fetchone()
+        logger.info("Check index via SQL Executed")
+        logger.info(run_sql)
+        return result
+        
+    except oracledb.DatabaseError as ex:
+        if ex.args and len(ex.args) > 0:
+            error_obj = ex.args[0]
+            if (
+                # ORA-00955: name is already used by an existing object
+                hasattr(error_obj, "code") and error_obj.code == 955
+            ):
+                logger.info("Table Exists")
+        else:
+            logger.exception(ex, exc_info=False)
+            raise
+    finally:
+        logger.info("check_index finally")
+        logger.info(result)
+        cursor.close()
+        return result
+
 
 ###############################################################################
 # Vector Storage
@@ -306,15 +337,41 @@ def json_to_doc(file: str):
     logger.info("Total Unique Chunks: %i", len(unique_chunks))
 
     # Need to consider this, it duplicates from_documents
-    logger.info("Dropping table %s", store_table)
-    LangchainVS.drop_table_purge(db_conn, store_table)
+    #logger.info("Dropping table %s", store_table)
+    #LangchainVS.drop_table_purge(db_conn, store_table)
 
-    vectorstore = OracleVS(
+    try:
+        vectorstore_back = OracleVS(
+            client=db_conn,
+            embedding_function=model_name,
+            table_name=store_table,
+            distance_strategy=distance_metric,
+        )
+    except Exception as ex:
+        logger.error("Unable to open existing vector table: %s", ex)
+    
+    #check if index exists before drop
+    index_exists= False
+    try:
+        index_exists=check_index(db_conn, f"{store_table}_HNSW_IDX")     
+        logger.info("Check in-memory index if exists")
+        logger.info(index_exists)
+    except Exception as ex:
+        logger.error("Check in-memory index if exists: %s", ex)
+        index_exists=True
+    
+    LangchainVS.drop_index_if_exists(db_conn, f"{store_table}_HNSW_IDX")
+
+
+    try:
+        vectorstore = OracleVS(
         client=db_conn,
         embedding_function=model_name,
-        table_name=store_table,
+        table_name=store_table+"_TEMP",
         distance_strategy=distance_metric,
-    )
+        )
+    except Exception as ex:
+        logger.error("Unable to open temp vector table: %s", ex)
 
     # Batch Size does not have a measurable impact on performance
     # but does eliminate issues with timeouts
@@ -328,23 +385,38 @@ def json_to_doc(file: str):
             len(unique_chunks),
             rate_limit,
         )
+        logger.info(unique_chunks[i])
         OracleVS.add_documents(vectorstore, documents=batch)
         if rate_limit > 0:
             interval = 60 / rate_limit
             logger.info("Rate Limiting: sleeping for %i seconds", interval)
             time.sleep(interval)
 
-    # Build the Index
-    logger.info("Creating index on: %s", store_table)
-    try:
-        params = {"idx_name": f"{store_table}_HNSW_IDX", "idx_type": "HNSW"}
-        LangchainVS.create_index(db_conn, vectorstore, params)
-    except Exception as ex:
-        logger.error("Unable to create vector index: %s", ex)
+    mergesql = f"INSERT INTO {store_table}(ID,TEXT,METADATA,EMBEDDING) SELECT ID, TEXT, METADATA, EMBEDDING FROM {store_table}_TEMP WHERE ID NOT IN (SELECT ID FROM {store_table} )"    
+    logger.info("MERGE with this command \n%s",mergesql)
+
+    execute_sql(db_conn, mergesql)
+    db_conn.commit()
+
+    if (index_exists):
+        # Build the Index
+        logger.info("Creating index on: %s", store_table)
+        try:
+            params = {"idx_name": f"{store_table}_HNSW_IDX", "idx_type": "HNSW"}
+            #params = {"idx_name": f"{store_table}_IVF_IDX", "idx_type": "IVF"}
+      
+            LangchainVS.create_index(db_conn, vectorstore_back, params)
+       
+        except Exception as ex:
+            logger.error("Unable to create vector index: %s", ex)
 
     # Comment the VS table
     comment = f"COMMENT ON TABLE {store_table} IS 'GENAI: {store_comment}'"
     execute_sql(db_conn, comment)
+
+    dropsql= f"DROP TABLE {store_table}_TEMP CASCADE CONSTRAINTS"
+    execute_sql(db_conn, dropsql)
+
     db_conn.close()
 
 

spring_ai/pom.xml

@@ -11,19 +11,19 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>myspringai</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-M4</version>
 	<name>myspringai</name>
 	<description>Simple AI Application using OpenAPI Service</description>
 	<properties>
 		<java.version>17</java.version>
-		<spring-ai.version>1.0.0-SNAPSHOT</spring-ai.version>
+		<spring-ai.version>1.0.0-M4</spring-ai.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.ai</groupId>
 				<artifactId>spring-ai-bom</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
+				<version>1.0.0-M4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -75,7 +75,7 @@
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
 			<artifactId>spring-ai-oracle-store-spring-boot-starter</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>1.0.0-M4</version>
 		</dependency>
 		<!--<dependency>
 			<groupId>org.springframework.ai</groupId>

spring_ai/src/main/java/org/springframework/ai/openai/samples/helloworld/AIController.java

@@ -1,3 +1,8 @@
+/*
+Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+Licensed under the Universal Permissive License v1.0 as shown at http://oss.oracle.com/licenses/upl.
+*/
+
 package org.springframework.ai.openai.samples.helloworld;
 
 import org.springframework.ai.chat.client.ChatClient;

spring_ai/src/main/java/org/springframework/ai/openai/samples/helloworld/Application.java

@@ -1,3 +1,8 @@
+/*
+Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+Licensed under the Universal Permissive License v1.0 as shown at http://oss.oracle.com/licenses/upl.
+*/
+
 package org.springframework.ai.openai.samples.helloworld;
 
 import org.springframework.ai.embedding.EmbeddingModel; 

spring_ai/src/main/java/org/springframework/ai/openai/samples/helloworld/Config.java

@@ -1,3 +1,8 @@
+/*
+Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+Licensed under the Universal Permissive License v1.0 as shown at http://oss.oracle.com/licenses/upl.
+*/
+
 package org.springframework.ai.openai.samples.helloworld;
 
 import org.springframework.ai.chat.client.ChatClient;