py2ls 0.2.4.39__py3-none-any.whl → 0.2.4.40__py3-none-any.whl

py2ls/ips.py

@@ -6330,6 +6330,7 @@ def format_excel(
     protect=None,  # dict
     number_format=None,  # dict: e.g., {1:"0.00", 2:"#,##0",3:"0%",4:"$#,##0.00"}
     data_validation=None,  # dict
+    apply_filter=True, # add filter 
     conditional_format=None,  # dict
     **kwargs,
 ):
@@ -6340,7 +6341,7 @@ def format_excel(
     from openpyxl.utils import get_column_letter
     from openpyxl.worksheet.datavalidation import DataValidation
     from openpyxl.comments import Comment
-    from openpyxl.formatting.rule import ColorScaleRule
+    from openpyxl.formatting.rule import ColorScaleRule, DataBarRule, IconSetRule,IconSet
 
     def convert_indices_to_range(row_slice, col_slice):
         """Convert numerical row and column slices to Excel-style range strings."""
@@ -6705,159 +6706,159 @@ def format_excel(
         filename = str(datetime.now().strftime("%y%m%d_%H.xlsx"))
     # !show usage:
     func_xample = """
-# Example usage
-data = {
-    "Header 1": [10, 2000000, 30],
-    "Header 2": [
-        40000,
-        '"start_color": "4F81BD", "end_color","start_color": "a1cd1e","start_color": "4F81BD", "end_color","start_color": "a1cd1e"',
-        60,
-    ],
-    "Header 3": [70, 80, 90],
-}
-df = pd.DataFrame(data)
-
-
-format_excel(
-    df,
-    filename="example.xlsx",
-    sheet_name="Sheet1",
-    cell=[
-        {
-            (slice(0, 1), slice(0, len(df.columns))): {
-                "font": {
-                    "name": "Calibri",  # Font name
-                    "size": 14,  # Font size
-                    "bold": True,  # Bold text
-                    "italic": False,  # Italic text
-                    "underline": "single",  # Underline (single, double)
-                    "color": "#FFFFFF",  # Font color
-                },
-                "fill": {
-                    "start_color": "a1cd1e",  # Starting color
-                    "end_color": "4F81BD",  # Ending color (useful for gradients)
-                    "fill_type": "solid",  # Fill type (solid, gradient, etc.)
-                },
-                "alignment": {
-                    "horizontal": "center",  # Horizontal alignment (left, center, right)
-                    "vertical": "center",  # Vertical alignment (top, center, bottom)
-                    "wrap_text": True,  # Wrap text in the cell
-                    "shrink_to_fit": True,  # Shrink text to fit within cell
-                    "text_rotation": 0,  # Text rotation angle
-                },
-                "border": {
-                    "left": "thin",
-                    "right": "thin",
-                    "top": "thin",
-                    "bottom": "thin",
-                    "color": "000000",  # Border color
-                },
+            # Example usage
+            data = {
+                "Header 1": [10, 2000000, 30],
+                "Header 2": [
+                    40000,
+                    '"start_color": "4F81BD", "end_color","start_color": "a1cd1e","start_color": "4F81BD", "end_color","start_color": "a1cd1e"',
+                    60,
+                ],
+                "Header 3": [70, 80, 90],
             }
-        },
-        {
-            (slice(0, 3), slice(1, 3)): {
-                "font": {
-                    "name": "Arial",  # Font name
-                    "size": 12,  # Font size
-                    "bold": False,  # Bold text
-                    "italic": True,  # Italic text
-                    "underline": None,  # No underline
-                    "color": "#000000",  # Font color
+            df = pd.DataFrame(data)
+
+
+            format_excel(
+                df,
+                filename="example.xlsx",
+                sheet_name="Sheet1",
+                cell=[
+                    {
+                        (slice(0, 1), slice(0, len(df.columns))): {
+                            "font": {
+                                "name": "Calibri",  # Font name
+                                "size": 14,  # Font size
+                                "bold": True,  # Bold text
+                                "italic": False,  # Italic text
+                                "underline": "single",  # Underline (single, double)
+                                "color": "#FFFFFF",  # Font color
+                            },
+                            "fill": {
+                                "start_color": "a1cd1e",  # Starting color
+                                "end_color": "4F81BD",  # Ending color (useful for gradients)
+                                "fill_type": "solid",  # Fill type (solid, gradient, etc.)
+                            },
+                            "alignment": {
+                                "horizontal": "center",  # Horizontal alignment (left, center, right)
+                                "vertical": "center",  # Vertical alignment (top, center, bottom)
+                                "wrap_text": True,  # Wrap text in the cell
+                                "shrink_to_fit": True,  # Shrink text to fit within cell
+                                "text_rotation": 0,  # Text rotation angle
+                            },
+                            "border": {
+                                "left": "thin",
+                                "right": "thin",
+                                "top": "thin",
+                                "bottom": "thin",
+                                "color": "000000",  # Border color
+                            },
+                        }
+                    },
+                    {
+                        (slice(0, 3), slice(1, 3)): {
+                            "font": {
+                                "name": "Arial",  # Font name
+                                "size": 12,  # Font size
+                                "bold": False,  # Bold text
+                                "italic": True,  # Italic text
+                                "underline": None,  # No underline
+                                "color": "#000000",  # Font color
+                            },
+                            "fill": {
+                                "start_color": "#c61313",  # Background color
+                                "end_color": "#490606",  # End color
+                                "fill_type": "solid",  # Fill type
+                            },
+                            "alignment": {
+                                "horizontal": "left",  # Horizontal alignment
+                                "vertical": "top",  # Vertical alignment
+                                "wrap_text": True,  # Enable text wrapping
+                                "shrink_to_fit": False,  # Disable shrink to fit
+                                "indent": 1,  # Indentation level
+                                "text_rotation": 0,  # Text rotation angle
+                            },
+                            "border": {
+                                "left": "thin",  # Left border style
+                                "right": "thin",  # Right border style
+                                "top": "thin",  # Top border style
+                                "bottom": "thin",  # Bottom border style
+                                "color": "000000",  # Border color
+                            },
+                        }
+                        # * border settings
+                        # "thin": Thin border line
+                        # "medium": Medium border line
+                        # "thick": Thick border line
+                        # "dotted": Dotted border line
+                        # "dashed": Dashed border line
+                        # "hair": Hairline border (very thin)
+                        # "mediumDashed": Medium dashed border line
+                        # "dashDot": Dash-dot border line
+                        # "dashDotDot": Dash-dot-dot border line
+                        # "slantDashDot": Slant dash-dot border line
+                    },
+                ],
+                width={2: 30},  # when it is None, it will automatic adjust width
+                height={2: 50, 3: 25},  # keys are columns
+                merge=(slice(0, 1), slice(1, 3)),
+                shade={
+                    (slice(1, 4), slice(1, 3)): {
+                        "bg_color": "FFFF00",  # Background color
+                        "pattern_type": "solid",  # Fill pattern (e.g., solid, darkGrid, lightGrid)
+                        "fg_color": "#0000FF",  # Foreground color, used in patterns
+                        "end_color": "0000FF",  # End color, useful for gradients
+                        "fill_type": "solid",  # Type of fill (solid, gradient, etc.)
+                    }
                 },
-                "fill": {
-                    "start_color": "#c61313",  # Background color
-                    "end_color": "#490606",  # End color
-                    "fill_type": "solid",  # Fill type
+                comment={(2, 4): "This is a comment"},
+                link={(2, 2): "https://example.com"},
+                protect={
+                    "password": "123",  # Password for sheet protection
+                    "sheet": False,  # True,  # Protect the sheet
+                    "objects": False,  # True,  # Protect objects
+                    "scenarios": False,  # True,  # Protect scenarios
+                    "formatCells": False,  # Disable formatting cells
+                    "formatColumns": False,  # Disable formatting columns
+                    "formatRows": False,  # Disable formatting rows
+                    "insertColumns": False,  # Disable inserting columns
+                    "insertRows": False,  # Disable inserting rows
+                    "deleteColumns": False,  # Disable deleting columns
+                    "deleteRows": False,  # Disable deleting rows
                 },
-                "alignment": {
-                    "horizontal": "left",  # Horizontal alignment
-                    "vertical": "top",  # Vertical alignment
-                    "wrap_text": True,  # Enable text wrapping
-                    "shrink_to_fit": False,  # Disable shrink to fit
-                    "indent": 1,  # Indentation level
-                    "text_rotation": 0,  # Text rotation angle
+                number_format={
+                    1: "0.00",  # Two decimal places for column index 1
+                    2: "#,##0",  # Thousands separator
+                    3: "0%",  # Percentage format
+                    4: "$#,##0.00",  # Currency format
                 },
-                "border": {
-                    "left": "thin",  # Left border style
-                    "right": "thin",  # Right border style
-                    "top": "thin",  # Top border style
-                    "bottom": "thin",  # Bottom border style
-                    "color": "000000",  # Border color
+                data_validation={
+                    (slice(1, 2), slice(2, 10)): {
+                        "type": "list",
+                        "formula1": '"Option1,Option2,Option3"',  # List of options
+                        "allow_blank": True,
+                        "showDropDown": True,
+                        "showErrorMessage": True,
+                        "errorTitle": "Invalid input",
+                        "error": "Please select a valid option.",
+                    }
                 },
-            }
-            # * border settings
-            # "thin": Thin border line
-            # "medium": Medium border line
-            # "thick": Thick border line
-            # "dotted": Dotted border line
-            # "dashed": Dashed border line
-            # "hair": Hairline border (very thin)
-            # "mediumDashed": Medium dashed border line
-            # "dashDot": Dash-dot border line
-            # "dashDotDot": Dash-dot-dot border line
-            # "slantDashDot": Slant dash-dot border line
-        },
-    ],
-    width={2: 30},  # when it is None, it will automatic adjust width
-    height={2: 50, 3: 25},  # keys are columns
-    merge=(slice(0, 1), slice(1, 3)),
-    shade={
-        (slice(1, 4), slice(1, 3)): {
-            "bg_color": "FFFF00",  # Background color
-            "pattern_type": "solid",  # Fill pattern (e.g., solid, darkGrid, lightGrid)
-            "fg_color": "#0000FF",  # Foreground color, used in patterns
-            "end_color": "0000FF",  # End color, useful for gradients
-            "fill_type": "solid",  # Type of fill (solid, gradient, etc.)
-        }
-    },
-    comment={(2, 4): "This is a comment"},
-    link={(2, 2): "https://example.com"},
-    protect={
-        "password": "123",  # Password for sheet protection
-        "sheet": False,  # True,  # Protect the sheet
-        "objects": False,  # True,  # Protect objects
-        "scenarios": False,  # True,  # Protect scenarios
-        "formatCells": False,  # Disable formatting cells
-        "formatColumns": False,  # Disable formatting columns
-        "formatRows": False,  # Disable formatting rows
-        "insertColumns": False,  # Disable inserting columns
-        "insertRows": False,  # Disable inserting rows
-        "deleteColumns": False,  # Disable deleting columns
-        "deleteRows": False,  # Disable deleting rows
-    },
-    number_format={
-        1: "0.00",  # Two decimal places for column index 1
-        2: "#,##0",  # Thousands separator
-        3: "0%",  # Percentage format
-        4: "$#,##0.00",  # Currency format
-    },
-    data_validation={
-        (slice(1, 2), slice(2, 10)): {
-            "type": "list",
-            "formula1": '"Option1,Option2,Option3"',  # List of options
-            "allow_blank": True,
-            "showDropDown": True,
-            "showErrorMessage": True,
-            "errorTitle": "Invalid input",
-            "error": "Please select a valid option.",
-        }
-    },
-    conditional_format={
-        (slice(1, 2), slice(2, 10)): [
-            {
-                "color_scale": {
-                    "start_type": "min",  # Type of start point (min, max, percent)
-                    "start_color": "#FF0000",  # Starting color
-                    "end_type": "max",  # End type (min, max, percent)
-                    "end_color": "00FF00",  # Ending color
-                    "mid_type": "percentile",  # Midpoint type (optional)
-                    "mid_value": 50,  # Midpoint value (optional)
-                    "mid_color": "FFFF00",  # Midpoint color (optional)
-                }
-            }
-        ]
-    },
-)
+                conditional_format={
+                    (slice(1, 2), slice(2, 10)): [
+                        {
+                            "color_scale": {
+                                "start_type": "min",  # Type of start point (min, max, percent)
+                                "start_color": "#FF0000",  # Starting color
+                                "end_type": "max",  # End type (min, max, percent)
+                                "end_color": "00FF00",  # Ending color
+                                "mid_type": "percentile",  # Midpoint type (optional)
+                                "mid_value": 50,  # Midpoint value (optional)
+                                "mid_color": "FFFF00",  # Midpoint color (optional)
+                            }
+                        }
+                    ]
+                },
+            )
             """
     if usage:
         print(func_xample)
@@ -6917,17 +6918,49 @@ format_excel(
             col_letter = get_column_letter(col_idx)
             for cell in ws[col_letter][1:]:  # Skip the header
                 cell.number_format = fmt
-
+    
+    if apply_filter:
+        if isinstance(apply_filter, bool):
+            # Default: Apply filter to the entire first row (header)
+            filter_range = f"A1:{get_column_letter(ws.max_column)}1"
+            ws.auto_filter.ref = filter_range
+            
+        elif isinstance(apply_filter, tuple):
+            row_slice, col_slice = apply_filter
+            
+            # Extract the start and end indices for rows and columns
+            start_row, end_row = row_slice.start, row_slice.stop
+            start_col_idx, end_col_idx = col_slice.start, col_slice.stop
+
+            # Ensure valid row and column indices
+            if start_row < 1: start_row = 1  # Row should not be less than 1
+            if end_row > ws.max_row: end_row = ws.max_row  # Ensure within sheet's row limits
+            if start_col_idx < 1: start_col_idx = 1  # Column should not be less than 1
+            if end_col_idx > ws.max_column: end_col_idx = ws.max_column  # Ensure within sheet's column limits
+            
+            # Get column letters based on indices
+            start_col = get_column_letter(start_col_idx)
+            end_col = get_column_letter(end_col_idx)
+
+            # Define the filter range based on specific rows and columns
+            filter_range = f"{start_col}{start_row}:{end_col}{end_row}"
+
+            # Apply the filter
+            ws.auto_filter.ref = filter_range
     # !widths
     if width is None:  # automatic adust width
         for col in ws.columns:
-            len_ = [len(str(cell.value)) for cell in col if cell.value]
-            if len_:
-                # scaling_factor = 1.2
-                max_length = max(len_)  # * scaling_factor
-                ws.column_dimensions[get_column_letter(col[0].column)].width = (
-                    max_length
-                )
+            max_length = 0
+            column = col[0].column_letter  # Get the column letter
+            for cell_ in col:
+                try:
+                    if cell_.value:
+                        max_length = max(max_length, len(str(cell_.value)))
+                except Exception:
+                    pass
+            adjusted_width = max_length + 2  # You can adjust the padding value as needed
+            ws.column_dimensions[column].width = adjusted_width
+
     else:
         for col_idx, width_ in width.items():
             col_letter = get_column_letter(col_idx)
@@ -7017,6 +7050,7 @@ format_excel(
         for indices, rules in conditional_format.items():
             cell_range = convert_indices_to_range(*indices)
             for rule in rules:
+                # Handle color scale
                 if "color_scale" in rule:
                     color_scale = rule["color_scale"]
                     start_color = hex2argb(color_scale.get("start_color", "FFFFFF"))
@@ -7035,6 +7069,32 @@ format_excel(
                         end_color=end_color,
                     )
                     ws.conditional_formatting.add(cell_range, color_scale_rule)
+                # Handle data bar
+                if "data_bar" in rule:
+                    data_bar = rule["data_bar"]
+                    bar_color = hex2argb(data_bar.get("color", "638EC6"))
+
+                    data_bar_rule = DataBarRule(
+                        start_type=data_bar.get("start_type", "min"),
+                        start_value=data_bar.get("start_value"),
+                        end_type=data_bar.get("end_type", "max"),
+                        end_value=data_bar.get("end_value"),
+                        color=bar_color,
+                        showValue=data_bar.get("show_value", True),
+                    )
+                    ws.conditional_formatting.add(cell_range, data_bar_rule)
+
+                # Handle icon set
+                if "icon_set" in rule:
+                    icon_set = rule["icon_set"]
+                    icon_set_rule = IconSet(
+                        iconSet=icon_set.get("iconSet", "3TrafficLights1"),  # Corrected
+                        showValue=icon_set.get("show_value", True),        # Corrected
+                        reverse=icon_set.get("reverse", False)            # Corrected
+                    )
+                    ws.conditional_formatting.add(cell_range, icon_set_rule)
+
+
     # Save the workbook
     wb.save(filename)
     print(f"Formatted Excel file saved as:\n{filename}")
@@ -11011,6 +11071,8 @@ def mouse(
     scroll_amount: int = -500,
     fail_safe: bool = True,
     grayscale: bool = False,
+    n_try: int = 10,
+    verbose: bool = True,
     **kwargs,
 ):
     """
@@ -11037,6 +11099,9 @@ def mouse(
     import pyautogui
     import time
 
+    # import logging
+    # logging.basicConfig(level=logging.DEBUG, filename="debug.log")
+
     pyautogui.FAILSAFE = fail_safe  # Enable/disable fail-safe
     loc_type = "absolute" if "abs" in loc_type else "relative"
     if len(args) == 1:
@@ -11045,7 +11110,6 @@ def mouse(
             x_offset, y_offset = None, None
         else:
             x_offset, y_offset = args
-
     elif len(args) == 2:
         x_offset, y_offset = args
     elif len(args) == 3:
@@ -11079,38 +11143,35 @@ def mouse(
         if region is None:
             w, h = pyautogui.size()
             region = (0, 0, w, h)
-            print(region)
-        try:
-            print(image_path)
-            location = pyautogui.locateOnScreen(
-                image_path, confidence=confidence, region=region, grayscale=grayscale
-            )
-            print(pyautogui.center(location))
-        except Exception as e:
-            location = None
+        retries = 0
+        while location is None and retries <= n_try:
+            try:
+                confidence_ = round(float(confidence - 0.05 * retries), 2)
+                location = pyautogui.locateOnScreen(
+                    image_path,
+                    confidence=confidence_,
+                    region=region,
+                    grayscale=grayscale,
+                )
+            except Exception as e:
+                if verbose:
+                    print(f"confidence={confidence_},{e}")
+                location = None
+            retries += 1
 
     # try:
     if location:
         x, y = pyautogui.center(location)
         x += x_offset if x_offset else 0
-        y += y_offset if y_offset else 0
+        if x_offset is not None:
+            x += x_offset
+        if y_offset is not None:
+            y += y_offset
         x_offset, y_offset = x, y
-    print(action)
+    print(action) if verbose else None
     if action in ["locate"]:
         x, y = pyautogui.position()
     elif action in ["click", "double_click", "triple_click"]:
-        # if location:
-        #     x, y = pyautogui.center(location)
-        #     x += x_offset
-        #     y += y_offset
-        #     pyautogui.moveTo(x, y, duration=duration)
-        #     if action == "click":
-        #         pyautogui.click(x=x, y=y, clicks=n_click, interval=interval, button=button)
-        #     elif action == "double_click":
-        #         pyautogui.doubleClick(x=x, y=y, interval=interval, button=button)
-        #     elif action=='triple_click':
-        #         pyautogui.tripleClick(x=x,y=y,interval=interval,  button=button)
-        # else:
         if action == "click":
             pyautogui.moveTo(x_offset, y_offset, duration=duration)
             time.sleep(wait)
@@ -11136,7 +11197,7 @@ def mouse(
         if text is not None:
             pyautogui.typewrite(text, interval=interval)
         else:
-            raise ValueError("Text must be provided for the 'type' action.")
+            print("Text must be provided for the 'type' action.") if verbose else None
 
     elif action == "drag":
         if loc_type == "absolute":
@@ -11168,15 +11229,7 @@ def mouse(
     else:
         raise ValueError(f"Unsupported action: {action}")
 
-    # except pyautogui.ImageNotFoundException:
-    #     print(
-    #         "Image not found. Ensure the image is visible and parameters are correct."
-    #     )
-    # except Exception as e:
-    #     print(f"An error occurred: {e}")
-
 
- 
 def py2installer(
     script_path: str = None,
     flatform: str = "mingw64",
@@ -11399,11 +11452,13 @@ def py2installer(
             if any(exclude_import):
                 cmd.extend([f"--nofollow-import-to={','.join(exclude_import)}"])
         if include_import is not None:
-            if any(include_import):#are included in the final build. Some packages may require manual inclusion.
+            if any(
+                include_import
+            ):  # are included in the final build. Some packages may require manual inclusion.
                 cmd.extend([f"--include-package={','.join(include_import)}"])
         if plugins:
             for plugin in plugins:
-                #Adds support for tkinter, ensuring it works correctly in the standalone build.
+                # Adds support for tkinter, ensuring it works correctly in the standalone build.
                 cmd.extend([f"--enable-plugin={plugin}"])
 
         if additional_args:
@@ -11422,7 +11477,9 @@ def py2installer(
         # )
 
         if clean_build:
-            cmd.append("--remove-output")#Removes intermediate files created during the build process, keeping only the final executable.
+            cmd.append(
+                "--remove-output"
+            )  # Removes intermediate files created during the build process, keeping only the final executable.
         # Add the script path (final positional argument)
         cmd.append(str(script_path))
         # Ensure Windows shell compatibility

{py2ls-0.2.4.39.dist-info → py2ls-0.2.4.40.dist-info}/METADATA

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

{py2ls-0.2.4.39.dist-info → py2ls-0.2.4.40.dist-info}/RECORD

@@ -243,7 +243,7 @@ py2ls/export_requirements.py,sha256=x2WgUF0jYKz9GfA1MVKN-MdsM-oQ8yUeC6Ua8oCymio,
 py2ls/fetch_update.py,sha256=9LXj661GpCEFII2wx_99aINYctDiHni6DOruDs_fdt8,4752
 py2ls/freqanalysis.py,sha256=F4218VSPbgL5tnngh6xNCYuNnfR-F_QjECUUxrPYZss,32594
 py2ls/ich2ls.py,sha256=3E9R8oVpyYZXH5PiIQgT3CN5NxLe4Dwtm2LwaeacE6I,21381
-py2ls/ips.py,sha256=nvpHPtEQl7rqnhTeI7BZYyJ2FZU9fXk85_w8PgT-5Gc,422932
+py2ls/ips.py,sha256=cC7kOZ-hpiMZ_iMwSMjq9fVFqOIqFASMQ8njv4atrxQ,427376
 py2ls/ml2ls.py,sha256=I-JFPdikgEtfQjhv5gBz-QSeorpTJI_Pda_JwkTioBY,209732
 py2ls/mol.py,sha256=AZnHzarIk_MjueKdChqn1V6e4tUle3X1NnHSFA6n3Nw,10645
 py2ls/netfinder.py,sha256=OhqD3S9PuwweL2013D-q4GNP1WvJjuYfZzq5BZgGddE,68980
@@ -255,6 +255,6 @@ py2ls/sleep_events_detectors.py,sha256=bQA3HJqv5qnYKJJEIhCyhlDtkXQfIzqksnD0YRXso
 py2ls/stats.py,sha256=qBn2rJmNa_QLLUqjwYqXUlGzqmW94sgA1bxJU2FC3r0,39175
 py2ls/translator.py,sha256=77Tp_GjmiiwFbEIJD_q3VYpQ43XL9ZeJo6Mhl44mvh8,34284
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.2.4.39.dist-info/METADATA,sha256=ANCx7SlkGLfIlF9_PzXMblurv9daFBOrTDrqKSWrkYU,20473
-py2ls-0.2.4.39.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-py2ls-0.2.4.39.dist-info/RECORD,,
+py2ls-0.2.4.40.dist-info/METADATA,sha256=depWxTukM5uk2vttHEvLLPWoMXjGV9HZACinx_WHjOM,20473
+py2ls-0.2.4.40.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+py2ls-0.2.4.40.dist-info/RECORD,,