py2ls 0.2.4.33__tar.gz → 0.2.4.34__tar.gz

{py2ls-0.2.4.33 → py2ls-0.2.4.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.2.4.33
+Version: 0.2.4.34
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com
@@ -85,7 +85,7 @@ Requires-Dist: h2 (>=3.2.0)
 Requires-Dist: h5py (>=3.11.0)
 Requires-Dist: hpack (>=3.0.0)
 Requires-Dist: hstspreload (>=2024.7.1)
-Requires-Dist: httpcore (>=0.9.1)
+Requires-Dist: httpcore (>=0.9.0)
 Requires-Dist: httpx (>=0.13.3)
 Requires-Dist: humanfriendly (>=10.0)
 Requires-Dist: hyperframe (>=5.2.0)

{py2ls-0.2.4.33 → py2ls-0.2.4.34}/py2ls/ips.py

@@ -26,6 +26,16 @@ import re
 import stat
 import platform
 
+# only for backup these scripts
+def backup(
+    src="/Users/macjianfeng/Dropbox/github/python/py2ls/.venv/lib/python3.12/site-packages/py2ls/",
+    tar="/Users/macjianfeng/Dropbox/github/python/py2ls/py2ls/",
+    kind="py",
+    overwrite=True,
+):
+    f = listdir(src, kind)
+    [copy(i, tar, overwrite=overwrite) for i in f.path]
+    print(f"all files are copied from {os.path.basename(src)} to {tar}")
 def run_once_within(duration=60, reverse=False):  # default 60s
     import time
 
@@ -5506,7 +5516,9 @@ def imgsets(img,
             show_axis:bool=False,
             plot_:bool=True,
             verbose:bool=False,
-            **kwargs):
+            model:str="isnet-general-use",
+            **kwargs,
+            ):
     """
     Apply various enhancements and filters to an image using PIL's ImageEnhance and ImageFilter modules.
 
@@ -5562,6 +5574,27 @@ def imgsets(img,
         "BOX_BLUR",
         "MEDIAN_FILTER",
     ]
+    # *Rembg is a tool to remove images background.
+    # https://github.com/danielgatis/rembg
+    rem_models = {
+        "u2net": "general use cases.",
+        "u2netp": "A lightweight version of u2net model.",
+        "u2net_human_seg": "human segmentation.",
+        "u2net_cloth_seg": "Cloths Parsing from human portrait. Here clothes are parsed into 3 category: Upper body, Lower body and Full body.",
+        "silueta": "Same as u2net but the size is reduced to 43Mb.",
+        "isnet-general-use": "A new pre-trained model for general use cases.",
+        "isnet-anime": "A high-accuracy segmentation for anime character.",
+        "sam": "any use cases.",
+        "birefnet-general": "general use cases.",
+        "birefnet-general-lite": "A light pre-trained model for general use cases.",
+        "birefnet-portrait": "human portraits.",
+        "birefnet-dis": "dichotomous image segmentation (DIS).",
+        "birefnet-hrsod": "high-resolution salient object detection (HRSOD).",
+        "birefnet-cod": "concealed object detection (COD).",
+        "birefnet-massive": "A pre-trained model with massive dataset.",
+    }
+    models_support_rem=list(rem_models.keys())
+
     str_usage="""
     imgsets(dir_img, auto=1, color=1.5, plot_=0)
     imgsets(dir_img, color=2)
