PyPI - py2ls - Versions diffs - 0.1.10.23__py3-none-any.whl → 0.1.10.25__py3-none-any.whl - Mend

py2ls 0.1.10.23py3-none-any.whl → 0.1.10.25py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

py2ls/batman.py +78 -16
py2ls/ips.py +220 -53
py2ls/netfinder.py +2 -2
py2ls/ocr.py +45 -34
py2ls/plot.py +46 -0
{py2ls-0.1.10.23.dist-info → py2ls-0.1.10.25.dist-info}/METADATA +1 -1
{py2ls-0.1.10.23.dist-info → py2ls-0.1.10.25.dist-info}/RECORD +8 -8
{py2ls-0.1.10.23.dist-info → py2ls-0.1.10.25.dist-info}/WHEEL +0 -0

py2ls/batman.py CHANGED Viewed

@@ -3,33 +3,75 @@ from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.mime.base import MIMEBase
 from email import encoders
-import schedule
 import time
 from datetime import datetime
 import os
 from pprint import pp
 import json
+import mimetypes
+import sys
-# Helper to convert text or list of text to HTML
-def convert_to_html(text_list):
+def convert_to_html(text_list, strict=False):
     if not isinstance(text_list, list):
         text_list = [text_list]
-    # Convert each element into HTML and add line breaks
-    html_content = ""  # "<html><body>\n"
-    html_content += "".join(
-        text.replace("\n", "<br>") for text in text_list if text.strip()
-    )
-    # html_content += "\n</body></html>"
+    # Define a mapping for escape sequences to their HTML representations
+    escape_mapping = {
+        "\\": "&bsol;",  # Backslash
+        "'": "&apos;",  # Single quote
+        '"': "&quot;",  # Double quote
+        "\n": "<br>",  # Newline
+        "\r": "",  # Carriage return (not represented in HTML)
+        "\t": "&nbsp;&nbsp;&nbsp;&nbsp;",  # Tab (4 spaces)
+        "\b": "",  # Backspace (not typically represented)
+        "\f": "",  # Form feed (not typically represented)
+        "\v": "",  # Vertical tab (not typically represented)
+        "\a": "",  # Bell/alert sound (not typically represented)
+        "\0": "",  # Null character (not typically represented)
+    }
+    # Convert text by replacing escape sequences with their HTML equivalents
+    html_content = ""
+    for text in text_list:
+        for escape_seq, html_rep in escape_mapping.items():
+            text = text.replace(escape_seq, html_rep)
+        html_content += text.replace("\n", "<br>")  # Add line breaks for newlines
+    if strict:
+        html_content = "<html><body>\n" + html_content + "\n</body></html>"
     return html_content
+def get_name(email_str, by="@"):
+    if "num" in by:
+        for i, char in enumerate(email_str):
+            if char.isdigit():
+                break
+        else:
+            return email_str
+        return email_str[:i]
+    # Handle the case where '@' is the criteria
+    elif "@" in by:
+        name = email_str.split("@")[0]
+        name = get_name(name, by="num")
+        name = " ".join([part.capitalize() for part in name.split(".")])
+        return name
 def extract_kv(
-    dir_data="/Users/macjianfeng/Dropbox/github/python/py2ls/confidential_data/gmail_login.json",
+    dir_data=None,
     idx=0,
 ):  # select the index
+    if dir_data is None:
+        if "dar" in sys.platform:
+            dir_data = "/Users/macjianfeng/Dropbox/github/python/py2ls/confidential_data/gmail_login.json"
+        else:
+            if "win" in sys.platform:
+                dir_data = (
+                    "Z:\\Jianfeng\\Apps\settings\\confidential_data\\gmail_login.json"
+                )
+            elif "lin" in sys.platform:
+                dir_data = "/Users/macjianfeng/Dropbox/github/python/py2ls/confidential_data/gmail_login.json"
     with open(dir_data, "r") as file:
         email_login = json.load(file)
     for i, (user, pd) in enumerate(email_login.items()):
