From 7916ce2d84a666ec20ddeb392aa37fe13d8ad606 Mon Sep 17 00:00:00 2001 From: mdr223 Date: Sat, 18 Nov 2023 11:56:47 -0500 Subject: [PATCH 1/4] lowercase main a2rchi directory --- {A2rchi => a2rchi}/__init__.py | 0 {A2rchi => a2rchi}/bin/__init__.py | 0 {A2rchi => a2rchi}/bin/service_chat.py | 0 {A2rchi => a2rchi}/bin/service_cleo.py | 0 {A2rchi => a2rchi}/bin/service_create_account.py | 0 {A2rchi => a2rchi}/bin/service_mailbox.py | 0 {A2rchi => a2rchi}/bin/service_piazza.py | 0 {A2rchi => a2rchi}/bin/service_uploader.py | 0 {A2rchi => a2rchi}/chains/__init__.py | 0 {A2rchi => a2rchi}/chains/base.py | 0 {A2rchi => a2rchi}/chains/chain.py | 0 {A2rchi => a2rchi}/chains/models.py | 0 {A2rchi => a2rchi}/chains/prompts.py | 0 {A2rchi => a2rchi}/interfaces/__init__.py | 0 {A2rchi => a2rchi}/interfaces/chat_app/__init__.py | 0 {A2rchi => a2rchi}/interfaces/chat_app/app.py | 0 .../chat_app/static/images/a2rchi-initial.png | Bin .../interfaces/chat_app/static/images/a2rchi.png | Bin .../interfaces/chat_app/static/images/close.png | Bin .../interfaces/chat_app/static/images/refresh.svg | 0 .../chat_app/static/images/thumbs_down.png | Bin .../chat_app/static/images/thumbs_down.svg | 0 .../chat_app/static/images/thumbs_down_filled.png | Bin .../interfaces/chat_app/static/images/thumbs_up.png | Bin .../interfaces/chat_app/static/images/thumbs_up.svg | Bin .../chat_app/static/images/thumbs_up_filled.png | Bin .../interfaces/chat_app/static/images/user.svg | 0 .../interfaces/chat_app/static/script.js-template | 0 .../interfaces/chat_app/static/style.css | 0 .../interfaces/chat_app/templates/index.html | 0 .../interfaces/chat_app/templates/terms.html | 0 {A2rchi => a2rchi}/interfaces/cleo.py | 0 .../interfaces/uploader_app/__init__.py | 0 {A2rchi => a2rchi}/interfaces/uploader_app/app.py | 0 .../interfaces/uploader_app/templates/index.html | 0 .../interfaces/uploader_app/templates/login.html | 0 {A2rchi => a2rchi}/utils/__init__.py | 0 {A2rchi => a2rchi}/utils/config_loader.py | 0 {A2rchi => a2rchi}/utils/data_manager.py | 0 {A2rchi => a2rchi}/utils/embedding_utils.py | 0 {A2rchi => a2rchi}/utils/env.py | 0 {A2rchi => a2rchi}/utils/imap.py | 0 {A2rchi => a2rchi}/utils/mailbox.py | 0 {A2rchi => a2rchi}/utils/scraper.py | 0 {A2rchi => a2rchi}/utils/sender.py | 0 {A2rchi => a2rchi}/utils/sql.py | 0 46 files changed, 0 insertions(+), 0 deletions(-) rename {A2rchi => a2rchi}/__init__.py (100%) rename {A2rchi => a2rchi}/bin/__init__.py (100%) rename {A2rchi => a2rchi}/bin/service_chat.py (100%) rename {A2rchi => a2rchi}/bin/service_cleo.py (100%) rename {A2rchi => a2rchi}/bin/service_create_account.py (100%) rename {A2rchi => a2rchi}/bin/service_mailbox.py (100%) rename {A2rchi => a2rchi}/bin/service_piazza.py (100%) rename {A2rchi => a2rchi}/bin/service_uploader.py (100%) rename {A2rchi => a2rchi}/chains/__init__.py (100%) rename {A2rchi => a2rchi}/chains/base.py (100%) rename {A2rchi => a2rchi}/chains/chain.py (100%) rename {A2rchi => a2rchi}/chains/models.py (100%) rename {A2rchi => a2rchi}/chains/prompts.py (100%) rename {A2rchi => a2rchi}/interfaces/__init__.py (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/__init__.py (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/app.py (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/a2rchi-initial.png (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/a2rchi.png (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/close.png (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/refresh.svg (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/thumbs_down.png (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/thumbs_down.svg (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/thumbs_down_filled.png (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/thumbs_up.png (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/thumbs_up.svg (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/thumbs_up_filled.png (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/images/user.svg (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/script.js-template (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/static/style.css (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/templates/index.html (100%) rename {A2rchi => a2rchi}/interfaces/chat_app/templates/terms.html (100%) rename {A2rchi => a2rchi}/interfaces/cleo.py (100%) rename {A2rchi => a2rchi}/interfaces/uploader_app/__init__.py (100%) rename {A2rchi => a2rchi}/interfaces/uploader_app/app.py (100%) rename {A2rchi => a2rchi}/interfaces/uploader_app/templates/index.html (100%) rename {A2rchi => a2rchi}/interfaces/uploader_app/templates/login.html (100%) rename {A2rchi => a2rchi}/utils/__init__.py (100%) rename {A2rchi => a2rchi}/utils/config_loader.py (100%) rename {A2rchi => a2rchi}/utils/data_manager.py (100%) rename {A2rchi => a2rchi}/utils/embedding_utils.py (100%) rename {A2rchi => a2rchi}/utils/env.py (100%) rename {A2rchi => a2rchi}/utils/imap.py (100%) rename {A2rchi => a2rchi}/utils/mailbox.py (100%) rename {A2rchi => a2rchi}/utils/scraper.py (100%) rename {A2rchi => a2rchi}/utils/sender.py (100%) rename {A2rchi => a2rchi}/utils/sql.py (100%) diff --git a/A2rchi/__init__.py b/a2rchi/__init__.py similarity index 100% rename from A2rchi/__init__.py rename to a2rchi/__init__.py diff --git a/A2rchi/bin/__init__.py b/a2rchi/bin/__init__.py similarity index 100% rename from A2rchi/bin/__init__.py rename to a2rchi/bin/__init__.py diff --git a/A2rchi/bin/service_chat.py b/a2rchi/bin/service_chat.py similarity index 100% rename from A2rchi/bin/service_chat.py rename to a2rchi/bin/service_chat.py diff --git a/A2rchi/bin/service_cleo.py b/a2rchi/bin/service_cleo.py similarity index 100% rename from A2rchi/bin/service_cleo.py rename to a2rchi/bin/service_cleo.py diff --git a/A2rchi/bin/service_create_account.py b/a2rchi/bin/service_create_account.py similarity index 100% rename from A2rchi/bin/service_create_account.py rename to a2rchi/bin/service_create_account.py diff --git a/A2rchi/bin/service_mailbox.py b/a2rchi/bin/service_mailbox.py similarity index 100% rename from A2rchi/bin/service_mailbox.py rename to a2rchi/bin/service_mailbox.py diff --git a/A2rchi/bin/service_piazza.py b/a2rchi/bin/service_piazza.py similarity index 100% rename from A2rchi/bin/service_piazza.py rename to a2rchi/bin/service_piazza.py diff --git a/A2rchi/bin/service_uploader.py b/a2rchi/bin/service_uploader.py similarity index 100% rename from A2rchi/bin/service_uploader.py rename to a2rchi/bin/service_uploader.py diff --git a/A2rchi/chains/__init__.py b/a2rchi/chains/__init__.py similarity index 100% rename from A2rchi/chains/__init__.py rename to a2rchi/chains/__init__.py diff --git a/A2rchi/chains/base.py b/a2rchi/chains/base.py similarity index 100% rename from A2rchi/chains/base.py rename to a2rchi/chains/base.py diff --git a/A2rchi/chains/chain.py b/a2rchi/chains/chain.py similarity index 100% rename from A2rchi/chains/chain.py rename to a2rchi/chains/chain.py diff --git a/A2rchi/chains/models.py b/a2rchi/chains/models.py similarity index 100% rename from A2rchi/chains/models.py rename to a2rchi/chains/models.py diff --git a/A2rchi/chains/prompts.py b/a2rchi/chains/prompts.py similarity index 100% rename from A2rchi/chains/prompts.py rename to a2rchi/chains/prompts.py diff --git a/A2rchi/interfaces/__init__.py b/a2rchi/interfaces/__init__.py similarity index 100% rename from A2rchi/interfaces/__init__.py rename to a2rchi/interfaces/__init__.py diff --git a/A2rchi/interfaces/chat_app/__init__.py b/a2rchi/interfaces/chat_app/__init__.py similarity index 100% rename from A2rchi/interfaces/chat_app/__init__.py rename to a2rchi/interfaces/chat_app/__init__.py diff --git a/A2rchi/interfaces/chat_app/app.py b/a2rchi/interfaces/chat_app/app.py similarity index 100% rename from A2rchi/interfaces/chat_app/app.py rename to a2rchi/interfaces/chat_app/app.py diff --git a/A2rchi/interfaces/chat_app/static/images/a2rchi-initial.png b/a2rchi/interfaces/chat_app/static/images/a2rchi-initial.png similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/a2rchi-initial.png rename to a2rchi/interfaces/chat_app/static/images/a2rchi-initial.png diff --git a/A2rchi/interfaces/chat_app/static/images/a2rchi.png b/a2rchi/interfaces/chat_app/static/images/a2rchi.png similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/a2rchi.png rename to a2rchi/interfaces/chat_app/static/images/a2rchi.png diff --git a/A2rchi/interfaces/chat_app/static/images/close.png b/a2rchi/interfaces/chat_app/static/images/close.png similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/close.png rename to a2rchi/interfaces/chat_app/static/images/close.png diff --git a/A2rchi/interfaces/chat_app/static/images/refresh.svg b/a2rchi/interfaces/chat_app/static/images/refresh.svg similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/refresh.svg rename to a2rchi/interfaces/chat_app/static/images/refresh.svg diff --git a/A2rchi/interfaces/chat_app/static/images/thumbs_down.png b/a2rchi/interfaces/chat_app/static/images/thumbs_down.png similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/thumbs_down.png rename to a2rchi/interfaces/chat_app/static/images/thumbs_down.png diff --git a/A2rchi/interfaces/chat_app/static/images/thumbs_down.svg b/a2rchi/interfaces/chat_app/static/images/thumbs_down.svg similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/thumbs_down.svg rename to a2rchi/interfaces/chat_app/static/images/thumbs_down.svg diff --git a/A2rchi/interfaces/chat_app/static/images/thumbs_down_filled.png b/a2rchi/interfaces/chat_app/static/images/thumbs_down_filled.png similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/thumbs_down_filled.png rename to a2rchi/interfaces/chat_app/static/images/thumbs_down_filled.png diff --git a/A2rchi/interfaces/chat_app/static/images/thumbs_up.png b/a2rchi/interfaces/chat_app/static/images/thumbs_up.png similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/thumbs_up.png rename to a2rchi/interfaces/chat_app/static/images/thumbs_up.png diff --git a/A2rchi/interfaces/chat_app/static/images/thumbs_up.svg b/a2rchi/interfaces/chat_app/static/images/thumbs_up.svg similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/thumbs_up.svg rename to a2rchi/interfaces/chat_app/static/images/thumbs_up.svg diff --git a/A2rchi/interfaces/chat_app/static/images/thumbs_up_filled.png b/a2rchi/interfaces/chat_app/static/images/thumbs_up_filled.png similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/thumbs_up_filled.png rename to a2rchi/interfaces/chat_app/static/images/thumbs_up_filled.png diff --git a/A2rchi/interfaces/chat_app/static/images/user.svg b/a2rchi/interfaces/chat_app/static/images/user.svg similarity index 100% rename from A2rchi/interfaces/chat_app/static/images/user.svg rename to a2rchi/interfaces/chat_app/static/images/user.svg diff --git a/A2rchi/interfaces/chat_app/static/script.js-template b/a2rchi/interfaces/chat_app/static/script.js-template similarity index 100% rename from A2rchi/interfaces/chat_app/static/script.js-template rename to a2rchi/interfaces/chat_app/static/script.js-template diff --git a/A2rchi/interfaces/chat_app/static/style.css b/a2rchi/interfaces/chat_app/static/style.css similarity index 100% rename from A2rchi/interfaces/chat_app/static/style.css rename to a2rchi/interfaces/chat_app/static/style.css diff --git a/A2rchi/interfaces/chat_app/templates/index.html b/a2rchi/interfaces/chat_app/templates/index.html similarity index 100% rename from A2rchi/interfaces/chat_app/templates/index.html rename to a2rchi/interfaces/chat_app/templates/index.html diff --git a/A2rchi/interfaces/chat_app/templates/terms.html b/a2rchi/interfaces/chat_app/templates/terms.html similarity index 100% rename from A2rchi/interfaces/chat_app/templates/terms.html rename to a2rchi/interfaces/chat_app/templates/terms.html diff --git a/A2rchi/interfaces/cleo.py b/a2rchi/interfaces/cleo.py similarity index 100% rename from A2rchi/interfaces/cleo.py rename to a2rchi/interfaces/cleo.py diff --git a/A2rchi/interfaces/uploader_app/__init__.py b/a2rchi/interfaces/uploader_app/__init__.py similarity index 100% rename from A2rchi/interfaces/uploader_app/__init__.py rename to a2rchi/interfaces/uploader_app/__init__.py diff --git a/A2rchi/interfaces/uploader_app/app.py b/a2rchi/interfaces/uploader_app/app.py similarity index 100% rename from A2rchi/interfaces/uploader_app/app.py rename to a2rchi/interfaces/uploader_app/app.py diff --git a/A2rchi/interfaces/uploader_app/templates/index.html b/a2rchi/interfaces/uploader_app/templates/index.html similarity index 100% rename from A2rchi/interfaces/uploader_app/templates/index.html rename to a2rchi/interfaces/uploader_app/templates/index.html diff --git a/A2rchi/interfaces/uploader_app/templates/login.html b/a2rchi/interfaces/uploader_app/templates/login.html similarity index 100% rename from A2rchi/interfaces/uploader_app/templates/login.html rename to a2rchi/interfaces/uploader_app/templates/login.html diff --git a/A2rchi/utils/__init__.py b/a2rchi/utils/__init__.py similarity index 100% rename from A2rchi/utils/__init__.py rename to a2rchi/utils/__init__.py diff --git a/A2rchi/utils/config_loader.py b/a2rchi/utils/config_loader.py similarity index 100% rename from A2rchi/utils/config_loader.py rename to a2rchi/utils/config_loader.py diff --git a/A2rchi/utils/data_manager.py b/a2rchi/utils/data_manager.py similarity index 100% rename from A2rchi/utils/data_manager.py rename to a2rchi/utils/data_manager.py diff --git a/A2rchi/utils/embedding_utils.py b/a2rchi/utils/embedding_utils.py similarity index 100% rename from A2rchi/utils/embedding_utils.py rename to a2rchi/utils/embedding_utils.py diff --git a/A2rchi/utils/env.py b/a2rchi/utils/env.py similarity index 100% rename from A2rchi/utils/env.py rename to a2rchi/utils/env.py diff --git a/A2rchi/utils/imap.py b/a2rchi/utils/imap.py similarity index 100% rename from A2rchi/utils/imap.py rename to a2rchi/utils/imap.py diff --git a/A2rchi/utils/mailbox.py b/a2rchi/utils/mailbox.py similarity index 100% rename from A2rchi/utils/mailbox.py rename to a2rchi/utils/mailbox.py diff --git a/A2rchi/utils/scraper.py b/a2rchi/utils/scraper.py similarity index 100% rename from A2rchi/utils/scraper.py rename to a2rchi/utils/scraper.py diff --git a/A2rchi/utils/sender.py b/a2rchi/utils/sender.py similarity index 100% rename from A2rchi/utils/sender.py rename to a2rchi/utils/sender.py diff --git a/A2rchi/utils/sql.py b/a2rchi/utils/sql.py similarity index 100% rename from A2rchi/utils/sql.py rename to a2rchi/utils/sql.py From eec46cf4ffcdee2c1ce20019e42d3698730cfd68 Mon Sep 17 00:00:00 2001 From: mdr223 Date: Sat, 18 Nov 2023 12:04:36 -0500 Subject: [PATCH 2/4] lowercase A2rchi --> a2rchi where applicable --- a2rchi/bin/service_chat.py | 6 +++--- a2rchi/bin/service_cleo.py | 6 +++--- a2rchi/bin/service_create_account.py | 6 +++--- a2rchi/bin/service_mailbox.py | 8 ++++---- a2rchi/bin/service_piazza.py | 12 ++++++------ a2rchi/bin/service_uploader.py | 10 +++++----- a2rchi/chains/base.py | 4 ++-- a2rchi/chains/chain.py | 4 ++-- a2rchi/chains/prompts.py | 2 +- a2rchi/interfaces/chat_app/app.py | 10 +++++----- a2rchi/interfaces/cleo.py | 8 ++++---- a2rchi/interfaces/uploader_app/app.py | 6 +++--- a2rchi/utils/config_loader.py | 2 +- a2rchi/utils/data_manager.py | 4 ++-- a2rchi/utils/imap.py | 2 +- a2rchi/utils/mailbox.py | 4 ++-- a2rchi/utils/scraper.py | 2 +- a2rchi/utils/sender.py | 2 +- config/dev-config.yaml | 6 +++--- config/prod-801-config.yaml | 6 +++--- config/prod-config.yaml | 6 +++--- config/prod-meta-config.yaml | 6 +++--- config/prod-root-config.yaml | 6 +++--- deploy/dockerfiles/Dockerfile-base | 2 +- deploy/dockerfiles/Dockerfile-chat | 2 +- deploy/dockerfiles/Dockerfile-cleo | 2 +- deploy/dockerfiles/Dockerfile-mailbox | 2 +- deploy/dockerfiles/Dockerfile-piazza | 2 +- deploy/dockerfiles/Dockerfile-uploader | 2 +- pyproject.toml | 16 ++++++++-------- test/test_chains.py | 6 +++--- test/test_interfaces.py | 2 +- 32 files changed, 82 insertions(+), 82 deletions(-) diff --git a/a2rchi/bin/service_chat.py b/a2rchi/bin/service_chat.py index 039a4667..08b2e0b0 100644 --- a/a2rchi/bin/service_chat.py +++ b/a2rchi/bin/service_chat.py @@ -1,7 +1,7 @@ #!/bin/python -from A2rchi.interfaces.chat_app.app import FlaskAppWrapper -from A2rchi.utils.config_loader import Config_Loader -from A2rchi.utils.env import read_secret +from a2rchi.interfaces.chat_app.app import FlaskAppWrapper +from a2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.env import read_secret from flask import Flask diff --git a/a2rchi/bin/service_cleo.py b/a2rchi/bin/service_cleo.py index f676a43e..759e9965 100755 --- a/a2rchi/bin/service_cleo.py +++ b/a2rchi/bin/service_cleo.py @@ -1,7 +1,7 @@ #!/bin/python -from A2rchi.interfaces import cleo -from A2rchi.utils.config_loader import Config_Loader -from A2rchi.utils.env import read_secret +from a2rchi.interfaces import cleo +from a2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.env import read_secret import os import time diff --git a/a2rchi/bin/service_create_account.py b/a2rchi/bin/service_create_account.py index 390502e6..5302e20c 100755 --- a/a2rchi/bin/service_create_account.py +++ b/a2rchi/bin/service_create_account.py @@ -1,7 +1,7 @@ #!/bin/python -from A2rchi.utils.config_loader import Config_Loader -from A2rchi.utils.env import read_secret -from A2rchi.interfaces.uploader_app.app import add_username_password +from a2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.env import read_secret +from a2rchi.interfaces.uploader_app.app import add_username_password import getpass import os diff --git a/a2rchi/bin/service_mailbox.py b/a2rchi/bin/service_mailbox.py index daac35f4..ef7b89ee 100755 --- a/a2rchi/bin/service_mailbox.py +++ b/a2rchi/bin/service_mailbox.py @@ -1,8 +1,8 @@ #!/bin/python -from A2rchi.interfaces import cleo -from A2rchi.utils import mailbox -from A2rchi.utils.config_loader import Config_Loader -from A2rchi.utils.env import read_secret +from a2rchi.interfaces import cleo +from a2rchi.utils import mailbox +from a2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.env import read_secret import os import time diff --git a/a2rchi/bin/service_piazza.py b/a2rchi/bin/service_piazza.py index 015cb13e..667a75c0 100644 --- a/a2rchi/bin/service_piazza.py +++ b/a2rchi/bin/service_piazza.py @@ -1,10 +1,10 @@ #!/bin/python -from A2rchi.chains.chain import Chain -from A2rchi.interfaces.uploader_app.app import FlaskAppWrapper -from A2rchi.utils.config_loader import Config_Loader -from A2rchi.utils.data_manager import DataManager -from A2rchi.utils.env import read_secret -from A2rchi.utils.scraper import Scraper +from a2rchi.chains.chain import Chain +from a2rchi.interfaces.uploader_app.app import FlaskAppWrapper +from a2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.data_manager import DataManager +from a2rchi.utils.env import read_secret +from a2rchi.utils.scraper import Scraper from flask import Flask from piazza_api import Piazza diff --git a/a2rchi/bin/service_uploader.py b/a2rchi/bin/service_uploader.py index 7342bd5b..4219953d 100755 --- a/a2rchi/bin/service_uploader.py +++ b/a2rchi/bin/service_uploader.py @@ -1,9 +1,9 @@ #!/bin/python -from A2rchi.interfaces.uploader_app.app import FlaskAppWrapper -from A2rchi.utils.config_loader import Config_Loader -from A2rchi.utils.data_manager import DataManager -from A2rchi.utils.env import read_secret -from A2rchi.utils.scraper import Scraper +from a2rchi.interfaces.uploader_app.app import FlaskAppWrapper +from a2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.data_manager import DataManager +from a2rchi.utils.env import read_secret +from a2rchi.utils.scraper import Scraper from flask import Flask from threading import Thread diff --git a/a2rchi/chains/base.py b/a2rchi/chains/base.py index c9f9d43c..f5b67d99 100644 --- a/a2rchi/chains/base.py +++ b/a2rchi/chains/base.py @@ -3,8 +3,8 @@ from loguru import logger from langchain.callbacks import FileCallbackHandler -from A2rchi.chains.prompts import CONDENSE_QUESTION_PROMPT, QA_PROMPT -from A2rchi.utils.config_loader import Config_Loader +from a2rchi.chains.prompts import CONDENSE_QUESTION_PROMPT, QA_PROMPT +from a2rchi.utils.config_loader import Config_Loader from langchain.base_language import BaseLanguageModel from langchain.chains.combine_documents.stuff import StuffDocumentsChain diff --git a/a2rchi/chains/chain.py b/a2rchi/chains/chain.py index c2ea02a6..8ab6ee90 100644 --- a/a2rchi/chains/chain.py +++ b/a2rchi/chains/chain.py @@ -1,4 +1,4 @@ -from A2rchi.chains.base import BaseSubMITChain as BaseChain +from a2rchi.chains.base import BaseSubMITChain as BaseChain from chromadb.config import Settings from langchain.vectorstores import Chroma @@ -17,7 +17,7 @@ def __init__(self): """ self.kill = False - from A2rchi.utils.config_loader import Config_Loader + from a2rchi.utils.config_loader import Config_Loader self.config = Config_Loader().config["chains"]["chain"] self.global_config = Config_Loader().config["global"] self.utils_config = Config_Loader().config["utils"] diff --git a/a2rchi/chains/prompts.py b/a2rchi/chains/prompts.py index cfc5ef93..e4c1d76e 100644 --- a/a2rchi/chains/prompts.py +++ b/a2rchi/chains/prompts.py @@ -1,6 +1,6 @@ # flake8: noqa from langchain.prompts.prompt import PromptTemplate -from A2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.config_loader import Config_Loader config = Config_Loader().config["chains"]["prompts"] diff --git a/a2rchi/interfaces/chat_app/app.py b/a2rchi/interfaces/chat_app/app.py index b1eefec0..8a021e43 100644 --- a/a2rchi/interfaces/chat_app/app.py +++ b/a2rchi/interfaces/chat_app/app.py @@ -1,8 +1,8 @@ -from A2rchi.chains.chain import Chain -from A2rchi.utils.config_loader import Config_Loader -from A2rchi.utils.data_manager import DataManager -from A2rchi.utils.env import read_secret -from A2rchi.utils.sql import SQL_INSERT_CONVO, SQL_INSERT_FEEDBACK, SQL_INSERT_TIMING, SQL_QUERY_CONVO +from a2rchi.chains.chain import Chain +from a2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.data_manager import DataManager +from a2rchi.utils.env import read_secret +from a2rchi.utils.sql import SQL_INSERT_CONVO, SQL_INSERT_FEEDBACK, SQL_INSERT_TIMING, SQL_QUERY_CONVO from datetime import datetime from pygments import highlight diff --git a/a2rchi/interfaces/cleo.py b/a2rchi/interfaces/cleo.py index 41a18960..577f662b 100644 --- a/a2rchi/interfaces/cleo.py +++ b/a2rchi/interfaces/cleo.py @@ -1,7 +1,7 @@ -from A2rchi.chains.chain import Chain -from A2rchi.utils import sender -from A2rchi.utils.data_manager import DataManager -from A2rchi.utils.env import read_secret +from a2rchi.chains.chain import Chain +from a2rchi.utils import sender +from a2rchi.utils.data_manager import DataManager +from a2rchi.utils.env import read_secret from redminelib import Redmine diff --git a/a2rchi/interfaces/uploader_app/app.py b/a2rchi/interfaces/uploader_app/app.py index d2a77b28..bd380c89 100644 --- a/a2rchi/interfaces/uploader_app/app.py +++ b/a2rchi/interfaces/uploader_app/app.py @@ -1,6 +1,6 @@ -from A2rchi.utils.config_loader import Config_Loader -from A2rchi.utils.env import read_secret -from A2rchi.utils.scraper import Scraper +from a2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.env import read_secret +from a2rchi.utils.scraper import Scraper from flask import render_template, request, redirect, url_for, flash, session diff --git a/a2rchi/utils/config_loader.py b/a2rchi/utils/config_loader.py index eb4ec527..7a36f0ac 100644 --- a/a2rchi/utils/config_loader.py +++ b/a2rchi/utils/config_loader.py @@ -1,4 +1,4 @@ -from A2rchi.chains.models import OpenAILLM, DumbLLM, LlamaLLM +from a2rchi.chains.models import OpenAILLM, DumbLLM, LlamaLLM from langchain.embeddings.openai import OpenAIEmbeddings from langchain.embeddings import HuggingFaceEmbeddings diff --git a/a2rchi/utils/data_manager.py b/a2rchi/utils/data_manager.py index de2b3978..7f4c0667 100644 --- a/a2rchi/utils/data_manager.py +++ b/a2rchi/utils/data_manager.py @@ -1,4 +1,4 @@ -from A2rchi.utils.scraper import Scraper +from a2rchi.utils.scraper import Scraper from chromadb.config import Settings from langchain.document_loaders import TextLoader @@ -19,7 +19,7 @@ class DataManager(): def __init__(self): - from A2rchi.utils.config_loader import Config_Loader + from a2rchi.utils.config_loader import Config_Loader self.config = Config_Loader().config["utils"] self.global_config = Config_Loader().config["global"] self.data_path = self.global_config["DATA_PATH"] diff --git a/a2rchi/utils/imap.py b/a2rchi/utils/imap.py index c4c1c930..0fa39b4d 100644 --- a/a2rchi/utils/imap.py +++ b/a2rchi/utils/imap.py @@ -1,7 +1,7 @@ import os import getpass, imaplib, email -from A2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.config_loader import Config_Loader config = Config_Loader().config["utils"]["mailbox"] def get_charsets(msg): diff --git a/a2rchi/utils/mailbox.py b/a2rchi/utils/mailbox.py index 6462a485..dc1949f4 100644 --- a/a2rchi/utils/mailbox.py +++ b/a2rchi/utils/mailbox.py @@ -1,6 +1,6 @@ #!/bin/python -from A2rchi.utils.config_loader import Config_Loader -from A2rchi.utils.env import read_secret +from a2rchi.utils.config_loader import Config_Loader +from a2rchi.utils.env import read_secret import email import imaplib diff --git a/a2rchi/utils/scraper.py b/a2rchi/utils/scraper.py index 924eee68..a608f3c3 100644 --- a/a2rchi/utils/scraper.py +++ b/a2rchi/utils/scraper.py @@ -15,7 +15,7 @@ class Scraper(): def __init__(self, piazza_email=None, piazza_password=None): # fetch configs - from A2rchi.utils.config_loader import Config_Loader + from a2rchi.utils.config_loader import Config_Loader self.config = Config_Loader().config["utils"]["scraper"] self.global_config = Config_Loader().config["global"] self.piazza_config = Config_Loader().config["utils"].get("piazza", None) diff --git a/a2rchi/utils/sender.py b/a2rchi/utils/sender.py index 0e4d6e1c..15339924 100644 --- a/a2rchi/utils/sender.py +++ b/a2rchi/utils/sender.py @@ -1,4 +1,4 @@ -from A2rchi.utils.env import read_secret +from a2rchi.utils.env import read_secret from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText diff --git a/config/dev-config.yaml b/config/dev-config.yaml index 58e111e6..a5cc4f2b 100644 --- a/config/dev-config.yaml +++ b/config/dev-config.yaml @@ -14,14 +14,14 @@ interfaces: EXTERNAL_PORT: 7682 HOST: "0.0.0.0" # either "0.0.0.0" (for public) or "127.0.0.1" (for internal) 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" + 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. include_copy_button: False uploader_app: PORT: 5001 HOST: "0.0.0.0" # either "0.0.0.0" (for public) or "127.0.0.1" (for internal) - template_folder: "/root/A2rchi/A2rchi/interfaces/uploader_app/templates" + template_folder: "/root/A2rchi/a2rchi/interfaces/uploader_app/templates" chains: input_lists: diff --git a/config/prod-801-config.yaml b/config/prod-801-config.yaml index 9d11bc8e..7cc7395e 100644 --- a/config/prod-801-config.yaml +++ b/config/prod-801-config.yaml @@ -14,14 +14,14 @@ interfaces: EXTERNAL_PORT: 7683 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 - template_folder: "/root/A2rchi/A2rchi/interfaces/chat_app/templates" - static_folder: "/root/A2rchi/A2rchi/interfaces/chat_app/static" + 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. include_copy_button: False uploader_app: PORT: 5001 HOST: "0.0.0.0" # either "0.0.0.0" (for public) or "127.0.0.1" (for internal) - template_folder: "/root/A2rchi/A2rchi/interfaces/uploader_app/templates" + template_folder: "/root/A2rchi/a2rchi/interfaces/uploader_app/templates" chains: input_lists: diff --git a/config/prod-config.yaml b/config/prod-config.yaml index cfc8db61..f723418a 100644 --- a/config/prod-config.yaml +++ b/config/prod-config.yaml @@ -14,14 +14,14 @@ interfaces: EXTERNAL_PORT: 7681 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 - template_folder: "/root/A2rchi/A2rchi/interfaces/chat_app/templates" - static_folder: "/root/A2rchi/A2rchi/interfaces/chat_app/static" + 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. include_copy_button: False uploader_app: PORT: 5001 HOST: "0.0.0.0" # either "0.0.0.0" (for public) or "127.0.0.1" (for internal) - template_folder: "/root/A2rchi/A2rchi/interfaces/uploader_app/templates" + template_folder: "/root/A2rchi/a2rchi/interfaces/uploader_app/templates" chains: input_lists: diff --git a/config/prod-meta-config.yaml b/config/prod-meta-config.yaml index 75e8de2a..55a25174 100644 --- a/config/prod-meta-config.yaml +++ b/config/prod-meta-config.yaml @@ -14,14 +14,14 @@ interfaces: EXTERNAL_PORT: 7685 HOST: "0.0.0.0" # either "0.0.0.0" (for public) or "127.0.0.1" (for internal) 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" + 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. include_copy_button: False uploader_app: PORT: 5001 HOST: "0.0.0.0" # either "0.0.0.0" (for public) or "127.0.0.1" (for internal) - template_folder: "/root/A2rchi/A2rchi/interfaces/uploader_app/templates" + template_folder: "/root/A2rchi/a2rchi/interfaces/uploader_app/templates" chains: input_lists: diff --git a/config/prod-root-config.yaml b/config/prod-root-config.yaml index 258137b6..2e3d149d 100644 --- a/config/prod-root-config.yaml +++ b/config/prod-root-config.yaml @@ -14,14 +14,14 @@ interfaces: EXTERNAL_PORT: 7684 HOST: "0.0.0.0" # either "0.0.0.0" (for public) or "127.0.0.1" (for internal) 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" + 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. include_copy_button: False uploader_app: PORT: 5001 HOST: "0.0.0.0" # either "0.0.0.0" (for public) or "127.0.0.1" (for internal) - template_folder: "/root/A2rchi/A2rchi/interfaces/uploader_app/templates" + template_folder: "/root/A2rchi/a2rchi/interfaces/uploader_app/templates" chains: input_lists: diff --git a/deploy/dockerfiles/Dockerfile-base b/deploy/dockerfiles/Dockerfile-base index 9952d0e5..62925b8e 100644 --- a/deploy/dockerfiles/Dockerfile-base +++ b/deploy/dockerfiles/Dockerfile-base @@ -7,5 +7,5 @@ COPY pyproject.toml pyproject.toml COPY README.md README.md COPY LICENSE LICENSE COPY config config -COPY A2rchi A2rchi +COPY a2rchi a2rchi RUN pip install --upgrade pip && pip install . diff --git a/deploy/dockerfiles/Dockerfile-chat b/deploy/dockerfiles/Dockerfile-chat index 0902e821..077738c5 100644 --- a/deploy/dockerfiles/Dockerfile-chat +++ b/deploy/dockerfiles/Dockerfile-chat @@ -6,4 +6,4 @@ EXPOSE 7861 # ensure this directory is present for prod-801 deployment RUN if [ "$BUILD_ENV" = "prod-801" ] ; then mkdir /root/data/801-content ; fi -CMD ["python", "-u", "A2rchi/bin/service_chat.py"] +CMD ["python", "-u", "a2rchi/bin/service_chat.py"] diff --git a/deploy/dockerfiles/Dockerfile-cleo b/deploy/dockerfiles/Dockerfile-cleo index 27ab9e68..de2e612a 100644 --- a/deploy/dockerfiles/Dockerfile-cleo +++ b/deploy/dockerfiles/Dockerfile-cleo @@ -2,4 +2,4 @@ ARG TAG=from-env FROM a2rchi-base:${TAG} -CMD ["python", "-u", "A2rchi/bin/service_cleo.py"] +CMD ["python", "-u", "a2rchi/bin/service_cleo.py"] diff --git a/deploy/dockerfiles/Dockerfile-mailbox b/deploy/dockerfiles/Dockerfile-mailbox index 78faa4ea..bbcb8f1b 100644 --- a/deploy/dockerfiles/Dockerfile-mailbox +++ b/deploy/dockerfiles/Dockerfile-mailbox @@ -2,4 +2,4 @@ ARG TAG=from-env FROM a2rchi-base:${TAG} -CMD ["python", "-u", "A2rchi/bin/service_mailbox.py"] +CMD ["python", "-u", "a2rchi/bin/service_mailbox.py"] diff --git a/deploy/dockerfiles/Dockerfile-piazza b/deploy/dockerfiles/Dockerfile-piazza index 47cfc76b..92e0280f 100644 --- a/deploy/dockerfiles/Dockerfile-piazza +++ b/deploy/dockerfiles/Dockerfile-piazza @@ -2,4 +2,4 @@ ARG TAG=from-env FROM a2rchi-base:${TAG} -CMD ["python", "-u", "A2rchi/bin/service_piazza.py"] +CMD ["python", "-u", "a2rchi/bin/service_piazza.py"] diff --git a/deploy/dockerfiles/Dockerfile-uploader b/deploy/dockerfiles/Dockerfile-uploader index a119e80a..4f1833db 100644 --- a/deploy/dockerfiles/Dockerfile-uploader +++ b/deploy/dockerfiles/Dockerfile-uploader @@ -2,4 +2,4 @@ ARG TAG=from-env FROM a2rchi-base:${TAG} -CMD ["python", "-u", "A2rchi/bin/service_uploader.py"] +CMD ["python", "-u", "a2rchi/bin/service_uploader.py"] diff --git a/pyproject.toml b/pyproject.toml index 41ff0dd1..fe8c9d9e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "A2rchi" +name = "a2rchi" version = "0.1.0" description = "An AI Augmented Research Chat Intelligence (A2rchi)" requires-python = ">=3.7" @@ -62,13 +62,13 @@ dependencies = [ [tool.setuptools] packages = [ - "A2rchi", - "A2rchi.bin", - "A2rchi.chains", - "A2rchi.interfaces", - "A2rchi.interfaces.chat_app", - "A2rchi.interfaces.uploader_app", - "A2rchi.utils", + "a2rchi", + "a2rchi.bin", + "a2rchi.chains", + "a2rchi.interfaces", + "a2rchi.interfaces.chat_app", + "a2rchi.interfaces.uploader_app", + "a2rchi.utils", ] [build-system] diff --git a/test/test_chains.py b/test/test_chains.py index 384aab86..ec7fd6b5 100644 --- a/test/test_chains.py +++ b/test/test_chains.py @@ -1,6 +1,6 @@ -from A2rchi.chains.chain import Chain -from A2rchi.chains.models import DumbLLM, LlamaLLM, OpenAILLM -from A2rchi.utils.config_loader import Config_Loader +from a2rchi.chains.chain import Chain +from a2rchi.chains.models import DumbLLM, LlamaLLM, OpenAILLM +from a2rchi.utils.config_loader import Config_Loader from langchain.schema import AIMessage, HumanMessage, SystemMessage diff --git a/test/test_interfaces.py b/test/test_interfaces.py index 564d662f..9f893593 100644 --- a/test/test_interfaces.py +++ b/test/test_interfaces.py @@ -1,4 +1,4 @@ -from A2rchi.interfaces.cleo import Cleo +from a2rchi.interfaces.cleo import Cleo from time import time import threading From 0422c8396aab43871aa1fb94b7761445ebbca66a Mon Sep 17 00:00:00 2001 From: mdr223 Date: Sat, 18 Nov 2023 12:05:25 -0500 Subject: [PATCH 3/4] release dev to see if things are okay --- .github/workflows/dev-ci-cd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-ci-cd.yaml b/.github/workflows/dev-ci-cd.yaml index 2c924d83..adb1dd5e 100644 --- a/.github/workflows/dev-ci-cd.yaml +++ b/.github/workflows/dev-ci-cd.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - hotfix/lowercase-a2rchi jobs: deploy-dev-system: runs-on: ubuntu-latest From bd52c8653a8a76928747dbabadcfcb2f3819ed42 Mon Sep 17 00:00:00 2001 From: mdr223 Date: Sat, 18 Nov 2023 15:52:16 -0500 Subject: [PATCH 4/4] removing feature branch from triggers --- .github/workflows/dev-ci-cd.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dev-ci-cd.yaml b/.github/workflows/dev-ci-cd.yaml index adb1dd5e..2c924d83 100644 --- a/.github/workflows/dev-ci-cd.yaml +++ b/.github/workflows/dev-ci-cd.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - - hotfix/lowercase-a2rchi jobs: deploy-dev-system: runs-on: ubuntu-latest