Skip to content

Commit 04824e9

Browse files
authored
Merge pull request #27 from biosimulations/notebook-helpers
add notebook and reports
2 parents 84526df + 2e7075d commit 04824e9

File tree

102 files changed

+16254
-4490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+16254
-4490
lines changed

Diff for: .openapi-generator/FILES

+25-8
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ biosim_client/api/biosim/docs/HDF5File.md
2020
biosim_client/api/biosim/docs/HDF5Group.md
2121
biosim_client/api/biosim/docs/HTTPValidationError.md
2222
biosim_client/api/biosim/docs/Hdf5DataValues.md
23-
biosim_client/api/biosim/docs/OmexVerifyWorkflowOutput.md
24-
biosim_client/api/biosim/docs/OmexVerifyWorkflowStatus.md
2523
biosim_client/api/biosim/docs/RunData.md
26-
biosim_client/api/biosim/docs/RunsVerifyWorkflowOutput.md
27-
biosim_client/api/biosim/docs/RunsVerifyWorkflowStatus.md
2824
biosim_client/api/biosim/docs/SimulationRunInfo.md
2925
biosim_client/api/biosim/docs/ValidationError.md
3026
biosim_client/api/biosim/docs/ValidationErrorLocInner.md
3127
biosim_client/api/biosim/docs/Value.md
3228
biosim_client/api/biosim/docs/VerificationApi.md
29+
biosim_client/api/biosim/docs/VerifyWorkflowOutput.md
30+
biosim_client/api/biosim/docs/VerifyWorkflowStatus.md
3331
biosim_client/api/biosim/exceptions.py
3432
biosim_client/api/biosim/models/__init__.py
3533
biosim_client/api/biosim/models/biosim_simulation_run.py
@@ -44,15 +42,34 @@ biosim_client/api/biosim/models/hdf5_dataset.py
4442
biosim_client/api/biosim/models/hdf5_file.py
4543
biosim_client/api/biosim/models/hdf5_group.py
4644
biosim_client/api/biosim/models/http_validation_error.py
47-
biosim_client/api/biosim/models/omex_verify_workflow_output.py
48-
biosim_client/api/biosim/models/omex_verify_workflow_status.py
4945
biosim_client/api/biosim/models/run_data.py
50-
biosim_client/api/biosim/models/runs_verify_workflow_output.py
51-
biosim_client/api/biosim/models/runs_verify_workflow_status.py
5246
biosim_client/api/biosim/models/simulation_run_info.py
5347
biosim_client/api/biosim/models/validation_error.py
5448
biosim_client/api/biosim/models/validation_error_loc_inner.py
5549
biosim_client/api/biosim/models/value.py
50+
biosim_client/api/biosim/models/verify_workflow_output.py
51+
biosim_client/api/biosim/models/verify_workflow_status.py
5652
biosim_client/api/biosim/rest.py
5753
biosim_client/api/biosim/test/__init__.py
54+
biosim_client/api/biosim/test/test_biosim_simulation_run.py
55+
biosim_client/api/biosim/test/test_biosim_simulation_run_status.py
56+
biosim_client/api/biosim/test/test_biosimulator_version.py
57+
biosim_client/api/biosim/test/test_compare_settings.py
58+
biosim_client/api/biosim/test/test_comparison_statistics.py
59+
biosim_client/api/biosim/test/test_default_api.py
60+
biosim_client/api/biosim/test/test_generate_statistics_activity_output.py
61+
biosim_client/api/biosim/test/test_hdf5_attribute.py
62+
biosim_client/api/biosim/test/test_hdf5_data_values.py
63+
biosim_client/api/biosim/test/test_hdf5_dataset.py
64+
biosim_client/api/biosim/test/test_hdf5_file.py
65+
biosim_client/api/biosim/test/test_hdf5_group.py
66+
biosim_client/api/biosim/test/test_http_validation_error.py
67+
biosim_client/api/biosim/test/test_run_data.py
68+
biosim_client/api/biosim/test/test_simulation_run_info.py
69+
biosim_client/api/biosim/test/test_validation_error.py
70+
biosim_client/api/biosim/test/test_validation_error_loc_inner.py
71+
biosim_client/api/biosim/test/test_value.py
72+
biosim_client/api/biosim/test/test_verification_api.py
73+
biosim_client/api/biosim/test/test_verify_workflow_output.py
74+
biosim_client/api/biosim/test/test_verify_workflow_status.py
5875
biosim_client/api/biosim_README.md

Diff for: biosim_client/api/api_specs/biosim.yaml

