Snapshot hooks: remove usage of hook_name in register method

Replaces `lambda` with `functools.wraps` in `CallbackRegistrar`, making
`hook_name` argument in `SnapshotCorrelationHookContainer.register`
redundant.

Author: dbnk0

dp3/common/callback_registrar.py

@@ -1,5 +1,5 @@
 import logging
-from functools import partial
+from functools import partial, wraps
 from logging import Logger
 from typing import Callable, Union
 
@@ -13,7 +13,6 @@
 from dp3.common.state import SharedFlag
 from dp3.common.task import DataPointTask
 from dp3.common.types import ParsedTimedelta
-from dp3.common.utils import get_func_name
 from dp3.core.updater import Updater
 from dp3.snapshots.snapshooter import SnapShooter
 from dp3.task_processing.task_executor import TaskExecutor
@@ -369,10 +368,14 @@ def register_correlation_hook(
         Raises:
             ValueError: On failure of specification validation.
         """
+
         # Ignore master record for this variant of the hook
-        hook_name = get_func_name(hook)
+        @wraps(hook)
+        def wrapped_hook(e: str, s: dict, _m: dict):
+            return hook(e, s)
+
         self._snap_shooter.register_correlation_hook(
-            lambda e, s, _m: hook(e, s), entity_type, depends_on, may_change, hook_name=hook_name
+            wrapped_hook, entity_type, depends_on, may_change
         )
 
     def register_correlation_hook_with_master_record(

dp3/snapshots/snapshooter.py

@@ -189,7 +189,6 @@ def register_correlation_hook(
         entity_type: str,
         depends_on: list[list[str]],
         may_change: list[list[str]],
-        hook_name: Optional[str] = None,
     ):
         """
         Registers passed hook to be called during snapshot creation.
@@ -211,15 +210,11 @@ def register_correlation_hook(
                 (even on linked entities).
             may_change: each item should specify an attribute that `hook` may change.
                 specification format is identical to `depends_on`.
-            hook_name: Optional custom name for the hook, used for logging purposes. If not
-                provided, the function name of `hook` will be used.
 
         Raises:
             ValueError: On failure of specification validation.
         """
-        self._correlation_hooks.register(
-            hook, entity_type, depends_on, may_change, hook_name=hook_name
-        )
+        self._correlation_hooks.register(hook, entity_type, depends_on, may_change)
 
     def register_run_init_hook(self, hook: Callable[[], list[DataPointTask]]):
         """

dp3/snapshots/snapshot_hooks.py

@@ -88,7 +88,6 @@ def register(
         entity_type: str,
         depends_on: list[list[str]],
         may_change: list[list[str]],
-        hook_name: Union[None, str] = None,
     ) -> str:
         """
         Registers passed hook to be called during snapshot creation.
@@ -108,8 +107,6 @@ def register(
                 (even on linked entities).
             may_change: each item should specify an attribute that `hook` may change.
                 specification format is identical to `depends_on`.
-            hook_name: Optional custom name for the hook, used for logging purposes. If not
-                provided, the function name of `hook` will be used.
         Returns:
             Generated hook id.
         """
@@ -124,8 +121,7 @@ def register(
         may_change = self._get_attr_path_destinations(entity_type, may_change)
 
         hook_args = f"({entity_type}, [{','.join(depends_on)}], [{','.join(may_change)}])"
-        hook_name = hook_name if hook_name is not None else get_func_name(hook)
-        hook_id = f"{hook_name}{hook_args}"
+        hook_id = f"{get_func_name(hook)}{hook_args}"
         self._short_hook_ids[hook_id] = hook_args
         self._dependency_graph.add_hook_dependency(hook_id, depends_on, may_change)