kotonebot 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

kotonebot/primitives/visual.py

@@ -1,63 +1,143 @@
-import logging
-
-from cv2.typing import MatLike
-
-from .geometry import Size
-from kotonebot.util import cv2_imread
-
-logger = logging.getLogger(__name__)
-
-class Image:
-    """
-    图像类。
-    """
-    def __init__(
-        self,
-        pixels: MatLike | None = None,
-        file_path: str | None = None,
-        lazy_load: bool = False,
-        name: str | None = None,
-        description: str | None = None
-    ):
-        """
-        从内存数据或图像文件创建图像类。
-        
-        :param pixels: 图像数据。格式必须为 BGR。
-        :param file_path: 图像文件路径。
-        :param lazy_load: 是否延迟加载图像数据。
-            若为 False，立即载入，否则仅当访问图像数据时才载入。仅当从文件创建图像类时生效。
-        :param name: 图像名称。
-        :param description: 图像描述。
-        """
-        self.name: str | None = name
-        """图像名称。"""
-        self.description: str | None = description
-        """图像描述。"""
-        self.file_path: str | None = file_path
-        """图像的文件路径。"""
-        self.__pixels: MatLike | None = None
-        # 立即加载
-        if not lazy_load and self.file_path:
-            _ = self.pixels
-        # 传入像素数据而不是文件
-        if pixels is not None:
-            self.__pixels = pixels
-
-    @property
-    def pixels(self) -> MatLike:
-        """图像的像素数据。"""
-        if self.__pixels is None:
-            if not self.file_path:
-                raise ValueError('Either pixels or file_path must be provided.')
-            logger.debug('Loading image "%s" from %s...', self.name or '(unnamed)', self.file_path)
-            self.__pixels = cv2_imread(self.file_path)
-        return self.__pixels
-
-    @property
-    def size(self) -> Size:
-        return Size(self.pixels.shape[1], self.pixels.shape[0])
-
-class Template(Image):
-    """
-    模板图像类。
-    """
+import logging
+import warnings
+from functools import cache
+
+import cv2
+from cv2.typing import MatLike
+
+from .geometry import Size, Rect
+from kotonebot.util import cv2_imread
+
+logger = logging.getLogger(__name__)
+
+class Image:
+    """
+    图像类。
+    """
+    def __init__(
+        self,
+        pixels: MatLike | None = None,
+        file_path: str | None = None,
+        lazy_load: bool = False,
+        name: str | None = None,
+        description: str | None = None
+    ):
+        """
+        从内存数据或图像文件创建图像类。
+        
+        :param pixels: 图像数据。格式必须为 BGR。
+        :param file_path: 图像文件路径。
+        :param lazy_load: 是否延迟加载图像数据。
+            若为 False，立即载入，否则仅当访问图像数据时才载入。仅当从文件创建图像类时生效。
+        :param name: 图像名称。
+        :param description: 图像描述。
+        """
+        self.name: str | None = name
+        """图像名称。"""
+        self.description: str | None = description
+        """图像描述。"""
+        self.file_path: str | None = file_path
+        """图像的文件路径。"""
+        self.__pixels: MatLike | None = None
+        # 立即加载
+        if not lazy_load and self.file_path:
+            _ = self.pixels
+        # 传入像素数据而不是文件
+        if pixels is not None:
+            self.__pixels = pixels
+
+    @property
+    def pixels(self) -> MatLike:
+        """图像的像素数据。"""
+        if self.__pixels is None:
+            if not self.file_path:
+                raise ValueError('Either pixels or file_path must be provided.')
+            logger.debug('Loading image "%s" from %s...', self.name or '(unnamed)', self.file_path)
+            self.__pixels = cv2_imread(self.file_path)
+        return self.__pixels
+
+    @property
+    def size(self) -> Size:
+        return Size(self.pixels.shape[1], self.pixels.shape[0])
+
+    # Compatibility with older API (deprecated)
+    def __compat_warn(self, name: str) -> None:
+        warnings.warn(
+            f'`Image.{name}` is deprecated — use `kotonebot.primitives.Image` API instead.',
+            DeprecationWarning,
+            stacklevel=3,
+        )
+
+    @property
+    def path(self) -> str | None:
+        """Deprecated alias for `file_path`."""
+        self.__compat_warn('path')
+        return self.file_path
+
+    @path.setter
+    def path(self, value: str | None) -> None:
+        self.__compat_warn('path')
+        self.file_path = value
+
+    @property
+    def data(self) -> MatLike:
+        """Deprecated alias for `pixels`."""
+        self.__compat_warn('data')
+        return self.pixels
+
+    @property
+    def data_with_alpha(self) -> MatLike:
+        """Deprecated: return image including alpha channel when available."""
+        self.__compat_warn('data_with_alpha')
+        # If current pixels already contain alpha, return them
+        try:
+            if self.__pixels is not None and getattr(self.__pixels, 'shape', None) and len(self.__pixels.shape) >= 3 and self.__pixels.shape[2] == 4:
+                return self.__pixels
+        except Exception:
+            pass
+        if not self.file_path:
+            raise ValueError('Either pixels or file_path must be provided.')
+        arr = cv2_imread(self.file_path, cv2.IMREAD_UNCHANGED)
+        return arr
+
+    @cache
+    def binary(self) -> 'Image':
+        """Deprecated: return a grayscale copy of the image."""
+        self.__compat_warn('binary')
+        gray = cv2.cvtColor(self.pixels, cv2.COLOR_BGR2GRAY)
+        return Image(pixels=gray, name=self.name)
+
+    def __repr__(self) -> str:
+        class_name = self.__class__.__name__
+        if self.file_path is None:
+            return f'<{class_name}: memory>'
+        else:
+            return f'<{class_name}: "{self.name or "untitled"}" at {self.file_path}>'
+
+
+class ImageSlice(Image):
+    def __init__(
+        self,
+        pixels: MatLike | None = None,
+        file_path: str | None = None,
+        lazy_load: bool = False,
+        name: str | None = None,
+        description: str | None = None,
+        *,
+        slice_rect: Rect | None
+    ):
+        super().__init__(
+            pixels=pixels,
+            file_path=file_path,
+            lazy_load=lazy_load,
+            name=name,
+            description=description
+        )
+        self.slice_rect = slice_rect
+        """图像切片的矩形区域。"""
+
+
+class Template(Image):
+    """
+    模板图像类。
+    """

