refactor: remove references to feedback and training, move session logic into session class, remove shared module

Author: apkostka

.github/workflows/deploy.yml

@@ -83,7 +83,6 @@ jobs:
             cat > /etc/tenantfirstaid/env <<EOF
             ENV=prod
             OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}
-            FEEDBACK_PASSWORD=${{ secrets.FEEDBACK_PASSWORD }}
             DB_HOST=${{secrets.DB_HOST}}
             DB_PASSWORD=${{secrets.DB_PASSWORD}}
             DB_PORT=${{secrets.DB_PORT}}

README.md

@@ -79,8 +79,4 @@ We currently have regular project meetups: https://www.meetup.com/codepdx/ . Als
 On DO, we:
 1. added our ssh public keys
 2. install nginx
-3. Kent got the tls cert (just ask chatgpt?)
-
-## Additional features
-
-go to the route `/feedback` for extra features. You will need to provide the password defined in your `.env` file.
+3. Kent got the tls cert (just ask chatgpt?)

backend/.env.example

@@ -1,4 +1,3 @@
-FEEDBACK_PASSWORD=password
 OPENAI_API_KEY=openai_api_key
 # If you want to use Github Models instead, omit OPENAI_API_KEY and use
 # GITHUB_API_KEY and MODEL_ENDPOINT

backend/PERSISTENT_DATA_README.md

@@ -4,7 +4,7 @@
 import os
 from openai import OpenAI
 
-from tenantfirstaid.shared import DEFAULT_INSTRUCTIONS
+from tenantfirstaid.chat import DEFAULT_INSTRUCTIONS
 
 API_KEY = os.getenv("OPENAI_API_KEY", os.getenv("GITHUB_API_KEY"))
 BASE_URL = os.getenv("MODEL_ENDPOINT", "https://api.openai.com/v1")

backend/scripts/simple_eval.py

@@ -1,23 +1,45 @@
-import uuid
-
 from openai import OpenAI
-from flask import request, stream_with_context, Response, session, after_this_request
+from flask import request, stream_with_context, Response
 from flask.views import View
 import os
 
-from .shared import DEFAULT_INSTRUCTIONS, DATA_DIR
-
-DATA_FILE = DATA_DIR / "chatlog.jsonl"
-
 API_KEY = os.getenv("OPENAI_API_KEY", os.getenv("GITHUB_API_KEY"))
 BASE_URL = os.getenv("MODEL_ENDPOINT", "https://api.openai.com/v1")
 MODEL = os.getenv("MODEL_NAME", "o3")
 MODEL_REASONING_EFFORT = os.getenv("MODEL_REASONING_EFFORT", "medium")
 
+DEFAULT_INSTRUCTIONS = """Pretend you're a legal expert who giving advice about eviction notices in Oregon. 
+Please give shorter answers. 
+Please only ask one question at a time so that the user isn't confused. 
+If the user is being evicted for non-payment of rent and they are too poor to pay the rent and you have confirmed in various ways that the notice is valid and there is a valid court hearing date, then tell them to call Oregon Law Center at 5131234567. 
+Focus on finding technicalities that would legally prevent someone getting evicted, such as deficiencies in notice.
+Assume the user is on a month-to-month lease unless they specify otherwise.
+
+Use only the information from the file search results to answer the question.
+City codes will override the state codes if there is a conflict.
+
+Make sure to include a citation to the relevant law in your answer, with a link to the actual web page the law is on using HTML.
+Use the following websites for citation links:
+https://oregon.public.law/statutes
+https://www.portland.gov/code/30/01
+https://eugene.municipal.codes/EC/8.425
+Include the links inline in your answer, with the attribute target="_blank" so that they open in a new tab, likethis:
+<a href="https://oregon.public.law/statutes/ORS_90.427" target="_blank">ORS 90.427</a>.
+"""
+
+
+class ChatManager:
+    def __init__(self):
+        self.client = OpenAI(
+            api_key=API_KEY,
+            base_url=BASE_URL,
+        )
+
+    def get_client(self):
+        return self.client
 
-class ChatView(View):
-    DATA_FILE = DATA_DIR / "chatlog.jsonl"
 
+class ChatView(View):
     client = OpenAI(
         api_key=API_KEY,
         base_url=BASE_URL,
@@ -26,23 +48,12 @@ class ChatView(View):
     def __init__(self, tenant_session):
         self.tenant_session = tenant_session
 
-    # Prompt iteration idea
-    # If the user starts off by saying something unclear, start off by asking me \"What are you here for?\"
-
     def dispatch_request(self):
         data = request.json
         user_msg = data["message"]
 
         # Get or create session ID using Flask sessions
-        session_id = session.get("session_id")
-        if not session_id:
-            session_id = str(uuid.uuid4())
-            session["session_id"] = session_id
-
-            @after_this_request
-            def save_session(response):
-                session.modified = True
-                return response
+        session_id = self.tenant_session.get_flask_session_id()
 
         current_session = self.tenant_session.get()
 

backend/tenantfirstaid/chat.py

@@ -1,11 +1,12 @@
 import os
 import uuid
-from flask import Response, request, session
+from flask import Response, after_this_request, request, session
 from flask.views import View
 from valkey import Valkey
 import simplejson as json
 
 
+# The class to manage tenant sessions using Valkey and Flask sessions
 class TenantSession:
     def __init__(self):
         print(
@@ -28,6 +29,20 @@ def __init__(self):
         except Exception as e:
             print(e)
 
+    # Retrieves the session ID from Flask session or creates a new one
+    def get_flask_session_id(self):
+        session_id = session.get("session_id")
+        if not session_id:
+            session_id = str(uuid.uuid4())
+            session["session_id"] = session_id
+
+            @after_this_request
+            def save_session(response):
+                session.modified = True
+                return response
+
+        return session_id
+
     def get(self):
         session_id = session.get("session_id")
         if not session_id:
@@ -50,22 +65,21 @@ def getNewSessionData(self):
         }
 
 
+# The Flask view to initialize a session
 class InitSessionView(View):
-    def __init__(self, session: TenantSession):
-        self.session = session
+    def __init__(self, tenant_session: TenantSession):
+        self.tenant_session = tenant_session
 
     def dispatch_request(self):
         data = request.json
-        session_id = session.get("session_id")
-        if not session_id:
-            session_id = str(uuid.uuid4())
-            session["session_id"] = session_id
+        session_id = self.tenant_session.get_flask_session_id()
+
         city = data["city"] or "null"
         state = data["state"]
 
         # Initialize the session with city and state
         initial_data = {"city": city, "state": state, "messages": []}
-        self.session.set(session_id, initial_data)
+        self.tenant_session.set(session_id, initial_data)
 
         return Response(
             status=200,

backend/tenantfirstaid/session.py

@@ -30,7 +30,7 @@ interface Props {
 
 export default function CitySelectField({ setMessages }: Props) {
     const [city, setCity] = useState<string | null>(null);
-    let [invalidCity, setInvalidCity] = useState<boolean>(false);
+    const [invalidCity, setInvalidCity] = useState<boolean>(false);
     const { initChat } = useMessages();
 
     const handleCityChange = async (key: string | null) => {