flask-postgresql-audit 1.0.8__tar.gz → 1.1.0__tar.gz

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/.gitignore

@@ -63,3 +63,6 @@ uv.lock
 
 # VSCode
 .vscode
+
+# Agents
+.agents

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flask-postgresql_audit
-Version: 1.0.8
+Version: 1.1.0
 Summary: Versioning and auditing extension for PostgreSQL and SQLAlchemy.
 Project-URL: Homepage, https://github.com/higamigu/flask-postgresql-audit
 Author-email: Higamigu <higamigu@gmail.com>, Konsta Vesterinen <konsta@fastmonkeys.com>
@@ -19,7 +19,7 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.11
 Requires-Dist: alembic-utils>=0.8.8
-Requires-Dist: alembic>=1.17.0
+Requires-Dist: alembic>=1.18.0
 Requires-Dist: flask-sqlalchemy>=3.1.1
 Requires-Dist: flask>=3.1.2
 Requires-Dist: psycopg2>=2.9.11

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/__init__.py

@@ -1,4 +1,4 @@
 # ruff: noqa: F401
 from .core import Audit, PostgreSQLAudit
 
-__version__ = "1.0.8"
+__version__ = "1.1.0"

flask_postgresql_audit-1.1.0/flask_postgresql_audit/alembic/__init__.py

@@ -0,0 +1,7 @@
+# ruff: noqa: F401
+from .setup import (
+    chain_revision_directives,
+    register_triggers,
+    reorder_migration_ops,
+    setup_db,
+)

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/alembic/schema.py

@@ -32,16 +32,16 @@ class SchemaDrop(SchemaOperation):
 
 @Operations.implementation_for(SchemaCreate)
 def create_schema(operations: Operations, operation: SchemaCreate):
-    stmt = """
-        CREATE SCHEMA {name};
-        REVOKE ALL ON SCHEMA {name} FROM public;
-    """.format(name=operation.schema_name)
+    stmt = f"""
+        CREATE SCHEMA {operation.schema_name};
+        REVOKE ALL ON SCHEMA {operation.schema_name} FROM public;
+    """
     operations.execute(text(stmt))
 
 
 @Operations.implementation_for(SchemaDrop)
 def drop_schema(operations: Operations, operation: SchemaDrop):
-    stmt = "DROP SCHEMA {name} CASCADE;".format(name=operation.schema_name)
+    stmt = f"DROP SCHEMA {operation.schema_name} CASCADE;"
     operations.execute(text(stmt))
 
 

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/alembic/setup.py

@@ -1,9 +1,11 @@
 import logging
-from typing import TYPE_CHECKING, Optional, Set, Union
+from typing import TYPE_CHECKING
 
 from alembic.autogenerate import comparators
 from alembic.autogenerate.api import AutogenContext
 from alembic.operations import ops
+from alembic.operations.ops import MigrationScript
+from alembic.util import DispatchPriority
 from alembic_utils.replaceable_entity import register_entities, registry
 from alembic_utils.reversible_op import CreateOp
 from sqlalchemy import Connection, text
@@ -26,38 +28,73 @@ def setup_db(audit: "PostgreSQLAudit"):
     register_triggers(audit)
     register_entities(audit.pg_audit_entities)
 
+    @comparators.dispatch_for("schema", priority=DispatchPriority.FIRST)
     def compare_audit_schema(
         autogen_context: AutogenContext,
         upgrade_ops: ops.UpgradeOps,
-        schemas: Union[Set[None], Set[Optional[str]]],
+        schemas: set[None] | set[str | None],
     ) -> None:
-        idx = 0
         if connection := autogen_context.connection:
             check_schema = """
                 SELECT TRUE FROM information_schema.schemata
                 WHERE schema_name = '{name}'
             """.format(name=audit.context["schema_name"])
             if not connection.scalar(text(check_schema)):
-                upgrade_ops.ops.insert(idx, SchemaCreate(audit.context["schema_name"]))
-                idx += 1
+                upgrade_ops.ops.append(SchemaCreate(audit.context["schema_name"]))
 
             for ent in audit.pg_audit_entities:
                 if op := get_blind_migration_op(ent, connection):
