Skip to content

Commit 9c518df

Browse files
committed
Merge branch 'master' into is7158/icon-services
2 parents 373a319 + 0eca9c2 commit 9c518df

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/ci-testing-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Check openapi specs are up to date
4040
run: |
4141
if ! ./ci/github/helpers/openapi-specs-diff.bash diff \
42-
https://raw.githubusercontent.com/${{ github.event.pull_request.head.repo.full_name }}/${{ github.event.after }} \
42+
https://raw.githubusercontent.com/${{ github.event.pull_request.head.repo.full_name }}/${{ github.event.pull_request.head.sha }} \
4343
.; then \
4444
echo "::error:: OAS are not up to date. Run 'make openapi-specs' to update them"; exit 1; \
4545
fi

services/catalog/src/simcore_service_catalog/models/services_db.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from models_library.services_base import ServiceKeyVersion
88
from models_library.services_metadata_editable import ServiceMetaDataEditable
99
from models_library.services_types import ServiceKey, ServiceVersion
10-
from pydantic import AfterValidator, BaseModel, ConfigDict, Field, HttpUrl
10+
from pydantic import BaseModel, ConfigDict, Field
1111
from pydantic.config import JsonDict
1212
from pydantic.types import PositiveInt
1313
from simcore_postgres_database.models.services_compatibility import CompatiblePolicyDict
@@ -16,12 +16,13 @@
1616
class ServiceMetaDataAtDB(ServiceKeyVersion, ServiceMetaDataEditable):
1717
# for a partial update all Editable members must be Optional
1818
name: str | None = None
19-
thumbnail: Annotated[str, HttpUrl] | None = None
20-
icon: Annotated[HttpUrl, AfterValidator(str)] | None = None
19+
thumbnail: str | None = None
20+
icon: str | None = None
2121
description: str | None = None
2222

2323
classifiers: Annotated[
24-
list[str] | None, Field(default_factory=list)
24+
list[str] | None,
25+
Field(default_factory=list),
2526
] = DEFAULT_FACTORY
2627

2728
owner: PositiveInt | None = None

services/web/server/src/simcore_service_webserver/exception_handling/_factory.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ async def _exception_handler(
9090
error=exception,
9191
error_code=oec,
9292
error_context={
93+
# NOTE: context is also used to substitute tokens in the error message
94+
# e.g. "support error is {error_code}"
9395
"request": request,
9496
"request.remote": f"{request.remote}",
9597
"request.method": f"{request.method}",

0 commit comments

Comments
 (0)