Merge branch 'dev/entities-current-dev'

Author: Francisco

migrations/versions/1c9784351972_add_owner_id_to_thread_table.py

@@ -13,12 +13,13 @@
 from sqlalchemy.dialects import mysql
 
 from migrations.utils.safe_ddl import (add_column_if_missing,
+                                       create_index_if_missing,
                                        drop_column_if_exists,
-                                       safe_alter_column)
+                                       drop_index_if_exists, safe_alter_column)
 
 # revision identifiers, used by Alembic.
-revision: str = '1c9784351972'
-down_revision: Union[str, None] = '1e55188b6b26'
+revision: str = "1c9784351972"
+down_revision: Union[str, None] = "1e55188b6b26"
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
@@ -47,7 +48,7 @@ def upgrade() -> None:
 
     # ── threads.owner_id ────────────────────────────────────────────────────
     # Canonical ownership column — mirrors the pattern introduced for
-    # assistants.owner_id.  Nullable during the back-fill window; tighten
+    # assistants.owner_id. Nullable during the back-fill window; tighten
     # to NOT NULL once every existing thread row has been back-filled.
     add_column_if_missing(
         "threads",
@@ -56,14 +57,25 @@ def upgrade() -> None:
             sa.String(length=64),
             sa.ForeignKey("users.id", ondelete="SET NULL"),
             nullable=True,
-            index=True,
+            # index=True is intentionally omitted: it is a metadata-level hint
+            # only honoured by create_all(), not by Alembic batch migrations.
+            # The index is created explicitly below.
             comment="Canonical creator/owner of this thread. Used for row-level access control.",
         ),
     )
 
+    # Create the index explicitly so it is reliably present on all environments,
+    # including fresh containers where the table did not previously exist.
+    create_index_if_missing(
+        "ix_threads_owner_id",
+        "threads",
+        ["owner_id"],
+    )
+
 
 def downgrade() -> None:
     # ── threads.owner_id ────────────────────────────────────────────────────
+    drop_index_if_exists("ix_threads_owner_id", "threads")
     drop_column_if_exists("threads", "owner_id")
 
     # ── messages.reasoning ──────────────────────────────────────────────────

migrations/versions/1e55188b6b26_add_owner_id_to_assistants.py

@@ -39,8 +39,14 @@
 def _constraint_exists(constraint_name: str, table_name: str) -> bool:
     """
     Return True if a named constraint already exists on the given table.
+    Returns False immediately if the table itself does not exist — prevents
+    op.drop_constraint / op.create_unique_constraint from being called on a
+    missing table in fresh-container scenarios.
     Used for unique constraints, which safe_ddl does not yet cover.
     """