-                    registry._entities.pop(ent.identity)
-                    if ent.signature == "btree_gist":
-                        upgrade_ops.ops.insert(idx, op)
-                    else:
-                        upgrade_ops.ops.append(op)
-
-    for idx, comp_fn in enumerate(comparators._registry.get(("schema", "default"), [])):
-        # Insert pg_audit comparators before alembic_utils comparators
-        # to override alembic_utils migration caveats when entity
-        # depend on new object in same migration
-        if comp_fn.__module__ == "alembic_utils.replaceable_entity":
-            comparators._registry.setdefault(("schema", "default"), []).insert(
-                idx, compare_audit_schema
-            )
-            break
+                    registry._entities.pop(ent.identity, None)
+                    upgrade_ops.ops.append(op)
+
+
+def reorder_migration_ops(context, revision, directives: list[MigrationScript]):
+    """
+    Alembic directive listener that reorders upgrade operations into correct
+    dependency order:
+    1. Schema creation & btree_gist extension
+    2. Tables, indexes, foreign keys, etc.
+    3. Triggers & Replaceable audit entities
+    """
+    for directive in directives:
+        if not hasattr(directive, "upgrade_ops") or directive.upgrade_ops is None:
+            continue
+
+        upgrade_ops = directive.upgrade_ops.ops
+
+        schema_ops = []
+        extension_ops = []
+        trigger_ops = []
+        other_ops = []
+
+        for op in upgrade_ops:
+            if isinstance(op, SchemaCreate):
+                schema_ops.append(op)
+            elif (
+                isinstance(op, CreateOp)
+                and getattr(op.target, "signature", None) == "btree_gist"
+            ):
+                extension_ops.append(op)
+            elif isinstance(op, CreateOp):
+                trigger_ops.append(op)
+            else:
+                other_ops.append(op)
+
+        # Reassemble the ops sequence in strict dependency order
+        directive.upgrade_ops.ops = schema_ops + extension_ops + other_ops + trigger_ops
+
+
+def chain_revision_directives(*callbacks):
+    """
+    Chain multiple process_revision_directives callbacks together into a single
+    listener for Alembic's context.configure().
+    """
+
+    def wrapper(context, revision, directives: list[MigrationScript]):
+        for cb in callbacks:
+            cb(context, revision, directives)
+
+    return wrapper
 
 
 def register_core_entities(audit: "PostgreSQLAudit"):
@@ -86,7 +123,7 @@ def register_triggers(audit: "PostgreSQLAudit"):
 
 def get_blind_migration_op(entity: "ReplaceableEntity", connection: Connection):
     session = Session(bind=connection)
-    db_ents: list["ReplaceableEntity"] = entity.from_database(session, entity.schema)
+    db_ents: list[ReplaceableEntity] = entity.from_database(session, entity.schema)
 
     for db_ent in db_ents:
         if entity.identity == db_ent.identity:

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/base.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Any
 
 from sqlalchemy import BigInteger, Text, func, text
 from sqlalchemy.dialects.postgresql import INET, JSONB
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, declared_attr, mapped_column
 
 from .typing import OMap
 
@@ -27,14 +27,14 @@ class ActivityBase:
     changed_data: OMap[dict] = mapped_column(JSONB, default={}, server_default="{}")
 
     def __repr__(self):
