py2ls 0.1.8.3__py3-none-any.whl → 0.1.8.5__py3-none-any.whl

py2ls/ips.py

@@ -457,13 +457,15 @@ def str2date(date_str, fmt="%Y-%m-%d_%H:%M:%S"):
 # print(str2)
 
 
-def str2num(s, *args):
-    delimiter = None
-    round_digits = None
+def str2num(s, *args, **kwargs):
+    delimiter = kwargs.get("sep", None)
+    round_digits = kwargs.get("round", None)
+    if delimiter is not None:
+        s = s.replace(delimiter, "")
     for arg in args:
-        if isinstance(arg, str):
+        if isinstance(arg, str) and delimiter is None:
             delimiter = arg
-        elif isinstance(arg, int):
+        elif isinstance(arg, int) and round_digits is None:
             round_digits = arg
     try:
         num = int(s)
@@ -491,17 +493,17 @@ def str2num(s, *args):
                             "Multiple number segments found, cannot determine single numeric value"
                         )
                 except Exception as e:
-                    raise ValueError(f"Cannot convert {s} to a number: {e}")
+                    return None
 
     # Apply rounding if specified
     if round_digits is not None:
         num_adj = num + 0.00000000001  # Ensure precise rounding
         num = round(num_adj, round_digits)
-
-    # Apply delimiter formatting if specified
-    if delimiter is not None:
-        num_str = f"{num:,}".replace(",", delimiter)
-        return num_str
+    if round_digits == 0:
+        num = int(num)
+    # if delimiter is not None:
+    #     num_str = f"{num:,}".replace(",", delimiter)
+    #     return num_str#s.replace(delimiter, "")
 
     return num
 
@@ -516,9 +518,9 @@ def str2num(s, *args):
 # print(str2num("12345.6789", " ", 2)) # Output: 12 345.68
 # print(str2num('111113.34555',3,',')) # Output: 111,113.346
 # print(str2num("123.55555 sec miniuets",3)) # Output: 1.3
-def num2str(num, *args):
-    delimiter = None
-    round_digits = None
+def num2str(num, *args, **kwargs):
+    delimiter = kwargs.get("sep", None)
+    round_digits = kwargs.get("round", None)
 
     # Parse additional arguments
     for arg in args: