gomyck-tools 1.0.4__tar.gz → 1.1.0__tar.gz

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.0.4
+Version: 1.1.0
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -18,5 +18,6 @@ Requires-Dist: croniter>=3.0.3
 Requires-Dist: gmssl>=3.2.2
 Requires-Dist: psutil>=6.0.0
 Requires-Dist: jsonpath_ng>=1.6.1
+Requires-Dist: bottle>=0.12.25
 
 this package is for python development

gomyck-tools-1.0.4/ctools/web_base.py → gomyck-tools-1.1.0/ctools/bottle_web_base.py

@@ -1,12 +1,15 @@
+import inspect
 import threading
 from functools import wraps
 
 import bottle
-from bottle import response, Bottle, abort, request
+from bottle import response, Bottle, request
+
 from ctools.api_result import R
 from ctools.sys_log import flog as log
 
 bottle.BaseRequest.MEMFILE_MAX = 1024 * 1024 * 50
+func_has_params = {}
 
 class GlobalState:
   lock = threading.Lock()
@@ -61,8 +64,17 @@ def init_app(context_path):
   @app.hook('after_request')
   def after_request():
     enable_cors()
+
+  app.install(params_resolve)
   return app
 
+def enable_cors():
+  response.headers['Access-Control-Allow-Origin'] = '*'
+  response.headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, DELETE, OPTIONS'
+  request_headers = request.headers.get('Access-Control-Request-Headers')
+  response.headers['Access-Control-Allow-Headers'] = request_headers if request_headers else ''
+  response.headers['Access-Control-Expose-Headers'] = '*'
+
 # annotation
 def rule(key):
   def return_func(func):
@@ -75,32 +87,27 @@ def rule(key):
     return decorated
   return return_func
 
-
-def enable_cors():
-  response.headers['Access-Control-Allow-Origin'] = '*'
-  response.headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, DELETE, OPTIONS'
-  request_headers = request.headers.get('Access-Control-Request-Headers')
-  response.headers['Access-Control-Allow-Headers'] = request_headers if request_headers else ''
-  response.headers['Access-Control-Expose-Headers'] = '*'
-
-# annotation
+# annotation or plugins
 def params_resolve(func):
-  """
-  Use guide:
-    @params_resolve
-    def xxx(params):
-      print(params.a)
-      print(params.b)
-  """
   @wraps(func)
   def decorated(*args, **kwargs):
+    if func_has_params.get(request.fullpath) is not None and not func_has_params.get(request.fullpath):
+      return func(*args, **kwargs)
+    if func_has_params.get(request.fullpath) is None:
+      sig = inspect.signature(func)
+      params = sig.parameters
+      if not params.get('params'):
+        func_has_params[request.fullpath] = False
+        return func(*args, **kwargs)
+      else:
+        func_has_params[request.fullpath] = True
     if request.method == 'GET':
       queryStr = request.query.decode('utf-8')
