Skip to content

Commit

Permalink
Merge a0c2b13 into 712801e
Browse files Browse the repository at this point in the history
  • Loading branch information
@medcelerate
medcelerate committed Nov 14, 2019
2 parents 712801e + a0c2b13 commit cbaf2b1
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 44 deletions.
8 changes: 4 additions & 4 deletions tes/client.py
View file
Expand Up @@ -21,16 +21,16 @@ def process_url(value):

@attrs
class HTTPClient(object):
url = attrib(convert=process_url)
url = attrib(converter=process_url)
timeout = attrib(default=10, validator=instance_of(int))
user = attrib(default=None,
convert=strconv,
converter=strconv,
validator=optional(instance_of(str)))
password = attrib(default=None,
convert=strconv,
converter=strconv,
validator=optional(instance_of(str)))
token = attrib(default=None,
convert=strconv,
converter=strconv,
validator=optional(instance_of(str)))

@url.validator
Expand Down
80 changes: 40 additions & 40 deletions tes/models.py
View file
Expand Up @@ -91,7 +91,7 @@ class Base(object):
def as_dict(self, drop_empty=True):
obj = asdict(self)
if drop_empty:
return _drop_none(obj)
return _drop_none(obj)
return obj

def as_json(self, drop_empty=True):
Expand All @@ -104,41 +104,41 @@ def as_json(self, drop_empty=True):
@attrs
class Input(Base):
url = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
path = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
type = attrib(
default="FILE", validator=in_(["FILE", "DIRECTORY"])
)
name = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
description = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
content = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)


@attrs
class Output(Base):
url = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
path = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
type = attrib(
default="FILE", validator=in_(["FILE", "DIRECTORY"])
)
name = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
description = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)


Expand All @@ -157,29 +157,29 @@ class Resources(Base):
default=None, validator=optional(instance_of(bool))
)
zones = attrib(
default=None, convert=strconv, validator=optional(list_of(str))
default=None, converter=strconv, validator=optional(list_of(str))
)


@attrs
class Executor(Base):
image = attrib(
convert=strconv, validator=instance_of(str)
converter=strconv, validator=instance_of(str)
)
command = attrib(
convert=strconv, validator=list_of(str)
converter=strconv, validator=list_of(str)
)
workdir = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
stdin = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
stdout = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
stderr = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
env = attrib(
default=None, validator=optional(instance_of(dict))
Expand All @@ -190,19 +190,19 @@ class Executor(Base):
class ExecutorLog(Base):
start_time = attrib(
default=None,
convert=timestampconv,
converter=timestampconv,
validator=optional(instance_of(datetime))
)
end_time = attrib(
default=None,
convert=timestampconv,
converter=timestampconv,
validator=optional(instance_of(datetime))
)
stdout = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
stderr = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
exit_code = attrib(
default=None, validator=optional(instance_of(int))
Expand All @@ -212,26 +212,26 @@ class ExecutorLog(Base):
@attrs
class OutputFileLog(Base):
url = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
path = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
size_bytes = attrib(
default=None, convert=int64conv, validator=optional(instance_of(int))
default=None, converter=int64conv, validator=optional(instance_of(int))
)


@attrs
class TaskLog(Base):
start_time = attrib(
default=None,
convert=timestampconv,
converter=timestampconv,
validator=optional(instance_of(datetime))
)
end_time = attrib(
default=None,
convert=timestampconv,
converter=timestampconv,
validator=optional(instance_of(datetime))
)
metadata = attrib(
Expand All @@ -251,7 +251,7 @@ class TaskLog(Base):
@attrs
class Task(Base):
id = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
state = attrib(
default=None,
Expand All @@ -261,10 +261,10 @@ class Task(Base):
))
)
name = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
description = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
inputs = attrib(
default=None, validator=optional(list_of(Input))
Expand All @@ -289,7 +289,7 @@ class Task(Base):
)
creation_time = attrib(
default=None,
convert=timestampconv,
converter=timestampconv,
validator=optional(instance_of(datetime))
)

Expand Down Expand Up @@ -361,7 +361,7 @@ def is_valid(self):
@attrs
class GetTaskRequest(Base):
id = attrib(
convert=strconv, validator=instance_of(str)
converter=strconv, validator=instance_of(str)
)
view = attrib(
default=None, validator=optional(in_(["MINIMAL", "BASIC", "FULL"]))
Expand All @@ -371,7 +371,7 @@ class GetTaskRequest(Base):
@attrs
class CreateTaskResponse(Base):
id = attrib(
convert=strconv, validator=instance_of(str)
converter=strconv, validator=instance_of(str)
)


Expand All @@ -383,20 +383,20 @@ class ServiceInfoRequest(Base):
@attrs
class ServiceInfo(Base):
name = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
doc = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
storage = attrib(
default=None, convert=strconv, validator=optional(list_of(str))
default=None, converter=strconv, validator=optional(list_of(str))
)


@attrs
class CancelTaskRequest(Base):
id = attrib(
convert=strconv, validator=instance_of(str)
converter=strconv, validator=instance_of(str)
)


Expand All @@ -408,16 +408,16 @@ class CancelTaskResponse(Base):
@attrs
class ListTasksRequest(Base):
project = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
name_prefix = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
page_size = attrib(
default=None, validator=optional(instance_of(int))
)
page_token = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)
view = attrib(
default=None, validator=optional(in_(["MINIMAL", "BASIC", "FULL"]))
Expand All @@ -430,5 +430,5 @@ class ListTasksResponse(Base):
default=None, validator=optional(list_of(Task))
)
next_page_token = attrib(
default=None, convert=strconv, validator=optional(instance_of(str))
default=None, converter=strconv, validator=optional(instance_of(str))
)

0 comments on commit cbaf2b1

Please sign in to comment.