copilot-swe-agent[bot]
e518bce922
Resolve all merge conflicts between our automation feature branch and current main (v0.163.0, 920 commits ahead). Conflicts resolved: - app/api/__init__.py: add automation_router alongside main's new routers (classification_rules, qr_auth, sessions, system_reset) - app/config.py: add main's new settings (dropbox_use_global_credentials, factory_reset_on_startup, enable_factory_reset) - app/models.py: add main's new models (ClassificationRuleModel, UserSession, QRLoginChallenge, SharePoint integration type) - app/utils/settings_service.py: merge automation_hooks_enabled with main's new metadata entries - docs/API.md: merge automation API docs with main's classification rules docs - docs/ConfigurationGuide.md: add factory reset settings - tests/conftest.py: import both AutomationHook and new main models Migration renumbered: - 037_add_automation_hooks → 040_add_automation_hooks - down_revision: 039_add_classification_rules (was 036_add_document_translation_fields) - Chain: 036 → 037 → 038 → 039 → 040 (automation hooks) For all non-automation files with conflicts, main's version was taken since our branch did not modify those files (conflicts were from a stale prior merge). Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com> Agent-Logs-Url: https://github.com/christianlouis/DocuElevate/sessions/cb62f012-3b69-4415-835e-3857ce3e9f45
44 lines
1.4 KiB
Python
44 lines
1.4 KiB
Python
"""Add expires_at column to api_tokens table.
|
|
|
|
Allows API tokens to be issued with an optional lifetime. If ``expires_at``
|
|
is set, the token is automatically rejected after that timestamp.
|
|
|
|
Revision ID: 038_add_api_token_expires_at
|
|
Revises: 037_add_user_sessions_and_qr_challenges
|
|
Create Date: 2026-03-18
|
|
"""
|
|
|
|
from typing import Union
|
|
|
|
import sqlalchemy as sa
|
|
from alembic import op
|
|
|
|
revision: str = "038_add_api_token_expires_at"
|
|
down_revision: Union[str, None] = "037_add_user_sessions_and_qr_challenges"
|
|
depends_on: Union[str, None] = None
|
|
|
|
|
|
def upgrade() -> None:
|
|
"""Add expires_at column to api_tokens (idempotent)."""
|
|
conn = op.get_bind()
|
|
inspector = sa.inspect(conn)
|
|
if "api_tokens" not in inspector.get_table_names():
|
|
return
|
|
existing_columns = {col["name"] for col in inspector.get_columns("api_tokens")}
|
|
if "expires_at" not in existing_columns:
|
|
op.add_column(
|
|
"api_tokens",
|
|
sa.Column("expires_at", sa.DateTime(timezone=True), nullable=True),
|
|
)
|
|
|
|
|
|
def downgrade() -> None:
|
|
"""Remove expires_at column from api_tokens."""
|
|
conn = op.get_bind()
|
|
inspector = sa.inspect(conn)
|
|
if "api_tokens" not in inspector.get_table_names():
|
|
return
|
|
existing_columns = {col["name"] for col in inspector.get_columns("api_tokens")}
|
|
if "expires_at" in existing_columns:
|
|
op.drop_column("api_tokens", "expires_at")
|