str-to-obj 2024.6__py3-none-any.whl → 2024.7__py3-none-any.whl

str_to_obj/catalog/choices.py

@@ -7,32 +7,34 @@ SEE COPYRIGHT NOTICE BELOW
 import dataclasses as d
 import typing as h
 
-from logger_36 import LOGGER
 from str_to_obj.type.annotation import annotation_t
 from str_to_obj.type.hint import annotated_hint_t
 
 
 @d.dataclass(slots=True, repr=False, eq=False)
 class choices_t(annotation_t):
-    ACCEPTED_TYPES: h.ClassVar[tuple[type, ...]] = (str,)
+    ACCEPTED_TYPES: h.ClassVar[tuple[type, ...]] = (h.Any,)
 
-    options: h.Sequence[str]
-
-    def __post_init__(self) -> None:
-        """"""
-        with LOGGER.AddedContextLevel("Choices Annotation"):
-            for option in self.options:
-                if not isinstance(option, str):
-                    LOGGER.StageIssue(
-                        f'Invalid type of option "{option}"',
-                        actual=type(option).__name__,
-                        expected="str",
-                    )
+    options: h.Sequence[h.Any]
 
     @classmethod
-    def NewAnnotatedType(cls, options: h.Sequence[str], /) -> annotated_hint_t:
-        """"""
-        return h.Annotated[str, cls(tuple(options))]
+    def NewAnnotatedType(cls, options: h.Sequence, /) -> annotated_hint_t:
+        """
+        Note: options hint cannot be h.Sequence | h.Literal since h.Literal cannot be
+        used alone, although a value of type h.Literal[...] can be passed as options.
+        """
+        if h.get_origin(options) is h.Literal:
+            options = h.get_args(options)
+        else:
+            options = tuple(options)
+
+        stripes = tuple(set(type(_elm) for _elm in options))
+        if stripes.__len__() > 1:
+            stripe = h.Union[stripes]
+        else:
+            stripe = stripes[0]
+
+        return h.Annotated[stripe, cls(options=options)]
 
     def ValueIssues(self, value: str | h.Any, /) -> list[str]:
         """"""

str_to_obj/main.py

