gomyck-tools 1.5.6__py3-none-any.whl → 1.5.7__py3-none-any.whl

ctools/ml/__init__.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2026/2/3 16:06'

ctools/ml/interface/__init__.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2026/2/3 16:06'

ctools/ml/interface/image_processor.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2026/1/20 15:02'
+
+import base64
+from io import BytesIO
+
+from PIL import Image
+
+
+class ImageProcessor:
+
+  @staticmethod
+  def image_show(base64_str):
+    """base64字符串转PIL Image并显示"""
+    from io import BytesIO
+    import base64
+    img_data = base64.b64decode(base64_str)
+    img = Image.open(BytesIO(img_data))
+    img.show()
+
+  @staticmethod
+  def image_to_base64(img: Image.Image, format='PNG') -> str:
+    """PIL Image -> base64 字符串"""
+    buffer = BytesIO()
+    img.save(buffer, format=format)
+    return base64.b64encode(buffer.getvalue()).decode('utf-8')
+
+  @staticmethod
+  def crop_to_base64(img: Image.Image, coordinate) -> str:
+    """
+    img: PIL Image
+    coordinate: [xmin, ymin, xmax, ymax] 图像坐标
+    return: 裁剪区域的 base64
+    """
+    if not isinstance(coordinate, (list, tuple)) or len(coordinate) != 4:
+      raise ValueError("coordinate 必须是长度为 4 的 list 或 tuple")
+
+    xmin, ymin, xmax, ymax = [int(c) for c in coordinate]
+    cropped = img.crop((xmin, ymin, xmax, ymax))
+    return ImageProcessor.image_to_base64(cropped)

ctools/ml/model_loader.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2026/2/3 16:07'
+
+import tempfile
+import shutil
+from pathlib import Path
+from typing import Optional
+from ctools.util.file_crypto import FileCrypto
+
+
+class TempDecryptedDir:
+  """
+  解密到临时目录的上下文工具
+  """
+
+  def __init__(self, encrypted_file: str, password: str):
+    self.encrypted_file = encrypted_file
+    self.password = password
+    self.temp_dir: Optional[Path] = None
+
+  def __enter__(self) -> str:
+    self.temp_dir = Path(
+      tempfile.mkdtemp(prefix="secure_model_")
+    )
+    FileCrypto.decrypt_to_directory(
+      encrypted_file=self.encrypted_file,
+      output_dir=str(self.temp_dir),
+      password=self.password
+    )
+    return str(self.temp_dir)
+
+  def __exit__(self, exc_type, exc, tb):
+    if self.temp_dir and self.temp_dir.exists():
+      shutil.rmtree(self.temp_dir, ignore_errors=True)

ctools/util/file_crypto.py

