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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.0.2
+Version: 1.0.4
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -10,5 +10,13 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: jsonpickle>=3.2.2
+Requires-Dist: SQLAlchemy>=2.0.32
+Requires-Dist: chardet>=5.2.0
+Requires-Dist: psycopg2-binary>=2.9.9
+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
 
 this package is for python development

gomyck-tools-1.0.2/ctools/bottle_server.py → gomyck-tools-1.0.4/ctools/bottle_webserver.py

@@ -1,8 +1,6 @@
 from bottle import ServerAdapter
 from socketserver import ThreadingMixIn
 from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, make_server
-from geventwebsocket.handler import WebSocketHandler
-from ctools import sys_log
 
 """
 app = init_app('/doc_download')
@@ -42,15 +40,6 @@ class ThreadedWSGIServer(ThreadingMixIn, WSGIServer): pass
 class CustomWSGIHandler(WSGIRequestHandler):
   def log_request(*args, **kw): pass
 
-class CustomWebSocketHandler(WebSocketHandler):
-  def log_request(self):
-    if '101' not in str(self.status):
-      log_msg = self.format_request()
-      for nk in sys_log.neglect_keywords:
-        if nk in log_msg:
-          return
-      self.logger.info(log_msg)
-
 class WSGIRefServer(ServerAdapter):
 
   def __init__(self, host='0.0.0.0', port=8010):
@@ -65,18 +54,3 @@ class WSGIRefServer(ServerAdapter):
 
   def stop(self):
     self.server.shutdown()
-
-
-class WebSocketServer(ServerAdapter):
-
-  def __init__(self, host='0.0.0.0', port=8011):
-    super().__init__(host, port)
-    self.server = None
-
-  def run(self, handler):
-    from gevent import pywsgi
-    self.server = pywsgi.WSGIServer((self.host, self.port), handler, handler_class=CustomWebSocketHandler)
-    self.server.serve_forever()
-
-  def stop(self):
-    self.server.stop()

gomyck-tools-1.0.4/ctools/bottle_websocket.py

@@ -0,0 +1,57 @@
+from bottle import ServerAdapter
+from geventwebsocket.handler import WebSocketHandler
+from ctools import sys_log
+
+"""
+app = init_app('/websocket_demo')
+
+@app.route('/script_debug', apply=[websocket])
+@rule('DOC:DOWNLOAD')
+def script_debug(ws: WebSocket):
+"""
+
+"""
+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 CustomWebSocketHandler(WebSocketHandler):
+  def log_request(self):
+    if '101' not in str(self.status):
+      log_msg = self.format_request()
+      for nk in sys_log.neglect_keywords:
+        if nk in log_msg:
+          return
+      self.logger.info(log_msg)
+
+class WebSocketServer(ServerAdapter):
+
+  def __init__(self, host='0.0.0.0', port=8011):
+    super().__init__(host, port)
+    self.server = None
+
+  def run(self, handler):
+    from gevent import pywsgi
+    self.server = pywsgi.WSGIServer((self.host, self.port), handler, handler_class=CustomWebSocketHandler)
+    self.server.serve_forever()
+
+  def stop(self):
+    self.server.stop()

{gomyck-tools-1.0.2 → gomyck-tools-1.0.4}/ctools/cjson.py

@@ -4,7 +4,7 @@ import jsonpickle
 str_value_keys = []
 jsonpickle.set_preferred_backend('json')
 jsonpickle.set_encoder_options('json', ensure_ascii=False)
-jsonpickle.set_decoder_options('json', encoding='utf-8')
+jsonpickle.set_decoder_options('json')
 
 def dumps(obj) -> str:
   """

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.0.2
+Version: 1.0.4
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -10,5 +10,13 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: jsonpickle>=3.2.2
+Requires-Dist: SQLAlchemy>=2.0.32
+Requires-Dist: chardet>=5.2.0
+Requires-Dist: psycopg2-binary>=2.9.9
+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
 
 this package is for python development

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

@@ -6,7 +6,8 @@ ctools/api_result.py
 ctools/application.py
 ctools/b64.py
 ctools/bashPath.py
-ctools/bottle_server.py
+ctools/bottle_webserver.py
+ctools/bottle_websocket.py
 ctools/browser_element_tools.py
 ctools/call.py
 ctools/cjson.py

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

@@ -3,6 +3,6 @@ SQLAlchemy>=2.0.32
 chardet>=5.2.0
 psycopg2-binary>=2.9.9
 croniter>=3.0.3
-pyautogui>=0.9.54
 gmssl>=3.2.2
 psutil>=6.0.0
+jsonpath_ng>=1.6.1

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

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
   name="gomyck-tools",
-  version="1.0.2",
+  version="1.0.4",
   author="gomyck",
   author_email="hao474798383@163.com",
   description="A ctools for python development by hao474798383",
@@ -22,9 +22,9 @@ setup(
     "chardet>=5.2.0",
     "psycopg2-binary>=2.9.9",
     "croniter>=3.0.3",
-    "pyautogui>=0.9.54",
-    "gmssl>=3.2.2",
-    "psutil>=6.0.0"
+    "gmssl>=3.2.2", # 国密
+    "psutil>=6.0.0",
+    "jsonpath_ng>=1.6.1"
   ],
 )