kotonebot/ui/file_host/sensio.py

@@ -1,36 +1,36 @@
-import requests
-import os
-
-def upload(file_path: str) -> str:
-    """
-    上传文件到 paste.sensio.no
-    
-    Args:
-        file_path: 要上传的文件路径
-    
-    Returns:
-        str: 上传后的 URL
-    """
-    url = 'https://paste.sensio.no/'
-    headers = {
-        'accept': 'text/plain',
-        'User-Agent': 'KAA',
-        'x-uuid': ''
-    }
-    
-    files = {
-        'file': (os.path.basename(file_path), open(file_path, 'rb'))
-    }
-        
-    response = requests.post(url, files=files, headers=headers, allow_redirects=False)
-    
-    if response.status_code != 200:
-        raise Exception(f"Upload failed with status code {response.status_code}")
-    
-    return response.text.strip()
-
-if __name__ == "__main__":
-    test_file = "version"
-    if os.path.exists(test_file):
-        result = upload(test_file)
-        print(f"Upload result: {result}")
+import requests
+import os
+
+def upload(file_path: str) -> str:
+    """
+    上传文件到 paste.sensio.no
+    
+    Args:
+        file_path: 要上传的文件路径
+    
+    Returns:
+        str: 上传后的 URL
+    """
+    url = 'https://paste.sensio.no/'
+    headers = {
+        'accept': 'text/plain',
+        'User-Agent': 'KAA',
+        'x-uuid': ''
+    }
+    
+    files = {
+        'file': (os.path.basename(file_path), open(file_path, 'rb'))
+    }
+        
+    response = requests.post(url, files=files, headers=headers, allow_redirects=False)
+    
+    if response.status_code != 200:
+        raise Exception(f"Upload failed with status code {response.status_code}")
+    
+    return response.text.strip()
+
+if __name__ == "__main__":
+    test_file = "version"
+    if os.path.exists(test_file):
+        result = upload(test_file)
+        print(f"Upload result: {result}")

kotonebot/ui/file_host/tmp_send.py

