Typecheck scripts too (#159)

* typecheck the scripts with mypy

* add more (but not all) of the annotations flagged when running with TYPECHECK_OPTIONS="--strict"

* fix merge issues that created lint errors

* bump and specify minimum version of major packages; resolves mypy errors

Author: yangm2

backend/Makefile

@@ -20,8 +20,16 @@ lint: uv.lock
 typecheck: uv.lock
 	$(PYTHON) run ty check $(TYPECHECK_OPTIONS)
 
-typecheck-mypy: uv.lock
-	$(PYTHON) run mypy $(TYPECHECK_OPTIONS) -p tenantfirstaid --python-executable .venv/bin/python3 --check-untyped-defs
+MYPY_CMD := $(PYTHON) run mypy $(TYPECHECK_OPTIONS)
+MYPY_ARGS :=  --python-executable .venv/bin/python3 --pretty --check-untyped-defs
+
+typecheck-mypy-scripts: uv.lock
+	$(MYPY_CMD) -p scripts $(MYPY_ARGS)
+
+typecheck-mypy-tenantfirstaid: uv.lock
+	$(MYPY_CMD) -p tenantfirstaid $(MYPY_ARGS)
+
+typecheck-mypy: typecheck-mypy-tenantfirstaid typecheck-mypy-scripts
 
 typecheck-pyrefly: uv.lock
 	$(PYTHON) run pyrefly check $(TYPECHECK_OPTIONS) --python-interpreter .venv/bin/python3

backend/pyproject.toml

@@ -3,18 +3,18 @@ name = "tenant-first-aid"
 version = "0.2.0"
 requires-python = ">=3.12"
 dependencies = [
-  "flask",
-  "valkey",
-  "gunicorn",
-  "google-auth",
-  "google-genai",
-  "google-cloud-aiplatform",
+  "flask>=3.1.1",
+  "valkey>=6.1.0",
+  "gunicorn>=23.0.0",
+  "google-auth>=2.40.3",
+  "google-genai>=1.28.0",
+  "google-cloud-aiplatform>=1.106.0",
   "openai==1.89",
   "jsonlines",
   "simplejson",
   "python-dotenv",
   "pandas>=2.3.0",
-  "vertexai",
+  "vertexai>=1.43.0",
 ]
 
 [tool.setuptools.packages.find]
@@ -27,16 +27,20 @@ build-backend = "setuptools.build_meta"
 
 [dependency-groups]
 dev = [
-  "ipdb>=0.13.13",
-  "mypy>=1.16.1",
-  "pyrefly>=0.21.0",
-  "pytest>=8.4.0",
-  "pytest-cov>=6.1.1",
-  "pytest-mock>=3.14.1",
-  "ruff>=0.12.0",
-  "ty>=0.0.1a11",
-  "types-Flask>=1.1.6",
-  "types-simplejson>=3.20.0.20250326",
+    "ipdb>=0.13.13",
+    "mypy>=1.16.1",
+    "pandas-stubs>=2.2.3.250527",
+    "pyrefly>=0.21.0",
+    "pytest>=8.4.0",
+    "pytest-cov>=6.1.1",
+    "pytest-mock>=3.14.1",
+    "ruff>=0.12.0",
+    "ty>=0.0.1a11",
+    "types-Flask>=1.1.6",
+    "types-simplejson>=3.20.0.20250326",
 ]
 
-gen_convo = ["pandas", "openai"]
+gen_convo = [
+      "pandas",
+      "openai",
+]

backend/scripts/create_vector_store.py

@@ -2,11 +2,11 @@
 from pathlib import Path
 from openai import OpenAI
 
-
-if Path(".env").exists():
+dotenv_path = Path(__file__).parent.parent / ".env"
+if dotenv_path.exists():
     from dotenv import load_dotenv
 
-    load_dotenv(override=True)
+    load_dotenv(dotenv_path=dotenv_path, override=True)
 
 API_KEY = os.getenv("OPENAI_API_KEY", os.getenv("GITHUB_API_KEY"))
 
@@ -64,11 +64,11 @@
             path.write_text(path.read_text(encoding="utf-8"), encoding="utf-8")
 
             print(f"Uploading {file_path} to vector store '{vector_store.name}'.")
-            file = client.files.create(
+            file_obj = client.files.create(
                 file=open(file_path, "rb"),
                 purpose="assistants",
             )
-            file_ids.append(file.id)
+            file_ids.append(file_obj.id)
 
         # Add files to the vector store
         batch_upload = client.vector_stores.file_batches.create(

backend/tenantfirstaid/chat.py

@@ -56,7 +56,7 @@ def __init__(self):
             system_instruction=DEFAULT_INSTRUCTIONS,
         )
 
-    def prepare_developer_instructions(self, city: str, state: str):
+    def prepare_developer_instructions(self, city: str, state: str) -> str:
         # Add city and state filters if they are set
         instructions = DEFAULT_INSTRUCTIONS
         instructions += (
@@ -117,11 +117,11 @@ def generate_gemini_chat_response(
 
 
 class ChatView(View):
-    def __init__(self, tenant_session):
+    def __init__(self, tenant_session) -> None:
         self.tenant_session = tenant_session
         self.chat_manager = ChatManager()
 
-    def dispatch_request(self, *args, **kwargs):
+    def dispatch_request(self, *args, **kwargs) -> Response:
         data = request.json
         user_msg = data["message"]
 

backend/tenantfirstaid/session.py

@@ -19,7 +19,7 @@ class TenantSessionData(TypedDict):
 
 # The class to manage tenant sessions using Valkey and Flask sessions
 class TenantSession:
-    def __init__(self):
+    def __init__(self) -> None:
         print(
             "Connecting to Valkey:",
             {
@@ -42,13 +42,13 @@ def __init__(self):
 
     # Retrieves the session ID from Flask session or creates a new one
     def get_flask_session_id(self) -> str:
-        session_id = session.get("session_id")
+        session_id: str | None = 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):
+            def save_session(response: Response) -> Response:
                 session.modified = True
                 return response
 
@@ -61,9 +61,12 @@ def get(self) -> TenantSessionData:
         if not saved_session:
             return self.getNewSessionData()
 
-        return json.loads(s=saved_session)
+        obj = json.loads(s=saved_session)
+        return TenantSessionData(
+            city=obj["city"], state=obj["state"], messages=obj["messages"]
+        )
 
-    def set(self, value: TenantSessionData):
+    def set(self, value: TenantSessionData) -> None:
         session_id = self.get_flask_session_id()
         self.db_con.set(session_id, json.dumps(value))
 
@@ -76,7 +79,7 @@ class InitSessionView(View):
     def __init__(self, tenant_session: TenantSession):
         self.tenant_session = tenant_session
 
-    def dispatch_request(self, *args, **kwargs):
+    def dispatch_request(self, *args, **kwargs) -> Response:
         data: Dict[str, Any] = request.json
         session_id: Optional[str] = self.tenant_session.get_flask_session_id()