make PricingUnitget backwards compatible

Author: bisgaard-itis

services/api-server/openapi.json

@@ -3928,7 +3928,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PricingUnitGet"
+                  "$ref": "#/components/schemas/simcore_service_api_server__models__schemas__backwards_compatibility__PricingUnitGet"
                 }
               }
             }
@@ -6469,40 +6469,6 @@
         "const": "TIER",
         "title": "PricingPlanClassification"
       },
-      "PricingUnitGet": {
-        "properties": {
-          "pricingUnitId": {
-            "type": "integer",
-            "exclusiveMinimum": true,
-            "title": "Pricingunitid",
-            "minimum": 0
-          },
-          "unitName": {
-            "type": "string",
-            "title": "Unitname"
-          },
-          "unitExtraInfo": {
-            "$ref": "#/components/schemas/UnitExtraInfo"
-          },
-          "currentCostPerUnit": {
-            "type": "string",
-            "title": "Currentcostperunit"
-          },
-          "default": {
-            "type": "boolean",
-            "title": "Default"
-          }
-        },
-        "type": "object",
-        "required": [
-          "pricingUnitId",
-          "unitName",
-          "unitExtraInfo",
-          "currentCostPerUnit",
-          "default"
-        ],
-        "title": "PricingUnitGet"
-      },
       "Profile": {
         "properties": {
           "first_name": {
@@ -6673,7 +6639,7 @@
           },
           "pricingUnits": {
             "items": {
-              "$ref": "#/components/schemas/PricingUnitGet"
+              "$ref": "#/components/schemas/models_library__api_schemas_webserver__resource_usage__PricingUnitGet"
             },
             "type": "array",
             "title": "Pricingunits"
@@ -7109,6 +7075,75 @@
           "INACTIVE"
         ],
         "title": "WalletStatus"
+      },
+      "models_library__api_schemas_webserver__resource_usage__PricingUnitGet": {
+        "properties": {
+          "pricingUnitId": {
+            "type": "integer",
+            "exclusiveMinimum": true,
+            "title": "Pricingunitid",
+            "minimum": 0
+          },
+          "unitName": {
+            "type": "string",
+            "title": "Unitname"
+          },
+          "unitExtraInfo": {
+            "$ref": "#/components/schemas/UnitExtraInfo"
+          },
+          "currentCostPerUnit": {
+            "type": "string",
+            "title": "Currentcostperunit"
+          },
+          "default": {
+            "type": "boolean",
+            "title": "Default"
+          }
+        },
+        "type": "object",
+        "required": [
+          "pricingUnitId",
+          "unitName",
+          "unitExtraInfo",
+          "currentCostPerUnit",
+          "default"
+        ],
+        "title": "PricingUnitGet"
+      },
+      "simcore_service_api_server__models__schemas__backwards_compatibility__PricingUnitGet": {
+        "properties": {
+          "pricingUnitId": {
+            "type": "integer",
+            "exclusiveMinimum": true,
+            "title": "Pricingunitid",
+            "minimum": 0
+          },
+          "unitName": {
+            "type": "string",
+            "title": "Unitname"
+          },
+          "unitExtraInfo": {
+            "$ref": "#/components/schemas/UnitExtraInfo"
+          },
+          "currentCostPerUnit": {
+            "type": "number",
+            "minimum": 0.0,
+            "title": "Currentcostperunit"
+          },
+          "default": {
+            "type": "boolean",
+            "title": "Default"
+          }
+        },
+        "type": "object",
+        "required": [
+          "pricingUnitId",
+          "unitName",
+          "unitExtraInfo",
+          "currentCostPerUnit",
+          "default"
+        ],
+        "title": "PricingUnitGet"
       }
     },
     "securitySchemes": {

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs_getters.py

@@ -11,7 +11,6 @@
 from fastapi.responses import RedirectResponse
 from fastapi_pagination.api import create_page
 from models_library.api_schemas_webserver.projects import ProjectGet
-from models_library.api_schemas_webserver.resource_usage import PricingUnitGet
 from models_library.api_schemas_webserver.wallets import WalletGetWithAvailableCredits
 from models_library.projects_nodes_io import BaseFileLink
 from models_library.users import UserID
@@ -25,6 +24,7 @@
 from ...exceptions.service_errors_utils import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.basic_types import LogStreamingResponse, VersionStr
 from ...models.pagination import Page, PaginationParams
+from ...models.schemas.backwards_compatibility import PricingUnitGet
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.files import File
 from ...models.schemas.jobs import (

services/api-server/src/simcore_service_api_server/models/schemas/backwards_compatibility.py

@@ -1,12 +1,17 @@
 # Models added here "cover" models from within the deployment in order to restore backwards compatibility
 
+from decimal import Decimal
 from typing import Annotated
 
 from models_library.api_schemas_webserver._base import OutputSchema
 from models_library.api_schemas_webserver.product import (
     GetCreditPrice as _GetCreditPrice,
 )
+from models_library.api_schemas_webserver.resource_usage import (
+    PricingUnitGet as _PricingUnitGet,
+)
 from models_library.basic_types import NonNegativeDecimal
+from models_library.resource_tracker import PricingUnitId, UnitExtraInfo
 from pydantic import Field, NonNegativeFloat, NonNegativeInt, PlainSerializer
 
 
@@ -30,3 +35,18 @@ class GetCreditPrice(OutputSchema):
 assert set(GetCreditPrice.model_fields.keys()) == set(
     _GetCreditPrice.model_fields.keys()
 )
+
+
+class PricingUnitGet(OutputSchema):
+    pricing_unit_id: PricingUnitId
+    unit_name: str
+    unit_extra_info: UnitExtraInfo
+    current_cost_per_unit: Annotated[
+        Decimal, PlainSerializer(float, return_type=NonNegativeFloat, when_used="json")
+    ]
+    default: bool
+
+
+assert set(PricingUnitGet.model_fields.keys()) == set(
+    _PricingUnitGet.model_fields.keys()
+)

services/api-server/src/simcore_service_api_server/services/webserver.py

@@ -28,10 +28,7 @@
     ProjectInputGet,
     ProjectInputUpdate,
 )
-from models_library.api_schemas_webserver.resource_usage import (
-    PricingPlanGet,
-    PricingUnitGet,
-)
+from models_library.api_schemas_webserver.resource_usage import PricingPlanGet
 from models_library.api_schemas_webserver.wallets import (
     WalletGet,
     WalletGetWithAvailableCredits,
@@ -80,6 +77,7 @@
 )
 from ..models.basic_types import VersionStr
 from ..models.pagination import MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
+from ..models.schemas.backwards_compatibility import PricingUnitGet
 from ..models.schemas.jobs import MetaValueType
 from ..models.schemas.profiles import Profile, ProfileUpdate
 from ..models.schemas.solvers import SolverKeyId

services/api-server/tests/unit/test_api_solver_jobs.py

@@ -14,7 +14,6 @@
 from fastapi import status
 from fastapi.encoders import jsonable_encoder
 from httpx import AsyncClient
-from models_library.api_schemas_webserver.resource_usage import PricingUnitGet
 from models_library.api_schemas_webserver.wallets import WalletGetWithAvailableCredits
 from models_library.generics import Envelope
 from pydantic import TypeAdapter
@@ -24,6 +23,9 @@
     SideEffectCallback,
 )
 from simcore_service_api_server._meta import API_VTAG
+from simcore_service_api_server.models.schemas.backwards_compatibility import (
+    PricingUnitGet,
+)
 from simcore_service_api_server.models.schemas.jobs import Job, JobStatus
 from simcore_service_api_server.models.schemas.solvers import Solver
 from simcore_service_api_server.services.director_v2 import ComputationTaskGet