Some more abilities renaming

Author: wvangeit

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions_rpc_interface.py

@@ -413,15 +413,17 @@ async def get_function_user_permissions(
 
 
 @log_decorator(_logger, level=logging.DEBUG)
-async def get_functions_user_abilities(
+async def get_functions_user_api_access_rights(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
     user_id: UserID,
     product_name: ProductName,
 ) -> FunctionUserApiAccessRights:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("get_functions_user_abilities"),
+        TypeAdapter(RPCMethodName).validate_python(
+            "get_functions_user_api_access_rights"
+        ),
         user_id=user_id,
         product_name=product_name,
     )

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

@@ -375,17 +375,17 @@ async def run_function(  # noqa: PLR0913
 ) -> RegisteredFunctionJob:
 
     # Make sure the user is allowed to execute any function
-    # (read/write ability is checked in the other endpoint called in this method)
-    user_abilities = await wb_api_rpc.get_functions_user_abilities(
+    # (read/write right is checked in the other endpoint called in this method)
+    user_api_access_rights = await wb_api_rpc.get_functions_user_api_access_rights(
         user_id=user_id, product_name=product_name
     )
-    if not user_abilities.execute_functions:
+    if not user_api_access_rights.execute_functions:
         raise FunctionsExecuteApiAccessDeniedError(
             user_id=user_id,
             function_id=function_id,
         )
     # Make sure the user is allowed to execute this particular function
-    # (read/write ability is checked in the other endpoint called in this method)
+    # (read/write right is checked in the other endpoint called in this method)
     user_permissions: FunctionUserAccessRights = (
         await wb_api_rpc.get_function_user_permissions(
             function_id=function_id, user_id=user_id, product_name=product_name

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -544,13 +544,13 @@ async def get_function_user_permissions(
             function_id=function_id,
         )
 
-    async def get_functions_user_abilities(
+    async def get_functions_user_api_access_rights(
         self,
         *,
         user_id: UserID,
         product_name: ProductName,
     ) -> FunctionUserApiAccessRights:
-        return await functions_rpc_interface.get_functions_user_abilities(
+        return await functions_rpc_interface.get_functions_user_api_access_rights(
             self._client,
             user_id=user_id,
             product_name=product_name,

services/api-server/tests/unit/api_functions/test_api_routers_functions.py

@@ -591,7 +591,7 @@ async def test_list_function_job_collections_with_function_filter(
     )
 
 
-@pytest.mark.parametrize("user_has_execute_ability", [False, True])
+@pytest.mark.parametrize("user_has_execute_right", [False, True])
 @pytest.mark.parametrize(
     "funcapi_endpoint,endpoint_inputs", [("run", {}), ("map", [{}, {}])]
 )
@@ -603,13 +603,12 @@ async def test_run_map_function_not_allowed(
     user_id: UserID,
     mocked_webserver_rest_api_base: respx.MockRouter,
     mocked_webserver_rpc_api: dict[str, MockType],
-    user_has_execute_ability: bool,
+    user_has_execute_right: bool,
     funcapi_endpoint: str,
     endpoint_inputs: dict | list[dict],
 ) -> None:
     """Test that running a function is not allowed."""
 
-    # Mock the function's user permissions and abilities
     mock_handler_in_functions_rpc_interface(
         "get_function_user_permissions",
         FunctionUserAccessRights(
@@ -620,10 +619,10 @@ async def test_run_map_function_not_allowed(
         ),
     )
     mock_handler_in_functions_rpc_interface(
-        "get_functions_user_abilities",
+        "get_functions_user_api_access_rights",
         FunctionUserApiAccessRights(
             user_id=user_id,
-            execute_functions=user_has_execute_ability,
+            execute_functions=user_has_execute_right,
             write_functions=True,
             read_functions=True,
         ),
@@ -640,7 +639,7 @@ async def async_magic():
         json=endpoint_inputs,
         auth=auth,
     )
-    if user_has_execute_ability:
+    if user_has_execute_right:
         assert response.status_code == status.HTTP_403_FORBIDDEN
         assert response.json()["errors"][0] == (
             f"Function {mock_registered_function.uid} execute access denied for user {user_id}"

services/web/server/src/simcore_service_webserver/functions/_controller/_functions_rpc.py

@@ -414,7 +414,7 @@ async def get_function_user_permissions(
 
 
 @router.expose(reraise_if_error_type=())
-async def get_functions_user_abilities(
+async def get_functions_user_api_access_rights(
     app: web.Application,
     *,
     user_id: UserID,
@@ -423,7 +423,7 @@ async def get_functions_user_abilities(
     """
     Returns a dictionary with the user's abilities for all function related objects.
     """
-    return await _functions_service.get_functions_user_abilities(
+    return await _functions_service.get_functions_user_api_access_rights(
         app=app,
         user_id=user_id,
         product_name=product_name,

services/web/server/src/simcore_service_webserver/functions/_functions_service.py

@@ -448,7 +448,7 @@ async def get_function_user_permissions(
     )
 
 
-async def get_functions_user_abilities(
+async def get_functions_user_api_access_rights(
     app: web.Application,
     *,
     user_id: UserID,