@@ -38,6 +80,10 @@ def extract_kv(
 def email_to(**kwargs):
+    return email(**kwargs)
+def email(**kwargs):
     """
     usage:
     email_to(who="example@gmail.com",
@@ -106,7 +152,14 @@ def email_to(**kwargs):
         what = ""
     if isinstance(what, list):
         what = convert_to_html(what)
-    if 'class="dataframe"' in str(attachments):
+    if 'class="' in str(what):
+        # Combine HTML content correctly
+        html_content = "<html><body>\n"
+        html_content += f"{what}"
+        html_content += f"<br><br>{convert_to_html([signature])}"
+        html_content += "\n</body></html>"
+        message.attach(MIMEText(html_content, "html"))
+    elif 'class="' in str(attachments):
         # Combine HTML content correctly
         html_content = "<html><body>\n"
         html_content += f"{convert_to_html(what)}<br>{attachments}"
@@ -124,15 +177,24 @@ def email_to(**kwargs):
         if isinstance(attachments, str):
             attachments = [attachments]
         for file in attachments:
-            part = MIMEBase("application", "octet-stream")
+            # 有时候一些不常用的文件类型, 无法自动识别
+            mime_type, _ = mimetypes.guess_type(file)
+            if mime_type is None:
+                if file.endswith(".xlsx"):
+                    mime_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                else:
+                    mime_type = "application/octet-stream"
+            main_type, sub_type = mime_type.split("/", 1)
+            # part = MIMEBase("application", "octet-stream") # 旧的版本
+            part = MIMEBase(main_type, sub_type)
             try:
                 with open(file, "rb") as attachment:
                     part.set_payload(attachment.read())
                 encoders.encode_base64(part)
+                filename = os.path.basename(file)
                 part.add_header(
-                    "Content-Disposition",
-                    f'attachment; filename= "{os.path.basename(file)}"',
+                    "Content-Disposition", f'attachment; filename="{filename}"'
                 )
                 message.attach(part)
             except FileNotFoundError:

py2ls/ips.py CHANGED Viewed

@@ -58,6 +58,18 @@ except NameError:
     pass
+# set 'dir_save'
+if 'dar' in sys.platform:
+    dir_save = "/Users/macjianfeng/Dropbox/Downloads/"
+else:
+    if 'win' in sys.platform:
+        dir_save= "Z:\\Jianfeng\\temp\\"
+    elif 'lin' in sys.platform:
+        dir_data="/Users/macjianfeng/Dropbox/github/python/py2ls/confidential_data/gmail_login.json"
 def unique(lst, ascending=None):
     """
     移除列表中的重复元素，同时可以选择按升序或降序排序。
@@ -260,10 +272,6 @@ def upgrade(module="py2ls"):
     except subprocess.CalledProcessError as e:
         print(f"An error occurred while upgrading py2ls: {e}")
-dir_save = "/Users/macjianfeng/Dropbox/Downloads/"
 def get_version(pkg):
     import importlib.metadata
@@ -749,6 +757,41 @@ def num2str(num, *args, **kwargs):
 #     num2str(12345333.6789, sep=","), type(num2str(12345.6789, ","))
 # )  # Output: "12,345.6789"
 # print(num2str(7000.00, sep=","), type(num2str(7000.00, ",")))  # Output: "7,000.00"
+# Helper to convert text or list of text to HTML
+def str2html(text_list, strict=False):
+    if not isinstance(text_list, list):
+        text_list = [text_list]
+    # Define a mapping for escape sequences to their HTML representations
+    escape_mapping = {
+        "\\": "&bsol;",  # Backslash
+        "'": "&apos;",  # Single quote
+        '"': "&quot;",  # Double quote
+        "\n": "<br>",  # Newline
+        "\r": "",  # Carriage return (not represented in HTML)
+        "\t": "&nbsp;&nbsp;&nbsp;&nbsp;",  # Tab (4 spaces)
+        "\b": "",  # Backspace (not typically represented)
+        "\f": "",  # Form feed (not typically represented)
+        "\v": "",  # Vertical tab (not typically represented)
+        "\a": "",  # Bell/alert sound (not typically represented)
+        "\0": "",  # Null character (not typically represented)
+    }
+    # Convert text by replacing escape sequences with their HTML equivalents
+    html_content = ""
+    for text in text_list:
+        for escape_seq, html_rep in escape_mapping.items():
+            text = text.replace(escape_seq, html_rep)
+        html_content += text.replace("\n", "<br>")  # Add line breaks for newlines
+    if strict:
+        html_content = "<html><body>\n" + html_content + "\n</body></html>"
+    return html_content
 def sreplace(*args, **kwargs):
     """
     sreplace(text, by=None, robust=True)
@@ -1443,10 +1486,21 @@ def fappend(fpath, content=None):
         file.write(content)
+def filter_kwargs(kws, valid_kwargs):
+    if isinstance(valid_kwargs, dict):
+        kwargs_filtered = {
+            key: value for key, value in kws.items() if key in valid_kwargs.keys()
+        }
+    elif isinstance(valid_kwargs, list):
+        kwargs_filtered = {
+            key: value for key, value in kws.items() if key in valid_kwargs
+        }
+    return kwargs_filtered
 def fsave(
     fpath,
     content,
-    mode="w",
     how="overwrite",
     kind=None,
     font_name="Times",
@@ -1468,7 +1522,7 @@ def fsave(
         None
     """
-    def save_content(fpath, content, mode=mode, how="overwrite"):
+    def save_content(fpath, content, mode="w", how="overwrite"):
         if "wri" in how.lower():
             with open(fpath, mode, encoding="utf-8") as file:
                 file.write(content)
@@ -1515,13 +1569,36 @@ def fsave(
         pdf.output(fpath, "F")
     def save_csv(fpath, data, **kwargs):
+        # https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.to_csv.html
+        kwargs_csv = dict(
+            path_or_buf=None,
+            sep=",",
+            na_rep="",
+            float_format=None,
+            columns=None,
+            header=True,
+            index=True,
+            index_label=None,
+            mode="w",
+            encoding=None,
+            compression="infer",
+            quoting=None,
+            quotechar='"',
+            lineterminator=None,
+            chunksize=None,
+            date_format=None,
+            doublequote=True,
+            escapechar=None,
+            decimal=".",
+            errors="strict",
+            storage_options=None,
+        )
+        kwargs_valid = filter_kwargs(kwargs, kwargs_csv)
         df = pd.DataFrame(data)
-        df.to_csv(fpath, **kwargs)
+        df.to_csv(fpath, **kwargs_valid)
     def save_xlsx(fpath, data, **kwargs):
-        format = kwargs.get("format", None)
-        if format:
-            kwargs.pop("format", None)
+        if any(kwargs):
             format_excel(df=data, filename=fpath, **kwargs)
         else:
             kwargs.pop("format", None)
@@ -1618,7 +1695,7 @@ def fsave(
         print(
             f"Warning:\n{kind} is not in the supported list ['docx', 'txt', 'md', 'html', 'pdf', 'csv', 'xlsx', 'json', 'xml', 'yaml']"
         )
+    mode = kwargs.get("mode", "w")
     if kind == "docx" or kind == "doc":
         save_docx(fpath, content, font_name, font_size, spacing)
     elif kind == "txt":
@@ -1735,46 +1812,66 @@ def sort_kind(df, by="name", ascending=True):
     sorted_df = df.iloc[sorted_index].reset_index(drop=True)
     return sorted_df
-def isa(*args, **kwargs):
+def isa(content, kind):
     """
-    fpath, contains='img'
-    containss file paths based on the specified contains.
+    content, kind='img'
+    kinds file paths based on the specified kind.
     Args:
-        fpath (str): Path to the file.
-        contains (str): contains of file to contains. Default is 'img' for images. Other options include 'doc' for documents,
+        content (str): Path to the file.
+        kind (str): kind of file to kind. Default is 'img' for images. Other options include 'doc' for documents,
                     'zip' for ZIP archives, and 'other' for other types of files.
     Returns:
-        bool: True if the file matches the contains, False otherwise.
+        bool: True if the file matches the kind, False otherwise.
     """
-    for arg in args:
-        if isinstance(arg, str):
-            if "/" in arg or "\\" in arg:
-                fpath = arg
-            else:
-                contains = arg
-    if "img" in contains.lower() or "image" in contains.lower():
-        return is_image(fpath)
-    elif "doc" in contains.lower():
-        return is_document(fpath)
-    elif "zip" in contains.lower():
-        return is_zip(fpath)
-    elif "dir" in contains.lower() or (
-        "f" in contains.lower() and "d" in contains.lower()
-    ):
-        return os.path.isdir(fpath)
-    elif "fi" in contains.lower():  # file
-        return os.path.isfile(fpath)
-    elif "num" in contains.lower():  # file
-        return os.path.isfile(fpath)
-    elif "text" in contains.lower() or "txt" in contains.lower():  # file
-        return is_text(fpath)
-    elif "color" in contains.lower():  # file
-        return is_str_color(fpath)
+    if "img" in kind.lower() or "image" in kind.lower():
+        return is_image(content)
+    elif "doc" in kind.lower():
+        return is_document(content)
+    elif "zip" in kind.lower():
+        return is_zip(content)
+    elif "dir" in kind.lower() or ("f" in kind.lower() and "d" in kind.lower()):
+        return os.path.isdir(content)
+    elif "fi" in kind.lower():  # file
+        return os.path.isfile(content)
+    elif "num" in kind.lower():  # file
+        return os.path.isfile(content)
+    elif "text" in kind.lower() or "txt" in kind.lower():  # file
+        return is_text(content)
+    elif "color" in kind.lower():  # file
+        return is_str_color(content)
+    elif "html" in kind.lower():
+        # Remove leading and trailing whitespace
+        content = content.strip()
+        # Check for common HTML tags using regex
+        # This pattern matches anything that looks like an HTML tag
+        tag_pattern = r"<[a-zA-Z][^>]*>(.*?)</[a-zA-Z][^>]*>"
+        # Check for any opening and closing tags
+        if re.search(tag_pattern, content):
+            return True
+        # Additional checks for self-closing tags
+        self_closing_tags = ["img", "br", "hr", "input", "meta", "link"]
+        for tag in self_closing_tags:
+            if f"<{tag}" in content:
+                return True
+        return False
     else:
-        print(f"{contains} was not set up correctly")
+        print(f"{kind} was not set up correctly")
         return False
+import sys
+def get_os():
+    os_name = sys.platform
+    if "dar" in os_name:
+        return "macOS"
+    else:
+        if "win" in os_name:
+            return "Windows"
+        elif "linux" in os_name:
+            return "Linux"
+        else:
+            print(f"{os_name}, returned 'None'")
+            return None
 def listdir(
     rootdir,
@@ -3186,7 +3283,13 @@ def hex2argb(hex_color):
     # 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."
     )
@@ -3540,7 +3643,6 @@ def format_excel(
     number_format=None,  # dict: e.g., {1:"0.00", 2:"#,##0",3:"0%",4:"$#,##0.00"}
     data_validation=None,  # dict
     conditional_format=None,  # dict
-    index_default=False,
     **kwargs,
 ):
     if not isinstance(df, pd.DataFrame):
@@ -3711,15 +3813,29 @@ format_excel(
         print(func_xample)
         return None
     kwargs.pop("format", None)  # 更好地跟fsave结合使用
+    kwargs.pop("sheet_name", None)  # 更好地跟df.to_excel结合使用
+    sheet_name_corr = (
+        sheet_name if isinstance(sheet_name, str) else f"Sheet_{sheet_name}"
+    )
-    # Save DataFrame to Excel file
-    if not index_default:
-        df.to_excel(filename, index=False, **kwargs)
-    else:
-        df.to_excel(filename, **kwargs)
+    # 只有openpyxl才支持 append
+    mode = strcmp(kwargs.get("mode", "w"), ["a", "w"])[0]
+    kwargs.pop("mode", None)
+    engine = strcmp(kwargs.get("engine", "openpyxl"), ["xlsxwriter", "openpyxl"])[0]
+    # 通常是不需要保存index的
+    index = kwargs.get("index", False)
+    kwargs.pop("index", None)
+    # save file
+    with pd.ExcelWriter(filename, mode=mode, engine=engine) as writer:
+        df.to_excel(writer, sheet_name=sheet_name_corr, index=index, **kwargs)
     wb = load_workbook(filename)
-    ws = wb.worksheets[sheet_name]
+    if isinstance(sheet_name, str):
+        ws = wb[sheet_name]
+    elif isinstance(sheet_name, int):
+        ws = wb.worksheets[sheet_name]
+    else:
+        ws = wb.worksheets[sheet_name]  # the index of worksheets
     # !Apply cell formatting
     if cell:
@@ -3812,7 +3928,9 @@ format_excel(
             comment = [comment]
         for comment_ in comment:
             for (row, col), comment_str in comment_.items():
-                ws.cell(row=row, column=col).comment = Comment(comment_str, "Author")
+                ws.cell(row=row + 1, column=col + 1).comment = Comment(
+                    comment_str, "Author"
+                )
     # !Add link
     if link:
@@ -3820,7 +3938,7 @@ format_excel(
             link = [link]
         for link_ in link:
             for (row, col), link_str in link_.items():
-                ws.cell(row=row, column=col).hyperlink = link_str
+                ws.cell(row=row + 1, column=col + 1).hyperlink = link_str
     # !Apply data validation
     if data_validation:
@@ -3870,3 +3988,52 @@ format_excel(
     # Save the workbook
     wb.save(filename)
     print(f"Formatted Excel file saved as:\n{filename}")
+from IPython.display import display, HTML, Markdown, Image
+def preview(var):
+    """Master function to preview formatted variables in Jupyter."""
+    if isinstance(var, str):
+        if isa(var,'html'):
+            display(HTML(var))  # Render as HTML
+        # Check if it's a valid markdown
+        elif var.startswith("#"):
+            display(Markdown(var))
+        else:
+            # Otherwise, display as plain text
+            print(var)
+    elif isinstance(var, pd.DataFrame):
+        # Display pandas DataFrame
+        display(var)
+    elif isinstance(var, list) or isinstance(var, dict):
+        # Display JSON
+        json_str = json.dumps(var, indent=4)
+        display(Markdown(f"```json\n{json_str}\n```"))
+    elif isinstance(var, bytes):
+        # Display image if it's in bytes format
+        display(Image(data=var))
+    elif isinstance(var, str) and (var.endswith(".png") or var.endswith(".jpg")):
+        # Display image from file path
+        display(Image(filename=var))
+    elif isinstance(var, dict):
+        # Handle dictionary formatting
+        json_str = json.dumps(var, indent=4)
+        display(Markdown(f"```json\n{json_str}\n```"))
+    else:
+        # If the format is not recognized, print a message
+        print("Format not recognized or unsupported.")
+# # Example usages:
+# preview("This is a plain text message.")
+# preview("# This is a Markdown header")
+# preview(pd.DataFrame({"Name": ["Alice", "Bob"], "Age": [25, 30]}))
+# preview({"key": "value", "numbers": [1, 2, 3]})

py2ls/netfinder.py CHANGED Viewed

@@ -582,7 +582,7 @@ def find_links(url, driver="request", booster=False):
                 if all(exclusion not in link_href for exclusion in cond_ex):
                     links_href.append(link_href)
-        unique_links = list(set(links_href))  # Remove duplicates
+        unique_links = ips.unique(links_href)  # Remove duplicates
         if booster:
             for link in unique_links:
@@ -590,7 +590,7 @@ def find_links(url, driver="request", booster=False):
                     sub_links = find_links(link, driver=driver, booster=False)
                     if sub_links:
                         links_href.extend(sub_links)
-            links_href = list(set(links_href))  # Remove duplicates again
+            links_href = ips.unique(links_href)  # Remove duplicates again
         return links_href

py2ls/ocr.py CHANGED Viewed

@@ -286,14 +286,16 @@ def add_text_pil(
     text,
     position,
     font_size=12,
-    color=(255, 0, 0),
-    bg_color=(173, 216, 230, 120),
+    color=(0, 0, 0),
+    bg_color=(133, 203, 245, 100),
 ):
     # Convert the image to PIL format
-    pil_image = Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB))
-    # Create a drawing context
-    draw = ImageDraw.Draw(pil_image)
+    pil_image = Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB)).convert("RGBA")
     # Define the font (make sure to use a font that supports Chinese characters)
+    overlay = Image.new("RGBA", pil_image.size, (255, 255, 255, 0))
+    # Create a drawing context
+    draw = ImageDraw.Draw(overlay)
     try:
         font = ImageFont.truetype(
             "/System/Library/Fonts/Supplemental/Songti.ttc", font_size
@@ -328,8 +330,14 @@ def add_text_pil(
     draw.rectangle(background_rect, fill=bg_color)
     # Add text to the image
     draw.text(adjusted_position, text, font=font, fill=color)
+    # Ensure both images are in RGBA mode for alpha compositing
+    if pil_image.mode != "RGBA":
+        pil_image = pil_image.convert("RGBA")
+    if overlay.mode != "RGBA":
+        overlay = overlay.convert("RGBA")
+    combined = Image.alpha_composite(pil_image, overlay)
     # Convert the image back to OpenCV format
-    image = cv2.cvtColor(np.array(pil_image), cv2.COLOR_RGBA2BGR)
+    image = cv2.cvtColor(np.array(combined), cv2.COLOR_RGBA2BGR)
     return image
@@ -382,12 +390,15 @@ def preprocess_img(
         image = cv2.imread(image)
     if not isinstance(image, np.ndarray):
         image = np.array(image)
-    if image.shape[1] == 4:  # Check if it has an alpha channel
-        # Drop the alpha channel (if needed), or handle it as required
-        image = cv2.cvtColor(image, cv2.COLOR_RGBA2RGB)
-    else:
-        # Convert RGB to BGR for OpenCV compatibility
-        image = cv2.cvtColor(image, cv2.COLOR_RGB2BGR)
+    try:
+        if image.shape[1] == 4:  # Check if it has an alpha channel
+            # Drop the alpha channel (if needed), or handle it as required
+            image = cv2.cvtColor(image, cv2.COLOR_RGBA2RGB)
+        else:
+            # Convert RGB to BGR for OpenCV compatibility
+            image = cv2.cvtColor(image, cv2.COLOR_RGB2BGR)
+    except:
+        pass
     # Rotate image
     if rotate == "auto":
@@ -532,7 +543,7 @@ def get_text(
     thr=0.1,
     gpu=True,
     decoder="wordbeamsearch",  #'greedy', 'beamsearch' and 'wordbeamsearch'(hightly accurate)
-    output="all",
+    output="txt",
     preprocess=None,
     postprocess="not ready",
     show=True,
@@ -541,9 +552,9 @@ def get_text(
     font=cv2.FONT_HERSHEY_SIMPLEX,
     font_scale=0.8,
     thickness_text=2,  # Line thickness of 2 px
-    color_box=(0, 255, 0),  # draw_box
-    color_text=(203, 44, 57),  # draw_box
-    bg_color=(173, 216, 230, 128),
+    box_color=(0, 255, 0),  # draw_box
+    font_color=(0, 0, 0),
+    bg_color=(133, 203, 245, 100),
     usage=False,
     **kwargs,
 ):
@@ -559,8 +570,8 @@ def get_text(
     show: 是否显示结果图像。
     ax: 用于显示图像的 Matplotlib 子图。
     cmap: 用于显示图像的颜色映射。
-    color_box: 边界框的颜色。
-    color_text: 文本的颜色。
+    box_color: 边界框的颜色。
+    font_color: 文本的颜色。
     kwargs: 传递给 EasyOCR readtext 函数的其他参数。
     # Uage
@@ -632,19 +643,19 @@ def get_text(
                 if score > thr:
                     top_left = tuple(map(int, bbox[0]))
                     bottom_right = tuple(map(int, bbox[2]))
-                    image = cv2.rectangle(image, top_left, bottom_right, color_box, 2)
+                    image = cv2.rectangle(image, top_left, bottom_right, box_color, 2)
                     # image = cv2.putText(
-                    #     image, text, top_left, font, font_scale, color_text, thickness_text
+                    #     image, text, top_left, font, font_scale, font_color, thickness_text
                     # )
                     image = add_text_pil(
                         image,
                         text,
                         top_left,
                         font_size=font_scale * 32,
-                        color=color_text,
+                        color=font_color,
                     )
-            img_cmp = cv2.cvtColor(image, cmap)
-            ax.imshow(img_cmp)
+            # img_cmp = cv2.cvtColor(image, cmap)
+            ax.imshow(image)
             ax.axis("off")
             # plt.show()
             # 根据输出类型返回相应的结果
@@ -720,20 +731,20 @@ def get_text(
                         map(int, bbox[1])
                     )  # Bottom-left for more accurate placement
                     bottom_right = tuple(map(int, bbox[2]))
-                    image = cv2.rectangle(image, top_left, bottom_right, color_box, 2)
+                    image = cv2.rectangle(image, top_left, bottom_right, box_color, 2)
                     # image = cv2.putText(
-                    #     image, text, top_left, font, font_scale, color_text, thickness_text
+                    #     image, text, top_left, font, font_scale, font_color, thickness_text
                     # )
                     image = add_text_pil(
                         image,
                         text,
                         top_left,
                         font_size=font_scale * 32,
-                        color=color_text,
+                        color=font_color,
                         bg_color=bg_color,
                     )
             img_cmp = cv2.cvtColor(image, cmap)
-            ax.imshow(img_cmp)
+            ax.imshow(image)
             ax.axis("off")
             # plt.show()
             # 根据输出类型返回相应的结果
@@ -797,13 +808,13 @@ def get_text(
                     bottom_right = (right, h - bottom)
                     # Draw the bounding box
-                    image = cv2.rectangle(image, top_left, bottom_right, color_box, 2)
+                    image = cv2.rectangle(image, top_left, bottom_right, box_color, 2)
                     image = add_text_pil(
                         image,
                         char,
                         left,
                         font_size=font_scale * 32,
-                        color=color_text,
+                        color=font_color,
                     )
             img_cmp = cv2.cvtColor(image, cmap)
             ax.imshow(img_cmp)
@@ -838,8 +849,8 @@ def draw_box(
     detections=None,
     thr=0.25,
     cmap=cv2.COLOR_BGR2RGB,
-    color_box=(0, 255, 0),  # draw_box
-    color_text=(0, 0, 255),  # draw_box
+    box_color=(0, 255, 0),  # draw_box
+    font_color=(0, 0, 255),  # draw_box
     font_scale=0.8,
     show=True,
     ax=None,
@@ -857,12 +868,12 @@ def draw_box(
         if score > thr:
             top_left = tuple(map(int, bbox[0]))
             bottom_right = tuple(map(int, bbox[2]))
-            image = cv2.rectangle(image, top_left, bottom_right, color_box, 2)
+            image = cv2.rectangle(image, top_left, bottom_right, box_color, 2)
             # image = cv2.putText(
-            #     image, text, top_left, font, font_scale, color_text, thickness_text
+            #     image, text, top_left, font, font_scale, font_color, thickness_text
             # )
             image = add_text_pil(
-                image, text, top_left, font_size=font_scale * 32, color=color_text
+                image, text, top_left, font_size=font_scale * 32, color=font_color
             )
     img_cmp = cv2.cvtColor(image, cmap)

py2ls/plot.py CHANGED Viewed

@@ -2391,3 +2391,49 @@ def style_examples(
             dir_save,
             f"{f.name[i]}.pdf",
         )
+import matplotlib.pyplot as plt
+from PIL import Image
+def thumbnail(dir_img_list: list, figsize=(10, 10), dpi=100, show=False, usage=False):
+    """
+    Display a thumbnail figure of all images in the specified directory.
+    Args:
+        dir_img_list (list): List of image file paths to display.
+        figsize (tuple): Size of the figure (width, height) in inches.
+        dpi (int): Dots per inch for the figure.
+    """
+    if usage:
+        print(
+            'thumbnail(listdir("./img-innere-medizin-ii", ["jpeg", "jpg", "png"]).fpath.tolist(),figsize=[5,5],dpi=200)'
+        )
+    num_images = len(dir_img_list)
+    if num_images == 0:
+        print("No images found to display.")
+        return None
+    # Calculate the number of rows and columns for the grid
+    cols = int(num_images**0.5)
+    rows = (num_images // cols) + (num_images % cols > 0)
+    fig, axs = plt.subplots(rows, cols, figsize=figsize, dpi=dpi)
+    axs = axs.flatten()  # Flatten the grid for easy iteration
+    for ax, image_file in zip(axs, dir_img_list):
+        try:
+            img = Image.open(image_file)
+            ax.imshow(img)
+            ax.axis("off")  # Hide axes
+        except (IOError, FileNotFoundError) as e:
+            ax.axis("off")  # Still hide axes if image can't be loaded
+    # Hide any remaining unused axes
+    for ax in axs[len(dir_img_list) :]:
+        ax.axis("off")
+    plt.tight_layout()
+    if show:
+        plt.show()

{py2ls-0.1.10.23.dist-info → py2ls-0.1.10.25.dist-info}/METADATA RENAMED Viewed

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

{py2ls-0.1.10.23.dist-info → py2ls-0.1.10.25.dist-info}/RECORD RENAMED Viewed

@@ -172,7 +172,7 @@ py2ls/.gitignore,sha256=y7GvbD_zZkjPVVIue8AyiuFkDMuUbvMaV65Lgu89To8,2763
 py2ls/LICENSE,sha256=UOZ1F5fFDe3XXvG4oNnkL1-Ecun7zpHzRxjp-XsMeAo,11324
 py2ls/README.md,sha256=CwvJWAnSXnCnrVHlnEbrxxi6MbjbE_MT6DH2D53S818,11572
 py2ls/__init__.py,sha256=Nn8jTIvySX7t7DMJ8VNRVctTStgXGjHldOIdZ35PdW8,165
-py2ls/batman.py,sha256=U5FcWkq4kgwvFKur0wsqe0jBdq1hQjwpSUKSRzQWeCM,7509
+py2ls/batman.py,sha256=HsZuB_NspZ8CysEY8lLy78zSqd_mg0LOGBofDwQjfKQ,10101
 py2ls/brain_atlas.py,sha256=w1o5EelRjq89zuFJUNSz4Da8HnTCwAwDAZ4NU4a-bAY,5486
 py2ls/chat.py,sha256=Yr22GoIvoWhpV3m4fdwV_I0Mn77La346_ymSinR-ORA,3793
 py2ls/correlators.py,sha256=RbOaJIPLCHJtUm5SFi_4dCJ7VFUPWR0PErfK3K26ad4,18243
@@ -206,15 +206,15 @@ py2ls/doc.py,sha256=xN3g1OWfoaGUhikbJ0NqbN5eKy1VZVvWwRlhHMgyVEc,4243
 py2ls/export_requirements.py,sha256=x2WgUF0jYKz9GfA1MVKN-MdsM-oQ8yUeC6Ua8oCymio,2325
 py2ls/freqanalysis.py,sha256=F4218VSPbgL5tnngh6xNCYuNnfR-F_QjECUUxrPYZss,32594
 py2ls/ich2ls.py,sha256=3E9R8oVpyYZXH5PiIQgT3CN5NxLe4Dwtm2LwaeacE6I,21381
-py2ls/ips.py,sha256=c152TEz1X3huntbr_QySp0rqEZVf3TkFZeOHUr1m7H0,141806
-py2ls/netfinder.py,sha256=_stenzqRZsB4m5FDE7YsSkC2jvkmrUOsq48BRQB2mPM,55369
-py2ls/ocr.py,sha256=T1C589yPF07lJ6EFpGgKq5Dw0vLIZ_-ffH_WZZVIz5o,31026
-py2ls/plot.py,sha256=J8hRKLpQXHQRG_xE_nmT0mQvc1IxCMJ21tJmKsUKFl4,96155
+py2ls/ips.py,sha256=yJHpxn0EQIPk0Xhh_tb7VMWkL9Eh9Hw5XzzY7TfhQOE,147612
+py2ls/netfinder.py,sha256=vgOOMhzwbjRuLWMAPyf_kh3HoOhsJ9dlA-tCkMf7kNU,55371
+py2ls/ocr.py,sha256=5lhUbJufIKRSOL6wAWVLEo8TqMYSjoI_Q-IO-_4u3DE,31419
+py2ls/plot.py,sha256=yj-AfnYNr1ha_Y5EimTsUVSooFc36nE0KCQ8cP9_Trs,97601
 py2ls/setuptools-70.1.0-py3-none-any.whl,sha256=2bi3cUVal8ip86s0SOvgspteEF8SKLukECi-EWmFomc,882588
 py2ls/sleep_events_detectors.py,sha256=bQA3HJqv5qnYKJJEIhCyhlDtkXQfIzqksnD0YRXso68,52145
 py2ls/stats.py,sha256=fJmXQ9Lq460StOn-kfEljE97cySq7876HUPTnpB5hLs,38123
 py2ls/translator.py,sha256=zBeq4pYZeroqw3DT-5g7uHfVqKd-EQptT6LJ-Adi8JY,34244
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.1.10.23.dist-info/METADATA,sha256=VIi88HkNs4dmmv3pLfKQOq0OGT-x0ktBoBmnIn1yVHY,19791
-py2ls-0.1.10.23.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-py2ls-0.1.10.23.dist-info/RECORD,,
+py2ls-0.1.10.25.dist-info/METADATA,sha256=LN1qZZRz26ZuwKH1RSRFFpxTR5TeIElPhveOyOaXTHA,19791
+py2ls-0.1.10.25.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+py2ls-0.1.10.25.dist-info/RECORD,,

{py2ls-0.1.10.23.dist-info → py2ls-0.1.10.25.dist-info}/WHEEL RENAMED Viewed

File without changes

py2ls 0.1.10.23__py3-none-any.whl → 0.1.10.25__py3-none-any.whl

py2ls 0.1.10.23py3-none-any.whl → 0.1.10.25py3-none-any.whl