Merge branch 'master' into refactor-api-keys-service

Author: giancarloromeo

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/pricing_plans.py

@@ -1,8 +1,7 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Annotated
 
-from pydantic import BaseModel, ConfigDict, PlainSerializer
+from pydantic import BaseModel, ConfigDict
 
 from ..resource_tracker import (
     HardwareInfo,
@@ -19,9 +18,7 @@ class PricingUnitGet(BaseModel):
     pricing_unit_id: PricingUnitId
     unit_name: str
     unit_extra_info: UnitExtraInfo
-    current_cost_per_unit: Annotated[
-        Decimal, PlainSerializer(float, return_type=float, when_used="json")
-    ]
+    current_cost_per_unit: Decimal
     current_cost_per_unit_id: PricingUnitCostId
     default: bool
     specific_info: HardwareInfo

packages/models-library/src/models_library/api_schemas_webserver/resource_usage.py

@@ -1,8 +1,7 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Annotated
 
-from pydantic import BaseModel, ConfigDict, Field, PlainSerializer
+from pydantic import BaseModel, ConfigDict, Field
 
 from ..projects import ProjectID
 from ..projects_nodes_io import NodeID
@@ -50,9 +49,7 @@ class PricingUnitGet(OutputSchema):
     pricing_unit_id: PricingUnitId
     unit_name: str
     unit_extra_info: UnitExtraInfo
-    current_cost_per_unit: Annotated[
-        Decimal, PlainSerializer(float, return_type=float, when_used="json")
-    ]
+    current_cost_per_unit: Decimal
     default: bool
 
 

packages/models-library/src/models_library/api_schemas_webserver/wallets.py

@@ -1,15 +1,8 @@
 from datetime import datetime
 from decimal import Decimal
-from typing import Annotated, Literal, TypeAlias
+from typing import Literal, TypeAlias
 
-from pydantic import (
-    ConfigDict,
-    Field,
-    HttpUrl,
-    PlainSerializer,
-    ValidationInfo,
-    field_validator,
-)
+from pydantic import ConfigDict, Field, HttpUrl, ValidationInfo, field_validator
 
 from ..basic_types import AmountDecimal, IDStr, NonNegativeDecimal
 from ..users import GroupID
@@ -20,9 +13,9 @@
 class WalletGet(OutputSchema):
     wallet_id: WalletID
     name: IDStr
-    description: str | None
+    description: str | None = None
     owner: GroupID
-    thumbnail: str | None
+    thumbnail: str | None = None
     status: WalletStatus
     created: datetime
     modified: datetime
@@ -31,7 +24,7 @@ class WalletGet(OutputSchema):
 
 
 class WalletGetWithAvailableCredits(WalletGet):
-    available_credits: Annotated[Decimal, PlainSerializer(float)]
+    available_credits: Decimal
 
 
 class WalletGetPermissions(WalletGet):

services/api-server/openapi.json

@@ -6492,7 +6492,7 @@
             "$ref": "#/components/schemas/UnitExtraInfo"
           },
           "currentCostPerUnit": {
-            "type": "number",
+            "type": "string",
             "title": "Currentcostperunit"
           },
           "default": {
@@ -7093,7 +7093,7 @@
             "title": "Modified"
           },
           "availableCredits": {
-            "type": "number",
+            "type": "string",
             "title": "Availablecredits"
           }
         },

services/resource-usage-tracker/tests/unit/api_rest/test__oas_spec.py

@@ -11424,7 +11424,7 @@ components:
         unitExtraInfo:
           $ref: '#/components/schemas/UnitExtraInfo-Output'
         currentCostPerUnit:
-          type: number
+          type: string
           title: Currentcostperunit
         default:
           type: boolean
@@ -11468,7 +11468,7 @@ components:
         unitExtraInfo:
           $ref: '#/components/schemas/UnitExtraInfo-Output'
         currentCostPerUnit:
-          type: number
+          type: string
           title: Currentcostperunit
         default:
           type: boolean
@@ -14189,7 +14189,7 @@ components:
           format: date-time
           title: Modified
         availableCredits:
-          type: number
+          type: string
           title: Availablecredits
       type: object
       required: