diff --git a/surfsense_backend/alembic/versions/10_update_chattype_enum_to_qna_report_structure.py b/surfsense_backend/alembic/versions/10_update_chattype_enum_to_qna_report_structure.py index 29a00e6c1..543481fd6 100644 --- a/surfsense_backend/alembic/versions/10_update_chattype_enum_to_qna_report_structure.py +++ b/surfsense_backend/alembic/versions/10_update_chattype_enum_to_qna_report_structure.py @@ -4,17 +4,15 @@ Revision ID: 10 Revises: 9 """ -from typing import Sequence, Union - -import sqlalchemy as sa +from collections.abc import Sequence from alembic import op # revision identifiers, used by Alembic. revision: str = "10" -down_revision: Union[str, None] = "9" -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = "9" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None # Define the ENUM type name CHAT_TYPE_ENUM = "chattype" diff --git a/surfsense_backend/alembic/versions/11_add_llm_config_table_and_relationships.py b/surfsense_backend/alembic/versions/11_add_llm_config_table_and_relationships.py index 028d14768..4740cc277 100644 --- a/surfsense_backend/alembic/versions/11_add_llm_config_table_and_relationships.py +++ b/surfsense_backend/alembic/versions/11_add_llm_config_table_and_relationships.py @@ -4,18 +4,17 @@ Revision ID: 11 Revises: 10 """ -from typing import Sequence, Union +from collections.abc import Sequence import sqlalchemy as sa -from sqlalchemy.dialects.postgresql import JSON, UUID from alembic import op # revision identifiers, used by Alembic. revision: str = "11" -down_revision: Union[str, None] = "10" -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = "10" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None def upgrade() -> None: diff --git a/surfsense_backend/alembic/versions/12_add_logs_table.py b/surfsense_backend/alembic/versions/12_add_logs_table.py index 5033d2ad7..e3dacfc5e 100644 --- a/surfsense_backend/alembic/versions/12_add_logs_table.py +++ b/surfsense_backend/alembic/versions/12_add_logs_table.py @@ -4,18 +4,15 @@ Revision ID: 12 Revises: 11 """ -from typing import Sequence, Union - -import sqlalchemy as sa -from sqlalchemy.dialects.postgresql import JSON +from collections.abc import Sequence from alembic import op # revision identifiers, used by Alembic. revision: str = "12" -down_revision: Union[str, None] = "11" -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = "11" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None def upgrade() -> None: diff --git a/surfsense_backend/alembic/versions/1_add_github_connector_enum.py b/surfsense_backend/alembic/versions/1_add_github_connector_enum.py index 2224ab67a..e54418c53 100644 --- a/surfsense_backend/alembic/versions/1_add_github_connector_enum.py +++ b/surfsense_backend/alembic/versions/1_add_github_connector_enum.py @@ -1,12 +1,11 @@ """Add GITHUB_CONNECTOR to SearchSourceConnectorType enum Revision ID: 1 -Revises: +Revises: """ -from typing import Sequence, Union -import sqlalchemy as sa +from collections.abc import Sequence from alembic import op @@ -15,19 +14,19 @@ from alembic import op # revision identifiers, used by Alembic. -revision: str = '1' -down_revision: Union[str, None] = None -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +revision: str = "1" +down_revision: str | None = None +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None def upgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### - + # Manually add the command to add the enum value # Note: It's generally better to let autogenerate handle this, but we're bypassing it op.execute("ALTER TYPE searchsourceconnectortype ADD VALUE 'GITHUB_CONNECTOR'") - + # Pass for the rest, as autogenerate didn't run to add other schema details pass # ### end Alembic commands ### @@ -35,20 +34,23 @@ def upgrade() -> None: def downgrade() -> None: # ### commands auto generated by Alembic - please adjust! ### - + # Downgrading removal of an enum value is complex and potentially dangerous # if the value is in use. Often omitted or requires manual SQL based on context. - # For now, we'll just pass. If you needed to reverse this, you'd likely + # For now, we'll just pass. If you needed to reverse this, you'd likely # have to manually check if 'GITHUB_CONNECTOR' is used in the table # and then potentially recreate the type without it. - op.execute("ALTER TYPE searchsourceconnectortype RENAME TO searchsourceconnectortype_old") - op.execute("CREATE TYPE searchsourceconnectortype AS ENUM('SERPER_API', 'TAVILY_API', 'SLACK_CONNECTOR', 'NOTION_CONNECTOR')") - op.execute(( + op.execute( + "ALTER TYPE searchsourceconnectortype RENAME TO searchsourceconnectortype_old" + ) + op.execute( + "CREATE TYPE searchsourceconnectortype AS ENUM('SERPER_API', 'TAVILY_API', 'SLACK_CONNECTOR', 'NOTION_CONNECTOR')" + ) + op.execute( "ALTER TABLE search_source_connectors ALTER COLUMN connector_type TYPE searchsourceconnectortype USING " "connector_type::text::searchsourceconnectortype" - )) + ) op.execute("DROP TYPE searchsourceconnectortype_old") - pass - # ### end Alembic commands ### + # ### end Alembic commands ### diff --git a/surfsense_backend/alembic/versions/2_add_linear_connector_enum.py b/surfsense_backend/alembic/versions/2_add_linear_connector_enum.py index dd1cccab8..91526120e 100644 --- a/surfsense_backend/alembic/versions/2_add_linear_connector_enum.py +++ b/surfsense_backend/alembic/versions/2_add_linear_connector_enum.py @@ -4,17 +4,15 @@ Revision ID: 2 Revises: e55302644c51 """ -from typing import Sequence, Union - -import sqlalchemy as sa +from collections.abc import Sequence from alembic import op # revision identifiers, used by Alembic. revision: str = '2' -down_revision: Union[str, None] = 'e55302644c51' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = 'e55302644c51' +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None def upgrade() -> None: @@ -34,10 +32,10 @@ def downgrade() -> None: # Downgrading removal of an enum value requires recreating the type op.execute("ALTER TYPE searchsourceconnectortype RENAME TO searchsourceconnectortype_old") op.execute("CREATE TYPE searchsourceconnectortype AS ENUM('SERPER_API', 'TAVILY_API', 'SLACK_CONNECTOR', 'NOTION_CONNECTOR', 'GITHUB_CONNECTOR')") - op.execute(( + op.execute( "ALTER TABLE search_source_connectors ALTER COLUMN connector_type TYPE searchsourceconnectortype USING " "connector_type::text::searchsourceconnectortype" - )) + ) op.execute("DROP TYPE searchsourceconnectortype_old") pass diff --git a/surfsense_backend/alembic/versions/3_add_linear_connector_to_documenttype_.py b/surfsense_backend/alembic/versions/3_add_linear_connector_to_documenttype_.py index 0a3c41e77..5b8e2bc2e 100644 --- a/surfsense_backend/alembic/versions/3_add_linear_connector_to_documenttype_.py +++ b/surfsense_backend/alembic/versions/3_add_linear_connector_to_documenttype_.py @@ -4,17 +4,15 @@ Revision ID: 3 Revises: 2 """ -from typing import Sequence, Union - -import sqlalchemy as sa +from collections.abc import Sequence from alembic import op # revision identifiers, used by Alembic. revision: str = '3' -down_revision: Union[str, None] = '2' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = '2' +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None # Define the ENUM type name and the new value ENUM_NAME = 'documenttype' # Make sure this matches the name in your DB (usually lowercase class name) diff --git a/surfsense_backend/alembic/versions/4_add_linkup_api_enum.py b/surfsense_backend/alembic/versions/4_add_linkup_api_enum.py index 35562a84d..c1d8cb0f3 100644 --- a/surfsense_backend/alembic/versions/4_add_linkup_api_enum.py +++ b/surfsense_backend/alembic/versions/4_add_linkup_api_enum.py @@ -4,17 +4,15 @@ Revision ID: 4 Revises: 3 """ -from typing import Sequence, Union - -import sqlalchemy as sa +from collections.abc import Sequence from alembic import op # revision identifiers, used by Alembic. revision: str = '4' -down_revision: Union[str, None] = '3' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = '3' +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None def upgrade() -> None: @@ -34,10 +32,10 @@ def downgrade() -> None: # Downgrading removal of an enum value requires recreating the type op.execute("ALTER TYPE searchsourceconnectortype RENAME TO searchsourceconnectortype_old") op.execute("CREATE TYPE searchsourceconnectortype AS ENUM('SERPER_API', 'TAVILY_API', 'SLACK_CONNECTOR', 'NOTION_CONNECTOR', 'GITHUB_CONNECTOR', 'LINEAR_CONNECTOR')") - op.execute(( + op.execute( "ALTER TABLE search_source_connectors ALTER COLUMN connector_type TYPE searchsourceconnectortype USING " "connector_type::text::searchsourceconnectortype" - )) + ) op.execute("DROP TYPE searchsourceconnectortype_old") pass diff --git a/surfsense_backend/alembic/versions/5_remove_title_char_limit.py b/surfsense_backend/alembic/versions/5_remove_title_char_limit.py index db36965a2..4163c4605 100644 --- a/surfsense_backend/alembic/versions/5_remove_title_char_limit.py +++ b/surfsense_backend/alembic/versions/5_remove_title_char_limit.py @@ -4,7 +4,7 @@ Revision ID: 5 Revises: 4 """ -from typing import Sequence, Union +from collections.abc import Sequence import sqlalchemy as sa @@ -12,9 +12,9 @@ from alembic import op # revision identifiers, used by Alembic. revision: str = '5' -down_revision: Union[str, None] = '4' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = '4' +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None def upgrade() -> None: diff --git a/surfsense_backend/alembic/versions/6_change_podcast_content_to_transcript.py b/surfsense_backend/alembic/versions/6_change_podcast_content_to_transcript.py index 411761f48..8799ae7e8 100644 --- a/surfsense_backend/alembic/versions/6_change_podcast_content_to_transcript.py +++ b/surfsense_backend/alembic/versions/6_change_podcast_content_to_transcript.py @@ -4,7 +4,7 @@ Revision ID: 6 Revises: 5 """ -from typing import Sequence, Union +from collections.abc import Sequence import sqlalchemy as sa from sqlalchemy.dialects.postgresql import JSON @@ -13,9 +13,9 @@ from alembic import op # revision identifiers, used by Alembic. revision: str = '6' -down_revision: Union[str, None] = '5' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = '5' +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None def upgrade() -> None: diff --git a/surfsense_backend/alembic/versions/7_remove_is_generated_column.py b/surfsense_backend/alembic/versions/7_remove_is_generated_column.py index 8acc22412..e721e219a 100644 --- a/surfsense_backend/alembic/versions/7_remove_is_generated_column.py +++ b/surfsense_backend/alembic/versions/7_remove_is_generated_column.py @@ -4,7 +4,7 @@ Revision ID: 7 Revises: 6 """ -from typing import Sequence, Union +from collections.abc import Sequence import sqlalchemy as sa @@ -12,9 +12,9 @@ from alembic import op # revision identifiers, used by Alembic. revision: str = '7' -down_revision: Union[str, None] = '6' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = '6' +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None def upgrade() -> None: diff --git a/surfsense_backend/alembic/versions/8_add_content_hash_to_documents.py b/surfsense_backend/alembic/versions/8_add_content_hash_to_documents.py index 908b9568b..f9cf88ab5 100644 --- a/surfsense_backend/alembic/versions/8_add_content_hash_to_documents.py +++ b/surfsense_backend/alembic/versions/8_add_content_hash_to_documents.py @@ -3,7 +3,7 @@ Revision ID: 8 Revises: 7 """ -from typing import Sequence, Union +from collections.abc import Sequence import sqlalchemy as sa @@ -11,9 +11,9 @@ from alembic import op # revision identifiers, used by Alembic. revision: str = '8' -down_revision: Union[str, None] = '7' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = '7' +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None def upgrade() -> None: diff --git a/surfsense_backend/alembic/versions/9_add_discord_connector_enum_and_documenttype.py b/surfsense_backend/alembic/versions/9_add_discord_connector_enum_and_documenttype.py index 45e7f813e..f4ee8378c 100644 --- a/surfsense_backend/alembic/versions/9_add_discord_connector_enum_and_documenttype.py +++ b/surfsense_backend/alembic/versions/9_add_discord_connector_enum_and_documenttype.py @@ -4,17 +4,15 @@ Revision ID: 9 Revises: 8 """ -from typing import Sequence, Union - -import sqlalchemy as sa +from collections.abc import Sequence from alembic import op # revision identifiers, used by Alembic. revision: str = "9" -down_revision: Union[str, None] = "8" -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = "8" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None # Define the ENUM type name and the new value CONNECTOR_ENUM = "searchsourceconnectortype" diff --git a/surfsense_backend/alembic/versions/e55302644c51_add_github_connector_to_documenttype_.py b/surfsense_backend/alembic/versions/e55302644c51_add_github_connector_to_documenttype_.py index 1e00936e8..d691ac0db 100644 --- a/surfsense_backend/alembic/versions/e55302644c51_add_github_connector_to_documenttype_.py +++ b/surfsense_backend/alembic/versions/e55302644c51_add_github_connector_to_documenttype_.py @@ -4,17 +4,15 @@ Revision ID: e55302644c51 Revises: 1 """ -from typing import Sequence, Union - -import sqlalchemy as sa +from collections.abc import Sequence from alembic import op # revision identifiers, used by Alembic. revision: str = 'e55302644c51' -down_revision: Union[str, None] = '1' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None +down_revision: str | None = '1' +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None # Define the ENUM type name and the new value ENUM_NAME = 'documenttype' # Make sure this matches the name in your DB (usually lowercase class name) diff --git a/surfsense_backend/pyproject.toml b/surfsense_backend/pyproject.toml index 21e86da4f..9ab56b771 100644 --- a/surfsense_backend/pyproject.toml +++ b/surfsense_backend/pyproject.toml @@ -71,7 +71,6 @@ exclude = [ "node_modules", "site-packages", "venv", - "alembic/versions", ] line-length = 88