Skip to content

Commit 4fc4e94

Browse files
Merge pull request #58 from biosimulations/improve-user-qol
Improve user QOL
2 parents ec161bf + d21fc19 commit 4fc4e94

32 files changed

Lines changed: 544 additions & 560 deletions
File renamed without changes.

compose_api/api/client/api/simulators/get_processes_list.py renamed to compose_api/api/client/api/compute/get_processes_list.py

File renamed without changes.

compose_api/api/client/api/simulators/get_simulator_list.py renamed to compose_api/api/client/api/compute/get_simulator_list.py

File renamed without changes.

compose_api/api/client/api/simulators/get_steps_list.py renamed to compose_api/api/client/api/compute/get_steps_list.py

File renamed without changes.
File renamed without changes.

compose_api/api/client/api/simulators/run_copasi.py renamed to compose_api/api/client/api/curated/run_copasi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def _get_kwargs(
3434

3535
_kwargs: dict[str, Any] = {
3636
"method": "post",
37-
"url": "/tools/copasi",
37+
"url": "/curated/copasi",
3838
"params": params,
3939
}
4040

compose_api/api/client/api/simulators/run_tellurium.py renamed to compose_api/api/client/api/curated/run_tellurium.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def _get_kwargs(
3434

3535
_kwargs: dict[str, Any] = {
3636
"method": "post",
37-
"url": "/tools/tellurium",
37+
"url": "/curated/tellurium",
3838
"params": params,
3939
}
4040

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""Contains endpoint functions for accessing the API"""

compose_api/api/client/api/simulations/get_simulation_results_file.py renamed to compose_api/api/client/api/results/get_simulation_results_file.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
def _get_kwargs(
1515
*,
16-
experiment_id: str,
16+
simulation_id: int,
1717
) -> dict[str, Any]:
1818
params: dict[str, Any] = {}
1919

20-
params["experiment_id"] = experiment_id
20+
params["simulation_id"] = simulation_id
2121

2222
params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
2323

2424
_kwargs: dict[str, Any] = {
2525
"method": "get",
26-
"url": "/core/simulation/run/results/file",
26+
"url": "/results/simulation/results/file",
2727
"params": params,
2828
}
2929

@@ -60,12 +60,12 @@ def _build_response(
6060
def sync_detailed(
6161
*,
6262
client: Union[AuthenticatedClient, Client],
63-
experiment_id: str,
63+
simulation_id: int,
6464
) -> Response[Union[Any, HTTPValidationError]]:
6565
"""Get simulation results as a zip file
6666
6767
Args:
68-
experiment_id (str):
68+
simulation_id (int):
6969
7070
Raises:
7171
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -76,7 +76,7 @@ def sync_detailed(
7676
"""
7777

7878
kwargs = _get_kwargs(
79-
experiment_id=experiment_id,
79+
simulation_id=simulation_id,
8080
)
8181

8282
response = client.get_httpx_client().request(
@@ -89,12 +89,12 @@ def sync_detailed(
8989
def sync(
9090
*,
9191
client: Union[AuthenticatedClient, Client],
92-
experiment_id: str,
92+
simulation_id: int,
9393
) -> Optional[Union[Any, HTTPValidationError]]:
9494
"""Get simulation results as a zip file
9595
9696
Args:
97-
experiment_id (str):
97+
simulation_id (int):
9898
9999
Raises:
100100
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -106,19 +106,19 @@ def sync(
106106

107107
return sync_detailed(
108108
client=client,
109-
experiment_id=experiment_id,
109+
simulation_id=simulation_id,
110110
).parsed
111111

112112

113113
async def asyncio_detailed(
114114
*,
115115
client: Union[AuthenticatedClient, Client],
116-
experiment_id: str,
116+
simulation_id: int,
117117
) -> Response[Union[Any, HTTPValidationError]]:
118118
"""Get simulation results as a zip file
119119
120120
Args:
121-
experiment_id (str):
121+
simulation_id (int):
122122
123123
Raises:
124124
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -129,7 +129,7 @@ async def asyncio_detailed(
129129
"""
130130

131131
kwargs = _get_kwargs(
132-
experiment_id=experiment_id,
132+
simulation_id=simulation_id,
133133
)
134134

135135
response = await client.get_async_httpx_client().request(**kwargs)
@@ -140,12 +140,12 @@ async def asyncio_detailed(
140140
async def asyncio(
141141
*,
142142
client: Union[AuthenticatedClient, Client],
143-
experiment_id: str,
143+
simulation_id: int,
144144
) -> Optional[Union[Any, HTTPValidationError]]:
145145
"""Get simulation results as a zip file
146146
147147
Args:
148-
experiment_id (str):
148+
simulation_id (int):
149149
150150
Raises:
151151
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -158,6 +158,6 @@ async def asyncio(
158158
return (
159159
await asyncio_detailed(
160160
client=client,
161-
experiment_id=experiment_id,
161+
simulation_id=simulation_id,
162162
)
163163
).parsed

compose_api/api/client/api/simulations/get_simulation_status.py renamed to compose_api/api/client/api/results/get_simulation_status.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def _get_kwargs(
2424

2525
_kwargs: dict[str, Any] = {
2626
"method": "get",
27-
"url": "/core/simulation/run/status",
27+
"url": "/results/simulation/status",
2828
"params": params,
2929
}
3030

0 commit comments

Comments
 (0)