Merge branch 'main' into opentelemetry

Author: kitsuta

.pythonstartup.py

@@ -11,7 +11,7 @@
     initialize_db()
 
     # Make it easier to do session stuff at the command line
-    session = Session().session
+    session = Session()
 
     if c.DEV_BOX:
         admin = session.query(AdminAccount).filter(

alembic/env.py

@@ -2,6 +2,7 @@
 
 import logging
 import sys
+import sqlmodel
 from logging.config import fileConfig
 from alembic import context
 
@@ -24,19 +25,21 @@
 logger = logging.getLogger('alembic.env')
 
 # Add the model's MetaData object here for "autogenerate" support.
-target_metadata = Session.BaseClass.metadata
+target_metadata = uber.models.MagModel.metadata
 
 
 def include_object(object, name, type_, reflected, compare_to):
     """Exclude alembic's own version tables from alembic's consideration."""
-    return not name.startswith('alembic_version')
+    return not name or not name.startswith('alembic_version')
 
 
 def render_item(type_, obj, autogen_context):
     """Apply custom rendering for selected items."""
     if type_ == 'type':
         if isinstance(obj, Choice):
             return 'sa.Integer()'
+        if isinstance(obj, sqlmodel.sql.sqltypes.AutoString):
+            return 'sa.Unicode()'
     # Default rendering for other objects
     return False
 

alembic/versions/3d942ce689fc_add_missing_columns_from_sqlalchemy_.py

@@ -0,0 +1,65 @@
+"""Add missing columns from SQLAlchemy upgrade
+
+Revision ID: 3d942ce689fc
+Revises: 5a0e898174d4
+Create Date: 2026-02-05 16:34:19.803186
+
+"""
+
+
+# revision identifiers, used by Alembic.
+revision = '3d942ce689fc'
+down_revision = '5a0e898174d4'
+branch_labels = None
+depends_on = None
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+try:
+    is_sqlite = op.get_context().dialect.name == 'sqlite'
+except Exception:
+    is_sqlite = False
+
+if is_sqlite:
+    op.get_context().connection.execute('PRAGMA foreign_keys=ON;')
+    utcnow_server_default = "(datetime('now', 'utc'))"
+else:
+    utcnow_server_default = "timezone('utc', current_timestamp)"
+
+def sqlite_column_reflect_listener(inspector, table, column_info):
+    """Adds parenthesis around SQLite datetime defaults for utcnow."""
+    if column_info['default'] == "datetime('now', 'utc')":
+        column_info['default'] = utcnow_server_default
+
+sqlite_reflect_kwargs = {
+    'listeners': [('column_reflect', sqlite_column_reflect_listener)]
+}
+
+# ===========================================================================
+# HOWTO: Handle alter statements in SQLite
+#
+# def upgrade():
+#     if is_sqlite:
+#         with op.batch_alter_table('table_name', reflect_kwargs=sqlite_reflect_kwargs) as batch_op:
+#             batch_op.alter_column('column_name', type_=sa.Unicode(), server_default='', nullable=False)
+#     else:
+#         op.alter_column('table_name', 'column_name', type_=sa.Unicode(), server_default='', nullable=False)
+#
+# ===========================================================================
+
+
+def upgrade():
+    op.add_column('panel_applicant', sa.Column('social_media_info', sa.String(), server_default='', nullable=False))
+    op.drop_column('panel_applicant', 'social_media')
+    op.drop_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), table_name='promo_code_word')
+    op.create_index('uq_promo_code_word_normalized_word_part_of_speech', 'promo_code_word', [sa.literal_column('lower(trim(word))'), 'part_of_speech'], unique=True)
+
+
+def downgrade():
+    op.drop_index('uq_promo_code_word_normalized_word_part_of_speech', table_name='promo_code_word')
+    op.create_index(op.f('uq_promo_code_word_normalized_word_part_of_speech'), 'promo_code_word', [sa.literal_column('lower(TRIM(BOTH FROM word))'), 'part_of_speech'], unique=True)
+    op.add_column('panel_applicant', sa.Column('social_media', postgresql.JSON(astext_type=sa.Text()), server_default=sa.text("'{}'::json"), autoincrement=False, nullable=False))
+    op.drop_column('panel_applicant', 'social_media_info')

alembic/versions/6902e1cceec6_relationships_overhaul.py

@@ -6,4 +6,3 @@
 
 with Session() as session:
     initialize_db()
-    session = Session().session

docs/script_example.py

@@ -11,6 +11,7 @@ configobj==5.0.9
 email_validator==2.2.0
 fpdf2==2.8.3
 geopy==2.4.1
+TatSu==5.7.4
 ics==0.7.2
 Jinja2==3.1.6
 ortools==9.14.6206
@@ -31,6 +32,7 @@ rpctools @ git+https://github.com/appliedsec/rpctools.git@4e4108c3b7b4b6c482e515
 sentry-sdk==2.32.0
 signnow_python_sdk==2.0.1
 SQLAlchemy==2.0.46
