allow handle() to be an initializer #24

Author: bckohan

django_typer/__init__.py

@@ -867,15 +867,17 @@ def decorator(func: t.Callable[..., t.Any]):
         setattr(
             func,
             "_typer_callback_",
-            lambda cmd, _name=None, **extra: cmd.typer_app.callback(
+            lambda cmd, _name=None, _help=Default(
+                None
+            ), **extra: cmd.typer_app.callback(
                 name=name or _name,
                 cls=type("_AdaptedCallback", (cls,), {"django_command": cmd}),
                 invoke_without_command=invoke_without_command,
                 subcommand_metavar=subcommand_metavar,
                 chain=chain,
                 result_callback=result_callback,
                 context_settings=context_settings,
-                help=cmd.typer_app.info.help or help,
+                help=cmd.typer_app.info.help or help or _help,
                 epilog=epilog,
                 short_help=short_help,
                 options_metavar=options_metavar,
@@ -886,7 +888,9 @@ def decorator(func: t.Callable[..., t.Any]):
                 rich_help_panel=rich_help_panel,
                 **kwargs,
                 **extra,
-            )(func),
+            )(
+                func
+            ),
         )
         return func
 

django_typer/tests/test_app/management/commands/handle_as_init.py

@@ -0,0 +1,20 @@
+from click import get_current_context
+
+from django_typer import TyperCommand, command, initialize
+
+
+class Command(TyperCommand):
+
+    help = "Test handle as initializer."
+
+    @initialize(invoke_without_command=True)
+    def handle(self):
+        if (ctx := get_current_context(silent=True)) and ctx.invoked_subcommand:
+            return
+
+        # if we're here a subcommand was not invoked
+        return "handle"
+
+    @command()
+    def subcommand(self):
+        return "subcommand"

django_typer/tests/tests.py

@@ -1252,7 +1252,7 @@ def test_command_line(self, settings=None):
 
         self.assertEqual(get_command("groups").echo(message="hey!").strip(), "hey!")
 
-        result = run_command("groups", *settings, "echo", "hey!", "5")
+        result = run_command("groups", "--no-color", *settings, "echo", "hey!", "5")
         if override:
             self.assertEqual(result[0].strip(), ("hey! " * 5).strip())
             self.assertEqual(
@@ -1413,7 +1413,15 @@ def test_command_line(self, settings=None):
         self.assertEqual(grp_cmd.lower(4, 9), "ANNAmonteS")
 
         result = run_command(
-            "groups", *settings, "string", "annamontes", "case", "upper", "4", "9"
+            "groups",
+            "--no-color",
+            *settings,
+            "string",
+            "annamontes",
+            "case",
+            "upper",
+            "4",
+            "9",
         )
         if override:
             self.assertIn(
@@ -2634,12 +2642,12 @@ class TracebackTests(TestCase):
     """
 
     def test_usage_error_no_tb(self):
-        stdout, stderr, retcode = run_command("tb", "wrong")
+        stdout, stderr, retcode = run_command("tb", "--no-color", "wrong")
         self.assertTrue("Usage: ./manage.py tb [OPTIONS] COMMAND [ARGS]" in stdout)
         self.assertTrue("No such command" in stderr)
         self.assertTrue(retcode > 0)
 
-        stdout, stderr, retcode = run_command("tb", "error", "wrong")
+        stdout, stderr, retcode = run_command("tb", "--no-color", "error", "wrong")
         self.assertTrue("Usage: ./manage.py tb error [OPTIONS]" in stdout)
         self.assertTrue("Got unexpected extra argument" in stderr)
         self.assertTrue(retcode > 0)
@@ -2652,7 +2660,9 @@ def test_usage_error_no_tb(self):
 
     def test_usage_error_with_tb_if_requested(self):
 
-        stdout, stderr, retcode = run_command("tb", "--traceback", "wrong")
+        stdout, stderr, retcode = run_command(
+            "tb", "--no-color", "--traceback", "wrong"
+        )
         self.assertFalse(stdout.strip())
         self.assertTrue("Traceback" in stderr)
         if rich_installed:
@@ -2662,7 +2672,9 @@ def test_usage_error_with_tb_if_requested(self):
         self.assertTrue("No such command 'wrong'" in stderr)
         self.assertTrue(retcode > 0)
 
-        stdout, stderr, retcode = run_command("tb", "--traceback", "error", "wrong")
+        stdout, stderr, retcode = run_command(
+            "tb", "--no-color", "--traceback", "error", "wrong"
+        )
         self.assertFalse(stdout.strip())
         self.assertTrue("Traceback" in stderr)
         if rich_installed:
@@ -2705,3 +2717,31 @@ def test_exit_on_call(self):
 
         with self.assertRaises(SystemExit):
             call_command("tb", "exit", "--code=1")
+
+
+class TestHandleAsInit(TestCase):
+
+    def test_handle_as_init_run(self):
+
+        stdout, stderr, retcode = run_command("handle_as_init")
+        self.assertTrue("handle" in stdout)
+        self.assertFalse(stderr.strip())
+        self.assertEqual(retcode, 0)
+
+        stdout, stderr, retcode = run_command("handle_as_init", "subcommand")
+        self.assertTrue("subcommand" in stdout)
+        self.assertFalse(stderr.strip())
+        self.assertEqual(retcode, 0)
+
+    def test_handle_as_init_call(self):
+
+        self.assertEqual(call_command("handle_as_init").strip(), "handle")
+        self.assertEqual(
+            call_command("handle_as_init", "subcommand").strip(), "subcommand"
+        )
+
+    def test_handle_as_init_direct(self):
+
+        self.assertEqual(get_command("handle_as_init")(), "handle")
+        self.assertEqual(get_command("handle_as_init", "subcommand")(), "subcommand")
+        self.assertEqual(get_command("handle_as_init").subcommand(), "subcommand")

doc/source/changelog.rst

@@ -11,6 +11,7 @@ v1.0.2
 * Fixed `Run type checking with django-stubs installed. <https://github.com/bckohan/django-typer/issues/30>`_
 * Fixed `Add pyright to linting and resolve any pyright errors. <https://github.com/bckohan/django-typer/issues/29>`_
 * Fixed `Missing subcommand produces stack trace without --traceback. <https://github.com/bckohan/django-typer/issues/27>`
+* Fixed `Allow handle() to be an initializer. <https://github.com/bckohan/django-typer/issues/24>`_
 
 v1.0.1
 ======