@@ -29,15 +29,26 @@ def ObjectFromStr(
             issues = [f'{string}: Invalid value; Expected="NONE" or "None" or "none".']
         return None, issues
 
+    value = _ObjectFromStr(string)
+
+    if expected_type is None:
+        return value, []
+
+    return CastValue(value, expected_type)
+
+
+def _ObjectFromStr(string:str, /)-> h.Any:
+    """"""
     try:
         value = bstr.literal_eval(string)
     except (SyntaxError, ValueError):
         value = string
 
-    if expected_type is None:
-        return value, []
+    if isinstance(value, h.Sequence) and not isinstance(value, str):
+        stripe = type(value)
+        value = stripe(_ObjectFromStr(_elm) for _elm in value)
 
-    return CastValue(value, expected_type)
+    return value
 
 
 """

str_to_obj/type/hint_tree.py

@@ -10,6 +10,7 @@ import types as t
 import typing as h
 
 from logger_36.format import FormattedMessage
+from str_to_obj.catalog.choices import choices_t
 from str_to_obj.task.inspection import HintComponents
 from str_to_obj.type.annotation import annotation_t
 from str_to_obj.type.hint import (
@@ -24,15 +25,22 @@ from str_to_obj.type.hint import (
 class _hint_node_t:
     """
     Leave elements to the tree.
+    literal_s: the accepted (literal) values if the hint is a typing.Literal, None
+    otherwise.
     """
 
     type: non_complex_hint_h | t.UnionType | t.EllipsisType | type[t.NoneType]
     annotations: tuple[annotation_t, ...] = d.field(default_factory=tuple)
+    literal_s: tuple[h.Any, ...] | None = None
 
 
 @d.dataclass(slots=True, repr=False, eq=False)
 class hint_t(_hint_node_t):
-    elements: tuple[h.Self, ...] = None
+    """
+    elements: tuple if the hint is a container, None otherwise. In terms of tree
+    structure, it plays the role of the (hint) node children.
+    """
+    elements: tuple[h.Self, ...] | None = None
 
     @classmethod
     def NewForHint(cls, hint: any_hint_h | complex_hint_additions_h, /) -> h.Self:
@@ -51,7 +59,7 @@ class hint_t(_hint_node_t):
                 )
             )
 
-        # Dealing with complex_hint_additions_h first
+        # Dealing with complex_hint_additions_h first.
         if hint is Ellipsis:
             return cls(type=t.EllipsisType)
         if (hint is None) or (hint is t.NoneType):
@@ -67,6 +75,25 @@ class hint_t(_hint_node_t):
         if origin is dict:
             raise TypeError(f"Unhandled type: {origin.__name__}.")
 
+        if origin is h.Literal:
+            literal_s = h.get_args(raw_hint)
+            if any(isinstance(_elm, choices_t) for _elm in nnts):
+                raise ValueError(
+                    f"Literal hint with values {literal_s} "
+                    f"must not be annotated with {choices_t.__name__} as it leads to "
+                    f"either redundancy or mismatch."
+                )
+            stripes = tuple(set(type(_elm) for _elm in literal_s))
+            if stripes.__len__() > 1:
+                origin = t.UnionType
+                elements = tuple(cls.NewForHint(_elm) for _elm in stripes)
+            else:
+                origin = stripes[0]
+                elements = None
+            return cls(
+                type=origin, annotations=nnts, elements=elements, literal_s=literal_s
+            )
+
         if origin is h.Union:
             origin = t.UnionType
         # get_args returns NoneType for None. This must be taken into account above.

str_to_obj/version.py

@@ -4,7 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-__version__ = "2024.6"
+__version__ = "2024.7"
 
 
 """

{str_to_obj-2024.6.dist-info → str_to_obj-2024.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: str-to-obj
-Version: 2024.6
+Version: 2024.7
 Summary: Convert strings to Python objects guided by (potentially annotated) type hints
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/str-to-obj/
 Author: Eric Debreuve

{str_to_obj-2024.6.dist-info → str_to_obj-2024.7.dist-info}/RECORD

@@ -1,11 +1,11 @@
 str_to_obj/__init__.py,sha256=PCxTXaZiI5pN2HqQPeS4q6r-QgwBrDGwGplHCWACQzA,2318
-str_to_obj/main.py,sha256=ebOat0qc3CQPGXC6RCOLGswDrGuobAziwSCawv6rSK4,3102
-str_to_obj/version.py,sha256=LBCw-ZZUoX13xuS_ZDbgVb5pOKJrbeI-M12p4irxEbU,2206
+str_to_obj/main.py,sha256=07IFp92qZnSnrcFEq0nNWlo8V45mSQDB6YMvQEMko9k,3373
+str_to_obj/version.py,sha256=O83viAXwHtIw3XPKRIn2hVz0ph7fsbs5jbdcnH2QzJw,2206
 str_to_obj/api/catalog.py,sha256=6ka6JciGdHFP93lg0yq2LO3iZBHfq0upZfXxQSg1izk,2521
 str_to_obj/api/type.py,sha256=yxD5wTtnh_h8Wa9_k1eex-nrkjtfh4ZJI6Db6hJHI9w,2468
 str_to_obj/catalog/boolean.py,sha256=7F0E36wQGkOxMMolqN5JF4zWOBJHLU9NDwOPt-LiFjQ,3489
 str_to_obj/catalog/callable.py,sha256=NCoogYzVBUSqiYEj_DoG-szqQdnYhvSj0xdyvg1W7Jw,3626
-str_to_obj/catalog/choices.py,sha256=YvRkgThmUhGVOl-SeNXrVC5Gwg9shCDdU0-dJ9Zk_zw,3798
+str_to_obj/catalog/choices.py,sha256=eZp_id2gWxgnzw7_RVEgy01s86c0Ci4MbRFZsRJMjJ8,3855
 str_to_obj/catalog/collection.py,sha256=OkwsgiMFrdvIvLqp1e_bgjBix677knrCSo-vOes86pQ,6767
 str_to_obj/catalog/number.py,sha256=U__ZF9TYMuIlIyY1QHIK2f89cPPCvmrNMhK3sCA7n0E,5461
 str_to_obj/catalog/path.py,sha256=xBrQJ-RMH-y_oaWP-uUTSpIKcL2vrtXoqrSaaS4HRpg,3857
@@ -17,10 +17,10 @@ str_to_obj/task/comparison.py,sha256=HBzv7gBtOnROsC6Sq-FYpgd_MKzVJreboNiqkza3vJ8
 str_to_obj/task/inspection.py,sha256=M8YnYq4A_Zz7rC2kgTYSSSawTnG2dCug5FBoCOBJ5g8,3127
 str_to_obj/type/annotation.py,sha256=xXShME2Q344N3QlsqKtU6ttne54tTVC3b62CHU1TGUM,3838
 str_to_obj/type/hint.py,sha256=w-yos8eD4CHQsXPfnqeqAc-ozyDWqzw46FOWDtAh7dM,2810
-str_to_obj/type/hint_tree.py,sha256=hm0JbEXc5lPl0djiBj0tksmfmZaeFtpo_qtZv1uXe7s,6690
+str_to_obj/type/hint_tree.py,sha256=uDvNF5kvb4S89bmB7BxX0UOc-cfvUWf8gWSD9nKmMeo,7876
 str_to_obj/type/type.py,sha256=ywc7GpzM1BsoQ3F0qk4wZ2DG1KZllw-PNv_umIGt8hA,4147
 str_to_obj/type/value.py,sha256=r9Ko5HHant1JGbsO7vH1unRBr9guc61Jz2piuJT0BjM,2533
-str_to_obj-2024.6.dist-info/METADATA,sha256=uHOtXMI95EtKqHF57ML92wyg_GC6P_pepvKWKCYqWsE,6464
-str_to_obj-2024.6.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-str_to_obj-2024.6.dist-info/top_level.txt,sha256=h-6bR_TAnXRGVSLTeNPlivlaG64xYM3E__Xg7sCgeug,11
-str_to_obj-2024.6.dist-info/RECORD,,
+str_to_obj-2024.7.dist-info/METADATA,sha256=lvnbZNs_v14VIAoGq9QvfuXsFCQu5tVNqTsZs-ZfmUw,6464
+str_to_obj-2024.7.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+str_to_obj-2024.7.dist-info/top_level.txt,sha256=h-6bR_TAnXRGVSLTeNPlivlaG64xYM3E__Xg7sCgeug,11
+str_to_obj-2024.7.dist-info/RECORD,,

{str_to_obj-2024.6.dist-info → str_to_obj-2024.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any