+sqlmodel==0.0.37
 stripe==9.1.0
 tatsu==5.7.4
 twilio==9.6.5

requirements.txt

@@ -12,7 +12,7 @@
 
 @pytest.fixture
 def session(request):
-    session = Session().session
+    session = Session()
     request.addfinalizer(session.close)
     check_ranges(session)
     for badge_type, badge_name in [(c.STAFF_BADGE, 'Staff'), (c.CONTRACTOR_BADGE, 'Contractor')]:

tests/uber/models/test_badge_funcs.py

@@ -44,7 +44,7 @@ def test_under_limit_no_price_bump(self):
 
     def test_over_limit_price_bump_before_event(self, monkeypatch):
         monkeypatch.setattr(c, 'EPOCH', localized_now() + timedelta(days=1))
-        session = Session().session
+        session = Session()
         assert c.BADGES_SOLD == 0
 
         with request_cached_context():
@@ -57,7 +57,7 @@ def test_over_limit_price_bump_before_event(self, monkeypatch):
     def test_over_limit_price_bump_during_event(self, monkeypatch):
         monkeypatch.setattr(c, 'EPOCH', localized_now() - timedelta(days=1))
 
-        session = Session().session
+        session = Session()
         assert c.BADGES_SOLD == 0
 
         with request_cached_context():
@@ -69,7 +69,7 @@ def test_over_limit_price_bump_during_event(self, monkeypatch):
 
     def test_refunded_badge_price_bump_before_event(self, monkeypatch):
         monkeypatch.setattr(c, 'EPOCH', localized_now() + timedelta(days=1))
-        session = Session().session
+        session = Session()
         assert c.BADGES_SOLD == 0
 
         with request_cached_context():
@@ -81,7 +81,7 @@ def test_refunded_badge_price_bump_before_event(self, monkeypatch):
 
     def test_refunded_badge_price_bump_during_event(self, monkeypatch):
         monkeypatch.setattr(c, 'EPOCH', localized_now() - timedelta(days=1))
-        session = Session().session
+        session = Session()
         assert c.BADGES_SOLD == 0
 
         with request_cached_context():
@@ -92,7 +92,7 @@ def test_refunded_badge_price_bump_during_event(self, monkeypatch):
         assert 40 == c.get_attendee_price()
 
     def test_invalid_badge_no_price_bump(self):
-        session = Session().session
+        session = Session()
         assert c.BADGES_SOLD == 0
 
         with request_cached_context():
@@ -103,7 +103,7 @@ def test_invalid_badge_no_price_bump(self):
         assert 40 == c.get_attendee_price()
 
     def test_free_badge_no_price_bump(self):
-        session = Session().session
+        session = Session()
         assert c.BADGES_SOLD == 0
 
         with request_cached_context():
@@ -249,31 +249,31 @@ def test_dealer_reg_soft_closed_after_deadline(self, monkeypatch):
         assert c.DEALER_REG_SOFT_CLOSED
 
     def test_dealer_app(self):
-        session = Session().session
+        session = Session()
         with request_cached_context():
             session.add(Group(tables=1, cost=10, status=c.UNAPPROVED))
             session.commit()
 
         assert c.DEALER_APPS == 1
 
     def test_waitlisted_dealer_not_app(self):
-        session = Session().session
+        session = Session()
         with request_cached_context():
             session.add(Group(tables=1, cost=10, status=c.WAITLISTED))
             session.commit()
 
         assert c.DEALER_APPS == 0
 
     def test_free_dealer_no_app(self):
-        session = Session().session
+        session = Session()
         with request_cached_context():
             session.add(Group(tables=1, cost=0, auto_recalc=False, status=c.UNAPPROVED))
             session.commit()
 
         assert c.DEALER_APPS == 0
 
     def test_not_a_dealer_no_app(self):
-        session = Session().session
+        session = Session()
         with request_cached_context():
             session.add(Group(tables=0, cost=10, status=c.UNAPPROVED))
             session.commit()

tests/uber/models/test_config.py

@@ -11,7 +11,7 @@
 
 @pytest.fixture
 def session(request, monkeypatch):
-    session = Session().session
+    session = Session()
     request.addfinalizer(session.close)
     monkeypatch.setattr(session, 'add', Mock())
     monkeypatch.setattr(session, 'delete', Mock())

tests/uber/models/test_group.py

@@ -31,7 +31,7 @@ def test_total_hours(monkeypatch):
 
 @pytest.fixture
 def session(request):
-    session = Session().session
+    session = Session()
     for num in ['One', 'Two', 'Three', 'Four', 'Five', 'Six']:
         setattr(session, 'job_' + num.lower(), session.job(name='Job ' + num))
     for num in ['One', 'Two', 'Three', 'Four', 'Five']: