merge: upstream/dev with migration renumbering

surfsense_backend/alembic/versions/79_add_composio_connector_enums.py

@@ -0,0 +1,95 @@
+"""Add Composio connector types to SearchSourceConnectorType and DocumentType enums
+
+Revision ID: 79
+Revises: 78
+
+This migration adds the Composio connector enum values to both:
+- searchsourceconnectortype (for connector type tracking)
+- documenttype (for document type tracking)
+
+Composio is a managed OAuth integration service that allows connecting
+to various third-party services (Google Drive, Gmail, Calendar, etc.)
+without requiring separate OAuth app verification.
+
+This migration adds three specific connector types:
+- COMPOSIO_GOOGLE_DRIVE_CONNECTOR
+- COMPOSIO_GMAIL_CONNECTOR
+- COMPOSIO_GOOGLE_CALENDAR_CONNECTOR
+"""
+
+from collections.abc import Sequence
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "79"
+down_revision: str | None = "78"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+# Define the ENUM type names and the new values
+CONNECTOR_ENUM = "searchsourceconnectortype"
+CONNECTOR_NEW_VALUES = [
+    "COMPOSIO_GOOGLE_DRIVE_CONNECTOR",
+    "COMPOSIO_GMAIL_CONNECTOR",
+    "COMPOSIO_GOOGLE_CALENDAR_CONNECTOR",
+]
+DOCUMENT_ENUM = "documenttype"
+DOCUMENT_NEW_VALUES = [
+    "COMPOSIO_GOOGLE_DRIVE_CONNECTOR",
+    "COMPOSIO_GMAIL_CONNECTOR",
+    "COMPOSIO_GOOGLE_CALENDAR_CONNECTOR",
+]
+
+
+def upgrade() -> None:
+    """Upgrade schema - add Composio connector types to connector and document enums safely."""
+    # Add each Composio connector type to searchsourceconnectortype only if not exists
+    for value in CONNECTOR_NEW_VALUES:
+        op.execute(
+            f"""
+            DO $$
+            BEGIN
+                IF NOT EXISTS (
+                    SELECT 1 FROM pg_enum e
+                    JOIN pg_type t ON e.enumtypid = t.oid
+                    WHERE t.typname = '{CONNECTOR_ENUM}' AND e.enumlabel = '{value}'
+                ) THEN
+                    ALTER TYPE {CONNECTOR_ENUM} ADD VALUE '{value}';
+                END IF;
+            END$$;
+        """
+        )
+
+    # Add each Composio connector type to documenttype only if not exists
+    for value in DOCUMENT_NEW_VALUES:
+        op.execute(
+            f"""
+            DO $$
+            BEGIN
+                IF NOT EXISTS (
+                    SELECT 1 FROM pg_enum e
+                    JOIN pg_type t ON e.enumtypid = t.oid
+                    WHERE t.typname = '{DOCUMENT_ENUM}' AND e.enumlabel = '{value}'
+                ) THEN
+                    ALTER TYPE {DOCUMENT_ENUM} ADD VALUE '{value}';
+                END IF;
+            END$$;
+        """
+        )
+
+
+def downgrade() -> None:
+    """Downgrade schema - remove Composio connector types from connector and document enums.
+
+    Note: PostgreSQL does not support removing enum values directly.
+    To properly downgrade, you would need to:
+    1. Delete any rows using the Composio connector type values
+    2. Create new enums without the Composio connector types
+    3. Alter the columns to use the new enums
+    4. Drop the old enums
+
+    This is left as a no-op since removing enum values is complex
+    and typically not needed in practice.
+    """
+    pass

surfsense_backend/alembic/versions/80_add_user_incentive_tasks_table.py

@@ -0,0 +1,97 @@
+"""Add user incentive tasks table for earning free pages
+
+Revision ID: 80
+Revises: 79
+
+Changes:
+1. Create incentive_task_type enum with GITHUB_STAR value
+2. Create user_incentive_tasks table to track completed tasks
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "80"
+down_revision: str | None = "79"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    """Create incentive tasks infrastructure."""
+
+    # Check if enum already exists (handles partial migration recovery)
+    conn = op.get_bind()
+    result = conn.execute(
+        sa.text("SELECT 1 FROM pg_type WHERE typname = 'incentivetasktype'")
+    )
+    enum_exists = result.fetchone() is not None
+
+    # Create the enum type only if it doesn't exist
+    if not enum_exists:
+        incentive_task_type_enum = postgresql.ENUM(
+            "GITHUB_STAR",
+            name="incentivetasktype",
+            create_type=False,
+        )
+        incentive_task_type_enum.create(op.get_bind(), checkfirst=True)
+
+    # Check if table already exists (handles partial migration recovery)
+    result = conn.execute(
+        sa.text(
+            "SELECT 1 FROM information_schema.tables WHERE table_name = 'user_incentive_tasks'"
+        )
+    )
+    table_exists = result.fetchone() is not None
+
+    if not table_exists:
+        # Create the user_incentive_tasks table
+        op.create_table(
+            "user_incentive_tasks",
+            sa.Column("id", sa.Integer(), primary_key=True, index=True),
+            sa.Column(
+                "user_id",
+                sa.UUID(as_uuid=True),
+                sa.ForeignKey("user.id", ondelete="CASCADE"),
+                nullable=False,
+                index=True,
+            ),
+            sa.Column(
+                "task_type",
+                postgresql.ENUM(
+                    "GITHUB_STAR", name="incentivetasktype", create_type=False
+                ),
+                nullable=False,
+                index=True,
+            ),
+            sa.Column("pages_awarded", sa.Integer(), nullable=False),
+            sa.Column(
+                "completed_at",
+                sa.TIMESTAMP(timezone=True),
+                nullable=False,
+                server_default=sa.func.now(),
+            ),
+            sa.Column(
+                "created_at",
+                sa.TIMESTAMP(timezone=True),
+                nullable=False,
+                server_default=sa.func.now(),
+                index=True,
+            ),
+            sa.UniqueConstraint("user_id", "task_type", name="uq_user_incentive_task"),
+        )
+
+
+def downgrade() -> None:
+    """Remove incentive tasks infrastructure."""
+
+    # Drop the table
+    op.drop_table("user_incentive_tasks")
+
+    # Drop the enum type
+    postgresql.ENUM(name="incentivetasktype").drop(op.get_bind(), checkfirst=True)

surfsense_backend/alembic/versions/81_add_public_share_to_chat_threads.py

@@ -1,7 +1,7 @@
 """Add public sharing columns to new_chat_threads
 
-Revision ID: 79
-Revises: 78
+Revision ID: 81
+Revises: 80
 Create Date: 2026-01-23
 
 Adds public_share_token and public_share_enabled columns to enable
@@ -13,8 +13,8 @@ from collections.abc import Sequence
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = "79"
-down_revision: str | None = "78"
+revision: str = "81"
+down_revision: str | None = "80"
 branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None
 

surfsense_backend/alembic/versions/82_add_thread_id_to_podcasts.py

@@ -1,7 +1,7 @@
 """Add thread_id to podcasts
 
-Revision ID: 80
-Revises: 79
+Revision ID: 82
+Revises: 81
 Create Date: 2026-01-23
 
 """
@@ -10,8 +10,8 @@ from collections.abc import Sequence
 
 from alembic import op
 
-revision: str = "80"
-down_revision: str | None = "79"
+revision: str = "82"
+down_revision: str | None = "81"
 branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None