removed sync table

Author: sanderegg

api/specs/storage/_locations.py

@@ -0,0 +1,22 @@
+from typing import Annotated
+
+from fastapi import APIRouter, Depends
+from models_library.api_schemas_storage import FileLocation
+from servicelib.aiohttp import status
+from simcore_service_storage._meta import API_VTAG
+from simcore_service_storage.models import StorageQueryParamsBase
+
+router = APIRouter(
+    prefix=f"/{API_VTAG}",
+    tags=["locations"],
+)
+
+
+# HANDLERS ---------------------------------------------------
+@router.get(
+    "/locations", status_code=status.HTTP_200_OK, response_model=list[FileLocation]
+)
+async def list_storage_locations(
+    _query: Annotated[StorageQueryParamsBase, Depends()],
+):
+    ...

api/specs/web-server/_storage.py

@@ -15,7 +15,6 @@
     FileUploadSchema,
     LinkType,
     PresignedLink,
-    TableSynchronisation,
 )
 from models_library.generics import Envelope
 from models_library.projects_nodes_io import LocationID
@@ -45,17 +44,6 @@ async def list_storage_locations():
     """Returns the list of available storage locations"""
 
 
-@router.post(
-    "/storage/locations/{location_id}:sync",
-    response_model=Envelope[TableSynchronisation],
-    summary="Manually triggers the synchronisation of the file meta data table in the database",
-)
-async def synchronise_meta_data_table(
-    location_id: LocationID, dry_run: bool = False, fire_and_forget: bool = False
-):
-    """Returns an object containing added, changed and removed paths"""
-
-
 @router.get(
     "/storage/locations/{location_id}/datasets",
     response_model=Envelope[list[DatasetMetaData]],

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

@@ -5651,42 +5651,6 @@ paths:
                   $ref: '#/components/schemas/DatasetMetaData'
                 type: array
                 title: Response List Storage Locations
-  /v0/storage/locations/{location_id}:sync:
-    post:
-      tags:
-      - storage
-      summary: Manually triggers the synchronisation of the file meta data table in
-        the database
-      description: Returns an object containing added, changed and removed paths
-      operationId: synchronise_meta_data_table
-      parameters:
-      - name: location_id
-        in: path
-        required: true
-        schema:
-          type: integer
-          title: Location Id
-      - name: dry_run
-        in: query
-        required: false
-        schema:
-          type: boolean
-          default: false
-          title: Dry Run
-      - name: fire_and_forget
-        in: query
-        required: false
-        schema:
-          type: boolean
-          default: false
-          title: Fire And Forget
-      responses:
-        '200':
-          description: Successful Response
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Envelope_TableSynchronisation_'
   /v0/storage/locations/{location_id}/datasets:
     get:
       tags:
@@ -8380,19 +8344,6 @@ components:
           title: Error
       type: object
       title: Envelope[StatusDiagnosticsGet]
-    Envelope_TableSynchronisation_:
-      properties:
-        data:
-          anyOf:
-          - $ref: '#/components/schemas/TableSynchronisation'
-          - type: 'null'
-        error:
-          anyOf:
-          - {}
-          - type: 'null'
-          title: Error
-      type: object
-      title: Envelope[TableSynchronisation]
     Envelope_TagGet_:
       properties:
         data:
@@ -13757,27 +13708,6 @@ components:
       additionalProperties: true
       type: object
       title: StudyUI
-    TableSynchronisation:
-      properties:
-        dry_run:
-          anyOf:
-          - type: boolean
-          - type: 'null'
-          title: Dry Run
-        fire_and_forget:
-          anyOf:
-          - type: boolean
-          - type: 'null'
-          title: Fire And Forget
-        removed:
-          items:
-            type: string
-          type: array
-          title: Removed
-      type: object
-      required:
-      - removed
-      title: TableSynchronisation
     TagAccessRights:
       properties:
         read:

services/web/server/src/simcore_service_webserver/storage/_handlers.py

@@ -339,25 +339,3 @@ class _PathParams(BaseModel):
 
     payload, status = await _forward_request_to_storage(request, "DELETE", body=None)
     return create_data_response(payload, status=status)
-
-
-@routes.post(
-    _path_prefix + "/{location_id}:sync",
-    name="synchronise_meta_data_table",
-)
-@login_required
-@permission_required("storage.files.sync")
-async def synchronise_meta_data_table(request: web.Request) -> web.Response:
-    class _PathParams(BaseModel):
-        location_id: LocationID
-
-    parse_request_path_parameters_as(_PathParams, request)
-
-    class _QueryParams(BaseModel):
-        dry_run: bool = False
-        fire_and_forget: bool = False
-
-    parse_request_query_parameters_as(_QueryParams, request)
-
-    payload, status = await _forward_request_to_storage(request, "POST", body=None)
-    return create_data_response(payload, status=status)

services/web/server/src/simcore_service_webserver/storage/schemas.py

@@ -1,7 +1,6 @@
 from enum import Enum
 from typing import Any, TypeAlias
 
-from models_library.api_schemas_storage import TableSynchronisation
 from pydantic import BaseModel, ConfigDict, Field, RootModel
 
 # NOTE: storage generates URLs that contain double encoded
@@ -79,11 +78,6 @@ class FileLocationEnveloped(BaseModel):
     error: Any | None = None
 
 
-class TableSynchronisationEnveloped(BaseModel):
-    data: TableSynchronisation
-    error: Any
-
-
 class FileUploadEnveloped(BaseModel):
     data: FileUploadSchema
     error: Any

services/web/server/tests/unit/with_dbs/01/test_storage.py

@@ -136,9 +136,6 @@ async def _get_datasets_meta(request: web.Request):
 
     app = create_safe_application()
     app.router.add_get(f"/{storage_api_version}/locations", _get_locs)
-    app.router.add_post(
-        f"/{storage_api_version}/locations/0:sync", _post_sync_meta_data
-    )
     app.router.add_get(
         f"/{storage_api_version}/locations/0/files/{{file_id}}/metadata", _get_filemeta
     )
@@ -181,31 +178,6 @@ async def test_list_storage_locations(
         assert data[0]["user_id"] == logged_user["id"]
 
 
-@pytest.mark.parametrize(
-    "user_role,expected",
-    [
-        (UserRole.ANONYMOUS, status.HTTP_401_UNAUTHORIZED),
-        (UserRole.GUEST, status.HTTP_403_FORBIDDEN),
-        (UserRole.USER, status.HTTP_403_FORBIDDEN),
-        (UserRole.TESTER, status.HTTP_403_FORBIDDEN),
-        (UserRole.ADMIN, status.HTTP_200_OK),
-    ],
-)
-async def test_sync_file_meta_table(
-    client: TestClient, storage_server: TestServer, logged_user, expected
-):
-    url = "/v0/storage/locations/0:sync"
-    assert url.startswith(PREFIX)
-
-    resp = await client.post(url, params={"dry_run": "true"})
-    data, error = await assert_status(resp, expected)
-
-    if not error:
-        # the test of the functionality is already done in storage
-        assert "removed" in data
-        assert not data["removed"]
-
-
 @pytest.mark.parametrize(
     "user_role,expected",
     [