py2ls 0.2.5.7__tar.gz → 0.2.5.8__tar.gz

{py2ls-0.2.5.7 → py2ls-0.2.5.8}/PKG-INFO

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

{py2ls-0.2.5.7 → py2ls-0.2.5.8}/py2ls/ips.py

@@ -6772,39 +6772,39 @@ def finfo(fpath):
 
 
 # ! format excel file
-def hex2argb(hex_color):
-    """
-        Convert a hex color code to aARGB format required by openpyxl.
 
-        :param hex_color: A hex color code in the format #RRGGBB, RRGGBB, or aARRGGBB.
-        :return: A hex color code in the format aARRGGBB.
 
-    # Example usage
-    print(hex_to_argb("FFFF00"))  # Outputs: FFFFFF00
-    print(hex_to_argb("#DF4245"))  # Outputs: FFFFFF00
-    print(hex_to_argb("FF00FF00"))  # Outputs: FF00FF00 (already in aARGB format)
+def hex2argb(color):
     """
-    # Remove the hash if present
-    if hex_color.startswith("#"):
-        hex_color = hex_color[1:]
+    Convert a color name or hex code to aARGB format required by openpyxl.
 
-    # Check if it's already in aARGB format (8 characters)
-    if len(hex_color) == 8:
-        return hex_color
+    :param color: A color in the format: 'blue', '#RRGGBB', 'RRGGBB', 'aARRGGBB'
+    :return: A hex color code in the format aARRGGBB.
 
-    # Otherwise, assume it's in RRGGBB format and prepend FF for opaque
-    if len(hex_color) == 6:
-        return f"FF{hex_color}"
-    if len(hex_color) == 7:
-        return f"F{hex_color}"
-    else:
-        if len(hex_color) > 8:
-            return hex_color[-9:]
-        else:
-            return "F" * (9 - len(hex_color)) + hex_color
-    raise ValueError(
-        "Invalid hex color format. Use RRGGBB, #RRGGBB, or aARRGGBB format."
-    )
+    Example:
+        print(hex2argb("blue"))      # Output: FF0000FF
+        print(hex2argb("FFFF00"))    # Output: FFFFFF00
+        print(hex2argb("#DF4245"))   # Output: FFDf4245
+        print(hex2argb("FF00FF00"))  # Output: FF00FF00 (already in aARGB format)
+    """
+    import matplotlib.colors as mcolors
+    import re
+    color = color.lower().replace(" ", "") # 'light blue'
+    # Convert color name (e.g., "blue") to hex
+    if color.lower() in mcolors.CSS4_COLORS:
+        color = mcolors.CSS4_COLORS[color.lower()].lstrip("#")
+    color = color.lstrip("#").upper()# Remove '#' if present
+    
+    # Validate hex format
+    if not re.fullmatch(r"[A-F0-9]{6,8}", color):
+        raise ValueError(f"格式错误❌: {color}, 应该使用 RRGGBB, #RRGGBB, or aARRGGBB format.")
+
+    # If already in aARRGGBB format (8 chars), return as is
+    if len(color) == 8:
+        return color
+    
+    # If in RRGGBB format, add FF (full opacity) as alpha
+    return f"FF{color}"
 
 def extract_kwargs(func):
     import inspect
@@ -6975,7 +6975,7 @@ def format_excel(
     from openpyxl.worksheet.datavalidation import DataValidation
     from openpyxl.comments import Comment
     from openpyxl.formatting.rule import ColorScaleRule, DataBarRule, IconSetRule,IconSet
-
+    from openpyxl.utils import get_column_letter
     def convert_indices_to_range(row_slice, col_slice):
         """Convert numerical row and column slices to Excel-style range strings."""
         start_row = row_slice.start + 1
@@ -7000,9 +7000,17 @@ def format_excel(
         sheet_name : str
             The name of the sheet to style.
         conditions : dict
-            Dictionary defining conditions for text coloring.
+            Dictionary defining conditions for text or background coloring.
+                Example:
+                {
+                    ">10": "#FF0000",           # Red if value is greater than 10
+                    "contains:Error": "#FFFF00", # Yellow if text contains 'Error'
+                    "startswith:Warn": "#FFA500" # Orange if text starts with 'Warn'
+                }
         cell_idx : tuple, optional
             A tuple of slices defining the selected row and column range (only for DataFrame).
+        where : str, default="text"
+            "text" -> Apply color to text, "bg" -> Apply color to background.
 
         Returns:
         openpyxl.workbook.workbook.Workbook
@@ -7010,14 +7018,24 @@ def format_excel(
         """ 
         def evaluate_condition(value, condition):
             """Evaluate the condition dynamically."""
+            if not isinstance(conditions, dict):
+                raise ValueError(f"condition必须是dict格式:e.g., {'x>=20':'#DD0531', 'startswith:Available':'#DD0531'}")
             try:
                 if "x" in condition and re.search(r"[<>=!]=*", condition):
                     expr = condition.replace("x", str(value))
+                    return eval(expr)
+                elif condition.startswith("startswith:") or condition.startswith("startwith:"):
+                    return value.startswith(condition.split(":", 1)[1])
+                elif condition.startswith("endswith:") or condition.startswith("endwith:"):
+                    return value.endswith(condition.split(":", 1)[1])
+                elif condition.startswith("contains:") or condition.startswith("contain:") or condition.startswith("include:"):
+                    return condition.split(":", 1)[1] in value
+                elif condition.startswith("matches:") or condition.startswith("match:"):
+                    return re.search(condition.split(":", 1)[1], value) is not None 
                 else:
                     expr = condition
-                return eval(expr)
-            except Exception as e:
-                # print(f"Error evaluating condition {condition} for value {value}: {e}")
+                return False
+            except Exception as e: 
                 return False
 
         def apply_condition_to_cell_text_color(cell, value):
@@ -7446,12 +7464,12 @@ def format_excel(
     kwargs.pop("sheet_name", 0)  # 更好地跟df.to_excel结合使用
     # 只有openpyxl才支持 append
     mode = strcmp(kwargs.get("mode", "a"), ["a", "w","auto"])[0]
-    print(f'mode="{mode}"')
+    # print(f'mode="{mode}"')
     kwargs.pop("mode", None)
     engine = strcmp(kwargs.get("engine", "openpyxl"), ["xlsxwriter", "openpyxl"])[0]
     # corr engine
     engine="openpyxl" if mode=="a" else "xlsxwriter" 
-    print(f'engine="{engine}"')
+    # print(f'engine="{engine}"')
     if_sheet_exists=kwargs.get("if_sheet_exists","replace")
     # 通常是不需要保存index的
     index = kwargs.get("index", False)
@@ -7478,11 +7496,7 @@ def format_excel(
                 with pd.ExcelWriter(filename, mode="a", engine=engine, if_sheet_exists=if_sheet_exists) as writer:
                     for ws in df.worksheets:  # Iterate through worksheets in the input workbook
                         ws_df = pd.DataFrame(ws.values)
-                        ws_df.to_excel(writer,
-                                    sheet_name=sheet_name,
-                                    index=index,
-                                    header=header,
-                                    **kwargs) 
+                        ws_df.to_excel(writer,sheet_name=sheet_name,index=index,header=header,**kwargs) 
                 # 重新打开刚更新过的数据
                 wb = load_workbook(filename) 
                 if sheet_name in wb.sheetnames:

{py2ls-0.2.5.7 → py2ls-0.2.5.8}/pyproject.toml

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