fix: works with subgroup

Signed-off-by: Aaron Pham <[email protected]>

Author: aarnphm

vllm/engine/arg_utils.py

@@ -515,6 +515,7 @@ def add_cli_args(parser: FlexibleArgumentParser) -> FlexibleArgumentParser:
             description=DecodingConfig.__doc__,
         )
         guided_decoding_group.add_argument("--guided-decoding-backend",
+                                           deprecated=True,
                                            **guided_decoding_kwargs["backend"])
         guided_decoding_group.add_argument(
             "--guided-decoding-disable-fallback",

vllm/utils.py

@@ -33,7 +33,7 @@
 import warnings
 import weakref
 from argparse import (Action, ArgumentDefaultsHelpFormatter, ArgumentParser,
-                      ArgumentTypeError)
+                      ArgumentTypeError, _ArgumentGroup)
 from asyncio import FIRST_COMPLETED, AbstractEventLoop, Task
 from collections import UserDict, defaultdict
 from collections.abc import (AsyncGenerator, Awaitable, Generator, Hashable,
@@ -1326,23 +1326,49 @@ def add_arguments(self, actions):
         super().add_arguments(actions)
 
 
+class _FlexibleArgumentGroup(_ArgumentGroup):
+
+    def __init__(self, parser: FlexibleArgumentParser, *args, **kwargs):
+        self._parser = parser
+        super().__init__(*args, **kwargs)
+
+    def add_argument(self, *args: Any, **kwargs: Any):
+        if sys.version_info < (3, 13):
+            deprecated = kwargs.pop('deprecated', False)
+            action = super().add_argument(*args, **kwargs)
+            object.__setattr__(action, 'deprecated', deprecated)
+            if deprecated and action.dest not in \
+                    self._parser.__class__._deprecated:
+                self._parser._warning(
+                    _gettext("argument '%(argument_name)s' is deprecated") %
+                    {'argument_name': action.dest})
+                self._parser._deprecated.add(action.dest)
+            return action
+
+        # python>3.13
+        return super().add_argument(*args, **kwargs)
+
+
 class FlexibleArgumentParser(ArgumentParser):
     """ArgumentParser that allows both underscore and dash in names."""
 
+    _deprecated: set[str] = set()
+
     def __init__(self, *args, **kwargs):
         # Set the default 'formatter_class' to SortedHelpFormatter
         if 'formatter_class' not in kwargs:
             kwargs['formatter_class'] = SortedHelpFormatter
         super().__init__(*args, **kwargs)
-        self._deprecated = set()
 
     def add_argument(self, *args: Any, **kwargs: Any):
         # add a deprecated=True with optional deprecated_reason to signify
         # reasons for deprecating this args
         if sys.version_info < (3, 13):
             deprecated = kwargs.pop('deprecated', False)
             action = super().add_argument(*args, **kwargs)
-            if deprecated and action.dest not in self._deprecated:
+            object.__setattr__(action, 'deprecated', deprecated)
+            if deprecated and \
+                action.dest not in FlexibleArgumentParser._deprecated:
                 self._warning(
                     _gettext("argument '%(argument_name)s' is deprecated") %
                     {'argument_name': action.dest})
@@ -1354,9 +1380,9 @@ def add_argument(self, *args: Any, **kwargs: Any):
         return super().add_argument(*args, **kwargs)
 
     def _warning(self, message: str):
-        args = {'prog': self.prog, 'message': message}
         self._print_message(
-            _gettext('%(prog)s: warning: %(message)s\n') % args, sys.stderr)
+            _gettext('warning: %(message)s\n') % {'message': message},
+            sys.stderr)
 
     def parse_args(  # type: ignore[override]
         self,
@@ -1533,6 +1559,12 @@ def _load_config_file(self, file_path: str) -> list[str]:
 
         return processed_args
 
+    def add_argument_group(self, *args: Any,
+                           **kwargs: Any) -> _FlexibleArgumentGroup:
+        group = _FlexibleArgumentGroup(self, self, *args, **kwargs)
+        self._action_groups.append(group)
+        return group
+
 
 async def _run_task_with_lock(task: Callable, lock: asyncio.Lock, *args,
                               **kwargs):