@@ -5569,6 +5602,7 @@ def imgsets(img,
     imgsets(dir_img, contrast=0, color=1.2, plot_=0)
     imgsets(get_clip(), flip="tb")# flip top and bottom
     imgsets(get_clip(), contrast=1, rm=[100, 5, 2]) #'foreground_threshold', 'background_threshold' and 'erode_structure_size'
+    imgsets(dir_img, rm="birefnet-portrait") # with using custom model
     """
     if run_once_within():
         print(str_usage)
@@ -5577,28 +5611,7 @@ def imgsets(img,
         # adjust gama value
         inv_gamma = 1.0 / gamma
         lut = [int((i / float(v_max)) ** inv_gamma * int(v_max)) for i in range(int(v_max))]
-        return lut #image.point(lut)
-
-    def confirm_rembg_models(model_name):
-        models_support = [
-            "u2net",
-            "u2netp",
-            "u2net_human_seg",
-            "u2net_cloth_seg",
-            "silueta",
-            "isnet-general-use",
-            "isnet-anime",
-            "sam",
-        ]
-        if model_name in models_support:
-            print(f"model_name: {model_name}")
-            return model_name
-        else:
-            print(
-                f"{model_name} cannot be found, check the name:{models_support}, default('isnet-general-use') has been used"
-            )
-            return "isnet-general-use"
-
+        return lut #image.point(lut) 
     def auto_enhance(img):
         """
         Automatically enhances the image based on its characteristics, including brightness,
@@ -5765,9 +5778,11 @@ def imgsets(img,
             img_update = ImageOps.pad(img_update, size=value)
         elif "rem" in k.lower() or "rm" in k.lower() or "back" in k.lower():
             from rembg import remove, new_session
-
+            if verbose:
+                preview(rem_models)
+            model=strcmp(model, models_support_rem)[0]
+            session = new_session(model)
             if isinstance(value, bool):
-                session = new_session("isnet-general-use")
                 img_update = remove(img_update, session=session)
             elif value and isinstance(value, (int, float, list)):
                 if verbose:
@@ -5779,14 +5794,14 @@ def imgsets(img,
                     img_update = remove(
                         img_update,
                         alpha_matting=True,
-                        alpha_matting_background_threshold=value,
+                        alpha_matting_background_threshold=value, session=session
                     )
                 elif 2 <= len(value) < 3:
                     img_update = remove(
                         img_update,
                         alpha_matting=True,
                         alpha_matting_background_threshold=value[0],
-                        alpha_matting_foreground_threshold=value[1],
+                        alpha_matting_foreground_threshold=value[1], session=session
                     )
                 elif 3 <= len(value) < 4:
                     img_update = remove(
@@ -5794,17 +5809,15 @@ def imgsets(img,
                         alpha_matting=True,
                         alpha_matting_background_threshold=value[0],
                         alpha_matting_foreground_threshold=value[1],
-                        alpha_matting_erode_size=value[2],
+                        alpha_matting_erode_size=value[2], session=session
                     )
             elif isinstance(value, tuple):  # replace the background color
                 if len(value) == 3:
                     value += (255,)
-                img_update = remove(img_update, bgcolor=value)
+                img_update = remove(img_update, bgcolor=value, session=session)
             elif isinstance(value, str):
-                if confirm_rembg_models(value):
-                    img_update = remove(img_update, session=new_session(value))
-                else:
-                    img_update = remove(img_update)
+                # use custom model
+                img_update = remove(img_update, session=new_session(strcmp(value, models_support_rem)[0]))
         elif "bg" in k.lower() and "color" in k.lower():
             from rembg import remove
 

{py2ls-0.2.4.33 → py2ls-0.2.4.34}/py2ls/ocr.py

@@ -9,8 +9,6 @@ from py2ls.ips import (
     isa
 )
 import logging
-#logging.getLogger("ppocr").setLevel(logging.ERROR)
-logging.getLogger("ppocr").setLevel(logging.WARNING)
 
 """
     Optical Character Recognition (OCR)
@@ -618,7 +616,6 @@ def get_text(
         image = cv2.imread(image)
     elif isa(image,'image'):
         cvt_cmp=False
-        print(1)
         image = np.array(image)
     else:
         raise ValueError(f"not support image with {type(image)} type")
@@ -704,6 +701,8 @@ def get_text(
                 return detections
     elif "pad" in model.lower():
         from paddleocr import PaddleOCR
+        logging.getLogger("ppocr").setLevel(logging.ERROR)
+        
         lang=strcmp(lang, ['ch','en','french','german','korean','japan'])[0]
         ocr = PaddleOCR(
             use_angle_cls=True,

{py2ls-0.2.4.33 → py2ls-0.2.4.34}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py2ls"
-version = "0.2.4.33"
+version = "0.2.4.34"
 description = "py(thon)2(too)ls"
 authors = ["Jianfeng <Jianfeng.Liu0413@gmail.com>"]
 readme = "README.md"
@@ -64,7 +64,7 @@ h2 = ">=3.2.0"
 h5py = ">=3.11.0"
 hpack = ">=3.0.0"
 hstspreload = ">=2024.7.1"
-httpcore = ">=0.9.1"
+httpcore = ">=0.9.0"
 httpx = ">=0.13.3"
 humanfriendly = ">=10.0"
 hyperframe = ">=5.2.0"