Skip to content

Commit c92e576

Browse files
committed
remove trigger_rule
1 parent 0e2433d commit c92e576

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

jupyter_scheduler/models.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,6 @@ def __str__(self):
7272
OUTPUT_FILENAME_TEMPLATE = "{{input_filename}}-{{create_time}}"
7373

7474

75-
class TriggerRule(str, Enum):
76-
ALL_SUCCESS = "all_success"
77-
ALL_FAILES = "all_failed"
78-
ALL_DONE = "all_done"
79-
ONE_FAILED = "one_failed"
80-
ONE_SUCCESS = "one_success"
81-
NONE_FAILED = "none_failed"
82-
NONE_SKIPPED = "none_skipped"
83-
DUMMY = "dummy"
84-
85-
def __str__(self):
86-
return self.value
87-
88-
8975
class CreateJob(BaseModel):
9076
"""Defines the model for creating a new job"""
9177

@@ -104,7 +90,6 @@ class CreateJob(BaseModel):
10490
package_input_folder: Optional[bool] = None
10591
depends_on: Optional[List[str]] = None
10692
workflow_id: Optional[str] = None
107-
trigger_rule: Optional[TriggerRule] = None
10893

10994
@root_validator
11095
def compute_input_filename(cls, values) -> Dict:
@@ -169,7 +154,6 @@ class DescribeJob(BaseModel):
169154
packaged_files: Optional[List[str]] = []
170155
depends_on: Optional[List[str]] = None
171156
workflow_id: Optional[str] = None
172-
trigger_rule: Optional[TriggerRule] = None
173157

174158
class Config:
175159
orm_mode = True
@@ -216,7 +200,6 @@ class UpdateJob(BaseModel):
216200
name: Optional[str] = None
217201
compute_type: Optional[str] = None
218202
depends_on: Optional[List[str]] = None
219-
trigger_rule: Optional[TriggerRule] = None
220203

221204

222205
class DeleteJob(BaseModel):
@@ -239,7 +222,6 @@ class CreateJobDefinition(BaseModel):
239222
package_input_folder: Optional[bool] = None
240223
depends_on: Optional[List[str]] = None
241224
workflow_definition_id: Optional[str] = None
242-
trigger_rule: Optional[TriggerRule] = None
243225

244226
@root_validator
245227
def compute_input_filename(cls, values) -> Dict:
@@ -269,7 +251,6 @@ class DescribeJobDefinition(BaseModel):
269251
packaged_files: Optional[List[str]] = []
270252
depends_on: Optional[List[str]] = None
271253
workflow_definition_id: Optional[str] = None
272-
trigger_rule: Optional[TriggerRule] = None
273254

274255
class Config:
275256
orm_mode = True
@@ -291,7 +272,6 @@ class UpdateJobDefinition(BaseModel):
291272
input_uri: Optional[str] = None
292273
depends_on: Optional[List[str]] = None
293274
workflow_definition_id: Optional[str] = None
294-
trigger_rule: Optional[TriggerRule] = None
295275

296276

297277
class ListJobDefinitionsQuery(BaseModel):

jupyter_scheduler/orm.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from sqlalchemy.orm import declarative_base, declarative_mixin, registry, sessionmaker
88
from sqlalchemy.sql import text
99

10-
from jupyter_scheduler.models import EmailNotifications, Status, TriggerRule
10+
from jupyter_scheduler.models import EmailNotifications, Status
1111
from jupyter_scheduler.utils import get_utc_timestamp
1212

1313
Base = declarative_base()
@@ -90,7 +90,6 @@ class CommonColumns:
9090
package_input_folder = Column(Boolean)
9191
packaged_files = Column(JsonType, default=[])
9292
depends_on = Column(JsonType)
93-
trigger_rule = Column(String(64))
9493

9594

9695
class Job(CommonColumns, Base):

0 commit comments

Comments
 (0)