π OpenHands: AI-Driven Development
fix(enterprise): migrate simple storage models to SQLAlchemy 2.0 [1/13] (#13847)
Rohit Malhotraf274d5e90f63
diff --git a/enterprise/storage/billing_session.py b/enterprise/storage/billing_session.pyindex e6b1c3ce43..0e2f9ef3c1 100644--- a/enterprise/storage/billing_session.py+++ b/enterprise/storage/billing_session.py@@ -1,22 +1,28 @@from datetime import UTC, datetime+from decimal import Decimal+from typing import TYPE_CHECKING+from uuid import UUID-from sqlalchemy import DECIMAL, Column, DateTime, Enum, ForeignKey, String-from sqlalchemy.dialects.postgresql import UUID-from sqlalchemy.orm import relationship+from sqlalchemy import DECIMAL, DateTime, Enum, ForeignKey, String+from sqlalchemy.orm import Mapped, mapped_column, relationshipfrom storage.base import Base+if TYPE_CHECKING:+ from storage.org import Org-class BillingSession(Base): # type: ignore++class BillingSession(Base):"""Represents a Stripe billing session for credit purchases.Tracks the status of payment transactions and associated user information."""__tablename__ = 'billing_sessions'- id = Column(String, primary_key=True)- user_id = Column(String, nullable=False)- org_id = Column(UUID(as_uuid=True), ForeignKey('org.id'), nullable=True)- status = Column(++ id: Mapped[str] = mapped_column(String, primary_key=True)+ user_id: Mapped[str] = mapped_column(String, nullable=False)+ org_id: Mapped[UUID | None] = mapped_column(ForeignKey('org.id'), nullable=True)+ status: Mapped[str] = mapped_column(Enum('in_progress','completed',@@ -26,16 +32,16 @@ class BillingSession(Base): # type: ignore),default='in_progress',)- price = Column(DECIMAL(19, 4), nullable=False)- price_code = Column(String, nullable=False)- created_at = Column(+ price: Mapped[Decimal] = mapped_column(DECIMAL(19, 4), nullable=False)+ price_code: Mapped[str] = mapped_column(String, nullable=False)+ created_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True),- default=lambda: datetime.now(UTC), # type: ignore[attr-defined]+ default=lambda: datetime.now(UTC),)- updated_at = Column(+ updated_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True),- default=lambda: datetime.now(UTC), # type: ignore[attr-defined]+ default=lambda: datetime.now(UTC),)# Relationships- org = relationship('Org', back_populates='billing_sessions')+ org: Mapped['Org | None'] = relationship('Org', back_populates='billing_sessions')diff --git a/enterprise/storage/feedback.py b/enterprise/storage/feedback.pyindex 5e2145f961..1d03e9ad1f 100644--- a/enterprise/storage/feedback.py+++ b/enterprise/storage/feedback.py@@ -1,29 +1,34 @@-from sqlalchemy import JSON, Column, DateTime, Enum, Integer, String, Text-from sqlalchemy.sql import func+from datetime import datetime+from typing import Any++from sqlalchemy import JSON, Enum, String, Text, func+from sqlalchemy.orm import Mapped, mapped_columnfrom storage.base import Base-class Feedback(Base): # type: ignore+class Feedback(Base):__tablename__ = 'feedback'- id = Column(String, primary_key=True)- version = Column(String, nullable=False)- email = Column(String, nullable=False)- polarity = Column(+ id: Mapped[str] = mapped_column(String, primary_key=True)+ version: Mapped[str] = mapped_column(String, nullable=False)+ email: Mapped[str] = mapped_column(String, nullable=False)+ polarity: Mapped[str] = mapped_column(Enum('positive', 'negative', name='polarity_enum'), nullable=False)- permissions = Column(+ permissions: Mapped[str] = mapped_column(Enum('public', 'private', name='permissions_enum'), nullable=False)- trajectory = Column(JSON, nullable=True)+ trajectory: Mapped[dict[str, Any] | None] = mapped_column(JSON, nullable=True)-class ConversationFeedback(Base): # type: ignore+class ConversationFeedback(Base):__tablename__ = 'conversation_feedback'- id = Column(Integer, primary_key=True, autoincrement=True)- conversation_id = Column(String, nullable=False, index=True)- event_id = Column(Integer, nullable=True)- rating = Column(Integer, nullable=False)- reason = Column(Text, nullable=True)- created_at = Column(DateTime, nullable=False, server_default=func.now())+ id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)+ conversation_id: Mapped[str] = mapped_column(String, nullable=False, index=True)+ event_id: Mapped[int | None] = mapped_column(nullable=True)+ rating: Mapped[int] = mapped_column(nullable=False)+ reason: Mapped[str | None] = mapped_column(Text, nullable=True)+ created_at: Mapped[datetime] = mapped_column(+ nullable=False, server_default=func.now()+ )diff --git a/enterprise/storage/subscription_access.py b/enterprise/storage/subscription_access.pyindex 38051995b1..9ca80263d5 100644--- a/enterprise/storage/subscription_access.py+++ b/enterprise/storage/subscription_access.py@@ -1,10 +1,12 @@from datetime import UTC, datetime+from decimal import Decimal-from sqlalchemy import DECIMAL, Column, DateTime, Enum, Integer, String+from sqlalchemy import DECIMAL, DateTime, Enum, String+from sqlalchemy.orm import Mapped, mapped_columnfrom storage.base import Base-class SubscriptionAccess(Base): # type: ignore+class SubscriptionAccess(Base):"""Represents a user's subscription access record.Tracks subscription status, duration, payment information, and cancellation status.@@ -12,8 +14,8 @@ class SubscriptionAccess(Base): # type: ignore__tablename__ = 'subscription_access'- id = Column(Integer, primary_key=True, autoincrement=True)- status = Column(+ id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)+ status: Mapped[str] = mapped_column(Enum('ACTIVE','DISABLED',@@ -22,22 +24,30 @@ class SubscriptionAccess(Base): # type: ignorenullable=False,index=True,)- user_id = Column(String, nullable=False, index=True)- start_at = Column(DateTime(timezone=True), nullable=True)- end_at = Column(DateTime(timezone=True), nullable=True)- amount_paid = Column(DECIMAL(19, 4), nullable=True)- stripe_invoice_payment_id = Column(String, nullable=False)- cancelled_at = Column(DateTime(timezone=True), nullable=True)- stripe_subscription_id = Column(String, nullable=True, index=True)- created_at = Column(+ user_id: Mapped[str] = mapped_column(String, nullable=False, index=True)+ start_at: Mapped[datetime | None] = mapped_column(+ DateTime(timezone=True), nullable=True+ )+ end_at: Mapped[datetime | None] = mapped_column(+ DateTime(timezone=True), nullable=True+ )+ amount_paid: Mapped[Decimal | None] = mapped_column(DECIMAL(19, 4), nullable=True)+ stripe_invoice_payment_id: Mapped[str] = mapped_column(String, nullable=False)+ cancelled_at: Mapped[datetime | None] = mapped_column(+ DateTime(timezone=True), nullable=True+ )+ stripe_subscription_id: Mapped[str | None] = mapped_column(+ String, nullable=True, index=True+ )+ created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True),- default=lambda: datetime.now(UTC), # type: ignore[attr-defined]+ default=lambda: datetime.now(UTC),nullable=False,)- updated_at = Column(+ updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True),- default=lambda: datetime.now(UTC), # type: ignore[attr-defined]- onupdate=lambda: datetime.now(UTC), # type: ignore[attr-defined]+ default=lambda: datetime.now(UTC),+ onupdate=lambda: datetime.now(UTC),nullable=False,)