feat: updated src code

Author: jasperan

json-dual.sql

@@ -27,6 +27,11 @@ insert into dept values (20,'RESEARCH','DALLAS');
 insert into dept values (30,'SALES','CHICAGO');
 insert into dept values (40,'OPERATIONS','BOSTON');
 
+insert into dept values (50,'STORAGE','LOS ANGELES');
+insert into dept values (60,'HEADQUARTER','PHOENIX');
+insert into dept values (70,'LOGISTICS','SAN DIEGO');
+insert into dept values (80,'RETAIL','SEATTLE');
+
 insert into emp values (7369,'SMITH','CLERK',7902,to_date('17-12-1980','dd-mm-yyyy'),800,null,20);
 insert into emp values (7499,'ALLEN','SALESMAN',7698,to_date('20-2-1981','dd-mm-yyyy'),1600,300,30);
 insert into emp values (7521,'WARD','SALESMAN',7698,to_date('22-2-1981','dd-mm-yyyy'),1250,500,30);
@@ -41,6 +46,13 @@ insert into emp values (7876,'ADAMS','CLERK',7788,to_date('13-JUL-87', 'dd-mm-rr
 insert into emp values (7900,'JAMES','CLERK',7698,to_date('3-12-1981','dd-mm-yyyy'),950,null,30);
 insert into emp values (7902,'FORD','ANALYST',7566,to_date('3-12-1981','dd-mm-yyyy'),3000,null,20);
 insert into emp values (7934,'MILLER','CLERK',7782,to_date('23-1-1982','dd-mm-yyyy'),1300,null,10);
+
+insert into emp values (7544,'MICHAEL','ANALYST',7698,to_date('8-9-1982','dd-mm-yyyy'),1500,0,50);
+insert into emp values (7996,'HENRY','CLERK',7788,to_date('13-JUL-83', 'dd-mm-rr')-51,2100,null,60);
+insert into emp values (7977,'MARK','CLERK',7698,to_date('3-12-1985','dd-mm-yyyy'),1950,null,60);
+insert into emp values (7190,'ANDY','ANALYST',7566,to_date('3-12-1982','dd-mm-yyyy'),1000,null,70);
+insert into emp values (7230,'DOUG','CLERK',7782,to_date('23-2-1984','dd-mm-yyyy'),2000,null,70);
+insert into emp values (7276,'SANJAY','CLERK',7782,to_date('23-2-1984','dd-mm-yyyy'),1000,null,80);
 commit;
 
 create or replace json relational duality view department_dv as

src/main/java/com/example/demoai/controller/DemoaiController.java

@@ -203,7 +203,7 @@ public List<Map<String, Object>> search(@RequestBody MessageDTO message) {
     }
 
     /**
-     * Store a pdf file in Oracle Vector DB 23ai
+     * Store a Json Duality view as documents: EXPERIMENTAL - NOT FULLY TESTED
      * 
      * @param view the name of Json-Duality view already created in the DB
      * @return success/fail message

src/main/java/com/example/demoai/service/VectorService.java

@@ -30,8 +30,10 @@
 import org.springframework.ai.reader.ExtractedTextFormatter;
 import org.springframework.ai.reader.JsonReader;
 import org.springframework.ai.reader.pdf.PagePdfDocumentReader;
+import org.springframework.ai.reader.pdf.ParagraphPdfDocumentReader;
 import org.springframework.ai.reader.pdf.config.PdfDocumentReaderConfig;
 import org.springframework.ai.transformer.splitter.TokenTextSplitter;
+import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -95,7 +97,8 @@ public class VectorService {
     public VectorStore getVectorStore() {
         return vectorStore;
     }
-
+    
+    //EXPERIMENTAL - NOT FULLY TESTED
     public Boolean putJsonView(String jsonView) {
 
         String sqlStatement = "select DATA from " + jsonView;
@@ -148,8 +151,12 @@ public String rag(String question) {
 
         String START = "\n<article>\n";
         String STOP = "\n</article>\n";
+        
+        List<Document> similarDocuments = this.vectorStore.similaritySearch( 
+            SearchRequest.
+               query(question).
+               withTopK(4));
 
-        List<Document> similarDocuments = this.vectorStore.similaritySearch(question);
         Iterator<Document> iterator = similarDocuments.iterator();
         StringBuilder context = new StringBuilder();
         while (iterator.hasNext()) {

src/main/resources/application-dev.properties

@@ -2,15 +2,17 @@ spring.ai.openai.api-key=${OPENAI_API_KEY}
 spring.ai.openai.base-url=${OPENAI_URL}
 spring.ai.openai.chat.options.model=${OPENAI_MODEL}
 spring.ai.openai.embedding.options.model=${OPENAI_EMBEDDING_MODEL}
-spring.ai.openai.chat.options.temperature=0.3
-spring.datasource.url=jdbc:oracle:thin:@${VECTORDB}:1521/ORCLPDB1
+spring.ai.openai.chat.options.temperature=0.5
+#spring.datasource.url=jdbc:oracle:thin:@${VECTORDB}:1521/ORCLPDB1
+spring.datasource.url=jdbc:oracle:thin:@${VECTORDB}:1521/FREEPDB1
 spring.datasource.username=${DB_USER}
 spring.datasource.password=${DB_PASSWORD}
 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
 config.tempDir=tempDir
 config.dropDb=true
 config.vectorDB=vectortable
 config.distance=EUCLIDEAN
+#config.distance=COSINE
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=20MB
 spring.ai.ollama.base-url=${OLLAMA_URL}

src/main/resources/application-prod.properties

@@ -2,7 +2,7 @@ spring.ai.openai.api-key=${OPENAI_API_KEY}
 spring.ai.openai.base-url=${OPENAI_URL}
 spring.ai.openai.chat.options.model=${OPENAI_MODEL}
 spring.ai.openai.embedding.options.model=${OPENAI_EMBEDDING_MODEL}
-spring.datasource.url=jdbc:oracle:thin:@${VECTORDB}:1521/ORCLPDB1
+spring.datasource.url=jdbc:oracle:thin:@${VECTORDB}:1521/FREEPDB1
 spring.datasource.username=${DB_USER}
 spring.datasource.password=${DB_PASSWORD}
 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver