Merge branch 'wip' of https://github.com/rootcodelabs/RAG-Module into kubernetes

Author: erangi-ar

.dockerignore

@@ -36,6 +36,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+myenv/
 
 # IDE
 .vscode/

DSL/Liquibase/changelog/rag-search-script-v5-prompt-config.sql

@@ -0,0 +1,8 @@
+-- liquibase formatted sql
+
+-- changeset Erangi Ariyasena:rag-script-v5-changeset1
+CREATE TABLE public.prompt_configuration (
+    id BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    prompt TEXT
+);
+

DSL/Liquibase/master.yml

@@ -6,4 +6,6 @@ databaseChangeLog:
   - include:
       file: changelog/rag-search-script-v3-configuration.sql
   - include:
-      file: changelog/rag-search-script-v4-authority-data.xml
+      file: changelog/rag-search-script-v4-authority-data.xml
+  - include:
+      file: changelog/rag-search-script-v5-prompt-config.sql

DSL/Resql/rag-search/GET/get-prompt-configuration.sql

@@ -0,0 +1,5 @@
+SELECT 
+    id,
+    prompt
+FROM prompt_configuration
+LIMIT 1

DSL/Resql/rag-search/POST/insert-prompt-configuration.sql

@@ -0,0 +1,3 @@
+INSERT INTO prompt_configuration (prompt)
+VALUES (:prompt)
+RETURNING id, prompt

DSL/Resql/rag-search/POST/update-prompt-configuration.sql

@@ -0,0 +1,4 @@
+UPDATE prompt_configuration
+SET prompt = :prompt
+WHERE id = :id
+RETURNING id, prompt

DSL/Ruuter.private/rag-search/GET/prompt-configuration/get.yml

@@ -0,0 +1,39 @@
+declaration:
+  call: declare
+  version: 0.1
+  description: "Get prompt configuration"
+  method: get
+  accepts: json
+  returns: json
+  namespace: rag-search
+
+get_prompt_configuration:
+  call: http.get
+  args:
+    url: "[#RAG_SEARCH_RESQL]/get-prompt-configuration"
+  result: prompt_result
+  next: check_prompt_exists
+
+check_prompt_exists:
+  switch:
+    - condition: "${prompt_result.response.body.length > 0}"
+      next: transform_response
+  next: transform_empty_response
+
+transform_response:
+  assign:
+    data: ${prompt_result.response.body}
+  next: return_success
+
+transform_empty_response:
+  assign:
+    emptyData: []
+  next: return_empty
+
+return_success:
+  return: ${data}
+  next: end
+
+return_empty:
+  return: ${emptyData}
+  next: end

DSL/Ruuter.private/rag-search/POST/llm-connections/edit.yml

@@ -119,9 +119,38 @@ check_connection_exists:
 validate_connection_exists:
   switch:
     - condition: "${existing_connection.response.body.length > 0}"
-      next: update_llm_connection
+      next: check_deployment_environment
   next: return_not_found
 
+check_deployment_environment:
+  switch:
+    - condition: ${environment == "production" && existing_connection.response.body[0].environment == "testing"}
+      next: get_existing_production_connection
+  next: update_llm_connection
+
+get_existing_production_connection:
+  call: http.post
+  args:
+    url: "[#RAG_SEARCH_RESQL]/get-production-connection"
+  result: existing_production_result
+  next: update_existing_production_to_testing
+
+update_existing_production_to_testing:
+  switch:
+    - condition: ${existing_production_result.response.body && existing_production_result.response.body.length > 0}
+      next: update_production_connection
+  next: update_llm_connection
+
+update_production_connection:
+  call: http.post
+  args:
+    url: "[#RAG_SEARCH_RESQL]/update-llm-connection-environment"
+    body:
+      connection_id: ${existing_production_result.response.body[0].id}
+      environment: "testing"
+  result: update_result
+  next: update_llm_connection
+
 update_llm_connection:
   call: http.post
   args:
@@ -169,4 +198,4 @@ return_invalid_environment:
 return_unauthorized:
   status: 401
   return: "error: unauthorized"
-  next: end
+  next: end

DSL/Ruuter.private/rag-search/POST/prompt-configuration/save.yml

@@ -0,0 +1,58 @@
+declaration:
+  call: declare
+  version: 0.1
+  description: "Update or insert prompt configuration"
+  method: post
+  accepts: json
+  returns: json
+  namespace: rag-search
+  allowlist:
+    body:
+      - field: prompt
+        type: string
+        description: "Prompt text to save"
+
+extract_request_data:
+  assign:
+    prompt: ${incoming.body.prompt ?? ""}
+  next: get_existing_prompt
+
+get_existing_prompt:
+  call: http.get
+  args:
+    url: "[#RAG_SEARCH_RESQL]/get-prompt-configuration"
+  result: existing_prompt
+  next: check_if_exists
+
+check_if_exists:
+  switch:
+    - condition: "${existing_prompt.response.body.length > 0}"
+      next: update_prompt
+  next: insert_prompt
+
+update_prompt:
+  call: http.post
+  args:
+    url: "[#RAG_SEARCH_RESQL]/update-prompt-configuration"
+    body:
+      id: ${existing_prompt.response.body[0].id}
+      prompt: ${prompt}
+  result: update_result
+  next: return_update_success
+
+insert_prompt:
+  call: http.post
+  args:
+    url: "[#RAG_SEARCH_RESQL]/insert-prompt-configuration"
+    body:
+      prompt: ${prompt}
+  result: insert_result
+  next: return_insert_success
+
+return_update_success:
+  return: ${update_result.response.body[0]}
+  next: end
+
+return_insert_success:
+  return: ${insert_result.response.body[0]}
+  next: end

DSL/Ruuter.private/rag-search/POST/vault/secret/create.yml

@@ -5,7 +5,7 @@ declaration:
   method: post
   accepts: json
   returns: json
-  namespace: classifier
+  namespace: rag-search
   allowlist:
     body:
       - field: connectionId