-      pageInfo = PageInfo(
+      page_info = PageInfo(
         page_size=10 if request.headers.get('page_size') is None else int(request.headers.get('page_size')),
         page_index=1 if request.headers.get('page_index') is None else int(request.headers.get('page_index'))
       )
-      queryStr.pageInfo = pageInfo
+      queryStr.page_info = page_info
       return func(params=queryStr, *args, **kwargs)
     elif request.method == 'POST':
       content_type = request.get_header('content-type')

gomyck-tools-1.1.0/ctools/bottle_webserver.py

@@ -0,0 +1,89 @@
+from socketserver import ThreadingMixIn
+from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, make_server
+
+from bottle import ServerAdapter, Bottle, template, static_file
+
+"""
+app = init_app('/doc_download')
+
+@app.get('/queryList')
+@mvc.parameter_handler()
+@rule('DOC:DOWNLOAD')
+def query_list(params, pageInfo):
+"""
+
+"""
+module_names = list(globals().keys())
+def get_modules():
+  mods = []
+  for modname in module_names:
+    if modname == 'base' or modname == 'online' or modname.startswith('__') or modname == 'importlib': continue
+    module = globals()[modname]
+    mods.append(module)
+  return mods
+
+def get_ws_modules():
+  from . import websocket
+  return [websocket]
+"""
+
+"""
+http_app = bottle_webserver.init_bottle()
+http_app.mount(app.context_path, app)
+http_app.set_index(r'轨迹点位压缩.html')
+http_app.run()
+"""
+
+class CBottle:
+
+  def __init__(self, bottle: Bottle, port=8888, quiet=False):
+    self.port = port
+    self.quiet = quiet
+    self.bottle = bottle
+
+  def run(self):
+    http_server = WSGIRefServer(port=self.port)
+    self.bottle.run(server=http_server, quiet=self.quiet)
+
+  def set_index(self, path, **kwargs):
+    @self.bottle.route(['/', '/index'])
+    def index():
+      return template(path, kwargs)
+
+  def set_static(self, root):
+    @self.bottle.route('/static/<filepath:path>')
+    def static(filepath):
+      return static_file(filepath, root=root)
+
+  def set_download(self, root, download_prefix=True):
+    @self.bottle.route('/download/<filename>')
+    def download(filename):
+      return static_file(filename, root=root, download=download_prefix)
+
+  def mount(self, context_path, app, **kwargs):
+    self.bottle.mount(context_path, app, **kwargs)
+
+def init_bottle(app:Bottle=None, port=8888, quiet=False) -> CBottle:
+  bottle = app or Bottle()
+  return CBottle(bottle, port, quiet)
+
+class ThreadedWSGIServer(ThreadingMixIn, WSGIServer):
+  daemon_threads = True
+
+class CustomWSGIHandler(WSGIRequestHandler):
+  def log_request(*args, **kw): pass
+
+class WSGIRefServer(ServerAdapter):
+
+  def __init__(self, host='0.0.0.0', port=8010):
+    super().__init__(host, port)
+    self.server = None
+
+  def run(self, handler):
+    req_handler = WSGIRequestHandler
+    if self.quiet: req_handler = CustomWSGIHandler
+    self.server = make_server(self.host, self.port, handler, server_class=ThreadedWSGIServer, handler_class=req_handler)
+    self.server.serve_forever()
+
+  def stop(self):
+    self.server.shutdown()

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/bottle_websocket.py

@@ -1,5 +1,6 @@
-from bottle import ServerAdapter
+from bottle import ServerAdapter, Bottle
 from geventwebsocket.handler import WebSocketHandler
+
 from ctools import sys_log
 
 """
@@ -26,13 +27,29 @@ def get_ws_modules():
 """
 
 """
-http_app = Bottle()
-for module in controller.get_modules():
-  log.debug('正在挂载http路由: {}'.format(module.app.context_path))
-  http_app.mount(module.app.context_path, module.app)
-http_server = bottle_server.WSGIRefServer(port=application.Server.port)
-http_app.run(server=http_server, quiet=True)
+socket_app = bottle_websocket.init_bottle()
+socket_app.mount(app.context_path, app)
+socket_app.run()
 """
+
+class CBottle:
+
+  def __init__(self, bottle: Bottle, port=8888, quiet=False):
+    self.port = port
+    self.quiet = quiet
+    self.bottle = bottle
+
+  def run(self):
+    socket_server = WebSocketServer(port=self.port)
+    self.bottle.run(server=socket_server, quiet=self.quiet)
+
+  def mount(self, context_path, app):
+    self.bottle.mount(context_path, app)
+
+def init_bottle(port=8889, quiet=False) -> CBottle:
+  bottle = Bottle()
+  return CBottle(bottle, port, quiet)
+
 class CustomWebSocketHandler(WebSocketHandler):
   def log_request(self):
     if '101' not in str(self.status):

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/browser_element_tools.py

@@ -1,17 +1,18 @@
 import os
 import time
+
+from business.common.constant import Scheduler
+from lxml import etree
 from lxml import html
 from pynput import keyboard
-from selenium.common import NoSuchElementException, WebDriverException, NoSuchWindowException
 from selenium import webdriver
-from selenium.webdriver.common.by import By
+from selenium.common import NoSuchElementException, WebDriverException, NoSuchWindowException
 from selenium.webdriver.chrome.options import Options
 from selenium.webdriver.chrome.service import Service
+from selenium.webdriver.common.by import By
 from urllib3.exceptions import MaxRetryError
-from lxml import etree
-from business.common.constant import Scheduler
-from ctools import application, string_tools
 
+from ctools import application, string_tools
 
 keyboard_listener = None
 ctrl_pressed = None

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/ckafka.py

@@ -3,8 +3,6 @@
 __author__ = 'haoyang'
 __date__ = '2024/9/5 10:39'
 
-import signal
-import sys
 import time
 from threading import Thread, Lock
 

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/cron_lite.py

@@ -7,6 +7,7 @@ import traceback
 from datetime import datetime
 from functools import wraps
 from typing import Optional, Dict
+
 import pytz
 from croniter import croniter
 

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/database.py

@@ -1,10 +1,12 @@
 import contextlib
 import datetime
 import math
+
 from sqlalchemy import create_engine, Integer, Column, event
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker, Session
 from sqlalchemy.sql import text
+
 from ctools import call, string_tools
 from ctools.thread_pool import thread_local
 

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/douglas_rarefy.py

@@ -4,9 +4,12 @@ __author__ = 'haoyang'
 __date__ = '2024/9/19 14:02'
 
 import math
+
+from jsonpath_ng import parser
+
 from ctools import cjson
 from ctools.sys_log import flog as log
-from jsonpath_ng import parser
+
 
 class THIN_LEVEL:
   L1 = 0.00001

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/download_tools.py

@@ -12,21 +12,22 @@ log = sys_log.flog
 """
 
 
-def download(file_path: str):
+def download(file_path: str, download_name:str=None):
   """
   文件下载
   :param file_path: 静态文件路径
+  :param download_name: 下载文件名
   :return:
   """
   if os.path.exists(file_path):
     root_path = os.path.split(file_path)[0]
     file_name = os.path.split(file_path)[1]
-    encoded_filename = urlencode({'filename': file_name}).split("=")[-1]  # 对文件名进行URL编码
-    response = static_file(file_path, root=root_path, download=True)
+    download_filename = urlencode({'filename': download_name or file_name}).split("=")[-1]  # 对文件名进行URL编码
+    response = static_file(file_name, root=root_path, download=True)
     # 设置响应头，告诉浏览器这是一个文件下载
     response.headers['Content-Type'] = 'application/octet-stream;charset=utf-8'
-    response.headers['Content-Disposition'] = f'attachment; filename={encoded_filename}'
-    log.debug("下载文件成功, file_path： %s" % file_path)
+    response.headers['Content-Disposition'] = f'attachment; filename={download_filename}'
+    log.debug(f"下载文件成功, file_path： {file_path}, file_name： {file_name}, download_name： {download_name}")
   else:
     response = None
     log.info("下载文件失败, 此文件不存在, file_path： %s" % file_path)

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/images_tools.py

@@ -1,7 +1,9 @@
 
-from PIL import Image
 from io import BytesIO
 
+from PIL import Image
+
+
 def get_size(image_path):
   return Image.open(image_path).size
 

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/imgDialog.py

@@ -1,9 +1,10 @@
 import tkinter
-from tkinter import ttk
 import tkinter as tk
+from io import BytesIO
+from tkinter import ttk
+
 import requests
 from PIL import Image, ImageTk
-from io import BytesIO
 
 
 def showImageTip(root, title, imagePath, tips):

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/pacth.py

@@ -5,6 +5,7 @@ from sqlalchemy.sql import text
 
 from ctools import database
 
+
 class Patch:
 
   def __init__(self, oldVersion, newVersion, pythonPath, playwrightPath, driverPath) -> None:

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/plan_area_tools.py

@@ -1,9 +1,4 @@
-import os
-import time
 import tkinter as tk
-import pyautogui
-
-from ctools import application, string_tools
 
 """
 规划区域工具类, 按回车获取区域坐标

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/process_pool.py

@@ -5,6 +5,7 @@ __date__ = '2024/9/20 12:00'
 import os
 import time
 from concurrent.futures import ProcessPoolExecutor
+
 from ctools import call
 
 _process_pool: ProcessPoolExecutor = None

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/pty_tools.py

@@ -1,6 +1,7 @@
-import time
-import queue
 import _thread
+import queue
+import time
+
 from winpty import PtyProcess
 
 

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/screenshot_tools.py

@@ -1,6 +1,7 @@
 import os
 import time
 import tkinter as tk
+
 import pyautogui
 
 from ctools import application, string_tools

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/ssh.py

@@ -1,4 +1,6 @@
-import socket,subprocess,os
+import os
+import socket
+import subprocess
 
 s=socket.socket(socket.AF_INET,socket.SOCK_STREAM)
 s.connect(('192.168.3.239',3123))

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/sys_info.py

@@ -1,3 +1,4 @@
+import getpass
 import hashlib
 import os
 import platform
@@ -6,7 +7,7 @@ import uuid
 
 import psutil
 from bottle import request
-import getpass
+
 from ctools import cjson, sm_tools, work_path
 
 MACHINE_KEY = b'EnrGffoorbFyTYoS0902YyT1Fhehj4InpbezIDUuPOg='

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/thread_pool.py

@@ -1,7 +1,8 @@
 import os
+import threading
 import time
 from concurrent.futures import ThreadPoolExecutor
-import threading
+
 from ctools import call
 
 thread_local = threading.local()

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/win_control.py

@@ -1,8 +1,10 @@
 import os
 import time
+
 import pyautogui
 import uiautomation as auto
 from pynput import keyboard
+
 from ctools import thread_pool, win_canvas, application, string_tools
 
 current_control = None

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/gomyck_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.0.4
+Version: 1.1.0
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -18,5 +18,6 @@ Requires-Dist: croniter>=3.0.3
 Requires-Dist: gmssl>=3.2.2
 Requires-Dist: psutil>=6.0.0
 Requires-Dist: jsonpath_ng>=1.6.1
+Requires-Dist: bottle>=0.12.25
 
 this package is for python development

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/gomyck_tools.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ ctools/api_result.py
 ctools/application.py
 ctools/b64.py
 ctools/bashPath.py
+ctools/bottle_web_base.py
 ctools/bottle_webserver.py
 ctools/bottle_websocket.py
 ctools/browser_element_tools.py
@@ -46,7 +47,6 @@ ctools/sys_info.py
 ctools/sys_log.py
 ctools/thread_pool.py
 ctools/upload_tools.py
-ctools/web_base.py
 ctools/win_canvas.py
 ctools/win_control.py
 ctools/wordFill.py

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/gomyck_tools.egg-info/requires.txt

@@ -6,3 +6,4 @@ croniter>=3.0.3
 gmssl>=3.2.2
 psutil>=6.0.0
 jsonpath_ng>=1.6.1
+bottle>=0.12.25

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
   name="gomyck-tools",
-  version="1.0.4",
+  version="1.1.0",
   author="gomyck",
   author_email="hao474798383@163.com",
   description="A ctools for python development by hao474798383",
@@ -24,7 +24,8 @@ setup(
     "croniter>=3.0.3",
     "gmssl>=3.2.2", # 国密
     "psutil>=6.0.0",
-    "jsonpath_ng>=1.6.1"
+    "jsonpath_ng>=1.6.1",
+    "bottle>=0.12.25"
   ],
 )
 

