revive batch_timeout column to avoid confusion between timeout column

src/ai/backend/manager/models/alembic/versions/d4c174934fd0_add_sessions_batch_timeout_column.py

@@ -0,0 +1,24 @@
+"""add sessions batch_timeout column
+
+Revision ID: d4c174934fd0
+Revises: e9e574a6e22d
+Create Date: 2024-11-11 16:47:05.150825
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "d4c174934fd0"
+down_revision = "e9e574a6e22d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("sessions", sa.Column("batch_timeout", sa.BigInteger(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("sessions", "batch_timeout")

src/ai/backend/manager/models/session.py

@@ -705,9 +705,10 @@ class SessionRow(Base):
     use_host_network = sa.Column("use_host_network", sa.Boolean(), default=False, nullable=False)
 
     # Lifecycle
-    timeout = sa.Column(
-        "timeout", sa.BigInteger(), nullable=True
-    )  # Used to set timeout of batch session
+    timeout = sa.Column("timeout", sa.BigInteger(), nullable=True)
+    batch_timeout = sa.Column(
+        "batch_timeout", sa.BigInteger(), nullable=True
+    )  # Used to set timeout of batch sessions
     created_at = sa.Column(
         "created_at", sa.DateTime(timezone=True), server_default=sa.func.now(), index=True
     )

src/ai/backend/manager/registry.py

@@ -1050,7 +1050,9 @@ async def enqueue_session(
             "access_key": access_key,
             "tag": session_tag,
             "starts_at": starts_at,
-            "timeout": int(batch_timeout.total_seconds()) if batch_timeout is not None else None,
+            "batch_timeout": int(batch_timeout.total_seconds())
+            if batch_timeout is not None
+            else None,
             "callback_url": callback_url,
             "occupying_slots": ResourceSlot(),
             "vfolder_mounts": vfolder_mounts,
@@ -2732,7 +2734,7 @@ async def trigger_batch_execution(
                     str(session.id),
                     str(session.main_kernel.id),
                     session.main_kernel.startup_command or "",
-                    session.timeout,
+                    session.batch_timeout,
                 )
 
     async def interrupt_session(