dcicutils 8.13.3.1b22__tar.gz → 8.13.3.1b24__tar.gz

{dcicutils-8.13.3.1b22 → dcicutils-8.13.3.1b24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.13.3.1b22
+Version: 8.13.3.1b24
 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.1b22 → dcicutils-8.13.3.1b24}/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
 }
 
@@ -1022,17 +1018,17 @@ _MULTIPLIER_SUFFIXES = {
 def to_number(value: str,
               allow_commas: bool = False,
               allow_multiplier_suffix: bool = False,
-              as_float: bool = False,
+              allow_float: bool = False,
               fallback: Optional[Union[int, float]] = None) -> Optional[Union[int, float]]:
 
     """
-    Converts the give string value to an int, or float if as_float is True.
+    Converts the give string value to an int, or possibly float if allow_float is True.
     If allow_commas is True (default: False) then allow commas (only) every three digits.
     If allow_multiplier_suffix is True (default: False) allow any of K, Kb, KB; or M, Mb, MB;
     or G, Gb, or GB; or T, Tb, TB, to mean multiply value by one thousand; one million;
-    one billion; or one trillion; respectively. If as_float is True (default: False)
+    one billion; or one trillion; respectively. If allow_float is True (default: False)
     allow the value to be floating point (i.e. with a decimal point and a fractional part),
-    in which case the returned value will be of type float rather than int.
+    in which case the returned value will be of type float, if it needs to be, and not int.
     If the string is not well formated then returns None.
     """
     if not (isinstance(value, str) and (value := value.strip())):
@@ -1051,17 +1047,19 @@ 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
                 break
 
-    if as_float is True:
+    if allow_float is True:
         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
@@ -1075,15 +1073,21 @@ def to_number(value: str,
     if not value.isdigit():
         return fallback
 
-    result = int(value) * value_multiplier
+    result = int(value)
 
     if value_fraction:
         result += value_fraction
 
+    result *= value_multiplier
+
     if value_negative:
         result = -result
 
-    return float(result) if as_float is True else result
+    if allow_float is True:
+        if result == int(result):
+            result = int(result)
+
+    return result
 
 
 def to_float(value: str, fallback: Optional[Any] = None) -> Optional[Any]:

{dcicutils-8.13.3.1b22 → dcicutils-8.13.3.1b24}/dcicutils/structured_data.py

@@ -727,7 +727,7 @@ class Schema(SchemaBase):
         allow_multiplier_suffix = typeinfo.get("allow_multiplier_suffix") is True
         def map_integer(value: str, src: Optional[str]) -> Any:  # noqa
             nonlocal allow_commas, allow_multiplier_suffix
-            return to_number(value, fallback=value, as_float=False,
+            return to_number(value, fallback=value, allow_float=False,
                              allow_commas=allow_commas,
                              allow_multiplier_suffix=allow_multiplier_suffix)
         return map_integer
@@ -737,7 +737,7 @@ class Schema(SchemaBase):
         allow_multiplier_suffix = typeinfo.get("allow_multiplier_suffix") is True
         def map_number(value: str, src: Optional[str]) -> Any:  # noqa
             nonlocal allow_commas, allow_multiplier_suffix
-            return to_number(value, fallback=value, as_float=True,
+            return to_number(value, fallback=value, allow_float=True,
                              allow_commas=allow_commas,
                              allow_multiplier_suffix=allow_multiplier_suffix)
         return map_number

{dcicutils-8.13.3.1b22 → dcicutils-8.13.3.1b24}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.13.3.1b22"  # TODO: To become 8.14.0
+version = "8.13.3.1b24"  # 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"