Use dict instead of tuple for timespan

DARPA-ASKEM · Jun 14, 2023 · 2fb64c2 · 2fb64c2
1 parent 820ce6d
commit 2fb64c2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/paths.yaml b/paths.yaml
@@ -17,7 +17,14 @@
                 type: string
                 example: "ba8da8d4-047d-11ee-be56"
               timespan:
-                type: array
+                type: object
+                properties:
+                  start:
+                    type: integer
+                    example: 0
+                  end:
+                    type: integer
+                    example: 0
                 items:
                   type: integer
                 example: [0, 90]
@@ -69,10 +76,14 @@
                     type: string
                     example: "dataset.csv"
               timespan:
-                type: array
-                items:
-                  type: integer
-                example: [0, 90]
+                type: object
+                properties:
+                  start:
+                    type: integer
+                    example: 0
+                  end:
+                    type: integer
+                    example: 0
               extra:
                 description: optional extra system specific arguments for advanced use cases
                 type: object
@@ -112,10 +123,14 @@
                   type: string
                 example: ["ba8da8d4-047d-11ee-be56", "c1cd941a-047d-11ee-be56", "c4b9f88a-047d-11ee-be56"]
               timespan:
-                type: array
-                items:
-                  type: integer
-                example: [0, 90]
+                type: object
+                properties:
+                  start:
+                    type: integer
+                    example: 0
+                  end:
+                    type: integer
+                    example: 0
               extra:
                 description: optional extra system specific arguments for advanced use cases
                 type: object                   

diff --git a/src/service/ArgIO.jl b/src/service/ArgIO.jl
@@ -24,6 +24,9 @@ function prepare_input(args; context...)
     if settings["ENABLE_TDS"]
         update_simulation(context[:job_id], Dict([:status=>"running", :start_time => time()]))
     end
+    if in(:timespan, keys(args))
+        args[:timespan] = (args[:timespan]["start"], args[:timespan]["end"])
+    end
     if in(:model_config_id, keys(args))
         args[:model] = fetch_model(args[:model_config_id])
     end