Fix serialization of integrity profile

src/api/src/backend/utils/__init__.py

@@ -24,22 +24,22 @@ def executor_request_is_valid(request):
     return True
 
 def build_etl_pipeline_env(body):
-    # Convert the data integrity policies to dicts. Easier
-    # to handle for null values via .get
-    local_inbox_data_integrity_profile = {}
-    if getattr(body.local_inbox.data, "integrity_profile", None) != None:
+    # Convert the data integrity policies to dicts. Easier to handle for null
+    # Svalues via .get
+    local_inbox_data_integrity_profile = body.local_inbox.data.integrity_profile
+    if body.local_inbox.data.integrity_profile != None:
         local_inbox_data_integrity_profile = body.local_inbox.data.integrity_profile.dict()
 
-    local_outbox_data_integrity_profile = {}
-    if getattr(body.local_outbox.data, "integrity_profile", None) != None:
+    local_outbox_data_integrity_profile = body.local_outbox.data.integrity_profile
+    if body.local_outbox.data.integrity_profile != None:
         local_outbox_data_integrity_profile = body.local_outbox.data.integrity_profile.dict()
 
-    remote_inbox_data_integrity_profile = {}
-    if getattr(body.remote_inbox.data, "integrity_profile", None) != None:
+    remote_inbox_data_integrity_profile = body.remote_inbox.data.integrity_profile
+    if body.remote_inbox.data.integrity_profile != None:
         remote_inbox_data_integrity_profile = body.remote_inbox.data.integrity_profile.dict()
 
-    remote_outbox_data_integrity_profile = {}
-    if getattr(body.remote_outbox.data, "integrity_profile", None) != None:
+    remote_outbox_data_integrity_profile = body.remote_outbox.data.integrity_profile
+    if body.remote_outbox.data.integrity_profile != None:
         remote_outbox_data_integrity_profile = body.remote_outbox.data.integrity_profile.dict()
 
     body.local_inbox.data.integrity_profile = local_inbox_data_integrity_profile

src/api/src/backend/views/http/tapis_etl.py

@@ -1,4 +1,4 @@
-from typing import List, Dict
+from typing import List, Dict, Literal
 
 from pydantic import BaseModel, Extra, conlist
 
@@ -72,6 +72,7 @@ class TapisJobDef(BaseModel):
 
 class TapisETLExtension(BaseModel):
     env_mappings: Dict[str, str] = {}
+    last_status: str = "PENDING"
 
 class TapisJobExtensions(BaseModel):
     tapis_etl: TapisETLExtension = TapisETLExtension()
@@ -95,12 +96,4 @@ class TapisETLPipeline(Pipeline):
     jobs: List[ExetendedTapisJob] = []
     local_outbox: LocalOutbox
     remote_inbox: RemoteInbox
-    after: ActionFilter = None
-
-    # @validator("jobs")
-    # def one_or_more_jobs(cls, value):
-    #     # Check that the pipeline contains at least 1 tapis job definition
-    #     if len(value) < 1:
-    #         raise ValueError("A Tapis ETL pipeline must contain at least 1 Tapis Job definition")
-
-    #     return value
+    after: ActionFilter = None