+52-119
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
openapi: 3.1.0
22
info:
33
title: biosim-server
4-
version: 0.1.0
4+
version: 0.2.0
55
paths:
66
/:
77
get:
@@ -29,12 +29,12 @@ paths:
2929
schema:
3030
type: string
3131
title: Response Get Version Version Get
32-
/verify_omex:
32+
/verify/omex:
3333
post:
3434
tags:
3535
- Verification
36-
summary: Request verification report for OMEX/COMBINE archive
37-
operationId: start-verify-omex
36+
summary: Request verification report for OMEX/COMBINE archive across simulators
37+
operationId: verify-omex
3838
parameters:
3939
- name: workflow_id_prefix
4040
in: query
@@ -140,26 +140,26 @@ paths:
140140
content:
141141
multipart/form-data:
142142
schema:
143-
$ref: "#/components/schemas/Body_start-verify-omex"
143+
$ref: "#/components/schemas/Body_verify-omex"
144144
responses:
145145
"200":
146146
description: Successful Response
147147
content:
148148
application/json:
149149
schema:
150-
$ref: "#/components/schemas/OmexVerifyWorkflowOutput"
150+
$ref: "#/components/schemas/VerifyWorkflowOutput"
151151
"422":
152152
description: Validation Error
153153
content:
154154
application/json:
155155
schema:
156156
$ref: "#/components/schemas/HTTPValidationError"
157-
/verify_omex/{workflow_id}:
157+
/verify/{workflow_id}:
158158
get:
159159
tags:
160160
- Verification
161161
summary: Retrieve verification report for OMEX/COMBINE archive
162-
operationId: get-verify-omex
162+
operationId: get-verify-output
163163
parameters:
164164
- name: workflow_id
165165
in: path
@@ -173,19 +173,19 @@ paths:
173173
content:
174174
application/json:
175175
schema:
176-
$ref: "#/components/schemas/OmexVerifyWorkflowOutput"
176+
$ref: "#/components/schemas/VerifyWorkflowOutput"
177177
"422":
178178
description: Validation Error
179179
content:
180180
application/json:
181181
schema:
182182
$ref: "#/components/schemas/HTTPValidationError"
183-
/verify_runs:
183+
/verify/runs:
184184
post:
185185
tags:
186186
- Verification
187-
summary: Request verification report for biosimulation runs
188-
operationId: start-verify-runs
187+
summary: Request verification report for biosimulation runs by run IDs
188+
operationId: verify-runs
189189
parameters:
190190
- name: workflow_id_prefix
191191
in: query
@@ -276,33 +276,7 @@ paths:
276276
content:
277277
application/json:
278278
schema:
279-
$ref: "#/components/schemas/RunsVerifyWorkflowOutput"
280-
"422":
281-
description: Validation Error
282-
content:
283-
application/json:
284-
schema:
285-
$ref: "#/components/schemas/HTTPValidationError"
286-
/verify_runs/{workflow_id}:
287-
get:
288-
tags:
289-
- Verification
290-
summary: Get verification report for biosimulation runs
291-
operationId: get-verify-runs
292-
parameters:
293-
- name: workflow_id
294-
in: path
295-
required: true
296-
schema:
297-
type: string
298-
title: Workflow Id
299-
responses:
300-
"200":
301-
description: Successful Response
302-
content:
303-
application/json:
304-
schema:
305-
$ref: "#/components/schemas/RunsVerifyWorkflowOutput"
279+
$ref: "#/components/schemas/VerifyWorkflowOutput"
306280
"422":
307281
description: Validation Error
308282
content:
@@ -382,7 +356,7 @@ components:
382356
- created
383357
- updated
384358
title: BiosimulatorVersion
385-
Body_start-verify-omex:
359+
Body_verify-omex:
386360
properties:
387361
uploaded_file:
388362
type: string
@@ -392,7 +366,7 @@ components:
392366
type: object
393367
required:
394368
- uploaded_file
395-
title: Body_start-verify-omex
369+
title: Body_verify-omex
396370
CompareSettings:
397371
properties:
398372
user_description:
@@ -615,47 +589,6 @@ components:
615589
- shape
616590
- values
617591
title: Hdf5DataValues
618-
OmexVerifyWorkflowOutput:
619-
properties:
620-
workflow_id:
621-
type: string
622-
title: Workflow Id
623-
compare_settings:
624-
$ref: "#/components/schemas/CompareSettings"
625-
workflow_status:
626-
$ref: "#/components/schemas/OmexVerifyWorkflowStatus"
627-
timestamp:
628-
type: string
629-
title: Timestamp
630-
workflow_run_id:
631-
anyOf:
632-
- type: string
633-
- type: "null"
634-
title: Workflow Run Id
635-
workflow_error:
636-
anyOf:
637-
- type: string
638-
- type: "null"
639-
title: Workflow Error
640-
workflow_results:
641-
anyOf:
642-
- $ref: "#/components/schemas/GenerateStatisticsActivityOutput"
643-
- type: "null"
644-
type: object
645-
required:
646-
- workflow_id
647-
- compare_settings
648-
- workflow_status
649-
- timestamp
650-
title: OmexVerifyWorkflowOutput
651-
OmexVerifyWorkflowStatus:
652-
type: string
653-
enum:
654-
- PENDING
655-
- IN_PROGRESS
656-
- COMPLETED
657-
- FAILED
658-
title: OmexVerifyWorkflowStatus
659592
RunData:
660593
properties:
661594
run_id:
@@ -678,15 +611,47 @@ components:
678611
- var_names
679612
- data
680613
title: RunData
681-
RunsVerifyWorkflowOutput:
614+
SimulationRunInfo:
615+
properties:
616+
biosim_sim_run:
617+
$ref: "#/components/schemas/BiosimSimulationRun"
618+
hdf5_file:
619+
$ref: "#/components/schemas/HDF5File"
620+
type: object
621+
required:
622+
- biosim_sim_run
623+
- hdf5_file
624+
title: SimulationRunInfo
625+
ValidationError:
626+
properties:
627+
loc:
628+
items:
629+
anyOf:
630+
- type: string
631+
- type: integer
632+
type: array
633+
title: Location
634+
msg:
635+
type: string
636+
title: Message
637+
type:
638+
type: string
639+
title: Error Type
640+
type: object
641+
required:
642+
- loc
643+
- msg
644+
- type
645+
title: ValidationError
646+
VerifyWorkflowOutput:
682647
properties:
683648
workflow_id:
684649
type: string
685650
title: Workflow Id
686651
compare_settings:
687652
$ref: "#/components/schemas/CompareSettings"
688653
workflow_status:
689-
$ref: "#/components/schemas/RunsVerifyWorkflowStatus"
654+
$ref: "#/components/schemas/VerifyWorkflowStatus"
690655
timestamp:
691656
type: string
692657
title: Timestamp
@@ -710,45 +675,13 @@ components:
710675
- compare_settings
711676
- workflow_status
712677
- timestamp
713-
title: RunsVerifyWorkflowOutput
714-
RunsVerifyWorkflowStatus:
678+
title: VerifyWorkflowOutput
679+
VerifyWorkflowStatus:
715680
type: string
716681
enum:
717682
- PENDING
718683
- IN_PROGRESS
719684
- COMPLETED
720685
- FAILED
721686
- RUN_ID_NOT_FOUND
722-
title: RunsVerifyWorkflowStatus
723-
SimulationRunInfo:
724-
properties:
725-
biosim_sim_run:
726-
$ref: "#/components/schemas/BiosimSimulationRun"
727-
hdf5_file:
728-
$ref: "#/components/schemas/HDF5File"
729-
type: object
730-
required:
731-
- biosim_sim_run
732-
- hdf5_file
733-
title: SimulationRunInfo
734-
ValidationError:
735-
properties:
736-
loc:
737-
items:
738-
anyOf:
739-
- type: string
740-
- type: integer
741-
type: array
742-
title: Location
743-
msg:
744-
type: string
745-
title: Message
746-
type:
747-
type: string
748-
title: Error Type
749-
type: object
750-
required:
751-
- loc
752-
- msg
753-
- type
754-
title: ValidationError
687+
title: VerifyWorkflowStatus