@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2026/2/3 16:07'
+
+import tarfile
+import tempfile
+import hashlib
+from pathlib import Path
+from cryptography.hazmat.primitives.ciphers.aead import AESGCM
+import secrets
+
+
+class FileCrypto:
+  """
+  文件 / 目录 加密解密工具
+  - AES-256-GCM
+  - 支持目录整体加密
+  """
+  NONCE_SIZE = 12
+  KEY_SIZE = 32
+  @staticmethod
+  def derive_key(password: str) -> bytes:
+    """
+    从口令派生固定长度 key（简化版，工程可控）
+    """
+    return hashlib.sha256(password.encode("utf-8")).digest()
+
+  @staticmethod
+  def encrypt_directory(
+    src_dir: str,
+    output_file: str,
+    password: str
+  ) -> None:
+    """
+    加密整个目录
+    """
+    src_dir = Path(src_dir).resolve()
+    output_file = Path(output_file).resolve()
+
+    with tempfile.NamedTemporaryFile(suffix=".tar", delete=False) as tmp_tar:
+      tar_path = Path(tmp_tar.name)
+
+    try:
+      # 1. 打包目录
+      with tarfile.open(tar_path, "w") as tar:
+        tar.add(src_dir, arcname=".")
+
+      # 2. 加密
+      key = FileCrypto.derive_key(password)
+      aesgcm = AESGCM(key)
+      nonce = secrets.token_bytes(FileCrypto.NONCE_SIZE)
+
+      data = tar_path.read_bytes()
+      encrypted = aesgcm.encrypt(nonce, data, None)
+
+      output_file.write_bytes(nonce + encrypted)
+
+    finally:
+      tar_path.unlink(missing_ok=True)
+
+  @staticmethod
+  def decrypt_to_directory(
+    encrypted_file: str,
+    output_dir: str,
+    password: str
+  ) -> None:
+    """
+    解密文件并解包到指定目录
+    """
+    encrypted_file = Path(encrypted_file).resolve()
+    output_dir = Path(output_dir).resolve()
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    raw = encrypted_file.read_bytes()
+    nonce = raw[:FileCrypto.NONCE_SIZE]
+    ciphertext = raw[FileCrypto.NONCE_SIZE:]
+
+    key = FileCrypto.derive_key(password)
+    aesgcm = AESGCM(key)
+
+    data = aesgcm.decrypt(nonce, ciphertext, None)
+
+    with tempfile.NamedTemporaryFile(suffix=".tar", delete=False) as tmp_tar:
+      tmp_tar.write(data)
+      tar_path = Path(tmp_tar.name)
+
+    try:
+      with tarfile.open(tar_path, "r") as tar:
+        tar.extractall(output_dir)
+    finally:
+      tar_path.unlink(missing_ok=True)

