Merge branch 'master' into feature/keep-console-errors

.env-devel

@@ -59,7 +59,7 @@ CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX=""
 CLUSTERS_KEEPER_LOGLEVEL=INFO
 CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
 CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null
-CLUSTERS_KEEPER_TASK_INTERVAL=30
+CLUSTERS_KEEPER_TASK_INTERVAL=00:00:30
 CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES=null
 CLUSTERS_KEEPER_TRACING={}
 

.vscode/launch.template.json

@@ -15,6 +15,7 @@
         "--log-cli-level=INFO",
         "--pdb",
         "--setup-show",
+        "--durations=5",
         "-sx",
         "-vv",
         "${file}"

Makefile

@@ -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
+services.ignore.md: ## Auto generates service.md
 	# Making $@
 	scripts/echo_services_markdown.py > $@
 

api/specs/storage/scripts/Makefile → api/specs/storage/Makefile

@@ -1,3 +1,4 @@
+.DEFAULT_GOAL := all
 
 .PHONY: _check_venv_active
 _check_venv_active:
@@ -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

api/specs/storage/scripts/storage.py → api/specs/storage/openapi.py

@@ -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
@@ -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"]
@@ -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)