Update support for Service Info (#55)

- Fix version to match PyPi release (#59)
ohsu-comp-bio · Feb 29, 2024 · 4d12b82 · 4d12b82
1 parent 7913526
commit 4d12b82
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 5 deletions.
diff --git a/tes/__init__.py b/tes/__init__.py
@@ -36,4 +36,4 @@
     "ServiceInfo"
 ]
 
-__version__ = "0.4.2"
+__version__ = "1.1.0-rc.1"
diff --git a/tes/models.py b/tes/models.py
@@ -224,6 +224,9 @@ class Executor(Base):
     command: List[str] = attrib(
         converter=strconv, validator=list_of(str)
     )
+    ignore_error: str = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(bool))
+    )
     workdir: str = attrib(
         default=None, converter=strconv, validator=optional(instance_of(str))
     )
@@ -454,18 +457,70 @@ class ServiceInfoRequest(Base):
     """`attrs` model class for `GET /service-info` request parameters."""
 
 
+@attrs
+class Organization:
+    name: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+    url: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+
+
+@attrs
+class Type:
+    artifact: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+    group: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+    version: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+
+
 @attrs
 class ServiceInfo(Base):
     """TES `tesServiceInfo` `attrs` model class."""
-
-    name: Optional[str] = attrib(
+    contact_url: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+    created_at: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+    description: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+    documentation_url: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+    environment: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+    id: Optional[str] = attrib(
         default=None, converter=strconv, validator=optional(instance_of(str))
     )
-    doc: Optional[str] = attrib(
+    name: Optional[str] = attrib(
         default=None, converter=strconv, validator=optional(instance_of(str))
     )
+    organization: Optional[dict] = attrib(
+        default=None, validator=optional(instance_of(dict))
+    )
     storage: Optional[List[str]] = attrib(
-        default=None, converter=strconv, validator=optional(list_of(str))
+        default=None, converter=strconv, validator=optional(instance_of(list))
+    )
+    tes_resources_backend_parameters: Optional[List[str]] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(list))
+    )
+    type: Optional[dict] = attrib(
+        default=None, validator=optional(instance_of(dict))
+    )
+    updated_at: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
+    )
+    version: Optional[str] = attrib(
+        default=None, converter=strconv, validator=optional(instance_of(str))
     )