+    if not has_table(table_name):
+        return False
+
     bind = op.get_bind()
     result = bind.execute(
         sa.text(
@@ -92,6 +98,7 @@ def upgrade() -> None:
     )
 
     # ── batfish_snapshots: comment-only column updates ──────────────────────
+    # All safe_alter_column calls check has_table internally — safe on fresh containers.
     safe_alter_column(
         "batfish_snapshots",
         "id",
@@ -150,17 +157,22 @@ def upgrade() -> None:
     )
 
     # ── batfish_snapshots: rename unique constraint ─────────────────────────
-    # Unique constraints are not yet covered by safe_ddl — using local
-    # _constraint_exists guard for these operations only
+    # _constraint_exists now returns False when the table is absent, so both
+    # branches below are safe on a fresh container (neither op will fire).
     if _constraint_exists("uq_batfish_user_snapshot", "batfish_snapshots"):
         op.drop_constraint("uq_batfish_user_snapshot", "batfish_snapshots", type_="unique")
 
     if not _constraint_exists("uq_batfish_user_snapshot_name", "batfish_snapshots"):
-        op.create_unique_constraint(
-            "uq_batfish_user_snapshot_name",
-            "batfish_snapshots",
-            ["user_id", "snapshot_name"],
-        )
+        # Only attempt to create if the table actually exists; the has_table
+        # check inside _constraint_exists already gates this when the table is
+        # missing (it returns False, making `not False` = True, which would
+        # incorrectly enter this branch on a missing table).
+        if has_table("batfish_snapshots"):
+            op.create_unique_constraint(
+                "uq_batfish_user_snapshot_name",
+                "batfish_snapshots",
+                ["user_id", "snapshot_name"],
+            )
 
     # ── messages ────────────────────────────────────────────────────────────
     safe_alter_column(
@@ -207,12 +219,13 @@ def downgrade() -> None:
         op.drop_constraint("uq_batfish_user_snapshot_name", "batfish_snapshots", type_="unique")
 
     if not _constraint_exists("uq_batfish_user_snapshot", "batfish_snapshots"):
-        op.create_index(
-            "uq_batfish_user_snapshot",
-            "batfish_snapshots",
-            ["user_id", "snapshot_name"],
-            unique=True,
-        )
+        if has_table("batfish_snapshots"):
+            op.create_index(
+                "uq_batfish_user_snapshot",
+                "batfish_snapshots",
+                ["user_id", "snapshot_name"],
+                unique=True,
+            )
 
     # ── batfish_snapshots: restore original comments ────────────────────────
     safe_alter_column(
@@ -273,7 +286,6 @@ def downgrade() -> None:
     )
 
     # ── assistants: owner_id ────────────────────────────────────────────────
-    # Safe FK + index drop via helpers, then column removal
     drop_fk_if_exists("assistants", "fk_assistants_owner_id_users")
     drop_index_if_exists("ix_assistants_owner_id", "assistants")
     drop_column_if_exists("assistants", "owner_id")

migrations/versions/6413efed1b18_add_decision_telemetry_to_assistants_.py

@@ -14,7 +14,7 @@
 
 # Import the safe DDL helpers
 from migrations.utils.safe_ddl import (add_column_if_missing,
-                                       drop_column_if_exists,
+                                       drop_column_if_exists, has_table,
                                        safe_alter_column)
 
 # revision identifiers, used by Alembic.
@@ -26,8 +26,6 @@
 
 def upgrade() -> None:
     """Upgrade schema safely."""
-    bind = op.get_bind()
-    insp = sa.inspect(bind)
 
     # --- Table: assistants ---
 
@@ -44,11 +42,13 @@ def upgrade() -> None:
     )
 
     # 2. DATA SANITIZATION (Critical for Type Conversion)
-    # Guard against clean database runs where the table doesn't exist yet
-    if insp.has_table("assistants"):
-        # We must convert strings like 'standard' to '0' so MySQL can cast to Boolean/TINYINT.
+    # Guard against fresh-container runs where the table doesn't exist yet.
+    # Uses safe_ddl.has_table() — consistent with the rest of the codebase and
+    # avoids the deprecated sa.inspect(bind) pattern.
+    if has_table("assistants"):
+        # Convert strings like 'standard' → '0' so MySQL can cast to TINYINT/Boolean.
         op.execute("UPDATE assistants SET agent_mode = '0' WHERE agent_mode = 'standard'")
-        # Catch-all for any other strings to ensure they are truthy (1)
+        # Catch-all: any remaining non-'0' string is treated as truthy (1).
         op.execute("UPDATE assistants SET agent_mode = '1' WHERE agent_mode != '0'")
 
     # 3. Convert agent_mode from String/Enum to Boolean
@@ -64,8 +64,6 @@ def upgrade() -> None:
 
 def downgrade() -> None:
     """Downgrade schema safely."""
-    bind = op.get_bind()
-    insp = sa.inspect(bind)
 
     # --- Table: assistants ---
 
@@ -78,9 +76,9 @@ def downgrade() -> None:
         nullable=True,
     )
 
