pyxllib 0.3.133__tar.gz → 0.3.134__tar.gz

{pyxllib-0.3.133/pyxllib.egg-info → pyxllib-0.3.134}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.133
+Version: 0.3.134
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -38,33 +38,33 @@ Requires-Dist: Jinja2
 Requires-Dist: pandas>=0.23.4
 Requires-Dist: pillow
 Provides-Extra: xlcv
+Requires-Dist: pillow; extra == "xlcv"
 Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
-Requires-Dist: pillow; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: opsdroid-get-image-size; extra == "xlai"
-Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: pynvml; extra == "xlai"
+Requires-Dist: opsdroid-get-image-size; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
+Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: opencv-python; extra == "xlai"
 Provides-Extra: xlall
+Requires-Dist: flask-wtf; extra == "xlall"
+Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: zhconv; extra == "xlall"
 Requires-Dist: fastapi; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
-Requires-Dist: flask-cors; extra == "xlall"
-Requires-Dist: pillow; extra == "xlall"
 Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: flask-restful; extra == "xlall"
-Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
-Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: openai2; extra == "xlall"
 Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: html2text; extra == "xlall"
 Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: flask-wtf; extra == "xlall"
+Requires-Dist: flask-jwt-extended; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
 Requires-Dist: flask; extra == "xlall"
+Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
+Requires-Dist: pillow; extra == "xlall"
 Requires-Dist: opencv-python; extra == "xlall"
-Requires-Dist: zhconv; extra == "xlall"
+Requires-Dist: openai2; extra == "xlall"
 
 # 1 install
 

{pyxllib-0.3.133 → pyxllib-0.3.134}/pyxllib/autogui/activewin.py

@@ -11,15 +11,16 @@ import cv2
 import psutil
 import numpy as np
 
-from pyxllib.prog.cachetools import xlcache
-from pyxllib.cv.xlcvlib import CvImg
-
 if sys.platform == 'win32':
     import pyautogui
     import win32gui
     import win32process
     from pywinauto import Desktop
 
+from pyxllib.prog.cachetools import xlcache
+from pyxllib.cv.xlcvlib import CvImg
+from pyxlpr.ai.clientlib import XlAiClient
+
 # 根据平台扩展相应的类
 if platform.system().lower() == "darwin":
     from mss.darwin import MSS as OriginalMSS
@@ -99,6 +100,10 @@ class ActiveWindowCapture(OriginalMSS):
         thread_id, process_id = win32process.GetWindowThreadProcessId(hwnd)
         return psutil.Process(process_id)
 
+    @xlcache(property=True)
+    def xlapi(self):
+        return XlAiClient()
+
     def __2_截图数据(self):
         pass
 

pyxllib-0.3.134/pyxllib/autogui/all.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Email  : 877362867@qq.com
+# @Date   : 2024/10/29
+
+from pyxllib.autogui.autogui import *
+from pyxllib.autogui.virtualkey import *
+from pyxllib.autogui.activewin import *

{pyxllib-0.3.133 → pyxllib-0.3.134}/pyxllib/ext/utools.py

@@ -27,7 +27,7 @@ import pyautogui
 
 from pyxllib.prog.specialist import browser, TicToc, parse_datetime
 from pyxllib.file.specialist import XlPath
-from pyxllib.ext.autogui import type_text, clipboard_decorator
+from pyxllib.autogui.autogui import type_text, clipboard_decorator
 
 
 def _print_df_result(df, outfmt='text'):

{pyxllib-0.3.133 → pyxllib-0.3.134}/pyxllib/prog/xlosenv.py

@@ -1,3 +1,10 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Email  : 877362867@qq.com
+# @Date   : 2024/10/30
+
+
 import os
 import json
 import base64

