move adapter out

Author: giancarloromeo

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/resource_usage_tracker/pricing_plans.py

@@ -26,6 +26,8 @@
 
 _DEFAULT_TIMEOUT_S: Final[NonNegativeInt] = 20
 
+_RPC_METHOD_NAME_ADAPTER: TypeAdapter[RPCMethodName] = TypeAdapter(RPCMethodName)
+
 
 @log_decorator(_logger, level=logging.DEBUG)
 async def get_pricing_plan(
@@ -36,7 +38,7 @@ async def get_pricing_plan(
 ) -> PricingPlanGet:
     result: PricingPlanGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("get_pricing_plan"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("get_pricing_plan"),
         product_name=product_name,
         pricing_plan_id=pricing_plan_id,
         timeout_s=_DEFAULT_TIMEOUT_S,
@@ -53,7 +55,7 @@ async def list_pricing_plans(
 ) -> list[PricingPlanGet]:
     result: PricingPlanGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("list_pricing_plans"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("list_pricing_plans"),
         product_name=product_name,
         timeout_s=_DEFAULT_TIMEOUT_S,
     )
@@ -69,7 +71,7 @@ async def create_pricing_plan(
 ) -> PricingPlanGet:
     result: PricingPlanGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("create_pricing_plan"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("create_pricing_plan"),
         data=data,
         timeout_s=_DEFAULT_TIMEOUT_S,
     )
@@ -86,7 +88,7 @@ async def update_pricing_plan(
 ) -> PricingPlanGet:
     result: PricingPlanGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("update_pricing_plan"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("update_pricing_plan"),
         product_name=product_name,
         data=data,
         timeout_s=_DEFAULT_TIMEOUT_S,
@@ -104,7 +106,7 @@ async def list_connected_services_to_pricing_plan_by_pricing_plan(
 ) -> list[PricingPlanToServiceGet]:
     result: PricingPlanGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python(
+        _RPC_METHOD_NAME_ADAPTER.validate_python(
             "list_connected_services_to_pricing_plan_by_pricing_plan"
         ),
         product_name=product_name,
@@ -126,7 +128,7 @@ async def connect_service_to_pricing_plan(
 ) -> PricingPlanToServiceGet:
     result: PricingPlanGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("connect_service_to_pricing_plan"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("connect_service_to_pricing_plan"),
         product_name=product_name,
         pricing_plan_id=pricing_plan_id,
         service_key=service_key,

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/resource_usage_tracker/pricing_units.py

@@ -25,6 +25,8 @@
 
 _DEFAULT_TIMEOUT_S: Final[NonNegativeInt] = 20
 
+_RPC_METHOD_NAME_ADAPTER: TypeAdapter[RPCMethodName] = TypeAdapter(RPCMethodName)
+
 
 @log_decorator(_logger, level=logging.DEBUG)
 async def get_pricing_unit(
@@ -36,7 +38,7 @@ async def get_pricing_unit(
 ) -> PricingUnitGet:
     result: PricingUnitGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("get_pricing_unit"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("get_pricing_unit"),
         product_name=product_name,
         pricing_plan_id=pricing_plan_id,
         pricing_unit_id=pricing_unit_id,
@@ -55,7 +57,7 @@ async def create_pricing_unit(
 ) -> PricingUnitGet:
     result: PricingUnitGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("create_pricing_unit"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("create_pricing_unit"),
         product_name=product_name,
         data=data,
         timeout_s=_DEFAULT_TIMEOUT_S,
@@ -73,7 +75,7 @@ async def update_pricing_unit(
 ) -> PricingUnitGet:
     result: PricingUnitGet = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("update_pricing_unit"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("update_pricing_unit"),
         product_name=product_name,
         data=data,
         timeout_s=_DEFAULT_TIMEOUT_S,

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/resource_usage_tracker/service_runs.py

@@ -28,6 +28,8 @@
 
 _DEFAULT_TIMEOUT_S: Final[NonNegativeInt] = 20
 
+_RPC_METHOD_NAME_ADAPTER: TypeAdapter[RPCMethodName] = TypeAdapter(RPCMethodName)
+
 
 @log_decorator(_logger, level=logging.DEBUG)
 async def get_service_run_page(
@@ -44,7 +46,7 @@ async def get_service_run_page(
 ) -> ServiceRunPage:
     result = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("get_service_run_page"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("get_service_run_page"),
         user_id=user_id,
         product_name=product_name,
         limit=limit,
@@ -74,7 +76,7 @@ async def get_osparc_credits_aggregated_usages_page(
 ) -> OsparcCreditsAggregatedUsagesPage:
     result = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python(
+        _RPC_METHOD_NAME_ADAPTER.validate_python(
             "get_osparc_credits_aggregated_usages_page"
         ),
         user_id=user_id,
@@ -104,7 +106,7 @@ async def export_service_runs(
 ) -> AnyUrl:
     result: AnyUrl = await rabbitmq_rpc_client.request(
         RESOURCE_USAGE_TRACKER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("export_service_runs"),
+        _RPC_METHOD_NAME_ADAPTER.validate_python("export_service_runs"),
         user_id=user_id,
         product_name=product_name,
         wallet_id=wallet_id,

packages/simcore-sdk/src/simcore_sdk/node_ports_common/r_clone_utils.py

@@ -12,6 +12,8 @@
 _logger = logging.getLogger(__name__)
 
 
+
+
 class _RCloneSyncMessageBase(BaseModel):
     level: str = Field(..., description="log level")
     msg: str