py2ls 0.1.8.2__tar.gz → 0.1.8.4__tar.gz

{py2ls-0.1.8.2 → py2ls-0.1.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.1.8.2
+Version: 0.1.8.4
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com

{py2ls-0.1.8.2 → py2ls-0.1.8.4}/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:

{py2ls-0.1.8.2 → py2ls-0.1.8.4}/py2ls/plot.py

@@ -983,9 +983,8 @@ def get_color(
     cmap: str = "auto",
     by: str = "start",
     alpha: float = 1.0,
-    output: str = "rgb",
+    output: str = "hue",
 ):
-    # Extract the colormap as a list
     def cmap2hex(cmap_name):
         cmap_ = matplotlib.pyplot.get_cmap(cmap_name)
         colors = [cmap_(i) for i in range(cmap_.N)]
@@ -1018,6 +1017,22 @@ def get_color(
             rgba_values = [hex_to_rgba(hex_color, alpha) for hex_color in hex_colors]
             return rgba_values
 
+    def rgba2hue(rgba_color):
+        if len(rgba_color) == 3:
+            r, g, b = rgba_color
+            a = 1
+        else:
+            r, g, b, a = rgba_color
+        # Convert each component to a scale of 0-255
+        r = int(r * 255)
+        g = int(g * 255)
+        b = int(b * 255)
+        a = int(a * 255)
+        if a < 255:
+            return "#{:02X}{:02X}{:02X}{:02X}".format(r, g, b, a)
+        else:
+            return "#{:02X}{:02X}{:02X}".format(r, g, b)
+
     # Determine color list based on cmap parameter
     if "aut" in cmap:
         colorlist = [
@@ -1042,15 +1057,17 @@ def get_color(
             for i in [int(i) for i in np.linspace(0, len(colorlist) - 1, n)]
         ]
 
-    if output == "rgb":
+    if "rgb" in output.lower():
         return hue2rgb(clist, alpha)
-    elif output == "hue":
-        return clist
+    elif "h" in output.lower():
+        hue_list = []
+        [hue_list.append(rgba2hue(i)) for i in hue2rgb(clist, alpha)]
+        return hue_list
     else:
         raise ValueError("Invalid output type. Choose 'rgb' or 'hue'.")
 
     # # Example usage
-    # colors = get_color(n=5, cmap="viridis", by="linear", alpha=0.5)
+    # colors = get_color(n=5, cmap="viridis", by="linear", alpha=0.5,output='rgb')
     # print(colors)
 
 

{py2ls-0.1.8.2 → py2ls-0.1.8.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py2ls"
-version = "0.1.8.2"
+version = "0.1.8.4"
 description = "py(thon)2(too)ls"
 authors = ["Jianfeng <Jianfeng.Liu0413@gmail.com>"]
 readme = "README.md"