-        return "<{cls} table_name={table_name!r} id={id!r}>".format(
-            cls=self.__class__.__name__, table_name=self.table_name, id=self.id
+        return (
+            f"<{self.__class__.__name__} table_name={self.table_name!r} id={self.id!r}>"
         )
 
 
 class TransactionBase:
     if TYPE_CHECKING:
-        actor_id: OMap[Any]
+        actor_id: declared_attr[Any]
 
     id: Mapped[int] = mapped_column(BigInteger, primary_key=True)
     native_transaction_id: OMap[int] = mapped_column(BigInteger)
@@ -47,6 +47,6 @@ class TransactionBase:
         return func.tsrange(cls.issued_at - interval, cls.issued_at)
 
     def __repr__(self):
-        return "<{cls} id={id!r} issued_at={issued_at!r}>".format(
-            cls=self.__class__.__name__, id=self.id, issued_at=self.issued_at
+        return (
+            f"<{self.__class__.__name__} id={self.id!r} issued_at={self.issued_at!r}>"
         )

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/core.py

@@ -4,11 +4,10 @@ from contextlib import contextmanager
 from itertools import groupby
 
 import sqlalchemy as sa
-import sqlalchemy.event as event
-import sqlalchemy.orm as orm
 from alembic_utils.replaceable_entity import ReplaceableEntity
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
+from sqlalchemy import event, orm
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.util import OrderedSet
 
@@ -26,7 +25,7 @@ class ImproperlyConfigured(Exception):
 
 
 class Audit:
-    __audit_args__: dict = {}
+    __audit_args__: t.ClassVar[dict] = {}
     __audit_schema__: str = ""
 
     __audit_relid__: orm.Mapped[int]
@@ -72,7 +71,7 @@ def get_modified_columns(obj: orm.DeclarativeBase):
     modified: set[sa.ColumnElement[t.Any]] = set()
     mapper = sa.inspect(obj.__class__)
     for key, attr in sa.inspect(obj).attrs.items():
-        if key in mapper.synonyms.keys():
+        if key in mapper.synonyms:
             continue
         if not attr.history.has_changes():
             continue
@@ -148,10 +147,10 @@ class PostgreSQLAudit:
     def __init__(
         self,
         *,
-        actor_cls: t.Optional[str] = None,
+        actor_cls: str | None = None,
         actor_id_getter: t.Callable[[], t.Any] = _default_actor_id,
         client_address_getter: t.Callable[[], t.Any] = _default_client_addr,
-        schema_name: t.Optional[str] = None,
+        schema_name: str | None = None,
         **kw,
     ):
         self._actor_cls = actor_cls
@@ -164,7 +163,7 @@ class PostgreSQLAudit:
 
     @property
     def context(self):
-        ctx = dict(schema_name=self.schema_name or "public")
+        ctx = {"schema_name": self.schema_name or "public"}
         ctx["schema_prefix"] = f"{ctx['schema_name']}."
         ctx["revoke_cmd"] = f"REVOKE ALL ON {ctx['schema_prefix']}activity FROM public;"
         if "jsonb_subtract_verbose" in self.options:
@@ -262,7 +261,7 @@ class PostgreSQLAudit:
         self.pg_audit_enabled = True
         self.pg_audit_entities = OrderedSet()
 
-        self.Base: type["orm.DeclarativeBase"] = db.Model  # type: ignore
+        self.Base: type[orm.DeclarativeBase] = db.Model  # type: ignore
 
         self.Transaction = transaction_model_factory(
             self.Base,
@@ -300,7 +299,7 @@ class PostgreSQLAudit:
                 self.Activity.changed_data,
             )
             .select_from(self.Activity)
-            .join(self.Transaction)
+            .outerjoin(self.Transaction)
             .order_by(self.Activity.id.desc())
         )
 
@@ -309,7 +308,7 @@ class PostgreSQLAudit:
             stmt = stmt.filter(self.Activity.table_name == class_.__tablename__)
 
         else:
-            objects = list(obj) if isinstance(obj, t.Sequence) else list([obj])
+            objects = list(obj) if isinstance(obj, t.Sequence) else [obj]
             conditions = []
             for class_, objs in groupby(objects, key=lambda o: o.__class__):
                 conditions.append(

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/descriptors.py

@@ -13,7 +13,7 @@ class hybridmethod(t.Generic[_P, _R]):
     def __init__(
         self,
         inst_func: t.Callable[t.Concatenate[t.Any, _P], _R],
-        cls_func: t.Optional[t.Callable[t.Concatenate[t.Any, _P], _R]] = None,
+        cls_func: t.Callable[t.Concatenate[t.Any, _P], _R] | None = None,
     ):
         self.inst_func = inst_func
         if cls_func is not None:
@@ -22,7 +22,7 @@ class hybridmethod(t.Generic[_P, _R]):
             self.classmethod(inst_func)
 
     def __get__(
-        self, instance: t.Optional[object], owner: t.Type[object]
+        self, instance: object | None, owner: type[object]
     ) -> t.Callable[t.Concatenate[t.Any, _P], _R]:
         if instance is None:
             return self.cls_func.__get__(owner, owner)

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/extensions/alembic_utils/pg_aggregate.py

@@ -49,7 +49,7 @@ class PGAggregate(ReplaceableEntity):
         )
 
     def to_sql_statement_create_or_replace(self):
-        return self.to_sql_statement_create(replace=True)
+        yield self.to_sql_statement_create(replace=True)
 
     def to_sql_statement_drop(self, cascade=False):
         return sa.text(
@@ -58,7 +58,7 @@ class PGAggregate(ReplaceableEntity):
         )
 
     @classmethod
-    def from_database(cls, sess: Session, schema: str) -> "list[PGAggregate]":
+    def from_database(cls, sess: Session, schema: str = "%") -> "list[PGAggregate]":
         PG_GTE_11 = """
             and p.prokind = 'a'
         """

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/extensions/document_staging/listener.py

@@ -1,9 +1,8 @@
 import typing as t
-from datetime import datetime
+from datetime import UTC, datetime
 
-import sqlalchemy.event as event
-import sqlalchemy.orm as orm
 from flask_sqlalchemy.session import Session
+from sqlalchemy import event, orm
 
 from flask_postgresql_audit.core import _default_actor_id
 
@@ -18,18 +17,19 @@ def attach_listener(actor_id_getter: t.Callable[[], t.Any] = _default_actor_id):
     def __receive_before_flush__(
         session: Session,
         flush_context: orm.UOWTransaction,
-        instances: t.Optional[t.Sequence[_O]],
+        instances: t.Sequence[_O] | None,
     ):
         for obj in session.new:
-            if isinstance(obj, DocumentStaging):
-                if obj.docstatus == Docstatus.DRAFT or obj.docstatus is None:
-                    obj.created_by = actor_id_getter()
-                    obj.created_on = datetime.now()
+            if isinstance(obj, DocumentStaging) and (
+                obj.docstatus == Docstatus.DRAFT or obj.docstatus is None
+            ):
+                obj.created_by = actor_id_getter()
+                obj.created_on = datetime.now(UTC)
         for obj in session.dirty:
             if isinstance(obj, DocumentStaging):
                 if obj.docstatus == Docstatus.SUBMITTED:
                     obj.submitted_by = actor_id_getter()
-                    obj.submitted_on = datetime.now()
+                    obj.submitted_on = datetime.now(UTC)
                 if obj.docstatus == Docstatus.CANCELLED:
                     obj.cancelled_by = actor_id_getter()
-                    obj.cancelled_on = datetime.now()
+                    obj.cancelled_on = datetime.now(UTC)

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/extensions/document_staging/model.py

@@ -2,9 +2,8 @@ import typing as t
 from datetime import datetime
 
 import sqlalchemy as sa
-import sqlalchemy.event as event
-import sqlalchemy.orm as orm
 from flask_sqlalchemy.session import Session
+from sqlalchemy import event, orm
 from sqlalchemy.dialects.postgresql import ENUM as PGEnum
 
 from flask_postgresql_audit.typing import OMap

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/flask_postgresql_audit/models.py

@@ -28,7 +28,7 @@ def activity_model_factory(
 ):
     class PGAuditActivity(base_cls, activity_base):
         __tablename__ = "pga_activity"
-        __table_args__ = {"schema": schema_name}
+        __table_args__: t.ClassVar[dict[str, t.Any]] = {"schema": schema_name}
 
         transaction_id = mapped_column(sa.BigInteger, sa.ForeignKey(transaction_cls.id))
         transaction = relationship(transaction_cls, backref="activities")
@@ -44,7 +44,7 @@ def transaction_model_factory(
     **kwargs,
 ):
     if actor_cls:
-        actor_mapper: "Mapper[DeclarativeBase]" = sa.inspect(actor_cls)
+        actor_mapper: Mapper[DeclarativeBase] = sa.inspect(actor_cls)
         if len(actor_mapper.primary_key) != 1:
             raise PGAuditFactoryError(
                 "PGAudit does not support actor class"
@@ -59,7 +59,7 @@ def transaction_model_factory(
         @declared_attr
         def actor_id(cls) -> OMap[t.Any]:
             if actor_cls:
-                return mapped_column(actor_pk.type, ForeignKey(actor_pk))
+                return mapped_column(actor_pk.type, ForeignKey(actor_pk))  # type: ignore
             return mapped_column(sa.Text)
 
         if actor_cls:

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-    "alembic>=1.17.0",
+    "alembic>=1.18.0",
     "alembic-utils>=0.8.8",
     "flask>=3.1.2",
     "flask-sqlalchemy>=3.1.1",
@@ -38,9 +38,9 @@ Homepage = "https://github.com/higamigu/flask-postgresql-audit"
 [dependency-groups]
 dev = [
     "pytest>=8.4.2",
-    "ruff>=0.14.1",
+    "ruff>=0.16.1",
     "setuptools>=80.9.0",
-    "tox>=4.31.0"
+    "tox>=4.31.0",
 ]
 
 [tool.hatch.version]

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/tests/app.py

@@ -10,18 +10,21 @@ from flask_postgresql_audit import Audit, PostgreSQLAudit
 
 
 class DefaultConfig:
-    DB_USER = os.environ.get("POSTGRESQL_AUDIT_TEST_USER", "postgres")
-    DB_PASSWORD = os.environ.get("POSTGRESQL_AUDIT_TEST_PASSWORD", "")
-    DB_NAME = os.environ.get("POSTGRESQL_AUDIT_TEST_DB", "postgresql_audit_test")
+    DB_USER = os.environ.get("POSTGRES_USER", "postgres")
+    DB_PASSWORD = os.environ.get("POSTGRES_PASSWORD", "postgres")
+    DB_NAME = os.environ.get("POSTGRES_DB", "pg_audit_test")
+    DB_PORT = os.environ.get("POSTGRES_PORT", "5432")
 
     SQLALCHEMY_DATABASE_URI = (
-        f"postgresql://{DB_USER}:{DB_PASSWORD}@localhost/{DB_NAME}"
+        f"postgresql://{DB_USER}:{DB_PASSWORD}@localhost:{DB_PORT}/{DB_NAME}"
     )
     SQLALCHEMY_ECHO = False
 
+    PGA_SCHEMA_NAME = os.environ.get("SCHEMA_NAME", None)
+
 
 db = SQLAlchemy()
-audit = PostgreSQLAudit()
+audit = PostgreSQLAudit(schema_name=DefaultConfig.PGA_SCHEMA_NAME)
 
 
 class BaseModel(db.Model):

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/tests/conftest.py

@@ -10,18 +10,16 @@ ALEMBIC_CONFIG = REPO_ROOT / "tests/migrations"
 @pytest.fixture(scope="session")
 def test_client():
     test_client = app.test_client()
-    with app.app_context():
-        with alembic_migration(db, ALEMBIC_CONFIG):
-            yield test_client
+    with app.app_context(), alembic_migration(db, ALEMBIC_CONFIG):
+        yield test_client
 
 
 @pytest.fixture(autouse=True)
 def join_transaction_mode(test_client):
-    with db.engine.connect() as connection:
-        with test_session(connection) as session:
-            db.session = session
-            yield
-            db.session.close()
+    with db.engine.connect() as connection, test_session(connection) as session:
+        db.session = session
+        yield
+        db.session.close()
 
 
 @pytest.fixture

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/tests/migrations/env.py

@@ -4,6 +4,10 @@ from alembic import context
 from alembic.operations.ops import MigrationScript
 from sqlalchemy import engine_from_config, pool
 
+from flask_postgresql_audit.alembic import (
+    chain_revision_directives,
+    reorder_migration_ops,
+)
 from tests.app import db
 
 # this is the Alembic Config object, which provides
@@ -30,10 +34,9 @@ target_metadata = db.metadata
 def process_revision_directives(context, revision, directives: list[MigrationScript]):
     if getattr(config.cmd_opts, "autogenerate", False):
         script = directives[0]
-        if upgrade_ops := script.upgrade_ops:
-            if upgrade_ops.is_empty():
-                directives[:] = []
-                print("No changes in schema detected.")
+        if (upgrade_ops := script.upgrade_ops) and upgrade_ops.is_empty():
+            directives[:] = []
+            print("No changes in schema detected.")
 
 
 def run_migrations_online() -> None:
@@ -54,7 +57,10 @@ def run_migrations_online() -> None:
             connection=connection,
             target_metadata=target_metadata,
             include_schemas=True,
-            process_revision_directives=process_revision_directives,
+            process_revision_directives=chain_revision_directives(
+                reorder_migration_ops,
+                process_revision_directives,
+            ),
         )
 
         with context.begin_transaction():

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/tests/test_operators.py

@@ -3,7 +3,9 @@ import json
 import pytest
 from sqlalchemy import text
 
-from .app import db
+from .app import audit, db
+
+JSONB_SUBTRACT = "SELECT {schema}jsonb_subtract((:new)::jsonb, (:old)::jsonb)"
 
 
 @pytest.mark.parametrize(
@@ -24,8 +26,8 @@ from .app import db
 def test_jsonb_subtract(test_client, old, new, result):
     assert (
         db.session.scalar(
-            text("SELECT jsonb_subtract((:new)::jsonb, (:old)::jsonb)"),
-            dict(old=json.dumps(old), new=json.dumps(new)),
+            text(JSONB_SUBTRACT.format(schema=audit.context["schema_prefix"])),
+            {"old": json.dumps(old), "new": json.dumps(new)},
         )
         == result
     )

{flask_postgresql_audit-1.0.8 → flask_postgresql_audit-1.1.0}/tests/utils.py

@@ -52,30 +52,37 @@ def alembic_config(cmd: str, engine: Engine, alembic_cfg_path: Path, **kw):
 
 def revision(engine: Engine, alembic_cfg_path: Path, **kw):
     stdout = StringIO()
-    with alembic_config("revision", engine, alembic_cfg_path, **kw) as cfg:
-        with contextlib.redirect_stdout(stdout):
-            command.revision(cfg, **kw)
+    with (
+        alembic_config("revision", engine, alembic_cfg_path, **kw) as cfg,
+        contextlib.redirect_stdout(stdout),
+    ):
+        command.revision(cfg, **kw)
     return stdout.getvalue()
 
 
 def upgrade(engine: Engine, alembic_cfg_path: Path, **kw):
     stdout = StringIO()
-    with alembic_config("upgrade", engine, alembic_cfg_path, **kw) as cfg:
-        with contextlib.redirect_stdout(stdout):
-            command.upgrade(cfg, **kw)
+    with (
+        alembic_config("upgrade", engine, alembic_cfg_path, **kw) as cfg,
+        contextlib.redirect_stdout(stdout),
+    ):
+        command.upgrade(cfg, **kw)
     return stdout.getvalue()
 
 
 def downgrade(engine: Engine, alembic_cfg_path: Path, **kw):
     stdout = StringIO()
-    with alembic_config("downgrade", engine, alembic_cfg_path, **kw) as cfg:
-        with contextlib.redirect_stdout(stdout):
-            command.upgrade(cfg, **kw)
+    with (
+        alembic_config("downgrade", engine, alembic_cfg_path, **kw) as cfg,
+        contextlib.redirect_stdout(stdout),
+    ):
+        command.upgrade(cfg, **kw)
     return stdout.getvalue()
 
 
 def clear_migrations(engine: Engine, alembic_cfg_path: Path, **kw):
     with engine.begin() as connection:
+        connection.execute(text("DROP EXTENSION IF EXISTS btree_gist CASCADE;"))
         connection.execute(text("DROP SCHEMA IF EXISTS public CASCADE;"))
         connection.execute(text("DROP SCHEMA IF EXISTS audit CASCADE;"))
         connection.execute(text("CREATE SCHEMA public;"))

flask_postgresql_audit-1.0.8/flask_postgresql_audit/alembic/__init__.py

@@ -1,2 +0,0 @@
-# ruff: noqa: F401
-from .setup import register_triggers, setup_db

flask_postgresql_audit-1.0.8/flask_postgresql_audit/extensions/__init__.py

@@ -1 +0,0 @@
-# ruff: noqa: F401