Skip to content

Commit 7edd084

Browse files
Deploy Version 0.1.0
1 parent df078b8 commit 7edd084

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

compose_api/api/routers/core.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ async def submit_simulation(background_tasks: BackgroundTasks, uploaded_file: Up
107107
pb_allow_list=PBAllowList(
108108
allow_list=[
109109
"pypi::git+https://github.com/biosimulators/bspil-basico.git@initial_work",
110-
"pypi:cobra",
111-
"pypi:tellurium",
112-
"pypi:copasi-basico",
113-
"pypi:smoldyn",
114-
"pypi:numpy",
115-
"pypi:matplotlib",
116-
"pypi:scipy",
110+
"pypi::cobra",
111+
"pypi::tellurium",
112+
"pypi::copasi-basico",
113+
"pypi::smoldyn",
114+
"pypi::numpy",
115+
"pypi::matplotlib",
116+
"pypi::scipy",
117117
]
118118
),
119119
)

compose_api/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.0.1"
1+
__version__ = "0.1.0"
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#SLURM_SUBMIT_HOST=hamantis.cam.uchc.edu
2-
SLURM_SUBMIT_HOST=haproxy-ssh
2+
SLURM_SUBMIT_HOST=mantis-sub-7.cam.uchc.edu
33
SLURM_SUBMIT_USER=crbmapi
44
#SLURM_SUBMIT_KEY_PATH=/run/secrets/slurmsubmitkeyfile/ssh-privatekey
55
SLURM_PARTITION=general
66
SLURM_NODE_LIST=mantis-039
7+
SLURM_BUILD_NODE=mantis-007
78
SLURM_QOS=general
89
SLURM_LOG_BASE_PATH=/home/FCAM/crbmapi/compose_api/prod/htclogs
9-
10+
SLURM_SBATCH_BASE_PATH=/home/FCAM/crbmapi/compose_api/prod/slurm_sbatch
1011
HPC_IMAGE_BASE_PATH=/home/FCAM/crbmapi/compose_api/prod/images
11-
HPC_REPO_BASE_PATH=/home/FCAM/crbmapi/compose_api/prod/repos
12+
HPC_REPO_BASE_PATH=/home/FCAM/crbmapi/compose_api/prod/repo
1213
HPC_SIM_BASE_PATH=/home/FCAM/crbmapi/compose_api/prod/sims
1314
HPC_SIM_CONFIG_FILE=publish-uchc-hpc.json
1415

@@ -18,3 +19,5 @@ NATS_WORKER_EVENT_SUBJECT=prod.publish
1819
NATS_EMITTER_URL=nats://compose.cam.uchc.edu:30052
1920
NATS_EMITTER_MAGIC_WORD=nats-emitter-magic-word
2021
MARIMO_API_SERVER=http://api:8000
22+
23+
NAMESPACE=prod

kustomize/overlays/compose-api-rke/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace: compose-api-rke
55

66
images:
77
- name: ghcr.io/biosimulations/compose-api
8-
newTag: 0.0.1
8+
newTag: 0.1.0
99
- name: docker.io/library/mongo
1010
newTag: 8.0.12
1111

tests/api/test_client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ async def test_sim_run(
3939
assert isinstance(sim_experiment, SimulationExperiment)
4040

4141
current_status = await get_simulation_status.asyncio(
42-
client=in_memory_api_client, simulation_id=sim_experiment.simulation.database_id
42+
client=in_memory_api_client, simulation_id=sim_experiment.simulation_id
4343
)
4444

4545
if not isinstance(current_status, HpcRun) or not isinstance(current_status.status, JobStatus):
@@ -49,15 +49,15 @@ async def test_sim_run(
4949
while current_status.status != JobStatus.COMPLETED and num_loops < 10:
5050
await asyncio.sleep(2)
5151
current_status = await get_simulation_status.asyncio(
52-
client=in_memory_api_client, simulation_id=sim_experiment.simulation.database_id
52+
client=in_memory_api_client, simulation_id=sim_experiment.simulation_id
5353
)
5454
num_loops += 1
5555

5656
if not isinstance(current_status, HpcRun) or not isinstance(current_status.status, JobStatus):
5757
raise TypeError()
5858

5959
current_status = await get_simulation_status.asyncio(
60-
client=in_memory_api_client, simulation_id=sim_experiment.simulation.database_id
60+
client=in_memory_api_client, simulation_id=sim_experiment.simulation_id
6161
)
6262

6363
if not isinstance(current_status, HpcRun) or not isinstance(current_status.status, JobStatus):

0 commit comments

Comments
 (0)