Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix(enterprise): migrate storage models to SQLAlchemy 2.0 [13/13] (#13859)

Rohit Malhotra439fa8fc30fa
diff --git a/enterprise/storage/conversation_work.py b/enterprise/storage/conversation_work.py
index b8e9f785cc..0412351e29 100644
--- a/enterprise/storage/conversation_work.py
+++ b/enterprise/storage/conversation_work.py
@@ -1,20 +1,23 @@
from datetime import UTC, datetime
-from sqlalchemy import Column, Float, Index, Integer, String
+from sqlalchemy import Index, String
+from sqlalchemy.orm import Mapped, mapped_column
from storage.base import Base
-class ConversationWork(Base): # type: ignore
+class ConversationWork(Base):
__tablename__ = 'conversation_work'
- id = Column(Integer, primary_key=True, autoincrement=True)
- conversation_id = Column(String, nullable=False, unique=True, index=True)
- user_id = Column(String, nullable=False, index=True)
- seconds = Column(Float, nullable=False, default=0.0)
- created_at = Column(
+ id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+ conversation_id: Mapped[str] = mapped_column(
+ String, nullable=False, unique=True, index=True
+ )
+ user_id: Mapped[str] = mapped_column(String, nullable=False, index=True)
+ seconds: Mapped[float] = mapped_column(nullable=False, default=0.0)
+ created_at: Mapped[str] = mapped_column(
String, default=lambda: datetime.now(UTC).isoformat(), nullable=False
)
- updated_at = Column(
+ updated_at: Mapped[str] = mapped_column(
String,
default=lambda: datetime.now(UTC).isoformat(),
onupdate=lambda: datetime.now(UTC).isoformat(),
diff --git a/enterprise/storage/proactive_convos.py b/enterprise/storage/proactive_convos.py
index d82c5fce39..32b2b31888 100644
--- a/enterprise/storage/proactive_convos.py
+++ b/enterprise/storage/proactive_convos.py
@@ -1,18 +1,23 @@
from datetime import UTC, datetime
+from typing import Any
-from sqlalchemy import JSON, Boolean, Column, DateTime, Integer, String
+from sqlalchemy import JSON, DateTime, String
+from sqlalchemy.orm import Mapped, mapped_column
from storage.base import Base
class ProactiveConversation(Base):
__tablename__ = 'proactive_conversation_table'
- id = Column(Integer, primary_key=True, autoincrement=True)
- repo_id = Column(String, nullable=False)
- pr_number = Column(Integer, nullable=False)
- workflow_runs = Column(JSON, nullable=False)
- commit = Column(String, nullable=False)
- conversation_starter_sent = Column(Boolean, nullable=False, default=False)
- last_updated_at = Column(
+
+ id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+ repo_id: Mapped[str] = mapped_column(String, nullable=False)
+ pr_number: Mapped[int] = mapped_column(nullable=False)
+ workflow_runs: Mapped[list[Any]] = mapped_column(JSON, nullable=False)
+ commit: Mapped[str] = mapped_column(String, nullable=False)
+ conversation_starter_sent: Mapped[bool] = mapped_column(
+ nullable=False, default=False
+ )
+ last_updated_at: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True),
default=lambda: datetime.now(UTC),
)
diff --git a/enterprise/storage/resend_synced_user.py b/enterprise/storage/resend_synced_user.py
index 9a4f19720d..f26372f978 100644
--- a/enterprise/storage/resend_synced_user.py
+++ b/enterprise/storage/resend_synced_user.py
@@ -1,14 +1,14 @@
"""SQLAlchemy model for tracking users synced to Resend audiences."""
from datetime import UTC, datetime
-from uuid import uuid4
+from uuid import UUID, uuid4
-from sqlalchemy import Column, DateTime, String, UniqueConstraint
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy import DateTime, String, UniqueConstraint
+from sqlalchemy.orm import Mapped, mapped_column
from storage.base import Base
-class ResendSyncedUser(Base): # type: ignore
+class ResendSyncedUser(Base):
"""Tracks users that have been synced to a Resend audience.
This table ensures that once a user is synced to a Resend audience,
@@ -18,15 +18,15 @@ class ResendSyncedUser(Base): # type: ignore
__tablename__ = 'resend_synced_users'
- id = Column(UUID(as_uuid=True), primary_key=True, default=uuid4)
- email = Column(String, nullable=False, index=True)
- audience_id = Column(String, nullable=False, index=True)
- synced_at = Column(
+ id: Mapped[UUID] = mapped_column(primary_key=True, default=uuid4)
+ email: Mapped[str] = mapped_column(String, nullable=False, index=True)
+ audience_id: Mapped[str] = mapped_column(String, nullable=False, index=True)
+ synced_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True),
default=lambda: datetime.now(UTC),
nullable=False,
)
- keycloak_user_id = Column(String, nullable=True)
+ keycloak_user_id: Mapped[str | None] = mapped_column(String, nullable=True)
__table_args__ = (
UniqueConstraint(
diff --git a/enterprise/storage/stored_conversation_metadata_saas.py b/enterprise/storage/stored_conversation_metadata_saas.py
index 848f51f137..7aaff13b0c 100644
--- a/enterprise/storage/stored_conversation_metadata_saas.py
+++ b/enterprise/storage/stored_conversation_metadata_saas.py
@@ -5,24 +5,34 @@ This model stores the SaaS-specific metadata for conversations,
containing only the conversation_id, user_id, and org_id.
"""
-from sqlalchemy import UUID as SQL_UUID
-from sqlalchemy import Column, ForeignKey, String
-from sqlalchemy.orm import relationship
+from typing import TYPE_CHECKING
+from uuid import UUID
+
+from sqlalchemy import ForeignKey, String
+from sqlalchemy.orm import Mapped, mapped_column, relationship
from storage.base import Base
+if TYPE_CHECKING:
+ from storage.org import Org
+ from storage.user import User
+
-class StoredConversationMetadataSaas(Base): # type: ignore
+class StoredConversationMetadataSaas(Base):
"""SaaS conversation metadata model containing user and org associations."""
__tablename__ = 'conversation_metadata_saas'
- conversation_id = Column(String, primary_key=True)
- user_id = Column(SQL_UUID(as_uuid=True), ForeignKey('user.id'), nullable=False)
- org_id = Column(SQL_UUID(as_uuid=True), ForeignKey('org.id'), nullable=False)
+ conversation_id: Mapped[str] = mapped_column(String, primary_key=True)
+ user_id: Mapped[UUID] = mapped_column(ForeignKey('user.id'), nullable=False)
+ org_id: Mapped[UUID] = mapped_column(ForeignKey('org.id'), nullable=False)
# Relationships
- user = relationship('User', back_populates='stored_conversation_metadata_saas')
- org = relationship('Org', back_populates='stored_conversation_metadata_saas')
+ user: Mapped['User'] = relationship(
+ 'User', back_populates='stored_conversation_metadata_saas'
+ )
+ org: Mapped['Org'] = relationship(
+ 'Org', back_populates='stored_conversation_metadata_saas'
+ )
__all__ = ['StoredConversationMetadataSaas']
diff --git a/enterprise/storage/stored_custom_secrets.py b/enterprise/storage/stored_custom_secrets.py
index c048644fce..8b0260222f 100644
--- a/enterprise/storage/stored_custom_secrets.py
+++ b/enterprise/storage/stored_custom_secrets.py
@@ -1,17 +1,25 @@
-from sqlalchemy import Column, ForeignKey, Identity, Integer, String
-from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.orm import relationship
+from typing import TYPE_CHECKING
+from uuid import UUID
+
+from sqlalchemy import ForeignKey, Identity, String
+from sqlalchemy.orm import Mapped, mapped_column, relationship
from storage.base import Base
+if TYPE_CHECKING:
+ from storage.org import Org
+
-class StoredCustomSecrets(Base): # type: ignore
+class StoredCustomSecrets(Base):
__tablename__ = 'custom_secrets'
- id = Column(Integer, Identity(), primary_key=True)
- keycloak_user_id = Column(String, nullable=True, index=True)
- org_id = Column(UUID(as_uuid=True), ForeignKey('org.id'), nullable=True)
- secret_name = Column(String, nullable=False)
- secret_value = Column(String, nullable=False)
- description = Column(String, nullable=True)
+
+ id: Mapped[int] = mapped_column(Identity(), primary_key=True)
+ keycloak_user_id: Mapped[str | None] = mapped_column(
+ String, nullable=True, index=True
+ )
+ org_id: Mapped[UUID | None] = mapped_column(ForeignKey('org.id'), nullable=True)
+ secret_name: Mapped[str] = mapped_column(String, nullable=False)
+ secret_value: Mapped[str] = mapped_column(String, nullable=False)
+ description: Mapped[str | None] = mapped_column(String, nullable=True)
# Relationships
- org = relationship('Org', back_populates='user_secrets')
+ org: Mapped['Org | None'] = relationship('Org', back_populates='user_secrets')
diff --git a/enterprise/storage/stored_offline_token.py b/enterprise/storage/stored_offline_token.py
index a48c9bed64..ebc5a4bf20 100644
--- a/enterprise/storage/stored_offline_token.py
+++ b/enterprise/storage/stored_offline_token.py
@@ -1,16 +1,19 @@
-from sqlalchemy import Column, DateTime, String, text
+from datetime import datetime
+
+from sqlalchemy import DateTime, String, text
+from sqlalchemy.orm import Mapped, mapped_column
from storage.base import Base
class StoredOfflineToken(Base):
__tablename__ = 'offline_tokens'
- user_id = Column(String(255), primary_key=True)
- offline_token = Column(String, nullable=False)
- created_at = Column(
+ user_id: Mapped[str] = mapped_column(String(255), primary_key=True)
+ offline_token: Mapped[str] = mapped_column(String, nullable=False)
+ created_at: Mapped[datetime] = mapped_column(
DateTime, server_default=text('CURRENT_TIMESTAMP'), nullable=False
)
- updated_at = Column(
+ updated_at: Mapped[datetime] = mapped_column(
DateTime,
server_default=text('CURRENT_TIMESTAMP'),
onupdate=text('CURRENT_TIMESTAMP'),
diff --git a/enterprise/storage/stored_repository.py b/enterprise/storage/stored_repository.py
index 5e25fbce1d..bf77406466 100644
--- a/enterprise/storage/stored_repository.py
+++ b/enterprise/storage/stored_repository.py
@@ -1,16 +1,20 @@
-from sqlalchemy import Boolean, Column, Integer, String
+from sqlalchemy import String
+from sqlalchemy.orm import Mapped, mapped_column
from storage.base import Base
-class StoredRepository(Base): # type: ignore
+class StoredRepository(Base):
"""
Represents a repositories fetched from git providers.
"""
__tablename__ = 'repos'
- id = Column(Integer, primary_key=True, autoincrement=True)
- repo_name = Column(String, nullable=False)
- repo_id = Column(String, nullable=False) # {provider}##{id} format
- is_public = Column(Boolean, nullable=False)
- has_microagent = Column(Boolean, nullable=True)
- has_setup_script = Column(Boolean, nullable=True)
+
+ id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+ repo_name: Mapped[str] = mapped_column(String, nullable=False)
+ repo_id: Mapped[str] = mapped_column(
+ String, nullable=False
+ ) # {provider}##{id} format
+ is_public: Mapped[bool] = mapped_column(nullable=False)
+ has_microagent: Mapped[bool | None] = mapped_column(nullable=True)
+ has_setup_script: Mapped[bool | None] = mapped_column(nullable=True)