Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️♻️ Fixes openapi specs generators and drops openapi-core dependencies #6787

Merged
merged 29 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ab2ee4a
updates OAS generators
pcrespov Nov 21, 2024
42e780f
fixes models to make schema work
pcrespov Nov 21, 2024
6714d6e
fixes models to make schema work
pcrespov Nov 21, 2024
ade0b24
rm artifact
pcrespov Nov 21, 2024
542723c
rename recipe
pcrespov Nov 21, 2024
4ddf9f4
tests
pcrespov Nov 21, 2024
df951af
rm oas for director
pcrespov Nov 21, 2024
3c0a217
rm openapi-core
pcrespov Nov 21, 2024
21475ef
rm openapi-core dependencies
pcrespov Nov 21, 2024
89e36ba
mv to pytest_simcore:
pcrespov Nov 21, 2024
4b5b6f6
further simplified tests in web
pcrespov Nov 21, 2024
a038265
both tests run
pcrespov Nov 21, 2024
379d758
restore director schemas
pcrespov Nov 21, 2024
089d180
updates storage
pcrespov Nov 21, 2024
a017337
new util
pcrespov Nov 21, 2024
4671620
using in web
pcrespov Nov 21, 2024
4426723
refactored storage api generator
pcrespov Nov 21, 2024
6089200
updates storae
pcrespov Nov 21, 2024
3be5679
fixes bump
pcrespov Nov 21, 2024
ca1cf9e
services/storage api version: 0.4.0 → 0.5.0
pcrespov Nov 21, 2024
ea460a0
storage and web-api validated
pcrespov Nov 21, 2024
7ff80e1
rm old tests
pcrespov Nov 21, 2024
f0b0105
rm old tests
pcrespov Nov 21, 2024
e12d114
@GitHK review: forgot todo
pcrespov Nov 21, 2024
cc66753
@GitHK review: req constraints
pcrespov Nov 21, 2024
4e7954f
@sanderegg review: rm cache
pcrespov Nov 22, 2024
fd60790
@sanderegg review: rm session scope
pcrespov Nov 22, 2024
e54cb62
@sanderegg review: rm session scope
pcrespov Nov 22, 2024
4219aca
Merge branch 'master' into fix/api-specs-in-master
pcrespov Nov 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vscode/launch.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"--log-cli-level=INFO",
"--pdb",
"--setup-show",
"--durations=5",
"-sx",
"-vv",
"${file}"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,8 @@ auto-doc: .stack-simcore-version.yml ## Auto generates diagrams for README.md
# Updating docs/img
@mv --verbose $<.png docs/img/

.PHONY: services.md
services.md: ## Auto generates service.md
.PHONY: services.ignore.md
pcrespov marked this conversation as resolved.
Show resolved Hide resolved
services.ignore.md: ## Auto generates service.md
# Making $@
scripts/echo_services_markdown.py > $@

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DEFAULT_GOAL := all

.PHONY: _check_venv_active
_check_venv_active:
Expand All @@ -6,13 +7,12 @@ _check_venv_active:


.PHONY: install
install: _check_venv_active
@cd ./../../../../services/storage && make install-dev && cd -
install-dev install: _check_venv_active
# installing storage and requirements.txt
@cd ./../../../services/storage && make install-dev && cd -
@uv pip install -r requirements.txt


.PHONY: all
all: _check_venv_active
@for file in *.py; do \
python $$file; \
done
all: _check_venv_active install
python openapi.py
pcrespov marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from models_library.projects_nodes_io import LocationID, StorageFileID
from models_library.users import UserID
from pydantic import AnyUrl, ByteSize
from servicelib.fastapi.openapi import create_openapi_specs
from servicelib.long_running_tasks._models import TaskGet, TaskId, TaskStatus
from settings_library.s3 import S3Settings
from simcore_service_storage._meta import API_VTAG
Expand All @@ -35,6 +36,7 @@
FileMetaData,
SearchFilesQueryParams,
)
from simcore_service_storage.resources import storage_resources

TAGS_DATASETS: list[str | Enum] = ["datasets"]
TAGS_FILES: list[str | Enum] = ["files"]
Expand Down Expand Up @@ -401,6 +403,7 @@ async def cancel_and_delete_task(task_id: TaskId):


if __name__ == "__main__":
from _common import CURRENT_DIR, create_openapi_specs
openapi = create_openapi_specs(app, drop_fastapi_default_422=True)

create_openapi_specs(app, CURRENT_DIR.parent / "openapi.yaml")
oas_path = storage_resources.get_path("api/v0/openapi.yaml").resolve()
print(f"Writing {oas_path}...", end=None)
Loading
Loading