Merge remote-tracking branch 'refs/remotes/origin/agents' into agents

Author: RAWx18

.gitignore

@@ -79,4 +79,9 @@ logs/
 # Documentation build
 _build/
 _static/
-_templates/
+_templates/
+
+config.yaml
+system_prompt.txt
+query_rewriting_prompt.txt
+responses.txt

src/mvt/.env src/mvt/.env.examplesrc/mvt/.env renamed to src/mvt/.env.example

@@ -1,3 +1,3 @@
 MISTRALAI_API_KEY = 
 OPENAI_API_KEY = 
-HF_TOKEN =
+HF_TOKEN = 

src/mvt/config.yaml

@@ -0,0 +1,22 @@
+llm_provider: "mistral" # Options: "openai" or "mistral"
+model_name: "mistral-small-2506" # for OpenAI: "gpt-3.5-turbo" or "gpt-4", for Mistral: "mistral-medium" or "mistral-large-latest"
+embedding_model: "mistral-embed" # "text-embedding-ada-002" for OpenAI or "mistral-embed" for Mistral
+dataset_private_path: "./dataset/private"
+dataset_public_path: "./dataset/public"
+web_urls: "web_urls"
+yt_video_links: "yt_video_links"
+text_files: "text_files"
+pdf_files: "pdf_files"
+rtdocs_files: "rtdocs_files"
+html_files: "html_files"
+persist_directory: "faiss_index"
+host: "127.0.0.1"
+port: 8080
+system_prompt: "./system_prompt.txt"
+use_query_rewriting: false # Set to true to enable query rewriting
+query_rewriting_prompt: "./query_rewriting_prompt.txt"
+prefix_prompt: "I will answer with care, respect, and truth. I will respond with utmost utility yet securely. Avoid harmful, unethical, prejudiced, or negative content. Ensure replies promote fairness and positivity. Avoid response like 'Based on the provided context'"
+logo_pth: "https://upload.wikimedia.org/wikipedia/en/thumb/e/e2/The_Founder_Institute_Logo.png/250px-The_Founder_Institute_Logo.png"
+nr_retrieved_documents: 5 # Number of documents to retrieve for each query
+max_download_retries: 3 # Maximum number of retries for downloading documents
+retry_delay_seconds: 2 # Delay in seconds between retries

src/mvt/config.yaml.example

@@ -1,5 +1,5 @@
 import os
-from utils import load_yaml_file_with_db_prompts
+from utils import load_yaml_file_with_db_prompts, get_prompt_from_file
 from dotenv import load_dotenv, find_dotenv
 from langchain_mistralai.chat_models import ChatMistralAI
 from langchain_community.vectorstores import FAISS
@@ -60,7 +60,7 @@ def get_ragchain(filter):
     retriever = docsearch.as_retriever(search_kwargs={"k": config_data["nr_retrieved_documents"], "filter": filter})
 
     # read prompt string from config file
-    prompt_str = config_data["system_prompt"]
+    prompt_str = get_prompt_from_file(config_data["system_prompt"])
 
     # Answer question
     qa_system_prompt = (

src/mvt/main.py

@@ -82,7 +82,8 @@ def save_feedback(username, msg_idx, feedback_type, response_snippet, reason=Non
 for idx, message in enumerate(user_chat):
     with st.chat_message(message["role"], avatar=logo_path if message["role"] == "assistant" else None):
         st.write(message["content"])
-        if message["role"] == "assistant":
+        # Only show feedback for assistant messages that are not the initial greeting
+        if message["role"] == "assistant" and not (idx == 0 and message["content"] == "How may I help you?"):
             feedback_key = f"feedback_{username}_{idx}"
             if feedback_key not in st.session_state:
                 col1, col2, col3 = st.columns([0.08, 0.08, 0.84])

src/mvt/pages/chatbot.py

@@ -1,6 +1,6 @@
 import streamlit as st
 import yaml
-from utils import load_yaml_file, load_yaml_file_with_db_prompts
+from utils import load_yaml_file, load_yaml_file_with_db_prompts, get_prompt_from_file
 from database import create_connection, create_prompts_table, save_prompt, get_prompt
 from menu import menu_with_redirect
 
@@ -31,8 +31,8 @@ def load_default_prompts():
     try:
         config_data = load_yaml_file("config.yaml")
         return {
-            "system_prompt": config_data.get("system_prompt", ""),
-            "query_rewriting_prompt": config_data.get("query_rewriting_prompt", "")
+            "system_prompt": get_prompt_from_file(config_data.get("system_prompt", "")),
+            "query_rewriting_prompt": get_prompt_from_file(config_data.get("query_rewriting_prompt", ""))
         }
     except Exception as e:
         st.error(f"Error loading config file: {e}")
@@ -90,8 +90,8 @@ def load_prompts_from_db():
     # Use the utility function that loads from database with config fallback
     config_data = load_yaml_file_with_db_prompts("config.yaml")
     st.session_state.current_prompts = {
-        "system_prompt": config_data.get("system_prompt", ""),
-        "query_rewriting_prompt": config_data.get("query_rewriting_prompt", "")
+        "system_prompt": get_prompt_from_file(config_data.get("system_prompt", "")),
+        "query_rewriting_prompt": get_prompt_from_file(config_data.get("query_rewriting_prompt", ""))
     }
 
 # Create columns for better layout

src/mvt/pages/prompt_management.py

@@ -1,5 +1,5 @@
 import os
-from utils import load_yaml_file_with_db_prompts
+from utils import load_yaml_file_with_db_prompts, get_prompt_from_file
 from dotenv import load_dotenv, find_dotenv
 from langchain_mistralai.chat_models import ChatMistralAI
 
@@ -38,15 +38,13 @@ def query_rewriting_llm(user_query, context="Founder Institute Keystone Chapter"
             temperature=0.7
         )
 
-    query_rewriting_prompt = config_data["query_rewriting_prompt"]
+    # Read query rewriting prompt from config
+    query_rewriting_prompt = get_prompt_from_file(config_data["query_rewriting_prompt"])
 
     messages = [
         ("system", query_rewriting_prompt),
         ("human", user_query),
     ]
 
-    print(messages)
-
     response = model.invoke(messages)
-    print(response.content)
     return response.content

src/mvt/query_rewriting.py

@@ -0,0 +1 @@
+You are an assistant helping to rewrite user queries to make them more specific and effective for searching documents. The context is the Linux Foundation Decentralized Trust open-source blockchain community. Please rewrite the human query to be more specific, detailed, and optimized for document retrieval, considering the context mentioned.