@@ -1,54 +1,54 @@
-import requests
-import os
-
-def upload(file_path: str) -> str:
-    url = 'https://tmpsend.com/upload'
-    headers = {
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
-        'Referer': 'https://tmpsend.com/',
-    }
-    
-    file_name = os.path.basename(file_path)
-    file_size = os.path.getsize(file_path)
-    
-    # 第一次请求：添加文件信息
-    files = {
-        'action': (None, 'add'),
-        'name': (None, file_name),
-        'size': (None, str(file_size)),
-        'file': (file_name, open(file_path, 'rb'))
-    }
-    
-    response = requests.post(url, headers=headers, files=files)
-    if response.status_code != 200:
-        raise Exception(f"Upload failed with status code {response.status_code}")
-    
-    result = response.json()
-    if result.get('hasError'):
-        raise Exception(result.get('error'))
-    
-    file_id = result.get('id')
-    if not file_id:
-        raise Exception("Failed to get file ID")
-    
-    # 第二次请求：上传实际文件
-    upload_files = {
-        'action': (None, 'upload'),
-        'id': (None, file_id),
-        'name': (None, file_name),
-        'size': (None, str(file_size)),
-        'start': (None, '0'),
-        'end': (None, str(file_size)),
-        'data': (file_name, open(file_path, 'rb'), 'application/octet-stream')
-    }
-    
-    upload_response = requests.post(url, headers=headers, files=upload_files)
-    if upload_response.status_code != 200:
-        raise Exception(f"File upload failed with status code {upload_response.status_code}")
-    
-    return 'https://tmpsend.com/' + file_id
-
-if __name__ == "__main__":
-    file_path = r"主题1.thmx"
-    print(upload(file_path))
-
+import requests
+import os
+
+def upload(file_path: str) -> str:
+    url = 'https://tmpsend.com/upload'
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
+        'Referer': 'https://tmpsend.com/',
+    }
+    
+    file_name = os.path.basename(file_path)
+    file_size = os.path.getsize(file_path)
+    
+    # 第一次请求：添加文件信息
+    files = {
+        'action': (None, 'add'),
+        'name': (None, file_name),
+        'size': (None, str(file_size)),
+        'file': (file_name, open(file_path, 'rb'))
+    }
+    
+    response = requests.post(url, headers=headers, files=files)
+    if response.status_code != 200:
+        raise Exception(f"Upload failed with status code {response.status_code}")
+    
+    result = response.json()
+    if result.get('hasError'):
+        raise Exception(result.get('error'))
+    
+    file_id = result.get('id')
+    if not file_id:
+        raise Exception("Failed to get file ID")
+    
+    # 第二次请求：上传实际文件
+    upload_files = {
+        'action': (None, 'upload'),
+        'id': (None, file_id),
+        'name': (None, file_name),
+        'size': (None, str(file_size)),
+        'start': (None, '0'),
+        'end': (None, str(file_size)),
+        'data': (file_name, open(file_path, 'rb'), 'application/octet-stream')
+    }
+    
+    upload_response = requests.post(url, headers=headers, files=upload_files)
+    if upload_response.status_code != 200:
+        raise Exception(f"File upload failed with status code {upload_response.status_code}")
+    
+    return 'https://tmpsend.com/' + file_id
+
+if __name__ == "__main__":
+    file_path = r"主题1.thmx"
+    print(upload(file_path))
+

kotonebot/ui/pushkit/__init__.py

@@ -1,3 +1,3 @@
-from .protocol import PushkitProtocol
-from .wxpusher import Wxpusher
-
+from .protocol import PushkitProtocol
+from .wxpusher import Wxpusher
+

kotonebot/ui/pushkit/image_host.py

