remove deprecated

Author: giancarloromeo

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/modules/db/repositories/resource_tracker.py

@@ -161,7 +161,7 @@ async def update_service_run_last_heartbeat(
         row = result.first()
         if row is None:
             return None
-        return ServiceRunDB.from_orm(row)
+        return ServiceRunDB.model_validate(row)
 
     async def update_service_run_stopped_at(
         self, data: ServiceRunStoppedAtUpdate
@@ -191,7 +191,7 @@ async def update_service_run_stopped_at(
         row = result.first()
         if row is None:
             return None
-        return ServiceRunDB.from_orm(row)
+        return ServiceRunDB.model_validate(row)
 
     async def get_service_run_by_id(
         self, service_run_id: ServiceRunId
@@ -204,7 +204,7 @@ async def get_service_run_by_id(
         row = result.first()
         if row is None:
             return None
-        return ServiceRunDB.from_orm(row)
+        return ServiceRunDB.model_validate(row)
 
     async def list_service_runs_by_product_and_user_and_wallet(
         self,
@@ -309,7 +309,9 @@ async def list_service_runs_by_product_and_user_and_wallet(
 
             result = await conn.execute(query)
 
-        return [ServiceRunWithCreditsDB.from_orm(row) for row in result.fetchall()]
+        return [
+            ServiceRunWithCreditsDB.model_validate(row) for row in result.fetchall()
+        ]
 
     async def get_osparc_credits_aggregated_by_service(
         self,
@@ -405,7 +407,7 @@ async def get_osparc_credits_aggregated_by_service(
         return (
             cast(int, count_result.scalar()),
             [
-                OsparcCreditsAggregatedByServiceKeyDB.from_orm(row)
+                OsparcCreditsAggregatedByServiceKeyDB.model_validate(row)
                 for row in list_result.fetchall()
             ],
         )
@@ -571,7 +573,7 @@ async def list_service_runs_with_running_status_across_all_products(
             )
             result = await conn.execute(query)
 
-        return [ServiceRunForCheckDB.from_orm(row) for row in result.fetchall()]
+        return [ServiceRunForCheckDB.model_validate(row) for row in result.fetchall()]
 
     async def total_service_runs_with_running_status_across_all_products(
         self,
@@ -620,7 +622,7 @@ async def update_service_missed_heartbeat_counter(
         row = result.first()
         if row is None:
             return None
-        return ServiceRunDB.from_orm(row)
+        return ServiceRunDB.model_validate(row)
 
     #################################
     # Credit transactions
@@ -847,7 +849,7 @@ def _version(column_or_value):
             result = await conn.execute(query)
 
         return [
-            PricingPlansWithServiceDefaultPlanDB.from_orm(row)
+            PricingPlansWithServiceDefaultPlanDB.model_validate(row)
             for row in result.fetchall()
         ]
 
@@ -873,7 +875,7 @@ async def get_pricing_plan(
             raise CustomResourceUsageTrackerError(
                 msg=f"Pricing plan does not exists: {pricing_plan_id}"
             )
-        return PricingPlansDB.from_orm(row)
+        return PricingPlansDB.model_validate(row)
 
     async def list_pricing_plans_by_product(
         self, product_name: ProductName
@@ -890,7 +892,7 @@ async def list_pricing_plans_by_product(
             ).where(resource_tracker_pricing_plans.c.product_name == product_name)
             result = await conn.execute(select_stmt)
 
-        return [PricingPlansDB.from_orm(row) for row in result.fetchall()]
+        return [PricingPlansDB.model_validate(row) for row in result.fetchall()]
 
     async def create_pricing_plan(self, data: PricingPlanCreate) -> PricingPlansDB:
         async with self.db_engine.begin() as conn:
@@ -924,7 +926,7 @@ async def create_pricing_plan(self, data: PricingPlanCreate) -> PricingPlansDB:
             raise CustomResourceUsageTrackerError(
                 msg=f"Pricing plan was not created: {data}"
             )
-        return PricingPlansDB.from_orm(row)
+        return PricingPlansDB.model_validate(row)
 
     async def update_pricing_plan(
         self, product_name: ProductName, data: PricingPlanUpdate
@@ -961,7 +963,7 @@ async def update_pricing_plan(
         row = result.first()
         if row is None:
             return None
-        return PricingPlansDB.from_orm(row)
+        return PricingPlansDB.model_validate(row)
 
     #################################
     # Pricing plan to service
@@ -1000,7 +1002,9 @@ async def list_connected_services_to_pricing_plan_by_pricing_plan(
             )
             result = await conn.execute(query)
 
-            return [PricingPlanToServiceDB.from_orm(row) for row in result.fetchall()]
+            return [
+                PricingPlanToServiceDB.model_validate(row) for row in result.fetchall()
+            ]
 
     async def upsert_service_to_pricing_plan(
         self,
@@ -1087,7 +1091,7 @@ async def upsert_service_to_pricing_plan(
                 raise CustomResourceUsageTrackerError(
                     msg="Pricing plan to service record was not created"
                 )
-            return PricingPlanToServiceDB.from_orm(row)
+            return PricingPlanToServiceDB.model_validate(row)
 
     #################################
     # Pricing units
@@ -1145,7 +1149,7 @@ async def list_pricing_units_by_pricing_plan(
             )
             result = await conn.execute(query)
 
-        return [PricingUnitsDB.from_orm(row) for row in result.fetchall()]
+        return [PricingUnitsDB.model_validate(row) for row in result.fetchall()]
 
     async def get_valid_pricing_unit(
         self,
@@ -1197,7 +1201,7 @@ async def get_valid_pricing_unit(
             raise CustomResourceUsageTrackerError(
                 msg=f"Pricing plan {pricing_plan_id} and pricing unit {pricing_unit_id} for product {product_name} not found"
             )
-        return PricingUnitsDB.from_orm(row)
+        return PricingUnitsDB.model_validate(row)
 
     async def create_pricing_unit_with_cost(
         self, data: PricingUnitWithCostCreate, pricing_plan_key: str
@@ -1348,4 +1352,4 @@ async def get_pricing_unit_cost_by_id(
             raise CustomResourceUsageTrackerError(
                 msg=f"Pricing unit cost id {pricing_unit_cost_id} not found in the resource_tracker_pricing_unit_costs table",
             )
-        return PricingUnitCostsDB.from_orm(row)
+        return PricingUnitCostsDB.model_validate(row)

services/resource-usage-tracker/tests/unit/with_dbs/conftest.py

@@ -177,7 +177,7 @@ async def assert_service_runs_db_row(
             )
             row = result.first()
             assert row
-            service_run_db = ServiceRunDB.from_orm(row)
+            service_run_db = ServiceRunDB.model_validate(row)
             if status:
                 assert service_run_db.service_run_status == status
             return service_run_db
@@ -202,7 +202,7 @@ async def assert_credit_transactions_db_row(
             )
             row = result.first()
             assert row
-            credit_transaction_db = CreditTransactionDB.from_orm(row)
+            credit_transaction_db = CreditTransactionDB.model_validate(row)
             if modified_at:
                 assert credit_transaction_db.modified > modified_at
             return credit_transaction_db

services/resource-usage-tracker/tests/unit/with_dbs/test_background_task.py

@@ -152,7 +152,7 @@ async def test_process_event_functions(
     # Check max acceptable missed heartbeats reached before considering them as unhealthy
     with postgres_db.connect() as con:
         result = con.execute(sa.select(resource_tracker_service_runs))
-        service_run_db = [ServiceRunDB.from_orm(row) for row in result]
+        service_run_db = [ServiceRunDB.model_validate(row) for row in result]
     for service_run in service_run_db:
         if service_run.service_run_id in (
             _SERVICE_RUN_ID_OSPARC_10_MIN_OLD,
@@ -172,7 +172,7 @@ async def test_process_event_functions(
 
     with postgres_db.connect() as con:
         result = con.execute(sa.select(resource_tracker_service_runs))
-        service_run_db = [ServiceRunDB.from_orm(row) for row in result]
+        service_run_db = [ServiceRunDB.model_validate(row) for row in result]
     for service_run in service_run_db:
         if service_run.service_run_id in (
             _SERVICE_RUN_ID_OSPARC_10_MIN_OLD,
@@ -186,7 +186,9 @@ async def test_process_event_functions(
 
     with postgres_db.connect() as con:
         result = con.execute(sa.select(resource_tracker_credit_transactions))
-        credit_transaction_db = [CreditTransactionDB.from_orm(row) for row in result]
+        credit_transaction_db = [
+            CreditTransactionDB.model_validate(row) for row in result
+        ]
     for transaction in credit_transaction_db:
         if transaction.service_run_id in (
             _SERVICE_RUN_ID_OSPARC_10_MIN_OLD,