chore: sync uncommitted working tree changes before clone cleanup

app/models/activity.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from datetime import datetime
 from enum import Enum
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from sqlalchemy import DateTime, ForeignKey, String, Text
 from sqlalchemy.orm import Mapped, mapped_column, relationship
@@ -12,10 +12,10 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship
 from app.models.base import Base, OrgScopedMixin, SoftDeleteMixin, TimestampMixin
 
 if TYPE_CHECKING:
-    from app.models.user import User
     from app.models.account import Account
     from app.models.contact import Contact
     from app.models.deal import Deal
+    from app.models.user import User
 
 
 class ActivityType(str, Enum):
@@ -36,20 +36,20 @@ class Activity(Base, TimestampMixin, SoftDeleteMixin, OrgScopedMixin):
         String(32), nullable=False, index=True
     )
     subject: Mapped[str] = mapped_column(String(255), nullable=False)
-    body: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
-    due_date: Mapped[Optional[datetime]] = mapped_column(
+    body: Mapped[str | None] = mapped_column(Text, nullable=True)
+    due_date: Mapped[datetime | None] = mapped_column(
         DateTime(timezone=True), nullable=True, index=True
     )
-    completed_at: Mapped[Optional[datetime]] = mapped_column(
+    completed_at: Mapped[datetime | None] = mapped_column(
         DateTime(timezone=True), nullable=True
     )
-    account_id: Mapped[Optional[int]] = mapped_column(
+    account_id: Mapped[int | None] = mapped_column(
         ForeignKey("accounts.id"), nullable=True, index=True
     )
-    contact_id: Mapped[Optional[int]] = mapped_column(
+    contact_id: Mapped[int | None] = mapped_column(
         ForeignKey("contacts.id"), nullable=True, index=True
     )
-    deal_id: Mapped[Optional[int]] = mapped_column(
+    deal_id: Mapped[int | None] = mapped_column(
         ForeignKey("deals.id"), nullable=True, index=True
     )
     owner_id: Mapped[int] = mapped_column(
@@ -57,16 +57,16 @@ class Activity(Base, TimestampMixin, SoftDeleteMixin, OrgScopedMixin):
     )
 
     # Relationships
-    account: Mapped[Optional["Account"]] = relationship(
+    account: Mapped[Account | None] = relationship(
         "Account", back_populates="activities", lazy="selectin"
     )
-    contact: Mapped[Optional["Contact"]] = relationship(
+    contact: Mapped[Contact | None] = relationship(
         "Contact", back_populates="activities", lazy="selectin"
     )
-    deal: Mapped[Optional["Deal"]] = relationship(
+    deal: Mapped[Deal | None] = relationship(
         "Deal", back_populates="activities", lazy="selectin"
     )
-    owner: Mapped["User"] = relationship(
+    owner: Mapped[User] = relationship(
         "User", foreign_keys=[owner_id], lazy="joined"
     )