Diff for: biosim_client/api/biosim/__init__.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
88
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
99
10-
The version of the OpenAPI document: 0.1.0
10+
The version of the OpenAPI document: 0.2.0
1111
Generated by OpenAPI Generator (https://openapi-generator.tech)
1212
1313
Do not edit the class manually.
@@ -43,12 +43,10 @@
4343
from biosim_client.api.biosim.models.hdf5_group import HDF5Group
4444
from biosim_client.api.biosim.models.http_validation_error import HTTPValidationError
4545
from biosim_client.api.biosim.models.hdf5_data_values import Hdf5DataValues
46-
from biosim_client.api.biosim.models.omex_verify_workflow_output import OmexVerifyWorkflowOutput
47-
from biosim_client.api.biosim.models.omex_verify_workflow_status import OmexVerifyWorkflowStatus
4846
from biosim_client.api.biosim.models.run_data import RunData
49-
from biosim_client.api.biosim.models.runs_verify_workflow_output import RunsVerifyWorkflowOutput
50-
from biosim_client.api.biosim.models.runs_verify_workflow_status import RunsVerifyWorkflowStatus
5147
from biosim_client.api.biosim.models.simulation_run_info import SimulationRunInfo
5248
from biosim_client.api.biosim.models.validation_error import ValidationError
5349
from biosim_client.api.biosim.models.validation_error_loc_inner import ValidationErrorLocInner
5450
from biosim_client.api.biosim.models.value import Value
51+
from biosim_client.api.biosim.models.verify_workflow_output import VerifyWorkflowOutput
52+
from biosim_client.api.biosim.models.verify_workflow_status import VerifyWorkflowStatus

Diff for: biosim_client/api/biosim/api/default_api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
55
6-
The version of the OpenAPI document: 0.1.0
6+
The version of the OpenAPI document: 0.2.0
77
Generated by OpenAPI Generator (https://openapi-generator.tech)
88
99
Do not edit the class manually.

0 commit comments

Comments
 (0)