pyscriptbase 1.1.5__tar.gz → 1.2.0__tar.gz

{pyscriptbase-1.1.5 → pyscriptbase-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyscriptbase
-Version: 1.1.5
+Version: 1.2.0
 Summary: python script base library
 Home-page: 
 Author: ASMan
@@ -19,6 +19,12 @@ Requires-Dist: beautifulsoup4
 Requires-Dist: requests
 Requires-Dist: lxml
 Requires-Dist: brotli
+Requires-Dist: pyperclip
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-dist
+Dynamic: summary
 
 # Instructions
 

pyscriptbase-1.2.0/pyscriptbase/ocr.py

@@ -0,0 +1,109 @@
+# encoding=utf8
+
+from urllib.parse import urlsplit
+
+import requests
+
+from . import env as Env
+
+
+class OCRError(RuntimeError):
+    """
+    OCR 服务返回异常或无效响应
+    """
+
+
+class OCRClient:
+    def __init__(
+        self, host: str = None, ocrHost: str = None, timeout: float = 30
+    ) -> None:
+        """
+        @host：pyai 服务地址，默认读取 PYAI_HOST，未配置时使用 http://192.168.8.103:8000
+        @ocrHost：pyocr 服务地址，默认读取 PYOCR_HOST，调用文字识别前需配置
+        @timeout：请求超时时间，单位为秒
+        """
+        if host is None:
+            host = Env.get("PYAI_HOST", "http://192.168.8.103:8000")
+        if ocrHost is None:
+            ocrHost = Env.get("PYOCR_HOST")
+        self.host = self.__validAddress__(host)
+        self.ocrHost = self.__validAddress__(ocrHost) if ocrHost else None
+        self.timeout = timeout
+
+    def __validAddress__(self, address: str) -> str:
+        address = address.strip()
+        if not address:
+            raise ValueError("OCR 服务地址不能为空")
+        if "://" not in address:
+            address = f"http://{address}"
+        parsed = urlsplit(address)
+        if parsed.scheme not in ("http", "https") or not parsed.netloc:
+            raise ValueError("OCR 服务地址必须为有效的 HTTP 或 HTTPS 地址")
+        if parsed.query or parsed.fragment:
+            raise ValueError("OCR 服务地址不能包含查询参数或片段")
+        return address.rstrip("/")
+
+    def __request__(self, host: str, path: str, data: dict):
+        response = requests.post(
+            url=f"{host}{path}", json=data, timeout=self.timeout
+        )
+        response.raise_for_status()
+        try:
+            result = response.json()
+        except ValueError as e:
+            raise OCRError("OCR 服务返回的不是有效 JSON") from e
+        if not isinstance(result, dict):
+            raise OCRError("OCR 服务返回格式错误")
+        return result
+
+    def classification(self, b64Data: str, model: str = "tencent") -> dict:
+        """
+        验证码识别，model 支持 tencent（腾讯数据模型）和 origin（原始模型）
+        """
+        if model not in ("tencent", "origin"):
+            raise ValueError("验证码模型仅支持 tencent 和 origin")
+        return self.__request__(
+            self.host, f"/api/recognize/classification/{model}", {"data": b64Data}
+        )
+
+    def getPredictCode(self, b64Data: str) -> dict:
+        """
+        腾讯模型验证码识别，返回完整 JSON 响应
+        """
+        return self.classification(b64Data)
+
+    def rotate(self, b64Data: str) -> dict:
+        """
+        识别图片旋转角度，返回完整 JSON 响应
+        """
+        return self.__request__(
+            self.host, "/api/recognize/rotate", {"data": b64Data}
+        )
+
+    def match(self, target: str, background: str) -> dict:
+        """
+        背景缺口匹配，target 和 background 均为 Base64 图片，返回完整 JSON 响应
+        """
+        return self.__request__(
+            self.host,
+            "/api/recognize/match/origin",
+            {"target": target, "background": background},
+        )
+
+    def detect(self, b64Data: str) -> dict:
+        """
+        检测图片中的文字区域，返回完整 JSON 响应
+        """
+        return self.__request__(
+            self.host, "/api/recognize/detect/origin", {"data": b64Data}
+        )
+
+    def ocr(self, b64Data: str) -> dict:
+        """
+        pyocr 文字识别，返回完整 JSON 响应，保留 cost 等字段
+        """
+        if not self.ocrHost:
+            raise ValueError("文字识别需要配置 pyocr 服务地址 ocrHost")
+        return self.__request__(
+            self.ocrHost, "/api/paddlex/orc", {"data": b64Data}
+        )

{pyscriptbase-1.1.5 → pyscriptbase-1.2.0}/pyscriptbase/pusher.py

@@ -165,7 +165,7 @@ def sendQQMail(
 
     # 连接到SMTP服务器并发送邮件
     try:
-        server = smtplib.SMTP(smtp_server, port)
+        server = smtplib.SMTP(smtp_server, port, timeout=20)
         server.starttls()  # 启动TLS模式
         server.login(sender, password)  # 登录你的账户
         server.sendmail(sender, receiver, message.as_string())  # 发送邮件
@@ -207,7 +207,7 @@ def sendMail(
 
     # 连接到SMTP服务器并发送邮件
     try:
-        server = smtplib.SMTP(smtp_server, port)
+        server = smtplib.SMTP(smtp_server, port, timeout=20)
         server.starttls()  # 启动TLS模式
         server.login(sender, password)  # 登录你的账户
         server.sendmail(sender, receiver, message.as_string())  # 发送邮件

{pyscriptbase-1.1.5 → pyscriptbase-1.2.0}/pyscriptbase.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyscriptbase
-Version: 1.1.5
+Version: 1.2.0
 Summary: python script base library
 Home-page: 
 Author: ASMan
@@ -19,6 +19,12 @@ Requires-Dist: beautifulsoup4
 Requires-Dist: requests
 Requires-Dist: lxml
 Requires-Dist: brotli
+Requires-Dist: pyperclip
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-dist
+Dynamic: summary
 
 # Instructions
 

{pyscriptbase-1.1.5 → pyscriptbase-1.2.0}/pyscriptbase.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ pyscriptbase/cipher.py
 pyscriptbase/database.py
 pyscriptbase/env.py
 pyscriptbase/net.py
+pyscriptbase/ocr.py
 pyscriptbase/panel.py
 pyscriptbase/pusher.py
 pyscriptbase/script.py
@@ -17,4 +18,5 @@ pyscriptbase.egg-info/SOURCES.txt
 pyscriptbase.egg-info/dependency_links.txt
 pyscriptbase.egg-info/requires.txt
 pyscriptbase.egg-info/top_level.txt
-test/test.py
+test/test.py
+test/test_ocr.py

{pyscriptbase-1.1.5 → pyscriptbase-1.2.0}/pyscriptbase.egg-info/requires.txt

@@ -11,3 +11,4 @@ beautifulsoup4
 requests
 lxml
 brotli
+pyperclip

{pyscriptbase-1.1.5 → pyscriptbase-1.2.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pyscriptbase",  # 包名
-    version="1.1.5",  # 版本号
+    version="1.2.0",  # 版本号
     packages=find_packages(),  # 自动查找包
     author="ASMan",
     author_email="",
@@ -24,5 +24,6 @@ setup(
         "requests",
         "lxml",
         "brotli",
+        "pyperclip",
     ],  # 依赖包列表
 )

{pyscriptbase-1.1.5 → pyscriptbase-1.2.0}/test/test.py

@@ -1,7 +1,7 @@
 from pyscriptbase.pusher import SMTPParams, sendMail, HtmlTableEmail
 
 if __name__ == "__main__":
-    params = SMTPParams("smtp.qq.com", 587, "2328697997@qq.com", "tbivvqolbinoecij")
+    params = SMTPParams("smtp.qq.com", 587, "dotoolsender@qq.com", "swecxgotxpfxdahe")
     table = HtmlTableEmail("Pupu", ["备注", "朴分", "红包"])
     table.rows.append(["测试", "100", "3.54"])
     table.rows.append(["测试", "100", "3.54"])

pyscriptbase-1.2.0/test/test_ocr.py

@@ -0,0 +1,92 @@
+import os
+import unittest
+from unittest.mock import Mock, patch
+
+import requests
+
+from pyscriptbase.ocr import OCRClient, OCRError
+
+
+class OCRClientTest(unittest.TestCase):
+    @patch.dict(os.environ, {}, clear=True)
+    def test_default_host(self):
+        self.assertEqual(OCRClient().host, "http://192.168.8.103:8000")
+
+    @patch.dict(os.environ, {"PYAI_HOST": "https://ai.example/", "PYOCR_HOST": "https://ocr.example/"})
+    def test_environment_and_explicit_hosts(self):
+        client = OCRClient()
+        self.assertEqual(client.host, "https://ai.example")
+        self.assertEqual(client.ocrHost, "https://ocr.example")
+        client = OCRClient("localhost:8000/", "https://custom.example/")
+        self.assertEqual(client.host, "http://localhost:8000")
+        self.assertEqual(client.ocrHost, "https://custom.example")
+
+    @patch("pyscriptbase.ocr.requests.post")
+    def test_routes(self, post):
+        client = OCRClient("https://ai.example/", "https://ocr.example/", timeout=12)
+        cases = [
+            (lambda: client.classification("image"), "https://ai.example/api/recognize/classification/tencent", {"data": "image"}, "abcd"),
+            (lambda: client.classification("image", "origin"), "https://ai.example/api/recognize/classification/origin", {"data": "image"}, "1234"),
+            (lambda: client.getPredictCode("image"), "https://ai.example/api/recognize/classification/tencent", {"data": "image"}, "abcd"),
+            (lambda: client.rotate("image"), "https://ai.example/api/recognize/rotate", {"data": "image"}, 0),
+            (lambda: client.match("target", "background"), "https://ai.example/api/recognize/match/origin", {"target": "target", "background": "background"}, {"target": [1, 2, 3, 4]}),
+            (lambda: client.detect("image"), "https://ai.example/api/recognize/detect/origin", {"data": "image"}, []),
+            (lambda: client.ocr("image"), "https://ocr.example/api/paddlex/orc", {"data": "image"}, [{"text": "文字", "score": 0.99, "x": 1, "y": 2, "w": 3, "h": 4}]),
+        ]
+        for call, url, data, expected in cases:
+            with self.subTest(url=url):
+                post.return_value = Mock()
+                result = {"code": 0, "data": expected, "msg": "", "cost": 0.25}
+                post.return_value.json.return_value = result
+                self.assertIs(call(), result)
+                post.assert_called_with(url=url, json=data, timeout=12)
+                post.return_value.raise_for_status.assert_called_once_with()
+
+    @patch("pyscriptbase.ocr.requests.post")
+    def test_invalid_responses(self, post):
+        client = OCRClient()
+        for result in [{"code": 200, "data": None, "msg": "not ready"}, {"code": 201}, {"data": "abcd"}, {"code": 0}, {"code": 0, "data": None}]:
+            with self.subTest(result=result):
+                post.return_value.json.return_value = result
+                self.assertIs(client.classification("image"), result)
+                self.assertIs(client.getPredictCode("image"), result)
+        post.return_value.json.return_value = []
+        with self.assertRaises(OCRError):
+            client.classification("image")
+        post.return_value.json.side_effect = ValueError("无效 JSON")
+        with self.assertRaises(OCRError):
+            client.classification("image")
+        with self.assertRaises(OCRError):
+            client.getPredictCode("image")
+
+    @patch("pyscriptbase.ocr.requests.post")
+    def test_request_failures(self, post):
+        client = OCRClient()
+        post.side_effect = requests.Timeout()
+        with self.assertRaises(requests.Timeout):
+            client.rotate("image")
+        with self.assertRaises(requests.Timeout):
+            client.getPredictCode("image")
+        post.side_effect = None
+        post.return_value.raise_for_status.side_effect = requests.HTTPError()
+        with self.assertRaises(requests.HTTPError):
+            client.classification("image")
+        with self.assertRaises(requests.HTTPError):
+            client.getPredictCode("image")
+
+    @patch.dict(os.environ, {}, clear=True)
+    @patch("pyscriptbase.ocr.requests.post")
+    def test_invalid_configuration(self, post):
+        for host in ["", " ", "ftp://example", "https://", "https://example?x=1"]:
+            with self.subTest(host=host), self.assertRaises(ValueError):
+                OCRClient(host)
+        client = OCRClient()
+        with self.assertRaises(ValueError):
+            client.ocr("image")
+        with self.assertRaises(ValueError):
+            client.classification("image", "unknown")
+        post.assert_not_called()
+
+
+if __name__ == "__main__":
+    unittest.main()