@@ -1,88 +1,88 @@
-import os
-import tempfile
-from pathlib import Path
-from typing import Sequence
-
-import cv2
-import numpy as np
-from cv2.typing import MatLike
-from dotenv import load_dotenv
-
-load_dotenv()
-
-def _save_temp_image(image: MatLike) -> Path:
-    """将OpenCV图片保存为临时文件"""
-    temp_file = Path(tempfile.mktemp(suffix='.jpg'))
-    cv2.imwrite(str(temp_file), image)
-    return temp_file
-
-def _upload_single(image: MatLike | str) -> str:
-    """
-    上传单张图片到freeimage.host
-    
-    :param image: OpenCV MatLike 或本地图片文件路径
-    """
-    import requests
-    
-    api_url = 'https://freeimage.host/api/1/upload'
-    api_key = os.getenv('FREEIMAGEHOST_KEY')
-    
-    if not api_key:
-        raise RuntimeError('Environment variable FREEIMAGEHOST_KEY is not set')
-    
-    # 处理输入
-    temp_file = None
-    if isinstance(image, str):
-        # 本地文件路径
-        files = {'source': open(image, 'rb')}
-    else:
-        # 保存OpenCV图片为临时文件
-        temp_file = _save_temp_image(image)
-        files = {'source': open(temp_file, 'rb')}
-    
-    data = {
-        'key': api_key,
-        'action': 'upload',
-        'format': 'json'
-    }
-    
-    try:
-        # 发送POST请求
-        response = requests.post(api_url, data=data, files=files)
-        
-        if response.status_code != 200:
-            raise RuntimeError(f'Upload failed: HTTP {response.status_code}')
-            
-        result = response.json()
-        
-        if result['status_code'] != 200:
-            raise RuntimeError(f'Upload failed: API {result["status_txt"]}')
-            
-        return result['image']['url']
-        
-    finally:
-        # 清理临时文件
-        files['source'].close()
-        if temp_file and temp_file.exists():
-            temp_file.unlink()
-
-def upload(images: MatLike | str | Sequence[MatLike | str]) -> list[str]:
-    """上传一张或多张图片到freeimage.host
-    
-    Args:
-        images: 单张图片或图片列表。每个图片可以是OpenCV图片对象或本地图片文件路径
-        
-    Returns:
-        上传后的图片URL列表
-    """
-    if isinstance(images, (str, np.ndarray)):
-        _images = [images]
-    elif isinstance(images, Sequence):
-        _images = [img for img in images]
-    else:
-        raise ValueError("Invalid input type")
-        
-    return [_upload_single(img) for img in _images]
-
-if __name__ == "__main__":
-    print(upload(cv2.imread("res/sprites/jp/common/button_close.png")))
+import os
+import tempfile
+from pathlib import Path
+from typing import Sequence
+
+import cv2
+import numpy as np
+from cv2.typing import MatLike
+from dotenv import load_dotenv
+
+load_dotenv()
+
+def _save_temp_image(image: MatLike) -> Path:
+    """将OpenCV图片保存为临时文件"""
+    temp_file = Path(tempfile.mktemp(suffix='.jpg'))
+    cv2.imwrite(str(temp_file), image)
+    return temp_file
+
+def _upload_single(image: MatLike | str) -> str:
+    """
+    上传单张图片到freeimage.host
+    
+    :param image: OpenCV MatLike 或本地图片文件路径
+    """
+    import requests
+    
+    api_url = 'https://freeimage.host/api/1/upload'
+    api_key = os.getenv('FREEIMAGEHOST_KEY')
+    
+    if not api_key:
+        raise RuntimeError('Environment variable FREEIMAGEHOST_KEY is not set')
+    
+    # 处理输入
+    temp_file = None
+    if isinstance(image, str):
+        # 本地文件路径
+        files = {'source': open(image, 'rb')}
+    else:
+        # 保存OpenCV图片为临时文件
+        temp_file = _save_temp_image(image)
+        files = {'source': open(temp_file, 'rb')}
+    
+    data = {
+        'key': api_key,
+        'action': 'upload',
+        'format': 'json'
+    }
+    
+    try:
+        # 发送POST请求
+        response = requests.post(api_url, data=data, files=files)
+        
+        if response.status_code != 200:
+            raise RuntimeError(f'Upload failed: HTTP {response.status_code}')
+            
+        result = response.json()
+        
+        if result['status_code'] != 200:
+            raise RuntimeError(f'Upload failed: API {result["status_txt"]}')
+            
+        return result['image']['url']
+        
+    finally:
+        # 清理临时文件
+        files['source'].close()
+        if temp_file and temp_file.exists():
+            temp_file.unlink()
+
+def upload(images: MatLike | str | Sequence[MatLike | str]) -> list[str]:
+    """上传一张或多张图片到freeimage.host
+    
+    Args:
+        images: 单张图片或图片列表。每个图片可以是OpenCV图片对象或本地图片文件路径
+        
+    Returns:
+        上传后的图片URL列表
+    """
+    if isinstance(images, (str, np.ndarray)):
+        _images = [images]
+    elif isinstance(images, Sequence):
+        _images = [img for img in images]
+    else:
+        raise ValueError("Invalid input type")
+        
+    return [_upload_single(img) for img in _images]
+
+if __name__ == "__main__":
+    print(upload(cv2.imread("res/sprites/jp/common/button_close.png")))

kotonebot/ui/pushkit/protocol.py

@@ -1,13 +1,13 @@
-from typing import Protocol
-
-from cv2.typing import MatLike
-
-class PushkitProtocol(Protocol):
-    def push(
-        self,
-        title: str,
-        message: str,
-        *,
-        images: list[str | MatLike] | None = None,
-    ) -> None:
-        ...
+from typing import Protocol
+
+from cv2.typing import MatLike
+
+class PushkitProtocol(Protocol):
+    def push(
+        self,
+        title: str,
+        message: str,
+        *,
+        images: list[str | MatLike] | None = None,
+    ) -> None:
+        ...