{gomyck_tools-1.5.6.dist-info → gomyck_tools-1.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gomyck-tools
-Version: 1.5.6
+Version: 1.5.7
 Summary: A tools collection for python development by hao474798383
 Author-email: gomyck <hao474798383@163.com>
 License-Expression: Apache-2.0
@@ -32,21 +32,22 @@ Requires-Dist: redis==7.1.0
 Requires-Dist: uvloop>=0.22.1
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: uiautomation>=2.0.20
+Requires-Dist: req>=1.0.0
 Provides-Extra: kwc
 Requires-Dist: imageio>=2.37.0; extra == "kwc"
 Requires-Dist: wordcloud>=1.9.4; extra == "kwc"
 Requires-Dist: jieba==0.42.1; extra == "kwc"
-Requires-Dist: paddlepaddle==3.2.2; extra == "kwc"
+Requires-Dist: paddlepaddle==3.3.0; extra == "kwc"
 Provides-Extra: cut
 Requires-Dist: jieba==0.42.1; extra == "cut"
-Requires-Dist: paddlepaddle==3.2.2; extra == "cut"
+Requires-Dist: paddlepaddle==3.3.0; extra == "cut"
 Provides-Extra: ml
 Requires-Dist: scikit-learn>=1.7.1; extra == "ml"
 Requires-Dist: pandas>=2.3.2; extra == "ml"
 Requires-Dist: lxml>=6.0.1; extra == "ml"
 Requires-Dist: xlrd>=2.0.2; extra == "ml"
 Provides-Extra: xj-plate-server
-Requires-Dist: paddlepaddle==3.2.2; extra == "xj-plate-server"
+Requires-Dist: paddlepaddle==3.3.0; extra == "xj-plate-server"
 Dynamic: license-file
 
 # Gomyck-Tools

{gomyck_tools-1.5.6.dist-info → gomyck_tools-1.5.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ctools/__init__.py,sha256=7EtnbO7mi1iYQeyU4CLusYrwO96_dC7eR7jboyWAqvg,1089
 ctools/application.py,sha256=QFLbwmjznz2HAwVyph9PhzMpJUU5R82eMaVcw5UDSMk,15899
 ctools/aspect.py,sha256=lXrpeu_F3w6v2Hu2yOwQIRGqfDN25_H-1YyW6fPt_mw,1667
-ctools/authcode_validator.py,sha256=g-AFBCEVvtLaoRTXn4qZgVfMv3TUFFYFUmc4fn8Hps8,12312
+ctools/authcode_validator.py,sha256=YGQFxNcGNO5Att2fC1LuH0GfmVoRPC5eef82OEC0_fg,10722
 ctools/call.py,sha256=TFFC8PqvCu0PS0XelmV4QXdXezQiUsEacxg3RgKvdwE,1572
 ctools/cdate.py,sha256=OhKAaQfo2Rxd3Jx3g9AfPsaISRoLkstqZdaGT4ZZr_I,3096
 ctools/cdebug.py,sha256=_mihZRCEx_bi7Kv_QPjP4MPLNFrl-GR1Y_irTgOP7OU,4021
@@ -48,9 +48,10 @@ ctools/database/database.py,sha256=IQzPw2fOJh0Xn_OdSMeEOXBEV9YCRDoszg-dwJPXTTU,7
 ctools/geo/__init__.py,sha256=OkUaZv5ckkXJFNbRyFZqkX5m3GxTueEGEBU99_jJQNE,98
 ctools/geo/coord_trans.py,sha256=UWCU1wnrTDU1aLSVAwmiHOeH7Pu-Dp8lDLAngDG48NM,3761
 ctools/geo/douglas_rarefy.py,sha256=bJo6TwNxPa-7-8MOi8MULxeqnz4cvIJN-oXqBDWNAVM,4883
-ctools/ml/image_process.py,sha256=keiIbcCkCZq-dp3PBpI-8tHFXNqKJKXATcrojMEpAGs,3168
-ctools/ml/img_extractor.py,sha256=x_o3il6gWoKMBRgJ9m7HNt70nY3Etr5QcPzEKq76oiA,1829
-ctools/ml/ppi.py,sha256=BtYam72ovii7UZ4LniM0smLv2fMmeqBUfKpfJTrHMVM,10886
+ctools/ml/__init__.py,sha256=hVR5_6Nh7y5VL-3oijXYuquxm754pB1o4nbiBjWb9aM,97
+ctools/ml/model_loader.py,sha256=U7DK3azEPZJ97g9swV9hFHQ887SD5F4V40uMvBySsKA,915
+ctools/ml/interface/__init__.py,sha256=hVR5_6Nh7y5VL-3oijXYuquxm754pB1o4nbiBjWb9aM,97
+ctools/ml/interface/image_processor.py,sha256=mzUuURjv9Ktqgu2ovL0nxcyt2nTDH3-aiVUSDz-g2eM,1172
 ctools/office/__init__.py,sha256=wum34b8YJg0qD7uKdDEbozSE8RIxWqTVa44CCIZyqPU,98
 ctools/office/cword.py,sha256=bIthKmf0oBqjcdkrU5hFDAPp66ZrjeMNzjIxOlMPeCc,837
 ctools/office/word_fill.py,sha256=ZoTxz0-agEy5atIRWqYmQZz82nVr2zz9JebSTMkulIo,18214
@@ -70,6 +71,7 @@ ctools/util/cklock.py,sha256=uS1g8H7jtQ5dINKe-k23osQ1sjvZSZrkXGwH6qKcgNo,3234
 ctools/util/compile_util.py,sha256=Nybh3vnkurIKnPnubdYzigjnzFu4GaTMKPvqFdibxmE,510
 ctools/util/config_util.py,sha256=FBacCqQ1kPtRl1VEz0IsAuxI0zdpqUiuBv11G8kiDLE,1230
 ctools/util/env_config.py,sha256=L98G9LPdpD7Yl5XbA_-KfkcA4mDunQoKiYtK5w7QR-s,1790
+ctools/util/file_crypto.py,sha256=qgNBrqTcl61V0fVMOz3JID91FfbDcwd4uyp01vuE7sw,2258
 ctools/util/html_soup.py,sha256=rnr8M3gn3gQGo-wNaNFXDjdzp8AAkv9o4yqfIIfO-zw,1567
 ctools/util/http_util.py,sha256=cx0FRnPLFdJ0mF9UYphl40SZj68fqG30Q0udku9hZIE,769
 ctools/util/image_process.py,sha256=nqJOi2p8wLe8wRsfkH99MyEYSjE9i4fthxBJwrrZVB8,835
@@ -85,8 +87,8 @@ ctools/web/ctoken.py,sha256=qsxrQY7IWgpPe5HyiDDnf50vsRX27QXMWPzam7bGu_Y,2646
 ctools/web/download_util.py,sha256=v0JTXiED1bvoWFfwfd-LD5s7_aoRQ0lCkaGwSnSp7WI,1954
 ctools/web/params_util.py,sha256=eJDV3PSq-ZHb8UZf6xqs8kOhbyZzits1H9yPoUBIDXg,828
 ctools/web/upload_util.py,sha256=z1QQCi4SFx08jrAQH5-Y_ShiM4MghuD_5Qz6V9KK_4U,1076
-gomyck_tools-1.5.6.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
-gomyck_tools-1.5.6.dist-info/METADATA,sha256=bzC0W0VinVmWDxCSpMkw5elRZ2svLnrog1aHUehGFFA,1957
-gomyck_tools-1.5.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-gomyck_tools-1.5.6.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.5.6.dist-info/RECORD,,
+gomyck_tools-1.5.7.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
+gomyck_tools-1.5.7.dist-info/METADATA,sha256=ahdr3pJFSRaeugXRe8qzwMYVgns8YA6XhQfRLNJhB-o,1983
+gomyck_tools-1.5.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+gomyck_tools-1.5.7.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.5.7.dist-info/RECORD,,

ctools/ml/image_process.py

@@ -1,121 +0,0 @@
-import random
-
-import numpy as np
-from PIL import Image, ImageDraw, ImageFont
-
-
-def preprocess(img, img_size):
-  mean = [0.485, 0.456, 0.406]
-  std = [0.229, 0.224, 0.225]
-  img = resize(img, img_size)
-  img = img[:, :, ::-1].astype('float32')  # RGB->BGR
-  img = normalize(img, mean, std)
-  img = img.transpose((2, 0, 1))  # hwc -> chw
-  #show_preprocess(img, mean, std)
-  return img[np.newaxis, :]
-
-
-def resize(img, target_size):
-  """
-  img: numpy.ndarray (H,W,3) BGR or RGB
-  return: numpy.ndarray (target_size, target_size, 3)
-  """
-  img = Image.fromarray(img)
-  img = img.resize((target_size, target_size), Image.BILINEAR)
-  return np.array(img)
-
-
-def normalize(img, mean, std):
-  img = img / 255.0
-  mean = np.array(mean)[np.newaxis, np.newaxis, :]
-  std = np.array(std)[np.newaxis, np.newaxis, :]
-  img -= mean
-  img /= std
-  return img
-
-
-def show_preprocess(chw_img, mean, std):
-  """
-  chw_img: (3, H, W), float32, normalized
-  """
-  img = chw_img.copy()
-  # 1. CHW -> HWC
-  img = img.transpose(1, 2, 0)
-  # 2. de-normalize
-  img = img * std + mean
-  img = img * 255.0
-  # 3. clamp + uint8
-  img = np.clip(img, 0, 255).astype(np.uint8)
-  Image.fromarray(img).show()
-
-
-def draw_bbox(img, result, threshold=0.5, save_name='res.jpg', scale_factor=None, im_size=320, class_names=None):
-  draw = ImageDraw.Draw(img)
-
-  if scale_factor is not None:
-    h_scale, w_scale = scale_factor[0]
-  else:
-    h_scale = w_scale = 1.
-
-  # 类别颜色随机但固定
-  category_colors = {}
-  if class_names is not None:
-    for cls in class_names:
-      category_colors[cls] = tuple(random.randint(0, 255) for _ in range(3))
-
-  # 字体
-  try:
-    font = ImageFont.truetype("arial.ttf", 15)
-  except:
-    font = ImageFont.load_default()
-
-  for res in result:
-    cat_id, score, bbox = res[0], res[1], res[2:]
-    if score < threshold:
-      continue
-
-    # 归一化 bbox -> 模型输入尺寸
-    xmin = bbox[0] * im_size
-    ymin = bbox[1] * im_size
-    xmax = bbox[2] * im_size
-    ymax = bbox[3] * im_size
-
-    # 模型输入尺寸 -> 原图
-    xmin = xmin / w_scale
-    xmax = xmax / w_scale
-    ymin = ymin / h_scale
-    ymax = ymax / h_scale
-
-    # 类别名和颜色
-    if class_names is not None:
-      class_name = class_names[int(cat_id)]
-      color = category_colors[class_name]
-      text = f"{class_name}:{score:.2f}"
-
-      # 获取文字尺寸，兼容所有版本 Pillow
-      try:
-        text_width, text_height = font.getsize(text)  # 旧版 / 大部分版本
-      except AttributeError:
-        # Pillow 9.2+ 推荐用 getbbox
-        bbox_font = font.getbbox(text)
-        text_width = bbox_font[2] - bbox_font[0]
-        text_height = bbox_font[3] - bbox_font[1]
-
-      text_origin = (xmin, max(0, ymin - text_height))  # 框上方显示
-      draw.text(text_origin, text, fill=color, font=font)
-    else:
-      color = 'red'
-
-    # 画矩形框
-    draw.rectangle([xmin, ymin, xmax, ymax], outline=color, width=2)
-
-  img.save(save_name)
-
-
-def image_show(base64_str):
-  """base64字符串转PIL Image并显示"""
-  from io import BytesIO
-  import base64
-  img_data = base64.b64decode(base64_str)
-  img = Image.open(BytesIO(img_data))
-  img.show()

ctools/ml/img_extractor.py

@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-__author__ = 'haoyang'
-__date__ = '2026/1/20 15:02'
-
-import base64
-from io import BytesIO
-
-class ClassRegionBase64ExtractorPIL:
-  def __init__(self, class_names, target_classes=None, threshold=0.5):
-    """
-    class_names: 模型类别列表
-    target_classes: 只截取的类别名列表，None 表示全部
-    threshold: 置信度阈值
-    """
-    self.class_names = class_names
-    self.target_classes = target_classes
-    self.threshold = threshold
-
-  @staticmethod
-  def image_to_base64(img, format='PNG'):
-    """
-    PIL Image -> base64 字符串
-    """
-    buffer = BytesIO()
-    img.save(buffer, format=format)
-    return base64.b64encode(buffer.getvalue()).decode('utf-8')
-
-  def extract(self, img, results, scale_factor=None, im_size=320):
-    """
-    img: PIL Image
-    results: 模型输出 [[cat_id, score, xmin, ymin, xmax, ymax], ...]
-    scale_factor: np.array([[h_scale, w_scale]]) 或 None
-    im_size: 模型输入尺寸
-    return: List[Dict] -> [{"class": class_name, "score": score, "base64": base64_str}, ...]
-    """
-    outputs = []
-    for res in results:
-      cat_id, score, bbox = res[0], res[1], res[2:]
-      if score < self.threshold or cat_id > len(self.class_names) - 1:
-        continue
-      class_name = self.class_names[int(cat_id)]
-      if self.target_classes is not None and class_name not in self.target_classes:
-        continue
-      xmin = bbox[0]
-      ymin = bbox[1]
-      xmax = bbox[2]
-      ymax = bbox[3]
-      # 裁剪
-      pil_img_threadsafe = img.copy()
-      cropped = pil_img_threadsafe.crop((xmin, ymin, xmax, ymax))
-      # 转 base64
-      b64_str = self.image_to_base64(cropped)
-      outputs.append({
-        "class": class_name,
-        "score": float(score),
-        "base64": b64_str
-      })
-    return outputs