-    # 2. DATA REVERSION (Optional: Restore the 'standard' string)
-    # Guard against clean database runs where the table doesn't exist
-    if insp.has_table("assistants"):
+    # 2. DATA REVERSION — restore the 'standard' string for any '0' rows.
+    # Guard against fresh-container runs where the table doesn't exist yet.
+    if has_table("assistants"):
         op.execute("UPDATE assistants SET agent_mode = 'standard' WHERE agent_mode = '0'")
 
     # 3. Drop the decision_telemetry column

migrations/versions/741d86dd5ac8_add_decision_telemetry_to_actions.py

@@ -11,12 +11,12 @@
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import mysql
-from sqlalchemy.engine.reflection import Inspector
 
 # Import the safe DDL helpers
 from migrations.utils.safe_ddl import (add_column_if_missing,
+                                       create_index_if_missing,
                                        drop_column_if_exists,
-                                       safe_alter_column)
+                                       drop_index_if_exists, safe_alter_column)
 
 # revision identifiers, used by Alembic.
 revision: str = "741d86dd5ac8"
@@ -51,23 +51,12 @@ def upgrade() -> None:
         ),
     )
 
-    # 3. Create Index safely (Check if exists first)
-    # Note: add_column_if_missing handles the column, but we need to handle the index explicitly
-    bind = op.get_bind()
-    inspector = Inspector.from_engine(bind)
-    indexes = inspector.get_indexes("actions")
-    index_names = [idx["name"] for idx in indexes]
-
-    if "ix_actions_confidence_score" not in index_names:
-        op.create_index(
-            op.f("ix_actions_confidence_score"),
-            "actions",
-            ["confidence_score"],
-            unique=False,
-        )
-        print("[Alembic-safeDDL] ✅ Created index: ix_actions_confidence_score")
-    else:
-        print("[Alembic-safeDDL] ⚠️ Skipped – index already exists: ix_actions_confidence_score")
+    # 3. Create index safely via helper (guards against missing table)
+    create_index_if_missing(
+        "ix_actions_confidence_score",
+        "actions",
+        ["confidence_score"],
+    )
 
     # --- Table: messages ---
     # 4. Enforce non-nullable content (Maintenance from auto-gen)
@@ -100,14 +89,9 @@ def downgrade() -> None:
     safe_alter_column("messages", "content", existing_type=mysql.TEXT(), nullable=True)
 
     # --- Table: actions ---
-    # 1. Drop Index safely
-    # Note: drop_column_if_exists usually drops associated indexes in MySQL/PG,
-    # but explicitly dropping it prevents warnings in some drivers.
-    try:
-        op.drop_index(op.f("ix_actions_confidence_score"), table_name="actions")
-    except Exception:
-        pass  # Index likely missing or dropped by column drop below
-
-    # 2. Drop Columns
+    # 1. Drop index safely via helper (guards against missing table/index)
+    drop_index_if_exists("ix_actions_confidence_score", "actions")
+
+    # 2. Drop columns
     drop_column_if_exists("actions", "confidence_score")
     drop_column_if_exists("actions", "decision_payload")

migrations/versions/ba35b4620058_add_soft_delete_to_vectorstore.py

@@ -12,11 +12,13 @@
 from alembic import op
 
 from migrations.utils.safe_ddl import (add_column_if_missing,
-                                       drop_column_if_exists)
+                                       create_index_if_missing,
+                                       drop_column_if_exists,
+                                       drop_index_if_exists)
 
 # revision identifiers, used by Alembic.
-revision: str = 'ba35b4620058'
-down_revision: Union[str, None] = '3e16915ae60f'
+revision: str = "ba35b4620058"
+down_revision: Union[str, None] = "3e16915ae60f"
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
@@ -32,27 +34,13 @@ def upgrade() -> None:
         ),
     )
 
-    bind = op.get_bind()
-    insp = sa.inspect(bind)
-
-    if insp.has_table("vector_stores"):
-        indexes = [idx["name"] for idx in insp.get_indexes("vector_stores")]
-        if "ix_vector_stores_deleted_at" not in indexes:
-            op.create_index(
-                op.f("ix_vector_stores_deleted_at"),
-                "vector_stores",
-                ["deleted_at"],
-                unique=False,
-            )
+    create_index_if_missing(
+        "ix_vector_stores_deleted_at",
+        "vector_stores",
+        ["deleted_at"],
+    )
 
 
 def downgrade() -> None:
