Skip to content

Commit d75255c

Browse files
Merge pull request #1514 from virtualcell/biomodel-get-info
Introduce Retrieval of BioModel Info Objects From Quarkus
2 parents bb1bb16 + ff347db commit d75255c

161 files changed

Lines changed: 11943 additions & 641 deletions

File tree

Some content is hidden

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

docker/swarm/README_zeke_stack_on_linux.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,15 @@
3333
-Dvcell.mongodb.port.internal=27020 \
3434
-Dvcell.primarySimdatadir.internal=/Users/evalencia/Documents/TempStorage
3535
popd
36-
```
36+
```
37+
38+
---
39+
Build and Generate Clients
40+
41+
``` bash
42+
pushd ../../
43+
mvn clean install dependency:copy-dependencies -DskipTests=true
44+
cp ./vcell-rest/target/generated/openapi.yaml ./tools/openapi.yaml
45+
./tools/generate.sh
46+
popd
47+
```

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<log4j2-jboss-logmanager.version>1.1.2.Final</log4j2-jboss-logmanager.version>
159159
<log4j-layout-template-json.version>2.24.0</log4j-layout-template-json.version>
160160
<lz4.version>1.8.0</lz4.version>
161+
<microprofile-openapi.version>3.1</microprofile-openapi.version>
161162
<mongodb-driver-sync.version>5.0.0</mongodb-driver-sync.version>
162163
<n5.version>3.0.0</n5.version>
163164
<netcdf.version>4.3.22</netcdf.version>

python-restclient/.openapi-generator/FILES

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
README.md
44
docs/AccesTokenRepresentationRecord.md
55
docs/AdminResourceApi.md
6+
docs/ApplicationInfo.md
67
docs/BatchSystemType.md
78
docs/BioModel.md
9+
docs/BioModelChildSummary.md
810
docs/BioModelResourceApi.md
11+
docs/BioModelSummary.md
912
docs/BiomodelRef.md
1013
docs/DataIdentifier.md
1114
docs/DetailedState.md
@@ -17,16 +20,22 @@ docs/FieldDataReference.md
1720
docs/FieldDataResourceApi.md
1821
docs/FieldDataSavedResults.md
1922
docs/FieldDataShape.md
23+
docs/GroupAccess.md
24+
docs/GroupAccessAll.md
25+
docs/GroupAccessNone.md
26+
docs/GroupAccessSome.md
2027
docs/HelloWorldApi.md
2128
docs/HelloWorldMessage.md
2229
docs/HtcJobID.md
2330
docs/ISize.md
2431
docs/Identity.md
2532
docs/KeyValue.md
33+
docs/MathType.md
2634
docs/MathmodelRef.md
2735
docs/ModelType.md
2836
docs/Origin.md
2937
docs/Publication.md
38+
docs/PublicationInfo.md
3039
docs/PublicationResourceApi.md
3140
docs/SaveBioModel.md
3241
docs/SchedulerStatus.md
@@ -46,10 +55,15 @@ docs/UserIdentityJSONSafe.md
4655
docs/UserLoginInfoForMapping.md
4756
docs/UserRegistrationInfo.md
4857
docs/UsersResourceApi.md
58+
docs/VCDocumentType.md
4959
docs/VCSimulationIdentifier.md
5060
docs/VCellHTTPError.md
61+
docs/VCellSite.md
62+
docs/VCellSoftwareVersion.md
5163
docs/VariableDomain.md
5264
docs/VariableType.md
65+
docs/Version.md
66+
docs/VersionFlag.md
5367
test/__init__.py
5468
tox.ini
5569
vcell_client/__init__.py
@@ -68,8 +82,11 @@ vcell_client/configuration.py
6882
vcell_client/exceptions.py
6983
vcell_client/models/__init__.py
7084
vcell_client/models/acces_token_representation_record.py
85+
vcell_client/models/application_info.py
7186
vcell_client/models/batch_system_type.py
7287
vcell_client/models/bio_model.py
88+
vcell_client/models/bio_model_child_summary.py
89+
vcell_client/models/bio_model_summary.py
7390
vcell_client/models/biomodel_ref.py
7491
vcell_client/models/data_identifier.py
7592
vcell_client/models/detailed_state.py
@@ -80,15 +97,21 @@ vcell_client/models/field_data.py
8097
vcell_client/models/field_data_reference.py
8198
vcell_client/models/field_data_saved_results.py
8299
vcell_client/models/field_data_shape.py
100+
vcell_client/models/group_access.py
101+
vcell_client/models/group_access_all.py
102+
vcell_client/models/group_access_none.py
103+
vcell_client/models/group_access_some.py
83104
vcell_client/models/hello_world_message.py
84105
vcell_client/models/htc_job_id.py
85106
vcell_client/models/i_size.py
86107
vcell_client/models/identity.py
87108
vcell_client/models/key_value.py
109+
vcell_client/models/math_type.py
88110
vcell_client/models/mathmodel_ref.py
89111
vcell_client/models/model_type.py
90112
vcell_client/models/origin.py
91113
vcell_client/models/publication.py
114+
vcell_client/models/publication_info.py
92115
vcell_client/models/save_bio_model.py
93116
vcell_client/models/scheduler_status.py
94117
vcell_client/models/simulation_execution_status_record.py
@@ -105,8 +128,13 @@ vcell_client/models/user_identity_json_safe.py
105128
vcell_client/models/user_login_info_for_mapping.py
106129
vcell_client/models/user_registration_info.py
107130
vcell_client/models/v_cell_http_error.py
131+
vcell_client/models/v_cell_site.py
132+
vcell_client/models/v_cell_software_version.py
108133
vcell_client/models/variable_domain.py
109134
vcell_client/models/variable_type.py
135+
vcell_client/models/vc_document_type.py
110136
vcell_client/models/vc_simulation_identifier.py
137+
vcell_client/models/version.py
138+
vcell_client/models/version_flag.py
111139
vcell_client/py.typed
112140
vcell_client/rest.py

