fixes #40

Author: bckohan

django_typer/__init__.py

@@ -105,7 +105,7 @@
     Verbosity,
     Version,
 )
-from .utils import _command_context, traceback_config, with_typehint
+from .utils import _command_context, get_usage_script, traceback_config, with_typehint
 
 if sys.version_info < (3, 10):
     from typing_extensions import ParamSpec
@@ -1846,7 +1846,7 @@ def create_parser(  # pyright: ignore[reportIncompatibleMethodOverride]
         :param subcommand: the name of the django command
         """
         with self:
-            return TyperParser(self, prog_name, subcommand)
+            return TyperParser(self, get_usage_script(prog_name), subcommand)
 
     def print_help(self, prog_name: str, subcommand: str, *cmd_path: str):
         """
@@ -1859,8 +1859,7 @@ def print_help(self, prog_name: str, subcommand: str, *cmd_path: str):
             typer/click have different helps for each subgroup or subcommand.
         """
         with self:
-            parser = self.create_parser(prog_name, subcommand)
-            parser.print_help(*cmd_path)
+            TyperParser(self, prog_name, subcommand).print_help(*cmd_path)
 
     def __call__(self, *args, **kwargs):
         """

django_typer/management/commands/shellcompletion.py

@@ -26,7 +26,6 @@
 import inspect
 import io
 import os
-import shutil
 import sys
 import typing as t
 from pathlib import Path
@@ -54,6 +53,7 @@
 from typer.completion import completion_init
 
 from django_typer import TyperCommand, command, get_command
+from django_typer.utils import get_usage_script
 
 DETECTED_SHELL = None
 
@@ -124,11 +124,10 @@ def manage_script(self) -> t.Union[str, Path]:
         # with a manage.py script being invoked directly as a script. Completion should work in
         # this case as well, but it does complicate the installation for some shell's so we must
         # first figure out which mode we are in.
-
-        cmd_pth = Path(sys.argv[0])
-        if shutil.which(cmd_pth.name):
-            return cmd_pth.name
-        return cmd_pth.absolute()
+        script = get_usage_script()
+        if isinstance(script, Path):
+            return script.absolute()
+        return script
 
     @cached_property
     def manage_script_name(self) -> str:

django_typer/tests/tests.py

@@ -423,9 +423,9 @@ def test_helps(self, top_level_only=False):
         buffer = StringIO()
         cmd = get_command(self.cmd_name, stdout=buffer, no_color=True)
         help_output_top = run_command(self.cmd_name, "--no-color", "--help")[0]
-        cmd.print_help("./manage.py", self.cmd_name)
+        cmd.print_help("manage.py", self.cmd_name)
         self.assertEqual(help_output_top.strip(), buffer.getvalue().strip())
-        self.assertIn(f"Usage: ./manage.py {self.cmd_name} [OPTIONS]", help_output_top)
+        self.assertIn(f"Usage: manage.py {self.cmd_name} [OPTIONS]", help_output_top)
 
         if not top_level_only:
             buffer.truncate(0)

django_typer/utils.py

@@ -2,14 +2,32 @@
 A collection of useful utilities.
 """
 
+import shutil
+import sys
+import os
 import typing as t
+from pathlib import Path
 from threading import local
 
 from django.conf import settings
 
 # DO NOT IMPORT ANYTHING FROM TYPER HERE - SEE patch.py
 
 
+def get_usage_script(script: t.Optional[str] = None) -> t.Union[Path, str]:
+    """
+    Return the script name if it is on the path or the absolute path to the script
+    if it is not.
+
+    :param script: The script name to check. If None the current script is used.
+    :return: The script name or the relative path to the script from cwd.
+    """
+    cmd_pth = Path(script or sys.argv[0])
+    if shutil.which(cmd_pth.name):
+        return cmd_pth.name
+    return cmd_pth.absolute().relative_to(Path(os.getcwd()))
+
+
 def traceback_config() -> t.Union[bool, t.Dict[str, t.Any]]:
     """
     Fetch the rich traceback installation parameters from our settings. By default

doc/source/changelog.rst

@@ -5,6 +5,7 @@ Change Log
 v1.0.4
 ======
 
+* Fixed `Help sometimes shows full script path in Usage: when it shouldnt. <https://github.com/bckohan/django-typer/issues/40>`_
 * Fixed `METAVAR when ModelObjectParser supplied should default to model name <https://github.com/bckohan/django-typer/issues/39>`_
 
 v1.0.3