WIP

Author: e3rd

mininterface/_lib/cli_parser.py

@@ -2,6 +2,7 @@
 # CLI and config file parsing.
 #
 from dataclasses import asdict
+from functools import reduce
 import sys
 from collections import deque
 from contextlib import ExitStack
@@ -137,9 +138,17 @@ def parse_cli(
             )
             if cond
         ]
+
     def annot(type_form):
         if annotations:
-            return Annotated[type_form, *annotations]
+            if sys.version_info >= (3, 11):
+                from .future_compatibility import spread_annotated
+
+                return spread_annotated(type_form, annotations)
+            else:
+                from warnings import warn
+
+                warn(f"Cannot apply {annotations} on Python <= 3.11.")
         return type_form
 
     try:
@@ -165,7 +174,9 @@ def annot(type_form):
             m.env = env
     except BaseException as exception:
         if ask_for_missing and getattr(exception, "code", None) == 2 and failed_fields.get():
-            env = _dialog_missing(env_classes, kwargs, m, cf, ask_for_missing, args, cli_settings, _crawled, _req_fields)
+            env = _dialog_missing(
+                env_classes, kwargs, m, cf, ask_for_missing, args, cli_settings, _crawled, _req_fields
+            )
 
             if final_call:
                 # Ask for the wrong fields

mininterface/_lib/future_compatibility.py

@@ -1,6 +1,9 @@
 
-from typing import Literal
+from typing import Annotated, Literal
 
 
 def literal(c):
-    return Literal[*c]
+    return Literal[*c]
+
+def spread_annotated(obj, annotations):
+    return Annotated[obj, *annotations]

tests/test_subcommands.py

@@ -451,12 +451,21 @@ def test_upper_command(self):
             )
 
         # omitting the prefixes can be set via CLI
-        with self.assertForms(*args):
-            env = runm(UpperCommandA, args=["upper-command2", "run"], settings=CliSettings(omit_subcommand_prefixes=True)).env
-            self.assertEqual(
-                """UpperCommandA(command=UpperCommand2(command=Run(bot_id='id-two', _subcommands=Message(kind='pop', msg=None, foo='hello'))))""",
-                repr(env),
-            )
+        # This does not work in Python3.10
+        if sys.version_info[:2] >= (3, 11):
+            with self.assertForms(*args):
+                env = runm(UpperCommandA, args=["upper-command2", "run"], settings=CliSettings(omit_subcommand_prefixes=True)).env
+                self.assertEqual(
+                    """UpperCommandA(command=UpperCommand2(command=Run(bot_id='id-two', _subcommands=Message(kind='pop', msg=None, foo='hello'))))""",
+                    repr(env),
+                )
+        else:
+            with self.assertWarns(UserWarning) as cm:
+                with self.assertForms(*args):
+                    env = runm(UpperCommandA, args=["command:upper-command2", "command.command:run"], settings=CliSettings(omit_subcommand_prefixes=True)).env
+
+            # # cm je context manager, můžeš zkontrolovat zprávu
+            self.assertIn("Cannot apply", str(cm.warning))
 
     def test_run_arg(self):
         with self.assertForms(