fix nathan wang type errors

server/__init__.py

@@ -1,13 +1,14 @@
 """Initialize the Flask app."""
 
-from typing import List, cast
+from typing import List, Type, cast
 
 import numpy
 from apiflask import APIFlask
 from flask import redirect, render_template
 from flask_cors import CORS
 from flask_sqlalchemy import SQLAlchemy
 from psycopg2.extensions import AsIs, register_adapter
+from sqlalchemy.orm import DeclarativeBase, MappedAsDataclass
 
 
 def addapt_numpy_float64(numpy_float64):
@@ -32,32 +33,31 @@ def addapt_numpy_int64(numpy_int64):
 register_adapter(numpy.int64, addapt_numpy_int64)
 
 cors = CORS()
-db = SQLAlchemy()
-
-
-# def init():
-#     documents = Document.query.order_by(Document.id.desc()).all()
-
-#     if len(documents) > 0:
-#         return
-#     # initialize with some default documents to create the index
-#     document = Document(
-#         "what is hackmit?",
-#         "HackMIT is a weekend-long event where thousands of students from around the
-#  world come together to work on cool new software and/or hardware projects.",
-#         "https://hackmit.org",
-#         "what is hackmit?",
-#     )
-#     db.session.add(document)
-#     document = Document(
-#         "what is blueprint?",
-#         "Blueprint is a weekend-long learnathon and hackathon for high school
-# students hosted at MIT",
-#         "https://blueprint.hackmit.org",
-#         "what is blueprint?",
-#     )
-#     db.session.add(document)
-#     db.session.commit()
+
+
+class Base(DeclarativeBase, MappedAsDataclass):
+    """Base SQLAlchemy class. Don't use this class; use db.Model instead.
+
+    Since we use Flask SQLAlchemy, this class shouldn't be used directly.
+    Instead, use db.Model.
+    """
+
+    pass
+
+
+class ProperlyTypedSQLAlchemy(SQLAlchemy):
+    """Temporary type hinting workaround for Flask SQLAlchemy.
+
+    This is a temporary workaround for the following issue:
+    https://github.com/pallets-eco/flask-sqlalchemy/issues/1312
+    This workaround may not be correct.
+    """
+
+    Model: Type[Base]
+
+
+db = SQLAlchemy(model_class=Base)
+db = cast(ProperlyTypedSQLAlchemy, db)
 
 
 def create_app():
@@ -94,15 +94,6 @@ def create_app():
 
         app.register_blueprint(seed)
 
-        # from server.controllers.admin import update_embeddings
-
-        # on server start, embed some hard-coded documents and update index
-        # this doesn't work for some reason
-        # from server.controllers.admin import update_embeddings
-
-        # init()
-        # update_embeddings()
-
         db.create_all()
 
         @app.errorhandler(404)

server/cli.py

@@ -29,13 +29,13 @@ def email():
     db.session.add(thread)
     db.session.commit()
     email = Email(
-        datetime.datetime.now(datetime.timezone.utc),
-        "azliu@mit.edu",
-        subject,
-        body,
-        "message-id",
-        False,
-        thread.id,
+        date=datetime.datetime.now(datetime.timezone.utc),
+        sender="azliu@mit.edu",
+        subject=subject,
+        body=body,
+        message_id="message-id",
+        is_reply=False,
+        thread_id=thread.id,
     )
 
     if email is not None and thread is not None:

server/models/document.py

@@ -21,7 +21,7 @@ class Document(db.Model):
 
     __tablename__ = "Documents"
 
-    id: Mapped[str] = mapped_column(primary_key=True)
+    id: Mapped[str] = mapped_column(primary_key=True, init=False)
     question: Mapped[str] = mapped_column(nullable=False)
     label: Mapped[str] = mapped_column(nullable=False)
     content: Mapped[str] = mapped_column(nullable=False)

server/models/email.py

@@ -31,7 +31,7 @@ class Email(db.Model):
 
     __tablename__ = "Emails"
 
-    id: Mapped[str] = mapped_column(db.Integer, primary_key=True)
+    id: Mapped[str] = mapped_column(primary_key=True, init=False)
     date: Mapped[DateTime] = mapped_column(nullable=False)
     sender: Mapped[str] = mapped_column(nullable=False)
     subject: Mapped[str] = mapped_column(nullable=False)

server/models/response.py

@@ -31,7 +31,7 @@ class Response(db.Model):
     __tablename__ = "Responses"
     __table_args__ = (UniqueConstraint("email_id", name="unique_email_id"),)
 
-    id: Mapped[str] = mapped_column(primary_key=True)
+    id: Mapped[str] = mapped_column(primary_key=True, init=False)
     response: Mapped[str] = mapped_column(nullable=False)
     questions: Mapped[List[str]] = mapped_column(nullable=False)
     documents: Mapped[List[List[int]]] = mapped_column(nullable=False)

server/models/thread.py

@@ -1,6 +1,6 @@
 """Thread."""
 
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, List, Optional
 
 from sqlalchemy import select
 from sqlalchemy.ext.hybrid import hybrid_property
@@ -19,15 +19,15 @@ class Thread(db.Model):
 
     id(str): The ID of the thread.
     resolved(bool): Whether the thread is resolved.
-    last_email(int): The ID of the last email in the thread.
+    last_email(str): The ID of the last email in the thread.
     emails(list): The emails in the thread.
     """
 
     __tablename__ = "Threads"
 
-    id: Mapped[str] = mapped_column(primary_key=True)
+    id: Mapped[str] = mapped_column(primary_key=True, init=False)
+    last_email: Mapped[Optional[str]] = mapped_column(nullable=True)
     resolved: Mapped[bool] = mapped_column(nullable=False, default=False)
-    last_email: Mapped[int] = mapped_column(nullable=False)
 
     emails: Mapped[List[Email]] = relationship(
         "Email",