Skip to content

Commit 596e6b8

Browse files
authored
feat(serverless_jobs): add started_at in JobRun (scaleway#470)
1 parent 869b9fb commit 596e6b8

File tree

4 files changed

+54
-42
lines changed

4 files changed

+54
-42
lines changed

scaleway-async/scaleway_async/jobs/v1alpha1/marshalling.py

+16-12
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,6 @@ def unmarshal_JobRun(data: Any) -> JobRun:
146146
if field is not None:
147147
args["command"] = field
148148

149-
field = data.get("environment_variables", None)
150-
if field is not None:
151-
args["environment_variables"] = field
152-
153-
field = data.get("local_storage_capacity", None)
154-
if field is not None:
155-
args["local_storage_capacity"] = field
156-
157-
field = data.get("region", None)
158-
if field is not None:
159-
args["region"] = field
160-
161149
field = data.get("created_at", None)
162150
if field is not None:
163151
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
@@ -180,6 +168,22 @@ def unmarshal_JobRun(data: Any) -> JobRun:
180168
if field is not None:
181169
args["run_duration"] = field
182170

171+
field = data.get("environment_variables", None)
172+
if field is not None:
173+
args["environment_variables"] = field
174+
175+
field = data.get("local_storage_capacity", None)
176+
if field is not None:
177+
args["local_storage_capacity"] = field
178+
179+
field = data.get("region", None)
180+
if field is not None:
181+
args["region"] = field
182+
183+
field = data.get("started_at", None)
184+
if field is not None:
185+
args["started_at"] = parser.isoparse(field) if isinstance(field, str) else field
186+
183187
return JobRun(**args)
184188

185189

scaleway-async/scaleway_async/jobs/v1alpha1/types.py

+11-9
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,6 @@ class JobRun:
111111

112112
command: str
113113

114-
environment_variables: Dict[str, str]
115-
116-
local_storage_capacity: int
117-
118-
region: Region
119-
"""
120-
Region to target. If none is passed will use default region from the config.
121-
"""
122-
123114
created_at: Optional[datetime]
124115

125116
updated_at: Optional[datetime]
@@ -130,6 +121,17 @@ class JobRun:
130121

131122
run_duration: Optional[str]
132123

124+
environment_variables: Dict[str, str]
125+
126+
local_storage_capacity: int
127+
128+
region: Region
129+
"""
130+
Region to target. If none is passed will use default region from the config.
131+
"""
132+
133+
started_at: Optional[datetime]
134+
133135

134136
@dataclass
135137
class UpdateJobDefinitionRequestCronScheduleConfig:

scaleway/scaleway/jobs/v1alpha1/marshalling.py

+16-12
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,6 @@ def unmarshal_JobRun(data: Any) -> JobRun:
146146
if field is not None:
147147
args["command"] = field
148148

149-
field = data.get("environment_variables", None)
150-
if field is not None:
151-
args["environment_variables"] = field
152-
153-
field = data.get("local_storage_capacity", None)
154-
if field is not None:
155-
args["local_storage_capacity"] = field
156-
157-
field = data.get("region", None)
158-
if field is not None:
159-
args["region"] = field
160-
161149
field = data.get("created_at", None)
162150
if field is not None:
163151
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
@@ -180,6 +168,22 @@ def unmarshal_JobRun(data: Any) -> JobRun:
180168
if field is not None:
181169
args["run_duration"] = field
182170

171+
field = data.get("environment_variables", None)
172+
if field is not None:
173+
args["environment_variables"] = field
174+
175+
field = data.get("local_storage_capacity", None)
176+
if field is not None:
177+
args["local_storage_capacity"] = field
178+
179+
field = data.get("region", None)
180+
if field is not None:
181+
args["region"] = field
182+
183+
field = data.get("started_at", None)
184+
if field is not None:
185+
args["started_at"] = parser.isoparse(field) if isinstance(field, str) else field
186+
183187
return JobRun(**args)
184188

185189

scaleway/scaleway/jobs/v1alpha1/types.py

+11-9
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,6 @@ class JobRun:
111111

112112
command: str
113113

114-
environment_variables: Dict[str, str]
115-
116-
local_storage_capacity: int
117-
118-
region: Region
119-
"""
120-
Region to target. If none is passed will use default region from the config.
121-
"""
122-
123114
created_at: Optional[datetime]
124115

125116
updated_at: Optional[datetime]
@@ -130,6 +121,17 @@ class JobRun:
130121

131122
run_duration: Optional[str]
132123

124+
environment_variables: Dict[str, str]
125+
126+
local_storage_capacity: int
127+
128+
region: Region
129+
"""
130+
Region to target. If none is passed will use default region from the config.
131+
"""
132+
133+
started_at: Optional[datetime]
134+
133135

134136
@dataclass
135137
class UpdateJobDefinitionRequestCronScheduleConfig:

0 commit comments

Comments
 (0)