dcicutils 8.13.3.1b23__py3-none-any.whl → 8.13.3.1b25__py3-none-any.whl

dcicutils/misc_utils.py

@@ -1005,16 +1005,12 @@ _MULTIPLIER_T = 1000 * _MULTIPLIER_G
 
 _MULTIPLIER_SUFFIXES = {
     "K": _MULTIPLIER_K,
-    "Kb": _MULTIPLIER_K,
     "KB": _MULTIPLIER_K,
     "M": _MULTIPLIER_M,
-    "Mb": _MULTIPLIER_M,
     "MB": _MULTIPLIER_M,
     "G": _MULTIPLIER_G,
-    "Gb": _MULTIPLIER_G,
     "GB": _MULTIPLIER_G,
     "T": _MULTIPLIER_T,
-    "Tb": _MULTIPLIER_T,
     "TB": _MULTIPLIER_T
 }
 
@@ -1051,8 +1047,9 @@ def to_number(value: str,
             return fallback
 
     if allow_multiplier_suffix is True:
+        value_upper = value.upper()
         for suffix in _MULTIPLIER_SUFFIXES:
-            if value.endswith(suffix):
+            if value_upper.endswith(suffix):
                 value_multiplier *= _MULTIPLIER_SUFFIXES[suffix]
                 if not (value := value[:-len(suffix)].strip()):
                     return fallback
@@ -1062,7 +1059,6 @@ def to_number(value: str,
         if (dot_index := value.rfind(".")) >= 0:
             if value_fraction := value[dot_index + 1:].strip():
                 try:
-                    # value_fraction = float(f"0.{value_fraction}")
                     value_fraction = float(f"0.{value_fraction}")
                 except Exception:
                     return fallback
@@ -1109,12 +1105,14 @@ def to_boolean(value: str, fallback: Optional[Any]) -> Optional[Any]:
     return fallback
 
 
-def to_enum(value: str, enumerators: List[str]) -> Optional[str]:
+def to_enum(value: str, enumerators: List[str], fuzzy: bool = False) -> Optional[str]:
     matches = []
     if isinstance(value, str) and (value := value.strip()) and isinstance(enumerators, List):
         enum_specifiers = {str(enum).lower(): enum for enum in enumerators}
         if (enum_value := enum_specifiers.get(lower_value := value.lower())) is not None:
             return enum_value
+        if fuzzy is not True:
+            return value
         for enum_canonical, _ in enum_specifiers.items():
             if enum_canonical.startswith(lower_value):
                 matches.append(enum_canonical)

{dcicutils-8.13.3.1b23.dist-info → dcicutils-8.13.3.1b25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.13.3.1b23
+Version: 8.13.3.1b25
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.13.3.1b23.dist-info → dcicutils-8.13.3.1b25.dist-info}/RECORD

@@ -45,7 +45,7 @@ dcicutils/license_policies/park-lab-gpl-pipeline.jsonc,sha256=vLZkwm3Js-kjV44nug
 dcicutils/license_policies/park-lab-pipeline.jsonc,sha256=9qlY0ASy3iUMQlr3gorVcXrSfRHnVGbLhkS427UaRy4,283
 dcicutils/license_utils.py,sha256=2Yxnh1T1iuMe6wluwbvpFO_zYSGPxB4-STAMc-vz-YM,47202
 dcicutils/log_utils.py,sha256=7pWMc6vyrorUZQf-V-M3YC6zrPgNhuV_fzm9xqTPph0,10883
-dcicutils/misc_utils.py,sha256=GwabwKfZvv8tXcEtPBwzNHPbOfzgAbRswTkYDoW6pFE,112984
+dcicutils/misc_utils.py,sha256=4Kj_0llvUabA1O-n4cGkFdDq_shq_b8iDFDpL9AAIkQ,112934
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
 dcicutils/portal_object_utils.py,sha256=Az3n1aL-PQkN5gOFE6ZqC2XkYsqiwKlq7-tZggs1QN4,11062
@@ -75,8 +75,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.13.3.1b23.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.13.3.1b23.dist-info/METADATA,sha256=ENxCidpL5wyavgS1kKnIj09sMPK42qj0Q9sl1s8WAoU,3440
-dcicutils-8.13.3.1b23.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.13.3.1b23.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.13.3.1b23.dist-info/RECORD,,
+dcicutils-8.13.3.1b25.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.13.3.1b25.dist-info/METADATA,sha256=SUAgwGUivRxlaR7vnZQEmmCaCcjBWeU7M2KySPMDmwo,3440
+dcicutils-8.13.3.1b25.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.13.3.1b25.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.13.3.1b25.dist-info/RECORD,,