rm unused in web-server

Author: pcrespov

services/web/server/src/simcore_service_webserver/catalog/_api.py

@@ -1,5 +1,4 @@
 import logging
-import warnings
 from collections.abc import Iterator
 from typing import Any, cast
 
@@ -183,55 +182,6 @@ async def list_services(
     return services
 
 
-async def get_service(
-    service_key: ServiceKey, service_version: ServiceVersion, ctx: CatalogRequestContext
-) -> dict[str, Any]:
-
-    warnings.warn(
-        "`get_service` is deprecated, use `get_service_v2` instead",
-        DeprecationWarning,
-        stacklevel=1,
-    )
-
-    service = await client.get_service(
-        ctx.app, ctx.user_id, service_key, service_version, ctx.product_name
-    )
-    await replace_service_input_outputs(
-        service,
-        unit_registry=ctx.unit_registry,
-        **RESPONSE_MODEL_POLICY,
-    )
-    return service
-
-
-async def update_service(
-    service_key: ServiceKey,
-    service_version: ServiceVersion,
-    update_data: dict[str, Any],
-    ctx: CatalogRequestContext,
-):
-    warnings.warn(
-        "`update_service_v2` is deprecated, use `update_service_v2` instead",
-        DeprecationWarning,
-        stacklevel=1,
-    )
-
-    service = await client.update_service(
-        ctx.app,
-        ctx.user_id,
-        service_key,
-        service_version,
-        ctx.product_name,
-        update_data,
-    )
-    await replace_service_input_outputs(
-        service,
-        unit_registry=ctx.unit_registry,
-        **RESPONSE_MODEL_POLICY,
-    )
-    return service
-
-
 async def list_service_inputs(
     service_key: ServiceKey, service_version: ServiceVersion, ctx: CatalogRequestContext
 ) -> list[ServiceInputGet]:
@@ -294,7 +244,7 @@ async def get_compatible_inputs_given_source_output(
     def iter_service_inputs() -> Iterator[tuple[ServiceInputKey, ServiceInput]]:
         for service_input in service_inputs:
             yield service_input.key_id, ServiceInput.model_construct(
-                **service_input.model_dump(include=ServiceInput.model_fields.keys())    # type: ignore[arg-type]
+                **service_input.model_dump(include=ServiceInput.model_fields.keys())  # type: ignore[arg-type]
             )
 
     # check
@@ -361,7 +311,7 @@ def iter_service_outputs() -> Iterator[tuple[ServiceOutputKey, ServiceOutput]]:
         to_service_key, to_service_version, to_input_key, ctx
     )
     to_input: ServiceInput = ServiceInput.model_construct(
-        **service_input.model_dump(include=ServiceInput.model_fields.keys())    # type: ignore[arg-type]
+        **service_input.model_dump(include=ServiceInput.model_fields.keys())  # type: ignore[arg-type]
     )
 
     # check

services/web/server/src/simcore_service_webserver/catalog/client.py

@@ -169,27 +169,3 @@ async def get_service_access_rights(
             resp.raise_for_status()
             body = await resp.json()
             return ServiceAccessRightsGet.model_validate(body)
-
-
-async def update_service(
-    app: web.Application,
-    user_id: UserID,
-    service_key: str,
-    service_version: str,
-    product_name: str,
-    update_data: dict[str, Any],
-) -> dict[str, Any]:
-    settings: CatalogSettings = get_plugin_settings(app)
-
-    url = URL(
-        f"{settings.api_base_url}/services/{urllib.parse.quote_plus(service_key)}/{service_version}",
-        encoded=True,
-    ).with_query({"user_id": user_id})
-
-    with _handle_client_exceptions(app) as session:
-        async with session.patch(
-            url, headers={X_PRODUCT_NAME_HEADER: product_name}, json=update_data
-        ) as resp:
-            resp.raise_for_status()
-            body: dict[str, Any] = await resp.json()
-            return body

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

@@ -30,7 +30,7 @@ def mock_rut_api_responses(
     settings: ResourceUsageTrackerSettings = get_plugin_settings(client.app)
 
     service_pricing_plan_get = PricingPlanGet.model_validate(
-        PricingPlanGet.model_config["json_schema_extra"]["examples"][0],
+        PricingPlanGet.model_json_schema()["examples"][0],
     )
     aioresponses_mocker.get(
         re.compile(f"^{settings.api_base_url}/services/+.+$"),

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

@@ -56,7 +56,7 @@ async def _list(
         assert user_id
 
         items = TypeAdapter(list[ServiceGetV2]).validate_python(
-            ServiceGetV2.model_config["json_schema_extra"]["examples"],
+            ServiceGetV2.model_json_schema()["examples"],
         )
         total_count = len(items)
 
@@ -80,7 +80,7 @@ async def _get(
         assert user_id
 
         got = ServiceGetV2.model_validate(
-            ServiceGetV2.model_config["json_schema_extra"]["examples"][0]
+            ServiceGetV2.model_json_schema()["examples"][0]
         )
         got.version = service_version
         got.key = service_key
@@ -101,7 +101,7 @@ async def _update(
         assert user_id
 
         got = ServiceGetV2.model_validate(
-            ServiceGetV2.model_config["json_schema_extra"]["examples"][0]
+            ServiceGetV2.model_json_schema()["examples"][0]
         )
         got.version = service_version
         got.key = service_key