Merge pull request #19 from dsba6010-llm-applications/fixing-fun-times

Refactor code and delete unused files
dsba6010-llm-applications · Nov 24, 2024 · 4dc0274 · 4dc0274
2 parents ebd1576 + a0d59dc
commit 4dc0274
Show file tree

Hide file tree

Showing 35 changed files with 32 additions and 779 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,8 @@
+# Visual Studio Code settings
+.vscode/
+
+.DS_STORE
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

diff --git a/backend/.DS_Store b/backend/.DS_Store
diff --git a/backend/src/agent/__init__.py → backend/agent/__init__.py b/backend/src/agent/__init__.py → backend/agent/__init__.py
diff --git a/backend/src/agent/faiss_store/index.faiss → backend/agent/faiss_store/index.faiss b/backend/src/agent/faiss_store/index.faiss → backend/agent/faiss_store/index.faiss
diff --git a/backend/src/agent/faiss_store/index.pkl → backend/agent/faiss_store/index.pkl b/backend/src/agent/faiss_store/index.pkl → backend/agent/faiss_store/index.pkl
diff --git a/backend/src/agent/graph.py → backend/agent/graph.py b/backend/src/agent/graph.py → backend/agent/graph.py
@@ -7,11 +7,11 @@
 import json
 import os
 from langchain_openai import ChatOpenAI
-from backend.src.agent.state import State
-from backend.src.agent.nodes.assistant import Assistant
-from backend.src.agent.utils import create_tool_node_with_fallback
-from backend.src.agent.tools.general import book_a_cab, book_a_table, answer_question
-from backend.src.agent.rag import populate_vector_db, create_faiss_store
+from backend.agent.state import State
+from backend.agent.nodes.assistant import Assistant
+from backend.agent.utils import create_tool_node_with_fallback
+from backend.agent.tools.general import book_a_cab, book_a_table, answer_question
+from backend.agent.rag import populate_vector_db, create_faiss_store
 
 
 token = os.environ.get("OPENAI_API_KEY")
@@ -61,7 +61,7 @@
 
 builder = StateGraph(State)
 routes: list = json.load(
-    open(os.path.dirname(os.path.abspath(__file__)) + "/../../../role-values.json")
+    open(os.path.dirname(os.path.abspath(__file__)) + "/../../role-values.json")
 )
 
 

diff --git a/backend/src/agent/nodes/__init__.py → backend/agent/nodes/__init__.py b/backend/src/agent/nodes/__init__.py → backend/agent/nodes/__init__.py
diff --git a/backend/src/agent/nodes/assistant.py → backend/agent/nodes/assistant.py b/backend/src/agent/nodes/assistant.py → backend/agent/nodes/assistant.py
@@ -1,5 +1,5 @@
 from langchain_core.runnables import Runnable, RunnableConfig
-from backend.src.agent.state import State
+from backend.agent.state import State
 
 
 class Assistant:

diff --git a/backend/src/agent/nodes/tool_node.py → backend/agent/nodes/tool_node.py b/backend/src/agent/nodes/tool_node.py → backend/agent/nodes/tool_node.py
diff --git a/backend/src/agent/rag.py → backend/agent/rag.py b/backend/src/agent/rag.py → backend/agent/rag.py
diff --git a/...nd/src/agent/rag_datasets/charlotte_r1.md → backend/agent/rag_datasets/charlotte_r1.md b/...nd/src/agent/rag_datasets/charlotte_r1.md → backend/agent/rag_datasets/charlotte_r1.md
diff --git a/...src/agent/rag_datasets/charlotte_r1/0.txt → ...end/agent/rag_datasets/charlotte_r1/0.txt b/...src/agent/rag_datasets/charlotte_r1/0.txt → ...end/agent/rag_datasets/charlotte_r1/0.txt
diff --git a/...gent/rag_datasets/restaurant_offerings.md → ...gent/rag_datasets/restaurant_offerings.md b/...gent/rag_datasets/restaurant_offerings.md → ...gent/rag_datasets/restaurant_offerings.md
diff --git a/...t/rag_datasets/restaurant_offerings/1.txt → ...t/rag_datasets/restaurant_offerings/1.txt b/...t/rag_datasets/restaurant_offerings/1.txt → ...t/rag_datasets/restaurant_offerings/1.txt
diff --git a/backend/src/agent/state.py → backend/agent/state.py b/backend/src/agent/state.py → backend/agent/state.py
@@ -1,7 +1,7 @@
 from typing import TypedDict, Annotated, Dict, Any, List
 
 # from langgraph.graph import add_messages
-from backend.src.agent.utils import add_messages_to_dict
+from backend.agent.utils import add_messages_to_dict
 from langchain_core.messages import AnyMessage
 
 

diff --git a/backend/src/agent/tools/__init__.py → backend/agent/tools/__init__.py b/backend/src/agent/tools/__init__.py → backend/agent/tools/__init__.py
diff --git a/backend/src/agent/tools/general.py → backend/agent/tools/general.py b/backend/src/agent/tools/general.py → backend/agent/tools/general.py
@@ -10,7 +10,7 @@
 from langchain.schema import StrOutputParser
 from langchain.schema.runnable import RunnablePassthrough
 from langchain_core.prompts import ChatPromptTemplate
-from backend.src.agent.rag import load_faiss_store
+from backend.agent.rag import load_faiss_store
 
 # from openai import OpenAI
 from langchain_openai import OpenAI, OpenAIEmbeddings

diff --git a/backend/src/agent/utils.py → backend/agent/utils.py b/backend/src/agent/utils.py → backend/agent/utils.py
@@ -1,6 +1,6 @@
 from langchain_core.messages import ToolMessage
 from langchain_core.runnables import RunnableLambda
-from backend.src.agent.nodes.tool_node import ToolNode
+from backend.agent.nodes.tool_node import ToolNode
 from langgraph.graph import add_messages
 from typing import Union
 

diff --git a/backend/src/graph.txt → backend/graph.txt b/backend/src/graph.txt → backend/graph.txt
diff --git a/backend/src/.DS_Store b/backend/src/.DS_Store
diff --git a/backend/src/api.py b/backend/src/api.py
diff --git a/backend/src/client.py b/backend/src/client.py
diff --git a/backend/src/template_llama3.jinja → backend/template_llama3.jinja b/backend/src/template_llama3.jinja → backend/template_llama3.jinja
diff --git a/dinebot_app.py b/dinebot_app.py
@@ -1,7 +1,7 @@
 import re
 import streamlit as st
-from backend.src.agent.graph import graph
-from backend.src.agent.utils import _print_event
+from backend.agent.graph import graph
+from backend.agent.utils import _print_event
 from langchain_core.messages import ToolMessage, HumanMessage, AIMessage
 from langchain.callbacks.base import BaseCallbackHandler
 from langchain_core.output_parsers import StrOutputParser

diff --git a/frontend/.DS_Store b/frontend/.DS_Store