Skip to content

Commit bc4c582

Browse files
committed
Fixes based on PR comments
1 parent 2af1289 commit bc4c582

File tree

4 files changed

+21
-28
lines changed

4 files changed

+21
-28
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
from typing import Any
2+
3+
from pydantic.fields import FieldInfo
4+
5+
6+
def _get_query_params(field: FieldInfo) -> dict[str, Any]:
7+
params = {}
8+
9+
if field.description:
10+
params["description"] = field.description
11+
if field.examples:
12+
params["example"] = next(
13+
(example for example in field.examples if "*" in example), field.examples[0]
14+
)
15+
return params

services/api-server/src/simcore_service_api_server/api/dependencies/models_schemas_function_filters.py

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
from typing import Annotated, Any
1+
from typing import Annotated
22

33
from fastapi import Query
44
from models_library.functions import FunctionJobCollectionsListFilters
5-
from pydantic.fields import FieldInfo
65

7-
8-
def _get_query_params(field: FieldInfo) -> dict[str, Any]:
9-
params = {}
10-
11-
if field.description:
12-
params["description"] = field.description
13-
if field.examples:
14-
params["example"] = next(
15-
(example for example in field.examples if "*" in example), field.examples[0]
16-
)
17-
return params
6+
from ._utils import _get_query_params
187

198

209
def get_function_job_collections_filters(

services/api-server/src/simcore_service_api_server/api/dependencies/models_schemas_solvers_filters.py

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
1-
from typing import Annotated, Any
1+
from typing import Annotated
22

33
from fastapi import Query
4-
from pydantic.fields import FieldInfo
54

65
from ...models.schemas.solvers_filters import SolversListFilters
7-
8-
9-
def _get_query_params(field: FieldInfo) -> dict[str, Any]:
10-
params = {}
11-
12-
if field.description:
13-
params["description"] = field.description
14-
if field.examples:
15-
params["example"] = next(
16-
(example for example in field.examples if "*" in example), field.examples[0]
17-
)
18-
return params
6+
from ._utils import _get_query_params
197

208

219
def get_solvers_filters(

services/web/server/src/simcore_service_webserver/functions/_functions_repository.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import json
22

3+
import sqlalchemy
34
from aiohttp import web
45
from models_library.functions import (
56
FunctionClass,
@@ -291,7 +292,7 @@ async def list_function_job_collections(
291292
"""
292293

293294
async with transaction_context(get_asyncpg_engine(app), connection) as conn:
294-
filter_condition = True
295+
filter_condition = sqlalchemy.sql.true()
295296

296297
if filters and filters.has_function_id:
297298
subquery = (

0 commit comments

Comments
 (0)