{pyxllib-0.3.133 → pyxllib-0.3.134/pyxllib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.133
+Version: 0.3.134
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -38,33 +38,33 @@ Requires-Dist: Jinja2
 Requires-Dist: pandas>=0.23.4
 Requires-Dist: pillow
 Provides-Extra: xlcv
+Requires-Dist: pillow; extra == "xlcv"
 Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
-Requires-Dist: pillow; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: opsdroid-get-image-size; extra == "xlai"
-Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: pynvml; extra == "xlai"
+Requires-Dist: opsdroid-get-image-size; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
+Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: opencv-python; extra == "xlai"
 Provides-Extra: xlall
+Requires-Dist: flask-wtf; extra == "xlall"
+Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: zhconv; extra == "xlall"
 Requires-Dist: fastapi; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
-Requires-Dist: flask-cors; extra == "xlall"
-Requires-Dist: pillow; extra == "xlall"
 Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: flask-restful; extra == "xlall"
-Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
-Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: openai2; extra == "xlall"
 Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: html2text; extra == "xlall"
 Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: flask-wtf; extra == "xlall"
+Requires-Dist: flask-jwt-extended; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
 Requires-Dist: flask; extra == "xlall"
+Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
+Requires-Dist: pillow; extra == "xlall"
 Requires-Dist: opencv-python; extra == "xlall"
-Requires-Dist: zhconv; extra == "xlall"
+Requires-Dist: openai2; extra == "xlall"
 
 # 1 install
 

{pyxllib-0.3.133 → pyxllib-0.3.134}/pyxlpr/ai/clientlib.py

@@ -204,7 +204,7 @@ class XlAiClient:
         self._priu_header = None
         self._priu_host = None
 
-        # 2 如果环境变量预存了账号信息，自动加载使用
+        # 2 (旧)如果环境变量预存了账号信息，自动加载使用
         accounts = XlOsEnv.get('XlAiAccounts', decoding=True)
         if accounts and auto_login:
             if 'aipocr' in accounts:
@@ -214,6 +214,17 @@ class XlAiClient:
             if 'priu' in accounts:
                 self.login_priu(**accounts['priu'], check=check)
 
+        # 3 (新)增设了更规范的环境变量名
+        if auto_login and os.environ.get("XL_API_AIP_ID"):
+            self.login_aipocr(os.environ.get("XL_API_AIP_ID"),
+                              os.environ.get("XL_API_AIP_KEY"),
+                              os.environ.get("XL_API_AIP_SKEY"))
+        if auto_login and os.environ.get("XL_API_MATHPIX_ID"):
+            self.login_mathpix(os.environ.get("XL_API_MATHPIX_ID"),
+                               os.environ.get("XL_API_MATHPIX_KEY"))
+        if auto_login and os.environ.get("XL_API_PRIU_TOKEN"):
+            self.login_priu(os.environ.get("XL_API_PRIU_TOKEN"))
+
     def __A1_登录账号(self):
         pass
 
@@ -268,7 +279,7 @@ class XlAiClient:
             connent = False
             for host in hosts:
                 try:
-                    if '欢迎来到 厦门理工' in requests.get(f'{host}/test_page', timeout=5).text:
+                    if requests.get(f'{host}/healthz', timeout=5).status_code == 200:
                         self._priu_host = host
                         connent = True
                         break

{pyxllib-0.3.133 → pyxllib-0.3.134}/setup.py

@@ -50,7 +50,7 @@ _dir = Path(__file__).parent
 
 setup(
     name='pyxllib',  # pip 安装时用的名字
-    version='0.3.133',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
+    version='0.3.134',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
     author='code4101',
     author_email='877362867@qq.com',
     url='https://github.com/XLPRUtils/pyxllib',

pyxllib-0.3.133/pyxllib/autogui/all.py

@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# @Author : 陈坤泽
-# @Email  : 877362867@qq.com
-# @Date   : 2024/10/29
-
-from pyxllib.ext.autogui.autogui import *
-from pyxllib.ext.autogui.virtualkey import *
-from pyxllib.ext.autogui.activewin import *

{pyxllib-0.3.133 → pyxllib-0.3.134}/pyxllib.egg-info/requires.txt

@@ -23,32 +23,32 @@ pandas>=0.23.4
 pillow
 
 [xlai]
-opsdroid-get-image-size
-pillow
 pynvml
+opsdroid-get-image-size
 visdom
+pillow
 opencv-python
 
 [xlall]
+flask-wtf
+xlrd
+zhconv
 fastapi
-opsdroid-get-image-size
-flask-cors
-pillow
 ujson
-flask-restful
-flask-jwt-extended
-xlrd
-arts
-html2text
-openai2
 sentencepiece
+html2text
 uvicorn
-flask-wtf
+flask-jwt-extended
+opsdroid-get-image-size
 flask
+flask-cors
+flask-restful
+arts
+pillow
 opencv-python
-zhconv
+openai2
 
 [xlcv]
+pillow
 opsdroid-get-image-size
 opencv-python
-pillow