fixes oas

Author: pcrespov

api/specs/web-server/_nih_sparc_redirections.py

@@ -1,5 +1,4 @@
-""" Helper script to generate OAS automatically NIH-sparc portal API section
-"""
+"""Helper script to generate OAS automatically NIH-sparc portal API section"""
 
 # pylint: disable=protected-access
 # pylint: disable=redefined-outer-name
@@ -11,7 +10,7 @@
 from fastapi import APIRouter, status
 from fastapi.responses import RedirectResponse
 from models_library.projects import ProjectID
-from models_library.services import ServiceKey, ServiceKeyVersion
+from models_library.services_types import ServiceKey, ServiceVersion
 from pydantic import HttpUrl, PositiveInt
 
 router = APIRouter(
@@ -31,7 +30,7 @@
 async def get_redirection_to_viewer(
     file_type: str,
     viewer_key: ServiceKey,
-    viewer_version: ServiceKeyVersion,
+    viewer_version: ServiceVersion,
     file_size: PositiveInt,
     download_link: HttpUrl,
     file_name: str | None = "unknown",

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

@@ -4528,6 +4528,13 @@ paths:
           type: string
           pattern: ^simcore/services/((comp|dynamic|frontend))/([a-z0-9][a-z0-9_.-]*/)*([a-z0-9-_]+[a-z0-9])$
           title: Viewer Key
+      - name: viewer_version
+        in: query
+        required: true
+        schema:
+          type: string
+          pattern: ^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$
+          title: Viewer Version
       - name: file_size
         in: query
         required: true
@@ -4554,12 +4561,6 @@ paths:
           - type: 'null'
           default: unknown
           title: File Name
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ServiceKeyVersion'
       responses:
         '302':
           description: Opens osparc and starts viewer for selected data