python-restclient/README.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ Class | Method | HTTP request | Description
9292
*AdminResourceApi* | [**get_usage**](docs/AdminResourceApi.md#get_usage) | **GET** /api/v1/admin/usage | Get usage summary
9393
*BioModelResourceApi* | [**delete_bio_model**](docs/BioModelResourceApi.md#delete_bio_model) | **DELETE** /api/v1/bioModel/{bioModelID} | Delete the BioModel from VCell&#39;s database.
9494
*BioModelResourceApi* | [**get_bio_model**](docs/BioModelResourceApi.md#get_bio_model) | **GET** /api/v1/bioModel/{bioModelID} | Get BioModel.
95+
*BioModelResourceApi* | [**get_bio_model_summaries**](docs/BioModelResourceApi.md#get_bio_model_summaries) | **GET** /api/v1/bioModel/summaries | Return BioModel summaries.
96+
*BioModelResourceApi* | [**get_bio_model_summary**](docs/BioModelResourceApi.md#get_bio_model_summary) | **GET** /api/v1/bioModel/{bioModelID}/summary | All of the text based information about a BioModel (summary, version, publication status, etc...), but not the actual BioModel itself.
9597
*BioModelResourceApi* | [**get_bio_model_vcml**](docs/BioModelResourceApi.md#get_bio_model_vcml) | **GET** /api/v1/bioModel/{bioModelID}/vcml_download | Get the BioModel in VCML format.
96-
*BioModelResourceApi* | [**save_bio_model**](docs/BioModelResourceApi.md#save_bio_model) | **POST** /api/v1/bioModel/save | Save&#39;s the given BioModel. Optional parameters of name and simulations to update due to math changes. Returns saved BioModel as VCML.
98+
*BioModelResourceApi* | [**save_bio_model**](docs/BioModelResourceApi.md#save_bio_model) | **POST** /api/v1/bioModel | Save&#39;s the given BioModel. Optional parameters of name and simulations to update due to math changes. Returns saved BioModel as VCML.
9799
*FieldDataResourceApi* | [**advanced_create**](docs/FieldDataResourceApi.md#advanced_create) | **POST** /api/v1/fieldData/advancedCreate | Create Field Data with granular detail in one request.The following files are accepted: .tif and .zip.
98100
*FieldDataResourceApi* | [**analyze_file**](docs/FieldDataResourceApi.md#analyze_file) | **POST** /api/v1/fieldData/analyzeFile | Analyze uploaded image file (Tiff, Zip, and Non-GPL BioFormats) and return field data. Color mapped images not supported (the colors in those images will be interpreted as separate channels). Filenames must be lowercase alphanumeric, and can contain underscores.
99101
*FieldDataResourceApi* | [**copy_models_field_data**](docs/FieldDataResourceApi.md#copy_models_field_data) | **POST** /api/v1/fieldData/copyModelsFieldData | Copy all existing field data from a BioModel/MathModel that you have access to, but don&#39;t own.
@@ -129,8 +131,11 @@ Class | Method | HTTP request | Description
129131
## Documentation For Models
130132

131133
- [AccesTokenRepresentationRecord](docs/AccesTokenRepresentationRecord.md)
134+
- [ApplicationInfo](docs/ApplicationInfo.md)
132135
- [BatchSystemType](docs/BatchSystemType.md)
133136
- [BioModel](docs/BioModel.md)
137+
- [BioModelChildSummary](docs/BioModelChildSummary.md)
138+
- [BioModelSummary](docs/BioModelSummary.md)
134139
- [BiomodelRef](docs/BiomodelRef.md)
135140
- [DataIdentifier](docs/DataIdentifier.md)
136141
- [DetailedState](docs/DetailedState.md)
@@ -141,15 +146,21 @@ Class | Method | HTTP request | Description
141146
- [FieldDataReference](docs/FieldDataReference.md)
142147
- [FieldDataSavedResults](docs/FieldDataSavedResults.md)
143148
- [FieldDataShape](docs/FieldDataShape.md)
149+
- [GroupAccess](docs/GroupAccess.md)
150+
- [GroupAccessAll](docs/GroupAccessAll.md)
151+
- [GroupAccessNone](docs/GroupAccessNone.md)
152+
- [GroupAccessSome](docs/GroupAccessSome.md)
144153
- [HelloWorldMessage](docs/HelloWorldMessage.md)
145154
- [HtcJobID](docs/HtcJobID.md)
146155
- [ISize](docs/ISize.md)
147156
- [Identity](docs/Identity.md)
148157
- [KeyValue](docs/KeyValue.md)
158+
- [MathType](docs/MathType.md)
149159
- [MathmodelRef](docs/MathmodelRef.md)
150160
- [ModelType](docs/ModelType.md)
151161
- [Origin](docs/Origin.md)
152162
- [Publication](docs/Publication.md)
163+
- [PublicationInfo](docs/PublicationInfo.md)
153164
- [SaveBioModel](docs/SaveBioModel.md)
154165
- [SchedulerStatus](docs/SchedulerStatus.md)
155166
- [SimulationExecutionStatusRecord](docs/SimulationExecutionStatusRecord.md)
@@ -165,10 +176,15 @@ Class | Method | HTTP request | Description
165176
- [UserIdentityJSONSafe](docs/UserIdentityJSONSafe.md)
166177
- [UserLoginInfoForMapping](docs/UserLoginInfoForMapping.md)
167178
- [UserRegistrationInfo](docs/UserRegistrationInfo.md)
179+
- [VCDocumentType](docs/VCDocumentType.md)
168180
- [VCSimulationIdentifier](docs/VCSimulationIdentifier.md)
169181
- [VCellHTTPError](docs/VCellHTTPError.md)
182+
- [VCellSite](docs/VCellSite.md)
183+
- [VCellSoftwareVersion](docs/VCellSoftwareVersion.md)
170184
- [VariableDomain](docs/VariableDomain.md)
171185
- [VariableType](docs/VariableType.md)
186+
- [Version](docs/Version.md)
187+
- [VersionFlag](docs/VersionFlag.md)
172188

173189

174190
<a id="documentation-for-authorization"></a>
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# ApplicationInfo
2+
3+
4+
## Properties
5+
Name | Type | Description | Notes
6+
------------ | ------------- | ------------- | -------------
7+
**name** | **str** | | [optional]
8+
**type** | [**MathType**](MathType.md) | | [optional]
9+
**dimensions** | **int** | | [optional]
10+
**geometry_name** | **str** | | [optional]
11+
12+
## Example
13+
14+
```python
15+
from vcell_client.models.application_info import ApplicationInfo
16+
17+
# TODO update the JSON string below
18+
json = "{}"
19+
# create an instance of ApplicationInfo from a JSON string
20+
application_info_instance = ApplicationInfo.from_json(json)
21+
# print the JSON string representation of the object
22+
print ApplicationInfo.to_json()
23+
24+
# convert the object into a dict
25+
application_info_dict = application_info_instance.to_dict()
26+
# create an instance of ApplicationInfo from a dict
27+
application_info_form_dict = application_info.from_dict(application_info_dict)
28+
```
29+
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
30+
31+
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# BioModelChildSummary
2+
3+
4+
## Properties
5+
Name | Type | Description | Notes
6+
------------ | ------------- | ------------- | -------------
7+
**sc_names** | **List[str]** | | [optional]
8+
**sc_annots** | **List[str]** | | [optional]
9+
**geo_names** | **List[str]** | | [optional]
10+
**geo_dims** | **List[int]** | | [optional]
11+
**app_types** | [**List[MathType]**](MathType.md) | | [optional]
12+
**sim_names** | **List[List[str]]** | | [optional]
13+
**sim_annots** | **List[List[str]]** | | [optional]
14+
**geometry_dimensions** | **List[int]** | | [optional]
15+
**geometry_names** | **List[str]** | | [optional]
16+
**simulation_context_annotations** | **List[str]** | | [optional]
17+
**simulation_context_names** | **List[str]** | | [optional]
18+
**application_info** | [**List[ApplicationInfo]**](ApplicationInfo.md) | | [optional]
19+
20+
## Example
21+
22+
```python
23+
from vcell_client.models.bio_model_child_summary import BioModelChildSummary
24+
25+
# TODO update the JSON string below
26+
json = "{}"
27+
# create an instance of BioModelChildSummary from a JSON string
28+
bio_model_child_summary_instance = BioModelChildSummary.from_json(json)
29+
# print the JSON string representation of the object
30+
print BioModelChildSummary.to_json()
31+
32+
# convert the object into a dict
33+
bio_model_child_summary_dict = bio_model_child_summary_instance.to_dict()
34+
# create an instance of BioModelChildSummary from a dict
35+
bio_model_child_summary_form_dict = bio_model_child_summary.from_dict(bio_model_child_summary_dict)
36+
```
37+
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
38+
39+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# BioModelContext
2+
3+
4+
## Properties
5+
Name | Type | Description | Notes
6+
------------ | ------------- | ------------- | -------------
7+
**version** | [**Version**](Version.md) | | [optional]
8+
**summary** | [**BioModelChildSummary**](BioModelChildSummary.md) | | [optional]
9+
**publication_information** | [**List[PublicationInfo]**](PublicationInfo.md) | | [optional]
10+
**v_cell_software_version** | [**VCellSoftwareVersion**](VCellSoftwareVersion.md) | | [optional]
11+
12+
## Example
13+
14+
```python
15+
from vcell_client.models.bio_model_context import BioModelContext
16+
17+
# TODO update the JSON string below
18+
json = "{}"
19+
# create an instance of BioModelContext from a JSON string
20+
bio_model_context_instance = BioModelContext.from_json(json)
21+
# print the JSON string representation of the object
22+
print BioModelContext.to_json()
23+
24+
# convert the object into a dict
25+
bio_model_context_dict = bio_model_context_instance.to_dict()
26+
# create an instance of BioModelContext from a dict
27+
bio_model_context_form_dict = bio_model_context.from_dict(bio_model_context_dict)
28+
```
29+
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
30+
31+

0 commit comments

Comments
 (0)