dcicutils 8.13.3.1b23__tar.gz → 8.13.3.1b25__tar.gz

{dcicutils-8.13.3.1b23 → dcicutils-8.13.3.1b25}/PKG-INFO

@@ -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 → dcicutils-8.13.3.1b25}/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 → dcicutils-8.13.3.1b25}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.13.3.1b23"  # TODO: To become 8.14.0
+version = "8.13.3.1b25"  # TODO: To become 8.14.0
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"