click-type-test 2.0.0__tar.gz → 2.0.2__tar.gz

{click_type_test-2.0.0 → click_type_test-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: click-type-test
-Version: 2.0.0
+Version: 2.0.2
 Summary: Test that type annotations match click parameter types
 Author-email: Stephen Rosen <sirosen@globus.org>
 License: MIT

{click_type_test-2.0.0 → click_type_test-2.0.2}/click_type_test.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: click-type-test
-Version: 2.0.0
+Version: 2.0.2
 Summary: Test that type annotations match click parameter types
 Author-email: Stephen Rosen <sirosen@globus.org>
 License: MIT

{click_type_test-2.0.0 → click_type_test-2.0.2}/click_type_test.py

@@ -9,6 +9,7 @@ click-type-test
 from __future__ import annotations
 
 import datetime
+import enum
 import inspect
 import types
 import typing as t
@@ -273,7 +274,9 @@ def deduce_type_from_parameter(param: click.Parameter) -> type:
     # inferred from its value, use that as one of the possible types
     param_default = param.to_info_dict()["default"]
     if param_default is not None:
-        possible_types.add(_type_of_value(param_default))
+        value_type = _type_of_value(param_default)
+        if not _type_or_literal_is_included(param_default, value_type, possible_types):
+            possible_types.add(value_type)
 
     # before returning, convert None -> NoneType
     try:
@@ -528,3 +531,61 @@ def _type_of_value(value: t.Any, *, _depth: int = 0) -> type:
     # fallthrough: use the class
     else:
         return value.__class__  # type: ignore[no-any-return]
+
+
+def _type_or_literal_is_included(
+    value: t.Any, value_type: type, possible_types: set[type | None]
+) -> bool:
+    if value_type in possible_types:
+        return True
+    # int-bool-ness means this makes more sense to encode than ignore
+    if value_type is bool and int in possible_types:
+        return True
+
+    # check if the value is listed in a literal
+    if isinstance(value, (int, str, bool)) or issubclass(type(value), enum.Enum):
+        collected_literal_values: set[int | str | bool | enum.Enum] = set()
+        for possible in possible_types:
+            if t.get_origin(possible) is t.Literal:
+                collected_literal_values |= set(t.get_args(possible))
+
+        if value in collected_literal_values:
+            return True
+
+    # if the value is a tuple of Literal-viable types, it may match a Literal tuple in
+    # a multiple use opt
+    if (
+        isinstance(value, tuple)
+        and any(t.get_origin(x) is tuple for x in possible_types)
+        and set(t.get_args(value_type)).issubset({int, str, bool})
+    ):
+        for tuple_type in possible_types:
+            # we're only interested in types of the form tuple[T, ...]
+            if t.get_origin(tuple_type) is not tuple:
+                continue
+            typeargs = t.get_args(tuple_type)
+            if len(typeargs) != 2 or typeargs[1] is not Ellipsis:
+                continue
+
+            multi_use_type = typeargs[0]
+
+            # if it's a literal, check if all of the values are matched
+            if t.get_origin(multi_use_type) is t.Literal and all(
+                member in t.get_args(multi_use_type) for member in value
+            ):
+                return True
+
+            # otherwise, not a literal, check if all of the types used are within the
+            # type (potential union)
+            member_types = {_type_of_value(member) for member in value}
+            if _is_union(multi_use_type):
+                union_members = set(t.get_args(multi_use_type))
+                if member_types.issubset(union_members):
+                    return True
+            else:
+                if len(member_types) == 1 and _compare_types(
+                    member_types.pop(), multi_use_type
+                ):
+                    return True
+
+    return False

{click_type_test-2.0.0 → click_type_test-2.0.2}/pyproject.toml

@@ -10,7 +10,7 @@ lint = ["pre-commit"]
 
 [project]
 name = "click-type-test"
-version = "2.0.0"
+version = "2.0.2"
 description = "Test that type annotations match click parameter types"
 readme = "README.md"
 requires-python = ">=3.10"