[fix] Fixes by @coderabbitai

Author: pandafy

docs/user/settings.rst

@@ -136,6 +136,12 @@ without having to specify the international prefix.
                  }
 ============ ==========================================================================
 
+.. note::
+
+    The ``callable`` value must be a Python callable (function or method),
+    not a string path. Ensure the function is imported in your settings
+    file before referencing it.
+
 This setting configures the fields exported by the :ref:`export_users`
 management command.
 

openwisp_users/management/commands/export_users.py

@@ -22,7 +22,8 @@ def normalize_field(field):
 class Command(BaseCommand):
     help = _("Exports user data to a CSV file")
 
-    def _normalize_value(self, value):
+    @staticmethod
+    def _normalize_value(value):
         """Convert None to empty string, otherwise stringify the value."""
         return "" if value is None else str(value)
 
@@ -152,6 +153,9 @@ def _get_field_value(self, user, field):
         if callable_fn is not None:
             try:
                 val = callable_fn(user)
+            except CommandError:
+                # Allow CommandError raised by callable to propagate unchanged.
+                raise
             except Exception as e:
                 func_name = getattr(callable_fn, "__name__", repr(callable_fn))
                 raise CommandError(

openwisp_users/tests/test_commands.py

@@ -175,23 +175,50 @@ def test_related_fields_no_n_plus_1(self):
         self.assertEqual(csv_data[2][1], "")
 
     def test_callable_error_handling(self):
-        def _broken_callable(user):
-            raise ValueError("test error")
+        with self.subTest("Callable that raises non-CommandError"):
 
-        config = {
-            "fields": ["id", {"name": "broken", "callable": _broken_callable}],
-            "select_related": [],
-            "prefetch_related": [],
-        }
-        self._create_user()
-        stderr = StringIO()
-        with (
-            patch.object(app_settings, "EXPORT_USERS_COMMAND_CONFIG", config),
-            self.assertRaises(CommandError) as context,
-        ):
-            # the command wraps callable errors in CommandError with callable name
-            call_command("export_users", filename=self.temp_file.name, stderr=stderr)
-        self.assertIn("Error calling function '", str(context.exception))
+            def _broken_callable(user):
+                raise ValueError("test error")
+
+            config = {
+                "fields": ["id", {"name": "broken", "callable": _broken_callable}],
+                "select_related": [],
+                "prefetch_related": [],
+            }
+            self._create_user()
+            stderr = StringIO()
+            with (
+                patch.object(app_settings, "EXPORT_USERS_COMMAND_CONFIG", config),
+                self.assertRaises(CommandError) as context,
+            ):
+                # the command wraps callable errors in CommandError with callable name
+                call_command(
+                    "export_users", filename=self.temp_file.name, stderr=stderr
+                )
+            self.assertIn("Error calling function '", str(context.exception))
+
+        with self.subTest("Callable raises CommandError"):
+
+            def _broken_command_error_callable(user):
+                raise CommandError("original msg")
+
+            config2 = {
+                "fields": [
+                    "id",
+                    {"name": "broken", "callable": _broken_command_error_callable},
+                ],
+                "select_related": [],
+                "prefetch_related": [],
+            }
+            stderr = StringIO()
+            with (
+                patch.object(app_settings, "EXPORT_USERS_COMMAND_CONFIG", config2),
+                self.assertRaises(CommandError) as context2,
+            ):
+                call_command(
+                    "export_users", filename=self.temp_file.name, stderr=stderr
+                )
+            self.assertIn("original msg", str(context2.exception))
 
     @patch.object(
         app_settings,