Skip to content

Commit ac49eb0

Browse files
committed
reduce noise in diff
1 parent 5b706d8 commit ac49eb0

File tree

2 files changed

+6
-5
lines changed
  • services/api-server

2 files changed

+6
-5
lines changed

services/api-server/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ openapi-client-master.json:
6969

7070

7171
define _openapi_diff_inputs
72-
$(SCRIPTS_DIR)/openapi-diff.bash diff $(foreach f,$^,/specs/$f) -f json > $@
72+
$(SCRIPTS_DIR)/openapi-diff.bash diff $(foreach f,$^,/specs/$f) --format json > $@
7373
$(SCRIPTS_DIR)/openapi-diff.bash breaking $(foreach f,$^,/specs/$f) --fail-on ERR > /dev/null
7474
endef
7575

@@ -81,7 +81,7 @@ openapi-%-diff.json: openapi.json openapi-%.json ## Diffs against newer or older
8181
$(call _openapi_diff_inputs)
8282

8383
openapi-diff.md: guard-OPENAPI_JSON_URL openapi.json ## Diffs against a remote openapi.json. E.g. OPENAPI_JSON_URL=https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/refs/heads/master/services/api-server/openapi.json
84-
$(SCRIPTS_DIR)/openapi-diff.bash diff $(OPENAPI_JSON_URL) /specs/openapi.json -f markup > $@
84+
$(SCRIPTS_DIR)/openapi-diff.bash diff $(OPENAPI_JSON_URL) /specs/openapi.json --format markup --flatten-allof --exclude-elements title,description > $@
8585
$(SCRIPTS_DIR)/openapi-diff.bash breaking $(OPENAPI_JSON_URL) /specs/openapi.json --fail-on ERR > /dev/null
8686

8787
# SEE https://schemathesis.readthedocs.io/en/stable/index.html

services/api-server/src/simcore_service_api_server/models/schemas/files.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from pydantic import (
1414
AnyUrl,
1515
BaseModel,
16-
ByteSize,
1716
ConfigDict,
1817
Field,
1918
StringConstraints,
@@ -170,8 +169,10 @@ class UploadLinks(BaseModel):
170169

171170

172171
class FileUploadData(BaseModel):
173-
chunk_size: ByteSize
174-
urls: list[AnyUrl]
172+
chunk_size: int # TODO: should probably be a NonNegativeInt
173+
urls: list[
174+
Annotated[AnyUrl, StringConstraints(max_length=65536)]
175+
] # maxlength added for backwards compatibility
175176
links: UploadLinks
176177

177178

0 commit comments

Comments
 (0)