refactor

Author: bckohan

django_typer/__init__.py

@@ -1,7 +1,7 @@
 import typing as t
 from django.core.management.base import CommandError
 import typer.core
-from django_typer import TyperCommand, completers, get_command, Typer, CommandGroup
+from django_typer import TyperCommand, completers, get_command, Typer
 import importlib
 import sys
 
@@ -38,10 +38,10 @@ class Command(TyperCommand):
 
     def handle(
         self,
-        command: Annotated[
-            str,
+        commands: Annotated[
+            t.List[str],
             typer.Argument(
-                help="An import path to the command to graph, or simply the name of the command.",
+                help="Import path(s) to the command to graph, or simply the name of the command.",
                 shell_complete=completers.complete_import_path,
             ),
         ],
@@ -68,22 +68,32 @@ def handle(
             typer.Option(help="Instantiate the command before graphing the app tree."),
         ] = True,
     ):
-        self.cmd_name = command.split(".")[-1]
-        if "." in command:
-            self.cmd = getattr(importlib.import_module(command), "Command")
-            if instantiate:
-                self.cmd = self.cmd()
-        elif instantiate:
-            self.cmd = get_command(command, TyperCommand)
-        else:
-            raise CommandError("Cannot instantiate a command that is not imported.")
-
-        output = Path(output.parent) / Path(output.name.format(command=self.cmd_name))
-
-        self.visit_app(self.cmd.typer_app)
-        self.dot.render(output, format=format, view=True)
-
-    def get_node_name(self, obj: t.Union[typer.models.CommandInfo, CommandGroup]):
+        for command in commands:
+            self.level = -1
+            self.cmd_name = command.split(".")[-1]
+            if "." in command:
+                self.cmd = getattr(importlib.import_module(command), "Command")
+                if instantiate:
+                    self.cmd = self.cmd()
+            elif instantiate:
+                self.cmd = get_command(command, TyperCommand)
+            else:
+                raise CommandError("Cannot instantiate a command that is not imported.")
+
+            output = Path(output.parent) / Path(
+                output.name.format(command=self.cmd_name)
+            )
+
+            self.visit_app(self.cmd.typer_app)
+
+            of = output.parent / f"{output.stem}.{format}"
+            num = 1
+            while of.exists():
+                of = output.parent / f"{output.stem}({num}).{format}"
+                num += 1
+            self.dot.render(of.parent / of.stem, format=format, view=len(commands) == 1)
+
+    def get_node_name(self, obj: t.Union[typer.models.CommandInfo, Typer]):
         assert obj.callback
         name = (
             obj.callback.__name__
@@ -106,13 +116,16 @@ def visit_app(self, app: Typer):
         self.level += 1
         parent_node = self.get_node_name(app) if self.level else self.cmd_name
 
-        self.dot.node(str(id(app)), parent_node)
+        style = {}
+        if self.level:
+            style = {"style": "filled", "fillcolor": "lightblue"}
+        self.dot.node(str(id(app)), parent_node, **style)
         for cmd in app.registered_commands:
             node_name = self.get_node_name(cmd)
-            self.dot.node(str(id(cmd)), node_name)
+            self.dot.node(str(id(cmd)), node_name, style="filled", fillcolor="green")
             self.dot.edge(str(id(app)), str(id(cmd)))
         for grp in app.registered_groups:
             assert grp.typer_instance
-            node_name = self.get_node_name(t.cast(CommandGroup, grp.typer_instance))
+            node_name = self.get_node_name(t.cast(Typer, grp.typer_instance))
             self.dot.edge(str(id(app)), str(id(grp.typer_instance)))
             self.visit_app(t.cast(Typer, grp.typer_instance))

django_typer/tests/apps/test_app/management/commands/graph.py

@@ -0,0 +1,9 @@
+import typing as t
+from django_typer import TyperCommand
+
+
+class Command(TyperCommand):
+    help = "Test various forms of handle override."
+
+    def handle(self) -> str:
+        return "handle"

django_typer/tests/apps/test_app/management/commands/handle.py

@@ -0,0 +1,11 @@
+import typing as t
+from django_typer import command
+from .handle import Command as Handle
+
+
+class Command(Handle):
+    help = "Test various forms of handle override."
+
+    @command()
+    def handle(self) -> str:
+        return "handle1"

django_typer/tests/apps/test_app/management/commands/handle1.py

@@ -0,0 +1,10 @@
+import typing as t
+from django_typer import TyperCommand, command
+
+
+class Command(TyperCommand):
+    help = "Test various forms of handle override."
+
+    @command()
+    def handle(self) -> str:
+        return "handle2"

django_typer/tests/apps/test_app/management/commands/handle2.py

@@ -0,0 +1,10 @@
+import typing as t
+from django_typer import TyperCommand, command
+from .handle import Command as Handle
+
+
+class Command(Handle):
+    help = "Test various forms of handle override."
+
+    def handle(self) -> str:
+        return "handle3"

django_typer/tests/apps/test_app/management/commands/handle3.py

@@ -0,0 +1,8 @@
+from .handle2 import Command as Handle
+
+
+class Command(Handle):
+    help = "Test various forms of handle override."
+
+    def handle(self) -> str:
+        return "handle4"

django_typer/tests/apps/test_app/management/commands/handle4.py

@@ -0,0 +1,5 @@
+from django_typer import TyperCommand
+
+
+class Command(TyperCommand):
+    help = "Test no commands."

django_typer/tests/apps/test_app/management/commands/handle_none.py

@@ -1,6 +1,5 @@
-from django_typer import Typer, TyperCommand, CommandGroup
+from django_typer import Typer, TyperCommand
 from django_typer.types import Verbosity
-import typing as t
 
 Command: TyperCommand
 
@@ -24,9 +23,6 @@ def main(name: str):
 
 grp2 = Typer()
 
-# # this does not work
-# app.add_typer(t.cast(CommandGroup, grp2))
-
 
 @grp2.callback(name="grp1")
 def init_grp1(flag: bool = False):

django_typer/tests/apps/test_app/management/commands/native_groups.py

@@ -1,5 +1,4 @@
-from .native import Command as Native
+from . import native
+from django_typer import Typer
 
-
-class Command(Native):
-    pass
+app = Typer(native.app)