dcicutils 8.13.3.1b26__py3-none-any.whl → 8.13.3.1b27__py3-none-any.whl

dcicutils/misc_utils.py

@@ -1027,24 +1027,32 @@ def to_number(value: str,
               allow_multiplier_suffix: bool = False,
               fallback: Optional[Union[int, float]] = None) -> Optional[Union[int, float]]:
     """
-    Converts the given string value to an int, or float if as_float is True, or None if malformed.
-    If allow_commas is True then allow commas (only) every three digits. If allow_multiplier_suffix
-    is True  allow any of K, KB; or M, MB; or G, or GB; or T, TB (case-insensitive), to mean multiply
-    value by one thousand; one million; one billion; or one trillion; respectively. If as_float is True
-    then value is parsed and returned as a float rather than int. Note that even if as_float is False,
-    values that might look like a float, can be an int, for example, "1.5K", returns 1500 as an int;
-    but "1.5002K" returns None, i.e. since 1.5002K is 1500.2 which is not an int.
+    Converts the given string value to an int, or float if as_float is True,
+    or None or the give fallback value if malformed.
+
+    If allow_commas is True then allows appropriately placed commas (i.e. every three digits).
+
+    If allow_multiplier_suffix is True allows any of the multiplier suffixes K, KB; M, MB;
+    or G, GB; or T, TB; all case-insensitive; which will multiply the value by a thousand;
+    a million; a billion; or a trillion; respectively.
+
+    If as_float is True then value is parsed and returned as a float rather than int.
+
+    Note that even if as_float is False, values that might LOOK like a float, can be
+    an int, for example, "1.5K", returns 1500 as an int since it is; but "1.5002K"
+    is malformed, since 1.5002K is equivalent to 1500.2 which is not an int.
     """
 
     if not (isinstance(value, str) and (value := value.strip())):
+        # Just in case the value is already the actual/desired return type.
         if as_float is True:
             return float(value) if isinstance(value, (float, int)) else fallback
         else:
             return value if isinstance(value, int) else fallback
 
     value_multiplier = 1
-    value_negative = False
     value_fraction = None
+    value_negative = False
 
     if value.startswith("-"):
         if not (value := value[1:].strip()):
@@ -1080,6 +1088,7 @@ def to_number(value: str,
         value = value[:value_dot_zero_suffix.start()]
 
     if (allow_commas is True) and ("," in value):
+        # Make sure that any commas are properly placed.
         if not re.fullmatch(r"(-?\d{1,3}(,\d{3})*)", value):
             return fallback
         value = value.replace(",", "")
@@ -1090,7 +1099,15 @@ def to_number(value: str,
     value = float(value) if as_float is True else int(value)
 
     if value_fraction:
-        value_float = (float(value) + value_fraction) * float(value_multiplier)
+        value_float = float(value) + value_fraction
+        # Here we do NOT simply do: value_float *= float(value_multiplier);
+        # because it introduces obvious FLOATing point precision ERRORs; for example,
+        # to_integer("1.5678K", allow_multiplier_suffix=True) would yield 1567.8000000000002
+        # if we simply did 1.5678 * 1000.0; but doing the multiplication 10 at a time obviates this
+        # idiosyncracy yielding 1567.8; this ASSUMES that the multipliers are simple multiples of 10.
+        while value_multiplier > 1:
+            value_float *= 10
+            value_multiplier /= 10
         if as_float is True:
             value = value_float
         else:

{dcicutils-8.13.3.1b26.dist-info → dcicutils-8.13.3.1b27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.13.3.1b26
+Version: 8.13.3.1b27
 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.1b26.dist-info → dcicutils-8.13.3.1b27.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=zkzCwtuqdq90HoOP8kLuJw4ldeE8AdRNBduW2KzEBfQ,114108
+dcicutils/misc_utils.py,sha256=R3nUtmx4nynmdTfc98w3CV2JKYCPZPRBijets1nWM20,114877
 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.1b26.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.13.3.1b26.dist-info/METADATA,sha256=jQjbtF24ujN4fAqJqGPzqMmdDZMI78IAeZlpBs3WAWc,3440
-dcicutils-8.13.3.1b26.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.13.3.1b26.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.13.3.1b26.dist-info/RECORD,,
+dcicutils-8.13.3.1b27.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.13.3.1b27.dist-info/METADATA,sha256=w4K_ZFbf-pBM62p35V5NoZS4HQWx0jlimtBQ2z73pQE,3440
+dcicutils-8.13.3.1b27.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.13.3.1b27.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.13.3.1b27.dist-info/RECORD,,