Skip to content

Commit cffe7d5

Browse files
committed
✨ Remove user ID and product name parameters from ProgramService methods and related API routes; update for consistency and clarity
1 parent bb538cb commit cffe7d5

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

services/api-server/src/simcore_service_api_server/_service_programs.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ def __init__(self, _catalog_service: CatalogService):
1717
async def get_program(
1818
self,
1919
*,
20-
user_id: int,
2120
name: ProgramKeyId,
2221
version: VersionStr,
23-
product_name: str,
2422
) -> Program:
2523
service = await self._catalog_service.get(
2624
name=name,
@@ -33,8 +31,6 @@ async def get_program(
3331
async def list_latest_programs(
3432
self,
3533
*,
36-
user_id: int,
37-
product_name: str,
3834
offset: NonNegativeInt,
3935
limit: PositiveInt,
4036
) -> tuple[list[Program], PageMetaInfoLimitOffset]:
@@ -50,9 +46,7 @@ async def list_latest_programs(
5046
async def list_program_history(
5147
self,
5248
*,
53-
user_id: int,
5449
program_key: ProgramKeyId,
55-
product_name: str,
5650
offset: NonNegativeInt,
5751
limit: PositiveInt,
5852
) -> tuple[list[Program], PageMetaInfoLimitOffset]:

services/api-server/src/simcore_service_api_server/api/routes/programs.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,11 @@
5050
include_in_schema=False, # TO BE RELEASED in 0.8
5151
)
5252
async def list_programs(
53-
user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
5453
program_service: Annotated[ProgramService, Depends(get_program_service)],
5554
url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
56-
product_name: Annotated[str, Depends(get_product_name)],
5755
page_params: Annotated[PaginationParams, Depends()],
5856
):
5957
programs, page_meta = await program_service.list_latest_programs(
60-
user_id=user_id,
61-
product_name=product_name,
6258
offset=page_params.offset,
6359
limit=page_params.limit,
6460
)
@@ -90,16 +86,12 @@ async def list_programs(
9086
)
9187
async def list_program_history(
9288
program_key: ProgramKeyId,
93-
user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
9489
program_service: Annotated[ProgramService, Depends(get_program_service)],
9590
url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
96-
product_name: Annotated[str, Depends(get_product_name)],
9791
page_params: Annotated[PaginationParams, Depends()],
9892
):
9993
programs, page_meta = await program_service.list_program_history(
10094
program_key=program_key,
101-
user_id=user_id,
102-
product_name=product_name,
10395
offset=page_params.offset,
10496
limit=page_params.limit,
10597
)
@@ -125,18 +117,14 @@ async def list_program_history(
125117
async def get_program_release(
126118
program_key: ProgramKeyId,
127119
version: VersionStr,
128-
user_id: Annotated[int, Depends(get_current_user_id)],
129120
program_service: Annotated[ProgramService, Depends(get_program_service)],
130121
url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
131-
product_name: Annotated[str, Depends(get_product_name)],
132122
) -> Program:
133123
"""Gets a specific release of a solver"""
134124
try:
135125
program = await program_service.get_program(
136-
user_id=user_id,
137126
name=program_key,
138127
version=version,
139-
product_name=product_name,
140128
)
141129

142130
program.url = url_for(
@@ -183,10 +171,8 @@ async def create_program_job(
183171
# ensures user has access to solver
184172
inputs = JobInputs(values={})
185173
program = await program_service.get_program(
186-
user_id=user_id,
187174
name=program_key,
188175
version=version,
189-
product_name=product_name,
190176
)
191177

192178
job, project = await job_service.create_job(

0 commit comments

Comments
 (0)