- 
-
-
-
-
-
-
-
-
-
-
-
-
`;
- // Create an incoming chat div with typing animation and append it to chat container
- const incomingChatDiv = createChatElement(html, "incoming");
- chatContainer.appendChild(incomingChatDiv);
- chatContainer.scrollTo(0, chatContainer.scrollHeight);
- getChatResponse(incomingChatDiv);
- showFeedbackRequest();
-}
-
-const showFeedbackRequest = () => {
- // Display a message from A2rchi to ask the user to give feedback
-
- num_responses_since_last_rating = num_responses_since_last_rating + 1;
-
- const html = `
-
`;
-
- // Create an incoming chat div with feedback request and append it to chat container
- if (num_responses_since_last_rating > 2) {
- const incomingChatDiv = createChatElement(html, "incoming");
- chatContainer.appendChild(incomingChatDiv);
- chatContainer.scrollTo(0, chatContainer.scrollHeight);
- num_responses_since_last_rating = 0;
- }
-}
-
-const handleOutgoingChat = () => {
- userText = chatInput.value.trim(); // Get chatInput value and remove extra spaces
- if(!userText) return; // If chatInput is empty return from here
- conversation.push(["User", userText])
-
- // Clear the input field and reset its height
- chatInput.value = "";
- chatInput.style.height = `${initialInputHeight}px`;
-
- const html = `
-
-
-
-
-
- I've noticed you haven't rated any of my responses in awhile. Rating responses is crucial because it not only helps me improve, but it also ensures that this project remains open source and freely accessible for everyone. Your input is highly valuable in supporting the A2rchi mission!
-
-
`;
-
- // Create an outgoing chat div with user's message and append it to chat container
- const outgoingChatDiv = createChatElement(html, "outgoing");
- chatContainer.querySelector(".default-text")?.remove();
- chatContainer.appendChild(outgoingChatDiv);
- chatContainer.scrollTo(0, chatContainer.scrollHeight);
- setTimeout(showTypingAnimation, 500);
-}
-
-deleteButton.addEventListener("click", () => {
- // Remove the chats from local storage and call loadDataFromLocalstorage function
- if(confirm("Are you sure you want to delete all the chats?")) {
- conversation = []
- discussion_id = null
- next_message_id = 0;
- localStorage.removeItem("all-chats");
- loadDataFromLocalstorage();
- }
-});
-
-refreshButton.addEventListener("click", () => {
- refreshChat();
-});
-
-themeButton.addEventListener("click", () => {
- // Toggle body's class for the theme mode and save the updated theme to the local storage
- document.body.classList.toggle("light-mode");
- localStorage.setItem("themeColor", themeButton.innerText);
- themeButton.innerText = document.body.classList.contains("light-mode") ? "dark_mode" : "light_mode";
-});
-
-const initialInputHeight = chatInput.scrollHeight;
-
-chatInput.addEventListener("input", () => {
- // Adjust the height of the input field dynamically based on its content
- chatInput.style.height = `${initialInputHeight}px`;
- chatInput.style.height = `${chatInput.scrollHeight}px`;
-});
-
-chatInput.addEventListener("keydown", (e) => {
- // If the Enter key is pressed without Shift and the window width is larger
- // than 800 pixels, handle the outgoing chat
- if (e.key === "Enter" && !e.shiftKey && window.innerWidth > 800) {
- e.preventDefault();
- handleOutgoingChat();
- }
-});
-
-loadDataFromLocalstorage();
-sendButton.addEventListener("click", handleOutgoingChat);
diff --git a/A2rchi/interfaces/chat_app/static/script.js-template b/A2rchi/interfaces/chat_app/static/script.js-template
index 83f5101e..86743b69 100644
--- a/A2rchi/interfaces/chat_app/static/script.js-template
+++ b/A2rchi/interfaces/chat_app/static/script.js-template
@@ -14,10 +14,10 @@ const appropriate_checkbox = document.getElementById("appropriate_checkbox");
popupForm.style.display = "none";
let userText = null;
-let discussion_id = null;
-let next_message_id = 0;
+let conversation_id = null;
let conversation = []
let num_responses_since_last_rating = 0;
+let last_response_is_feedback_request = false;
const loadDataFromLocalstorage = () => {
// Load saved chats and theme from local storage and apply/add on the page
@@ -46,22 +46,30 @@ const createChatElement = (content, className) => {
}
const refreshChat = async () => {
- conversation.pop();
- if (next_message_id > 0) {
- next_message_id = next_message_id -1;
+ // if the conversation is empty; this is a no-op
+ if (conversation.length == 0) {
+ return;
}
+
+ // remove message to be regenerated from conversation
+ conversation.pop();
chatContainer.removeChild(chatContainer.lastChild);
- showTypingAnimation();
+
+ // if the last response generated a feedback request, make sure to remove it here as well
+ console.log(last_response_is_feedback_request)
+ if (last_response_is_feedback_request) {
+ console.log("remove again")
+ chatContainer.removeChild(chatContainer.lastChild);
+ }
+
+ // generate new response
+ showTypingAnimation(isRefresh=true);
}
-const getChatResponse = async (incomingChatDiv) => {
+const getChatResponse = async (incomingChatDiv, isRefresh=false) => {
const API_URL = "http://XX-HOSTNAME-XX:XX-HTTP_PORT-XX/api/get_chat_response";
const pElement = document.createElement("div");
- // Give the p element of the response an id which is equal to the message id
- pElement.setAttribute('id',next_message_id.toString());
- next_message_id = next_message_id + 1
-
// Define the properties and data for the API request
const requestOptions = {
method: "POST",
@@ -69,18 +77,21 @@ const getChatResponse = async (incomingChatDiv) => {
"Content-Type": "application/json",
},
body: JSON.stringify({
- conversation: conversation,
- discussion_id: discussion_id,
+ last_message: conversation.slice(-1),
+ conversation_id: conversation_id,
+ is_refresh: isRefresh,
})
}
- // Send POST request to Flask API, get response and set the response as paragraph element text
- try {
+ // Send POST request to Flask API, get response and set the response as paragraph element text
+ try {
const response = await (await fetch(API_URL, requestOptions)).json();
pElement.innerHTML = response.response;
+ pElement.setAttribute('id', response.a2rchi_msg_id.toString());
pElement.classList.add(".default-text");
conversation.push(["A2rchi", response.response]);
- discussion_id = response.discussion_id ;
+ conversation_id = response.conversation_id;
+ last_response_is_feedback_request = false;
} catch (error) {
pElement.classList.add("error");
pElement.textContent = "Oops! Something went wrong while retrieving the response. Please try again.";
@@ -91,6 +102,9 @@ const getChatResponse = async (incomingChatDiv) => {
incomingChatDiv.querySelector(".chat-details").appendChild(pElement);
localStorage.setItem("all-chats", chatContainer.innerHTML);
chatContainer.scrollTo(0, chatContainer.scrollHeight);
+
+ // ask user for feedback if it's been too many messages w/out any feedback
+ setTimeout(showFeedbackRequest, 500);
}
const copyCode = (copyCodeBtn) => {
@@ -108,8 +122,6 @@ const copyResponse = (copyBtn) => {
const likeResponse = (likeBtn) => {
num_responses_since_last_rating = 0;
- const chatContent = likeBtn.parentElement.previousElementSibling.querySelector("p").textContent;
-
// fill the image
const image = likeBtn.querySelector("img");
image.src = "/static/images/thumbs_up_filled.png"
@@ -127,9 +139,7 @@ const likeResponse = (likeBtn) => {
"Content-Type": "application/json",
"Access-Control-Allow-Origin": "*",
},
- body: JSON.stringify({
- content: chatContent,
- discussion_id: discussion_id,
+ body: JSON.stringify({
message_id: likeBtn.parentElement.previousElementSibling.querySelector("p").parentElement.id,
}),
})
@@ -138,8 +148,6 @@ const likeResponse = (likeBtn) => {
const dislikeResponse = (dislikeBtn) => {
num_responses_since_last_rating = 0;
- const chatContent = dislikeBtn.parentElement.previousElementSibling.querySelector("p").textContent;
-
// fill the image
const image = dislikeBtn.querySelector("img");
image.src = "/static/images/thumbs_down_filled.png";
@@ -164,10 +172,8 @@ const dislikeResponse = (dislikeBtn) => {
"Access-Control-Allow-Origin": "*",
},
body: JSON.stringify({
- content: chatContent,
- discussion_id: discussion_id,
message_id: dislikeBtn.parentElement.previousElementSibling.querySelector("p").parentElement.id,
- message: additionalThoughts,
+ feedback_msg: additionalThoughts,
incorrect: correct_checkbox.checked,
unhelpful: helpful_checkbox.checked,
inappropriate: appropriate_checkbox.checked,
@@ -179,16 +185,16 @@ const dislikeResponse = (dislikeBtn) => {
}
//wait for user to submit response or close the additional feedback window
- submitButton.addEventListener("click", handleSubmitToAPI);
- closeButton.addEventListener("click", handleSubmitToAPI);
+ submitButton.addEventListener("click", handleSubmitToAPI, {once: true});
+ closeButton.addEventListener("click", handleSubmitToAPI, {once: true});
}
const closeFeedback = (closeBtn) => {
- //hide pop up formi
+ //hide pop up form
popupForm.style.display = "none";
}
-const showTypingAnimation = () => {
+const showTypingAnimation = (isRefresh=false) => {
// Display the typing animation and call the getChatResponse function
const html = `
- 
-
-
- ${userText}
-
@@ -212,8 +218,7 @@ const showTypingAnimation = () => {
const incomingChatDiv = createChatElement(html, "incoming");
chatContainer.appendChild(incomingChatDiv);
chatContainer.scrollTo(0, chatContainer.scrollHeight);
- getChatResponse(incomingChatDiv);
- showFeedbackRequest();
+ getChatResponse(incomingChatDiv, isRefresh);
}
const showFeedbackRequest = () => {
@@ -225,7 +230,7 @@ const showFeedbackRequest = () => {
`;
@@ -236,6 +241,7 @@ const showFeedbackRequest = () => {
chatContainer.appendChild(incomingChatDiv);
chatContainer.scrollTo(0, chatContainer.scrollHeight);
num_responses_since_last_rating = 0;
+ last_response_is_feedback_request = true;
}
}
@@ -267,8 +273,7 @@ deleteButton.addEventListener("click", () => {
// Remove the chats from local storage and call loadDataFromLocalstorage function
if(confirm("Are you sure you want to delete all the chats?")) {
conversation = []
- discussion_id = null
- next_message_id = 0;
+ conversation_id = null
localStorage.removeItem("all-chats");
loadDataFromLocalstorage();
}
diff --git a/A2rchi/interfaces/cleo.py b/A2rchi/interfaces/cleo.py
index 557b9ef6..41a18960 100644
--- a/A2rchi/interfaces/cleo.py
+++ b/A2rchi/interfaces/cleo.py
@@ -20,7 +20,6 @@ class CleoAIWrapper:
def __init__(self):
self.chain = Chain()
- self.number_of_queries = 0 #TODO: finish installing this safegaurd.
# initialize data manager
self.data_manager = DataManager()
diff --git a/A2rchi/utils/sql.py b/A2rchi/utils/sql.py
new file mode 100644
index 00000000..c2b780db
--- /dev/null
+++ b/A2rchi/utils/sql.py
@@ -0,0 +1,6 @@
+"""SQL queries used by A2rchi"""
+SQL_INSERT_CONVO = "INSERT INTO conversations (conversation_id, sender, content, ts) VALUES %s RETURNING message_id;"
+
+SQL_INSERT_FEEDBACK = "INSERT INTO feedback (mid, feedback_ts, feedback, feedback_msg, incorrect, unhelpful, inappropriate) VALUES (%s, %s, %s, %s, %s, %s, %s);"
+
+SQL_QUERY_CONVO = "SELECT sender, content FROM conversations WHERE conversation_id = %s ORDER BY message_id ASC;"
diff --git a/config/dev-config.yaml b/config/dev-config.yaml
index 404403e2..d6c1e041 100644
--- a/config/dev-config.yaml
+++ b/config/dev-config.yaml
@@ -13,7 +13,7 @@ interfaces:
PORT: 7861
EXTERNAL_PORT: 7682
HOST: "0.0.0.0" # either "0.0.0.0" (for public) or "127.0.0.1" (for internal)
- HOSTNAME: "t3desk019.mit.edu" # careful, this is used for the chat service
+ HOSTNAME: "submit06.mit.edu" # careful, this is used for the chat service
template_folder: "/root/A2rchi/A2rchi/interfaces/chat_app/templates"
static_folder: "/root/A2rchi/A2rchi/interfaces/chat_app/static"
num_responses_until_feedback: 3 #the number of responses given by A2rchi until she asks for feedback.
@@ -83,6 +83,11 @@ utils:
mailbox:
IMAP4_PORT: 143
mailbox_update_time: 10
+ postgres:
+ port: 5432
+ user: a2rchi
+ database: a2rchi-db
+ host: dev-postgres-dev-1
data_manager:
CHUNK_SIZE: 1000
CHUNK_OVERLAP: 0
diff --git a/config/prod-801-config.yaml b/config/prod-801-config.yaml
index 15c0f772..8feda008 100644
--- a/config/prod-801-config.yaml
+++ b/config/prod-801-config.yaml
@@ -81,6 +81,11 @@ utils:
mailbox:
IMAP4_PORT: 143
mailbox_update_time: 10
+ postgres:
+ port: 5432
+ user: a2rchi
+ database: a2rchi-db
+ host: prod-801-postgres-prod-801-1
data_manager:
CHUNK_SIZE: 1000
CHUNK_OVERLAP: 0
diff --git a/config/prod-config.yaml b/config/prod-config.yaml
index f373016c..f8c4ef30 100644
--- a/config/prod-config.yaml
+++ b/config/prod-config.yaml
@@ -81,6 +81,11 @@ utils:
mailbox:
IMAP4_PORT: 143
mailbox_update_time: 10
+ postgres:
+ port: 5432
+ user: a2rchi
+ database: a2rchi-db
+ host: prod-postgres-prod-1
data_manager:
CHUNK_SIZE: 1000
CHUNK_OVERLAP: 0
diff --git a/config/prod-root-config.yaml b/config/prod-root-config.yaml
index 782a1820..6dfecfab 100644
--- a/config/prod-root-config.yaml
+++ b/config/prod-root-config.yaml
@@ -82,6 +82,11 @@ utils:
mailbox:
IMAP4_PORT: 143
mailbox_update_time: 10
+ postgres:
+ port: 5432
+ user: a2rchi
+ database: a2rchi-db
+ host: prod-root-postgres-prod-root-1
data_manager:
CHUNK_SIZE: 1000
CHUNK_OVERLAP: 0
diff --git a/deploy/dev/dev-compose.yaml b/deploy/dev/dev-compose.yaml
index 369897c1..55113b5b 100644
--- a/deploy/dev/dev-compose.yaml
+++ b/deploy/dev/dev-compose.yaml
@@ -9,6 +9,8 @@ services:
depends_on:
chromadb-dev:
condition: service_healthy
+ postgres-dev:
+ condition: service_healthy
environment:
RUNTIME_ENV: dev
CLEO_URL_FILE: /run/secrets/cleo_url
@@ -22,6 +24,7 @@ services:
SENDER_PW_FILE: /run/secrets/sender_pw
OPENAI_API_KEY_FILE: /run/secrets/openai_api_key
HUGGING_FACE_HUB_TOKEN_FILE: /run/secrets/hf_token
+ POSTGRES_PASSWORD_FILE: /run/secrets/pg_password
secrets:
- cleo_url
- cleo_user
@@ -34,6 +37,7 @@ services:
- sender_pw
- openai_api_key
- hf_token
+ - pg_password
volumes:
- a2rchi-dev-data:/root/data/
logging:
@@ -51,13 +55,17 @@ services:
depends_on:
chromadb-dev:
condition: service_healthy
+ postgres-dev:
+ condition: service_healthy
environment:
RUNTIME_ENV: dev
OPENAI_API_KEY_FILE: /run/secrets/openai_api_key
HUGGING_FACE_HUB_TOKEN_FILE: /run/secrets/hf_token
+ POSTGRES_PASSWORD_FILE: /run/secrets/pg_password
secrets:
- openai_api_key
- hf_token
+ - pg_password
volumes:
- a2rchi-dev-data:/root/data/
logging:
@@ -77,6 +85,8 @@ services:
depends_on:
chromadb-dev:
condition: service_healthy
+ postgres-dev:
+ condition: service_healthy
environment:
RUNTIME_ENV: dev
IMAP_USER_FILE: /run/secrets/imap_user
@@ -121,6 +131,8 @@ services:
depends_on:
chromadb-dev:
condition: service_healthy
+ postgres-dev:
+ condition: service_healthy
environment:
RUNTIME_ENV: dev
FLASK_UPLOADER_APP_SECRET_KEY_FILE: /run/secrets/flask_uploader_app_secret_key
@@ -165,9 +177,33 @@ services:
start_period: 10s
start_interval: 5s
+ postgres-dev:
+ image: postgres:16
+ environment:
+ RUNTIME_ENV: dev
+ POSTGRES_PASSWORD_FILE: /run/secrets/pg_password
+ POSTGRES_USER: a2rchi
+ POSTGRES_DB: a2rchi-db
+ secrets:
+ - pg_password
+ volumes:
+ - ./dev-init.sql:/docker-entrypoint-initdb.d/init.sql
+ - a2rchi-dev-pg-data:/var/lib/postgresql/data
+ logging:
+ options:
+ max-size: 10m
+ restart: always
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U a2rchi -d a2rchi-db"]
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
volumes:
a2rchi-dev-data:
external: true
+ a2rchi-dev-pg-data:
+ external: true
secrets:
imap_user:
@@ -200,3 +236,5 @@ secrets:
file: secrets/openai_api_key.txt
hf_token:
file: secrets/hf_token.txt
+ pg_password:
+ file: secrets/pg_password.txt
diff --git a/deploy/dev/dev-init.sql b/deploy/dev/dev-init.sql
new file mode 100644
index 00000000..90d49c61
--- /dev/null
+++ b/deploy/dev/dev-init.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS conversations (
+ conversation_id INTEGER NOT NULL,
+ message_id SERIAL,
+ sender TEXT NOT NULL,
+ content TEXT NOT NULL,
+ ts TIMESTAMP NOT NULL,
+ PRIMARY KEY (message_id)
+);
+CREATE TABLE IF NOT EXISTS feedback (
+ mid INTEGER NOT NULL,
+ feedback_ts TIMESTAMP NOT NULL,
+ feedback TEXT NOT NULL,
+ feedback_msg TEXT,
+ incorrect BOOLEAN,
+ unhelpful BOOLEAN,
+ inappropriate BOOLEAN,
+ PRIMARY KEY (mid, feedback_ts),
+ FOREIGN KEY (mid) REFERENCES conversations(message_id)
+);
\ No newline at end of file
diff --git a/deploy/dev/dev-install.sh b/deploy/dev/dev-install.sh
index 29180feb..ba11b725 100755
--- a/deploy/dev/dev-install.sh
+++ b/deploy/dev/dev-install.sh
@@ -1,11 +1,17 @@
#!/bin/bash
-# create volume if it doesn't already exist
+# create volume if it doesn't already exist for app data
exists=`docker volume ls | awk '{print $2}' | grep a2rchi-dev-data`
if [[ $exists != 'a2rchi-dev-data' ]]; then
docker volume create --name a2rchi-dev-data
fi
+# create volume if it doesn't already exist for postgres data
+exists=`docker volume ls | awk '{print $2}' | grep a2rchi-dev-pg-data`
+if [[ $exists != 'a2rchi-dev-pg-data' ]]; then
+ docker volume create --name a2rchi-dev-pg-data
+fi
+
# build base image; try to reuse previously built image
cd A2rchi-dev/deploy/dev/
docker build -f ../dockerfiles/Dockerfile-base -t a2rchi-base:BASE_TAG ../..
diff --git a/deploy/prod-801/prod-801-compose.yaml b/deploy/prod-801/prod-801-compose.yaml
index 887f8733..50612dce 100644
--- a/deploy/prod-801/prod-801-compose.yaml
+++ b/deploy/prod-801/prod-801-compose.yaml
@@ -81,9 +81,33 @@ services:
start_period: 10s
start_interval: 5s
+ postgres-prod-801:
+ image: postgres:16
+ environment:
+ RUNTIME_ENV: prod-801
+ POSTGRES_PASSWORD_FILE: /run/secrets/pg_password
+ POSTGRES_USER: a2rchi
+ POSTGRES_DB: a2rchi-db
+ secrets:
+ - pg_password
+ volumes:
+ - ./prod-801-init.sql:/docker-entrypoint-initdb.d/init.sql
+ - a2rchi-prod-801-pg-data:/var/lib/postgresql/data
+ logging:
+ options:
+ max-size: 10m
+ restart: always
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U a2rchi -d a2rchi-db"]
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
volumes:
a2rchi-prod-801-data:
external: true
+ a2rchi-prod-801-pg-data:
+ external: true
secrets:
flask_uploader_app_secret_key:
@@ -94,3 +118,5 @@ secrets:
file: secrets/openai_api_key.txt
hf_token:
file: secrets/hf_token.txt
+ pg_password:
+ file: secrets/pg_password.txt
diff --git a/deploy/prod-801/prod-801-init.sql b/deploy/prod-801/prod-801-init.sql
new file mode 100644
index 00000000..90d49c61
--- /dev/null
+++ b/deploy/prod-801/prod-801-init.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS conversations (
+ conversation_id INTEGER NOT NULL,
+ message_id SERIAL,
+ sender TEXT NOT NULL,
+ content TEXT NOT NULL,
+ ts TIMESTAMP NOT NULL,
+ PRIMARY KEY (message_id)
+);
+CREATE TABLE IF NOT EXISTS feedback (
+ mid INTEGER NOT NULL,
+ feedback_ts TIMESTAMP NOT NULL,
+ feedback TEXT NOT NULL,
+ feedback_msg TEXT,
+ incorrect BOOLEAN,
+ unhelpful BOOLEAN,
+ inappropriate BOOLEAN,
+ PRIMARY KEY (mid, feedback_ts),
+ FOREIGN KEY (mid) REFERENCES conversations(message_id)
+);
\ No newline at end of file
diff --git a/deploy/prod-801/prod-801-install.sh b/deploy/prod-801/prod-801-install.sh
index 6ecab7e7..867b4607 100644
--- a/deploy/prod-801/prod-801-install.sh
+++ b/deploy/prod-801/prod-801-install.sh
@@ -6,6 +6,12 @@ if [[ $exists != 'a2rchi-prod-801-data' ]]; then
docker volume create --name a2rchi-prod-801-data
fi
+# create volume if it doesn't already exist for postgres data
+exists=`docker volume ls | awk '{print $2}' | grep a2rchi-prod-801-pg-data`
+if [[ $exists != 'a2rchi-prod-801-pg-data' ]]; then
+ docker volume create --name a2rchi-prod-801-pg-data
+fi
+
# build base image; try to reuse previously built image
cd A2rchi-prod-801/deploy/prod-801/
docker build -f ../dockerfiles/Dockerfile-base -t a2rchi-base:BASE_TAG ../..
diff --git a/deploy/prod-root/prod-root-compose.yaml b/deploy/prod-root/prod-root-compose.yaml
index 844528e8..f581b2d7 100644
--- a/deploy/prod-root/prod-root-compose.yaml
+++ b/deploy/prod-root/prod-root-compose.yaml
@@ -80,9 +80,33 @@ services:
start_period: 10s
start_interval: 5s
+ postgres-prod-root:
+ image: postgres:16
+ environment:
+ RUNTIME_ENV: prod-root
+ POSTGRES_PASSWORD_FILE: /run/secrets/pg_password
+ POSTGRES_USER: a2rchi
+ POSTGRES_DB: a2rchi-db
+ secrets:
+ - pg_password
+ volumes:
+ - ./prod-root-init.sql:/docker-entrypoint-initdb.d/init.sql
+ - a2rchi-prod-root-pg-data:/var/lib/postgresql/data
+ logging:
+ options:
+ max-size: 10m
+ restart: always
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U a2rchi -d a2rchi-db"]
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
volumes:
a2rchi-prod-root-data:
external: true
+ a2rchi-prod-root-pg-data:
+ external: true
secrets:
flask_uploader_app_secret_key:
@@ -92,4 +116,6 @@ secrets:
openai_api_key:
file: secrets/openai_api_key.txt
hf_token:
- file: secrets/hf_token.txt
\ No newline at end of file
+ file: secrets/hf_token.txt
+ pg_password:
+ file: secrets/pg_password.txt
diff --git a/deploy/prod-root/prod-root-init.sql b/deploy/prod-root/prod-root-init.sql
new file mode 100644
index 00000000..90d49c61
--- /dev/null
+++ b/deploy/prod-root/prod-root-init.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS conversations (
+ conversation_id INTEGER NOT NULL,
+ message_id SERIAL,
+ sender TEXT NOT NULL,
+ content TEXT NOT NULL,
+ ts TIMESTAMP NOT NULL,
+ PRIMARY KEY (message_id)
+);
+CREATE TABLE IF NOT EXISTS feedback (
+ mid INTEGER NOT NULL,
+ feedback_ts TIMESTAMP NOT NULL,
+ feedback TEXT NOT NULL,
+ feedback_msg TEXT,
+ incorrect BOOLEAN,
+ unhelpful BOOLEAN,
+ inappropriate BOOLEAN,
+ PRIMARY KEY (mid, feedback_ts),
+ FOREIGN KEY (mid) REFERENCES conversations(message_id)
+);
\ No newline at end of file
diff --git a/deploy/prod-root/prod-root-install.sh b/deploy/prod-root/prod-root-install.sh
index 11639d86..dfc041bd 100644
--- a/deploy/prod-root/prod-root-install.sh
+++ b/deploy/prod-root/prod-root-install.sh
@@ -6,6 +6,12 @@ if [[ $exists != 'a2rchi-prod-root-data' ]]; then
docker volume create --name a2rchi-prod-root-data
fi
+# create volume if it doesn't already exist for postgres data
+exists=`docker volume ls | awk '{print $2}' | grep a2rchi-prod-root-pg-data`
+if [[ $exists != 'a2rchi-prod-root-pg-data' ]]; then
+ docker volume create --name a2rchi-prod-root-pg-data
+fi
+
# build base image; try to reuse previously built image
cd A2rchi-prod-root/deploy/prod-root/
docker build -f ../dockerfiles/Dockerfile-base -t a2rchi-base:BASE_TAG ../..
diff --git a/deploy/prod/prod-compose.yaml b/deploy/prod/prod-compose.yaml
index 98d32cfb..8bf7d66a 100644
--- a/deploy/prod/prod-compose.yaml
+++ b/deploy/prod/prod-compose.yaml
@@ -165,9 +165,33 @@ services:
start_period: 10s
start_interval: 5s
+ postgres-prod:
+ image: postgres:16
+ environment:
+ RUNTIME_ENV: prod
+ POSTGRES_PASSWORD_FILE: /run/secrets/pg_password
+ POSTGRES_USER: a2rchi
+ POSTGRES_DB: a2rchi-db
+ secrets:
+ - pg_password
+ volumes:
+ - ./prod-init.sql:/docker-entrypoint-initdb.d/init.sql
+ - a2rchi-prod-pg-data:/var/lib/postgresql/data
+ logging:
+ options:
+ max-size: 10m
+ restart: always
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U a2rchi -d a2rchi-db"]
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
volumes:
a2rchi-prod-data:
external: true
+ a2rchi-prod-pg-data:
+ external: true
secrets:
imap_user:
@@ -200,3 +224,5 @@ secrets:
file: secrets/openai_api_key.txt
hf_token:
file: secrets/hf_token.txt
+ pg_password:
+ file: secrets/pg_password.txt
diff --git a/deploy/prod/prod-init.sql b/deploy/prod/prod-init.sql
new file mode 100644
index 00000000..90d49c61
--- /dev/null
+++ b/deploy/prod/prod-init.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS conversations (
+ conversation_id INTEGER NOT NULL,
+ message_id SERIAL,
+ sender TEXT NOT NULL,
+ content TEXT NOT NULL,
+ ts TIMESTAMP NOT NULL,
+ PRIMARY KEY (message_id)
+);
+CREATE TABLE IF NOT EXISTS feedback (
+ mid INTEGER NOT NULL,
+ feedback_ts TIMESTAMP NOT NULL,
+ feedback TEXT NOT NULL,
+ feedback_msg TEXT,
+ incorrect BOOLEAN,
+ unhelpful BOOLEAN,
+ inappropriate BOOLEAN,
+ PRIMARY KEY (mid, feedback_ts),
+ FOREIGN KEY (mid) REFERENCES conversations(message_id)
+);
\ No newline at end of file
diff --git a/deploy/prod/prod-install.sh b/deploy/prod/prod-install.sh
index 7bedf15c..f6c1410d 100755
--- a/deploy/prod/prod-install.sh
+++ b/deploy/prod/prod-install.sh
@@ -6,6 +6,12 @@ if [[ $exists != 'a2rchi-prod-data' ]]; then
docker volume create --name a2rchi-prod-data
fi
+# create volume if it doesn't already exist for postgres data
+exists=`docker volume ls | awk '{print $2}' | grep a2rchi-prod-pg-data`
+if [[ $exists != 'a2rchi-prod-pg-data' ]]; then
+ docker volume create --name a2rchi-prod-pg-data
+fi
+
# build base image; try to reuse previously built image
cd A2rchi-prod/deploy/prod/
docker build -f ../dockerfiles/Dockerfile-base -t a2rchi-base:BASE_TAG ../..
diff --git a/pyproject.toml b/pyproject.toml
index b76db279..792a6ec5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,6 +38,7 @@ dependencies = [
"pandas==2.1.0",
"peft==0.5.0",
"posthog==3.0.1",
+ "psycopg2==2.9.9",
"pulsar-client==3.2.0",
"pygments==2.16.1",
"pypdf==3.16.1",
-
I've noticed you haven't rated any of my responses in awhile. Rating responses is crucial because it not only helps me improve, but it also ensures that this project remains open source and freely accessible for everyone. Your input is highly valuable in supporting the A2rchi mission!
+I've noticed you haven't rated any of my responses in a while. Rating responses is crucial because it not only helps me improve, but it also ensures that this project remains open source and freely accessible for everyone. Your input is highly valuable in supporting the A2rchi mission!