gomyck-tools 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

ctools/{bottle_server.py → 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()

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()

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.dist-info → gomyck_tools-1.0.4.dist-info}/METADATA

@@ -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
@@ -15,8 +15,8 @@ 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: pyautogui >=0.9.54
 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.dist-info → gomyck_tools-1.0.4.dist-info}/RECORD

@@ -4,10 +4,11 @@ ctools/api_result.py,sha256=NiM-R9K42G3m16B27sG_mqKrlexZzC5-LKoY8D5tO4s,1239
 ctools/application.py,sha256=WviU7p9GOqducbGW3XGkP7jCNKmraCh6JGSYBC33CQk,16008
 ctools/b64.py,sha256=_BdhX3p3-MaSSlU2wivN5qPxQfacR3VRBr1WC456tU0,194
 ctools/bashPath.py,sha256=BCN_EhYzqvwsxYso81omMNd3SbEociwSOyb9kLvu8V4,337
-ctools/bottle_server.py,sha256=9gmw1og_8ZaOfmF8X9pwDlRxxeo648QmFvLl0shV0Dk,2303
+ctools/bottle_webserver.py,sha256=ssZSepcihbukOl-BUyPLYdj4jsQRBoD6Dq4rqjss5YE,1572
+ctools/bottle_websocket.py,sha256=aO5s1zlPVxjUj86529UkEXywmuaDK5qFvorsW5RIBEY,1583
 ctools/browser_element_tools.py,sha256=tWNxUJ9m-hNTYtS0NRvmH9r5I-Qw55uKekwDYgt49bc,9951
 ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
-ctools/cjson.py,sha256=hFw-Ue3sUxHd_RAA5Yp1vIyf79KnlxiISOSHCKQQnF8,1263
+ctools/cjson.py,sha256=M2XrXnFXTJyKsXP2JRos2Bse4b6WXjr6TrA6y-EF_Ig,1245
 ctools/ckafka.py,sha256=win6iV9-7FJDzcmqwQ5httN_NWjrBlWHc5b7N9E5tCQ,5187
 ctools/compile_tools.py,sha256=Nybh3vnkurIKnPnubdYzigjnzFu4GaTMKPvqFdibxmE,510
 ctools/console.py,sha256=1VAq_-fSGgHKYv6Qe53kHaJL0-3NpFRUZljahbJPcfk,1807
@@ -50,7 +51,7 @@ ctools/wordFill.py,sha256=dB1OLt6GLmWdkDV8H20VWbJmY4ggNNI8iHD1ocae2iM,875
 ctools/word_fill.py,sha256=aIkzjAF2soSW6w2dO2CRZlveDcuIdr6v9DtyyyB8uxM,18216
 ctools/word_fill_entity.py,sha256=eX3G0Gy16hfGpavQSEkCIoKDdTnNgRRJrFvKliETZK8,985
 ctools/work_path.py,sha256=i4MTUobqNW2WMrT3mwEC_XYQ0_IhFmKoNpTX2W6A8Tc,1680
-gomyck_tools-1.0.2.dist-info/METADATA,sha256=di1uIqHBSRqYIzKZFrQZ_FJsp_BJ3Yi26POCoxFwDqk,711
-gomyck_tools-1.0.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.0.2.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.0.2.dist-info/RECORD,,
+gomyck_tools-1.0.4.dist-info/METADATA,sha256=iS_5GtFgNjro54IcaZQVyLKycAqwN_ghaZAuy2buDYU,712
+gomyck_tools-1.0.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+gomyck_tools-1.0.4.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.0.4.dist-info/RECORD,,