Skip to content

Commit 579afac

Browse files
committed
fixes format json-string issue
1 parent 8317ef4 commit 579afac

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

api/specs/web-server/_common.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ class _Json(str):
2525
@classmethod
2626
def __modify_schema__(cls, field_schema: dict[str, Any]) -> None:
2727
# openapi.json schema is corrected here
28-
field_schema.update(type="string", format="json-string")
28+
field_schema.update(
29+
type="string",
30+
# format="json-string" NOTE: we need to get rid of openapi-core in web-server before using this!
31+
)
2932
if schema_extras:
3033
field_schema.update(schema_extras)
3134

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2604,7 +2604,6 @@ paths:
26042604
title: Filters
26052605
type: string
26062606
description: Custom filter query parameter encoded as JSON
2607-
format: json-string
26082607
name: filters
26092608
in: query
26102609
- required: false
@@ -2613,7 +2612,6 @@ paths:
26132612
type: string
26142613
description: Order by field (`description|modified|name`) and direction
26152614
(`asc|desc`). The default sorting order is `{"field":"modified","direction":"desc"}`.
2616-
format: json-string
26172615
default: '{"field":"modified","direction":"desc"}'
26182616
example: '{"field":"some_field_name","direction":"desc"}'
26192617
name: order_by
@@ -2707,7 +2705,6 @@ paths:
27072705
title: Filters
27082706
type: string
27092707
description: Custom filter query parameter encoded as JSON
2710-
format: json-string
27112708
name: filters
27122709
in: query
27132710
- required: false
@@ -2716,7 +2713,6 @@ paths:
27162713
type: string
27172714
description: Order by field (`description|modified|name`) and direction
27182715
(`asc|desc`). The default sorting order is `{"field":"modified","direction":"desc"}`.
2719-
format: json-string
27202716
default: '{"field":"modified","direction":"desc"}'
27212717
example: '{"field":"some_field_name","direction":"desc"}'
27222718
name: order_by
@@ -3153,7 +3149,6 @@ paths:
31533149
title: Filters
31543150
type: string
31553151
description: Custom filter query parameter encoded as JSON
3156-
format: json-string
31573152
name: filters
31583153
in: query
31593154
- required: false
@@ -3162,7 +3157,6 @@ paths:
31623157
type: string
31633158
description: Order by field (`creation_date|description|last_change_date|name|prj_owner|type|uuid`)
31643159
and direction (`asc|desc`). The default sorting order is `{"field":"last_change_date","direction":"desc"}`.
3165-
format: json-string
31663160
default: '{"field":"last_change_date","direction":"desc"}'
31673161
example: '{"field":"some_field_name","direction":"desc"}'
31683162
name: order_by
@@ -3384,7 +3378,6 @@ paths:
33843378
type: string
33853379
description: Order by field (`creation_date|description|last_change_date|name|prj_owner|type|uuid`)
33863380
and direction (`asc|desc`). The default sorting order is `{"field":"last_change_date","direction":"desc"}`.
3387-
format: json-string
33883381
default: '{"field":"last_change_date","direction":"desc"}'
33893382
example: '{"field":"some_field_name","direction":"desc"}'
33903383
name: order_by
@@ -4394,7 +4387,7 @@ paths:
43944387
'403':
43954388
description: ProjectInvalidRightsError
43964389
'404':
4397-
description: UserDefaultWalletNotFoundError, ProjectNotFoundError
4390+
description: ProjectNotFoundError, UserDefaultWalletNotFoundError
43984391
'409':
43994392
description: ProjectTooManyProjectOpenedError
44004393
'422':
@@ -4616,7 +4609,6 @@ paths:
46164609
type: string
46174610
description: Order by field (`credit_cost|node_id|node_name|project_id|project_name|root_parent_project_id|root_parent_project_name|service_key|service_run_status|service_type|service_version|started_at|stopped_at|transaction_status|user_email|user_id|wallet_id|wallet_name`)
46184611
and direction (`asc|desc`). The default sorting order is `{"field":"started_at","direction":"desc"}`.
4619-
format: json-string
46204612
default: '{"field":"started_at","direction":"desc"}'
46214613
example: '{"field":"some_field_name","direction":"desc"}'
46224614
name: order_by
@@ -4637,7 +4629,6 @@ paths:
46374629
JSON. Currently supports the filtering of 'started_at' field with 'from'
46384630
and 'until' parameters in <yyyy-mm-dd> ISO 8601 format. The date range
46394631
specified is inclusive.
4640-
format: json-string
46414632
name: filters
46424633
in: query
46434634
- required: false
@@ -4732,7 +4723,6 @@ paths:
47324723
type: string
47334724
description: Order by field (`credit_cost|node_id|node_name|project_id|project_name|root_parent_project_id|root_parent_project_name|service_key|service_run_status|service_type|service_version|started_at|stopped_at|transaction_status|user_email|user_id|wallet_id|wallet_name`)
47344725
and direction (`asc|desc`). The default sorting order is `{"field":"started_at","direction":"desc"}`.
4735-
format: json-string
47364726
default: '{"field":"started_at","direction":"desc"}'
47374727
example: '{"field":"some_field_name","direction":"desc"}'
47384728
name: order_by
@@ -4753,7 +4743,6 @@ paths:
47534743
JSON. Currently supports the filtering of 'started_at' field with 'from'
47544744
and 'until' parameters in <yyyy-mm-dd> ISO 8601 format. The date range
47554745
specified is inclusive.
4756-
format: json-string
47574746
name: filters
47584747
in: query
47594748
responses:

0 commit comments

Comments
 (0)