-    bind = op.get_bind()
-    insp = sa.inspect(bind)
-
-    if insp.has_table("vector_stores"):
-        indexes = [idx["name"] for idx in insp.get_indexes("vector_stores")]
-        if "ix_vector_stores_deleted_at" in indexes:
-            op.drop_index(op.f("ix_vector_stores_deleted_at"), table_name="vector_stores")
-
+    drop_index_if_exists("ix_vector_stores_deleted_at", "vector_stores")
     drop_column_if_exists("vector_stores", "deleted_at")

migrations/versions/dc84d53c3c46_restore_missing_columns.py

@@ -5,61 +5,15 @@
 Create Date: 2025-08-20 11:46:00.251355
 """
 
-from typing import Optional, Sequence, Union
+from typing import Sequence, Union
 
 import sqlalchemy as sa
 from alembic import op
 
-# --- Try to import your DDL safety helpers; fall back to local shims ---
-try:
-    from migrations.utils.safe_ddl import (add_column_if_missing,
-                                           column_exists,
-                                           drop_column_if_exists,
-                                           rename_column_if_exists,
-                                           safe_alter_column)
-except Exception:
-
-    def _insp():
-        bind = op.get_bind()
-        return sa.inspect(bind)
-
-    def column_exists(table: str, col: str) -> bool:
-        insp = _insp()
-        # GUARD: Check if table exists before inspecting columns
-        if not insp.has_table(table):
-            return False
-        return col in {c["name"] for c in insp.get_columns(table)}
-
-    def add_column_if_missing(table: str, column: sa.Column) -> None:
-        if not column_exists(table, column.name):
-            op.add_column(table, column)
-
-    def drop_column_if_exists(table: str, col_name: str) -> None:
-        if column_exists(table, col_name):
-            op.drop_column(table, col_name)
-
-    def safe_alter_column(table: str, col_name: str, **kw) -> None:
-        insp = _insp()
-        # GUARD: Check if table and column exist before altering
-        if insp.has_table(table) and column_exists(table, col_name):
-            op.alter_column(table, col_name, **kw)
-
-    def rename_column_if_exists(
-        table: str,
-        old_name: str,
-        new_name: str,
-        existing_type: Optional[sa.types.TypeEngine] = None,
-        existing_nullable: Optional[bool] = None,
-    ) -> None:
-        if column_exists(table, old_name) and not column_exists(table, new_name):
-            op.alter_column(
-                table,
-                old_name,
-                new_column_name=new_name,
-                existing_type=existing_type,
-                existing_nullable=existing_nullable,
-            )
-
+from migrations.utils.safe_ddl import (add_column_if_missing, column_exists,
+                                       drop_column_if_exists, has_table,
+                                       rename_column_if_exists,
+                                       safe_alter_column)
 
 # Alembic identifiers
 revision: str = "dc84d53c3c46"
@@ -72,7 +26,11 @@ def _bigint_to_int_swap(table: str, base_col: str) -> None:
     """
     Safely convert BIGINT column to INT using temp column + backfill + swap.
     NOTE: This can truncate values > INT range; ensure data is within bounds.
+    Exits early if the table doesn't exist — safe on fresh containers.
     """
+    if not has_table(table):
+        return
+
     temp = f"{base_col}_i"
 
     # 1) Add temp INT column if missing
@@ -98,7 +56,11 @@ def _bigint_to_int_swap(table: str, base_col: str) -> None:
 def _int_to_bigint_swap(table: str, base_col: str) -> None:
     """
     Downgrade path: convert INT back to BIGINT via temp column + backfill + swap.
+    Exits early if the table doesn't exist — safe on fresh containers.
     """
+    if not has_table(table):
+        return
+
     temp = f"{base_col}_bi"
 
     # 1) Add temp BIGINT column if missing