Skip to content

Commit ba1f494

Browse files
authored
Merge pull request #75 from jmfernandez/funnel_in_out_fix
Fixes to avoid unmarshalling errors in some corner cases dealing with TES 1.1 compliant service
2 parents 186480c + f96174e commit ba1f494

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
# - "1.0"
1717
# - "1.1"
1818
python-version:
19-
- "3.7"
2019
- "3.8"
2120
- "3.9"
2221
- "3.10"
2322
- "3.11"
2423
- "3.12"
24+
- "3.13"
2525

2626
steps:
2727
- name: Check out code

tes/models.py

+18-4
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ class Output(Base):
187187
path: Optional[str] = attrib(
188188
default=None, converter=strconv, validator=optional(instance_of(str))
189189
)
190+
path_prefix: Optional[str] = attrib(
191+
default=None, converter=strconv, validator=optional(instance_of(str))
192+
)
190193
type: str = attrib(
191194
default="FILE", validator=in_(["FILE", "DIRECTORY"])
192195
)
@@ -217,8 +220,8 @@ class Resources(Base):
217220
zones: Optional[List[str]] = attrib(
218221
default=None, converter=strconv, validator=optional(list_of(str))
219222
)
220-
backend_parameters: Optional[List[str]] = attrib(
221-
default=None, converter=strconv, validator=optional(instance_of(list))
223+
backend_parameters: Optional[Dict[str, str]] = attrib(
224+
default=None, validator=optional(instance_of(dict))
222225
)
223226
backend_parameters_strict: Optional[bool] = attrib(
224227
default=None, validator=optional(instance_of(bool))
@@ -333,8 +336,19 @@ class Task(Base):
333336
state: Optional[str] = attrib(
334337
default=None,
335338
validator=optional(in_(
336-
["UNKNOWN", "QUEUED", "INITIALIZING", "RUNNING", "COMPLETE",
337-
"CANCELED", "EXECUTOR_ERROR", "SYSTEM_ERROR"]
339+
[
340+
"UNKNOWN",
341+
"QUEUED",
342+
"INITIALIZING",
343+
"RUNNING",
344+
"PAUSED",
345+
"COMPLETE",
346+
"EXECUTOR_ERROR",
347+
"SYSTEM_ERROR",
348+
"CANCELED",
349+
"CANCELING",
350+
"PREEMPTED",
351+
]
338352
))
339353
)
340354
name: Optional[str] = attrib(

0 commit comments

Comments
 (0)