Skip to content

Commit

Permalink
Resolve alembic conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jopemachine committed Jan 26, 2024
1 parent d6686f9 commit a94fc0f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
"""Replace status_history's type map with list
Revision ID: 37fb8b8e98e5
Revises: 8c74e7df26f8
Create Date: 2023-10-30 08:02:27.845105
Revision ID: 8c8e90aebacd
Revises: 8b2ec7e3d22a
Create Date: 2024-01-26 11:19:23.075014
"""

from alembic import op

# revision identifiers, used by Alembic.
revision = "37fb8b8e98e5"
down_revision = "8c74e7df26f8"
revision = "8c8e90aebacd"
down_revision = "8b2ec7e3d22a"
branch_labels = None
depends_on = None

Expand Down
20 changes: 12 additions & 8 deletions src/ai/backend/manager/registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -974,10 +974,12 @@ async def enqueue_session(
session_data = {
"id": session_id,
"status": SessionStatus.PENDING,
"status_history": {
"status": SessionStatus.PENDING.name,
"timestamp": datetime.now(tzutc()).isoformat(),
},
"status_history": [
{
"status": SessionStatus.PENDING.name,
"timestamp": datetime.now(tzutc()).isoformat(),
}
],
"creation_id": session_creation_id,
"name": session_name,
"session_type": session_type,
Expand All @@ -997,10 +999,12 @@ async def enqueue_session(

kernel_shared_data = {
"status": KernelStatus.PENDING,
"status_history": {
"status": KernelStatus.PENDING.name,
"timestamp": datetime.now(tzutc()).isoformat(),
},
"status_history": [
{
"status": KernelStatus.PENDING.name,
"timestamp": datetime.now(tzutc()).isoformat(),
},
],
"session_creation_id": session_creation_id,
"session_id": session_id,
"session_name": session_name,
Expand Down

0 comments on commit a94fc0f

Please sign in to comment.