Skip to content

Commit f793456

Browse files
committed
changed column names and add processed column
1 parent d717200 commit f793456

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
"""added_last_scheduled
1+
"""added_distributed_comp_scheduler
22
3-
Revision ID: da1700f9eceb
3+
Revision ID: b7f23f6d8aa2
44
Revises: c9db8bf5091e
5-
Create Date: 2024-11-24 17:11:30.519365+00:00
5+
Create Date: 2024-11-26 17:06:27.053774+00:00
66
77
"""
88
import sqlalchemy as sa
99
from alembic import op
1010

1111
# revision identifiers, used by Alembic.
12-
revision = "da1700f9eceb"
12+
revision = "b7f23f6d8aa2"
1313
down_revision = "c9db8bf5091e"
1414
branch_labels = None
1515
depends_on = None
@@ -18,13 +18,16 @@
1818
def upgrade():
1919
# ### commands auto generated by Alembic - please adjust! ###
2020
op.add_column(
21-
"comp_runs",
22-
sa.Column("last_scheduled", sa.DateTime(timezone=True), nullable=True),
21+
"comp_runs", sa.Column("scheduled", sa.DateTime(timezone=True), nullable=True)
22+
)
23+
op.add_column(
24+
"comp_runs", sa.Column("processed", sa.DateTime(timezone=True), nullable=True)
2325
)
2426
# ### end Alembic commands ###
2527

2628

2729
def downgrade():
2830
# ### commands auto generated by Alembic - please adjust! ###
29-
op.drop_column("comp_runs", "last_scheduled")
31+
op.drop_column("comp_runs", "processed")
32+
op.drop_column("comp_runs", "scheduled")
3033
# ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/comp_runs.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,17 @@
108108
doc="If filled, when cancellation was requested",
109109
),
110110
sa.Column(
111-
"last_scheduled",
111+
"scheduled",
112112
sa.DateTime(timezone=True),
113113
nullable=True,
114114
doc="last time the pipeline was scheduled to be processed",
115115
),
116+
sa.Column(
117+
"processed",
118+
sa.DateTime(timezone=True),
119+
nullable=True,
120+
doc="last time the pipeline was actually processed",
121+
),
116122
sa.Column("metadata", JSONB, nullable=True, doc="the run optional metadata"),
117123
sa.Column(
118124
"use_on_demand_clusters",

services/director-v2/src/simcore_service_director_v2/models/comp_runs.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ class CompRunsAtDB(BaseModel):
5555
cancelled: datetime.datetime | None
5656
metadata: RunMetadataDict = RunMetadataDict()
5757
use_on_demand_clusters: bool
58-
last_scheduled: datetime.datetime | None
58+
scheduled: datetime.datetime | None
59+
processed: datetime.datetime | None
5960

6061
@field_validator("result", mode="before")
6162
@classmethod
@@ -108,7 +109,8 @@ def convert_null_to_empty_metadata(cls, v):
108109
"modified": "2021-03-01T13:07:34.191610",
109110
"cancelled": None,
110111
"use_on_demand_clusters": False,
111-
"last_scheduled": None,
112+
"scheduled": None,
113+
"processed": None,
112114
},
113115
{
114116
"run_id": 432,
@@ -123,7 +125,8 @@ def convert_null_to_empty_metadata(cls, v):
123125
"modified": "2021-03-01T13:07:34.191610",
124126
"cancelled": None,
125127
"use_on_demand_clusters": False,
126-
"last_scheduled": None,
128+
"scheduled": None,
129+
"processed": None,
127130
},
128131
{
129132
"run_id": 43243,
@@ -145,7 +148,8 @@ def convert_null_to_empty_metadata(cls, v):
145148
"some-other-metadata-which-is-an-array": [1, 3, 4],
146149
},
147150
"use_on_demand_clusters": False,
148-
"last_scheduled": None,
151+
"scheduled": None,
152+
"processed": None,
149153
},
150154
{
151155
"run_id": 43243,
@@ -161,7 +165,8 @@ def convert_null_to_empty_metadata(cls, v):
161165
"cancelled": None,
162166
"metadata": None,
163167
"use_on_demand_clusters": False,
164-
"last_scheduled": None,
168+
"scheduled": None,
169+
"processed": None,
165170
},
166171
]
167172
},

0 commit comments

Comments
 (0)