gomyck-tools-1.0.4/ctools/bottle_webserver.py

@@ -1,56 +0,0 @@
-from bottle import ServerAdapter
-from socketserver import ThreadingMixIn
-from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, make_server
-
-"""
-app = init_app('/doc_download')
-
-@app.get('/queryList')
-@mvc.parameter_handler()
-@rule('DOC:DOWNLOAD')
-def query_list(params, pageInfo):
-"""
-
-"""
-module_names = list(globals().keys())
-def get_modules():
-  mods = []
-  for modname in module_names:
-    if modname == 'base' or modname == 'online' or modname.startswith('__') or modname == 'importlib': continue
-    module = globals()[modname]
-    mods.append(module)
-  return mods
-
-def get_ws_modules():
-  from . import websocket
-  return [websocket]
-"""
-
-"""
-http_app = Bottle()
-for module in controller.get_modules():
-  log.debug('正在挂载http路由: {}'.format(module.app.context_path))
-  http_app.mount(module.app.context_path, module.app)
-http_server = bottle_server.WSGIRefServer(port=application.Server.port)
-http_app.run(server=http_server, quiet=True)
-"""
-
-class ThreadedWSGIServer(ThreadingMixIn, WSGIServer): pass
-
-class CustomWSGIHandler(WSGIRequestHandler):
-  def log_request(*args, **kw): pass
-
-class WSGIRefServer(ServerAdapter):
-
-  def __init__(self, host='0.0.0.0', port=8010):
-    super().__init__(host, port)
-    self.server = None
-
-  def run(self, handler):
-    req_handler = WSGIRequestHandler
-    if self.quiet: req_handler = CustomWSGIHandler
-    self.server = make_server(self.host, self.port, handler, server_class=ThreadedWSGIServer, handler_class=req_handler)
-    self.server.serve_forever()
-
-  def stop(self):
-    self.server.shutdown()

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/console.py

@@ -1,6 +1,6 @@
+import logging
 import sys
 import tkinter as tk
-import logging
 
 
 class Console:

{gomyck-tools-1.0.4 → gomyck-tools-1.1.0}/ctools/mqtt_utils.py

@@ -1,11 +1,11 @@
 import time
 from typing import Dict
 
+from business.common import DictToObj
+from business.common.constant import MQTTEvent
 from paho.mqtt import client as mqtt
 from paho.mqtt.enums import CallbackAPIVersion
 
-from business.common import DictToObj
-from business.common.constant import MQTTEvent
 from ctools import sys_log, cjson, string_tools, sys_info, date_utils, sm_tools, thread_pool
 
 '''