gomyck-tools 1.4.5__py3-none-any.whl → 1.4.6__py3-none-any.whl

ctools/util/jb_cut.py

@@ -31,7 +31,7 @@ def add_freq(word: ()):
   """
   jieba.suggest_freq(word, True)
 
-def get_declare_type_word(word: str, word_flag=(), use_paddle=False, exclude_flag="x"):
+def get_declare_type_word(word: str, word_flag=(), use_paddle=False, exclude_flag=jqfx_exclude, exclude_word=()):
   #import paddle
   #paddle.enable_static()
   #sys.stdout = sys.__stdout__
@@ -42,12 +42,13 @@ def get_declare_type_word(word: str, word_flag=(), use_paddle=False, exclude_fla
   :param word_flag: 标签
   :param use_paddle: 是否使用 paddle
   :param exclude_flag: 排除的标签
+  :param exclude_word: 排除的词
   :return:  筛选之后的单词(数组)
   """
   # linux 可以开放下面的语句, 并发执行分词, windows 不支持
   # if platform.system() == 'Linux': jieba.enable_parallel(4)
   ret = []
   for w, flag in pseg.cut(word, use_paddle=use_paddle):
-    if (flag in word_flag or len(word_flag) == 0) and flag not in exclude_flag:
+    if (flag in word_flag or len(word_flag) == 0) and flag not in exclude_flag and w not in exclude_word:
       ret.append((w, flag))
   return ret

ctools/web/bottle_web_base.py

@@ -23,6 +23,7 @@ class GlobalState:
     '/index',
     '/login',
     '/favicon.ico',
+    '/static/',
   }
   allowRemoteCallURI = set()
   auth_ignore_func = set()
@@ -44,7 +45,7 @@ def cache_white_list(app):
       for path, tuples in routes.items():
         req_func = inspect.getmodule(tuples[0].callback).__name__ + "." + tuples[0].callback.__name__
         if req_func in GlobalState.auth_ignore_func:
-          print("add white list: {}".format(join_path(app.context_path, real_func.context_path, path)))
+          print("add white list: {}".format(route.rule))
           GlobalState.withOutLoginURI.add(join_path(app.context_path, real_func.context_path, path))
 
 def init_app(context_path="/", main_app=False):
@@ -58,7 +59,11 @@ def init_app(context_path="/", main_app=False):
   def init_main_app():
     @app.hook('before_request')
     def before_request():
-      if request.path.startswith('/static') or request.path in GlobalState.withOutLoginURI: return
+      for v in GlobalState.withOutLoginURI:
+        if v.endswith('/'):
+          if request.path.startswith(v): return
+        else:
+          if v in request.path: return
       for interceptor in GlobalState.interceptors:
         res: R = interceptor['func']()
         if res.code != 200: bottle.abort(res.code, res.message)
@@ -124,6 +129,7 @@ def before_intercept(order=0):
   return decorator
 
 # annotation
+# 接口请求地址后面带不带斜杠都会影响: /api/xxx/ 和 /api/xxx 是不一样的
 def auth_ignore(func):
   """忽略登录验证的接口"""
   ignore_req_func = inspect.getmodule(func).__name__ + "." + func.__name__

ctools/web/bottle_webserver.py

@@ -1,13 +1,14 @@
+import os
 import sys
 from socketserver import ThreadingMixIn
 from wsgiref.simple_server import WSGIServer, WSGIRequestHandler, make_server
 
-from bottle import ServerAdapter, Bottle, template, static_file, abort, redirect, response
+from bottle import ServerAdapter, Bottle, template, static_file, abort, redirect, response, request
 
 from ctools import sys_info
 from ctools.pkg.dynamic_imp import load_modules_from_package
-from ctools.web.bottle_web_base import cache_white_list
-
+from ctools.web.api_result import R
+from ctools.web.bottle_web_base import cache_white_list, auth_ignore, GlobalState
 
 """
 import controllers
@@ -53,6 +54,7 @@ class CBottle:
     self.redirect_url = None
     self.static_root = './static'
     self.download_root = './download'
+    self.template_root = './templates'
 
     @self.bottle.route(['/', '/index'])
     def index():
@@ -63,6 +65,13 @@ class CBottle:
       except FileNotFoundError:
         abort(404, "File not found...")
 
+    @self.bottle.route('/template/<filepath:path>')
+    def tpl(filepath, tmp_args):
+      try:
+        return template(f"{self.template_root}/{filepath}", tmp_args)
+      except FileNotFoundError:
+        abort(404, "File not found...")
+
     @self.bottle.route('/static/<filepath:path>')
     def static(filepath):
       try:
@@ -86,22 +95,54 @@ class CBottle:
       '''
       return svg_icon
 
+  def auto_register_statics(self, dist_root='./static'):
+    for d in os.listdir(dist_root):
+      full_path = os.path.join(dist_root, d)
+      if os.path.isdir(full_path):
+        self.add_static_route(f'/{d}', full_path)
+
+  def add_static_route(self, url_prefix, root):
+    """动态添加静态资源映射"""
+    if not url_prefix.startswith('/'):
+      url_prefix = '/' + url_prefix
+    if not url_prefix.endswith('/'):
+      url_prefix += '/'
+    route_path = f"{url_prefix}<filepath:path>"
+    @self.bottle.route(route_path)
+    def static_handler(filepath):
+      try:
+        return static_file(filepath, root=root)
+      except FileNotFoundError:
+        abort(404, f"{filepath} not found in {root}")
+    GlobalState.withOutLoginURI.add(url_prefix)
+    print(f"[static] mounted {url_prefix} -> {root}")
+
   def run(self):
     http_server = WSGIRefServer(port=self.port)
     print('Click the link below to open the service homepage %s' % '\n \t\t http://localhost:%s \n \t\t http://%s:%s' % (self.port, sys_info.get_local_ipv4(), self.port), file=sys.stderr)
     cache_white_list(self.bottle)
     self.bottle.run(server=http_server, quiet=self.quiet)
 
-  def set_index(self, filename='index.html', root='./', is_tpl=False, redirect_url=None, **kwargs):
+  def enable_spa_mode(self):
+    @self.bottle.error(404)
+    def error_404_handler(error):
+      if request.path.startswith('/api/'): return R.error(resp=R.Code.cus_code(404, "资源未找到: {}".format(error.body)))
+      return static_file(filename=self.index_filename, root=self.index_root)
+
+  def set_index(self, filename='index.html', root='./', is_tpl=False, redirect_url=None, spa=False, **kwargs):
     self.index_root = root
     self.index_filename = filename
     self.is_tpl = is_tpl
     self.redirect_url = redirect_url
+    if spa: self.enable_spa_mode()
     self.tmp_args = kwargs
 
   def set_static(self, root='./static'):
     self.static_root = root
 
+  def set_template(self, root='./templates'):
+    self.template_root = root
+
   def set_download(self, root='./download'):
     self.download_root = root
 

{gomyck_tools-1.4.5.dist-info → gomyck_tools-1.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gomyck-tools
-Version: 1.4.5
+Version: 1.4.6
 Summary: A tools collection for python development by hao474798383
 Author-email: gomyck <hao474798383@163.com>
 License-Expression: Apache-2.0
@@ -41,6 +41,9 @@ Requires-Dist: jieba==0.42.1; extra == "cut"
 Requires-Dist: paddlepaddle==2.6.1; extra == "cut"
 Provides-Extra: ml
 Requires-Dist: scikit-learn>=1.7.1; extra == "ml"
+Requires-Dist: pandas>=2.3.2; extra == "ml"
+Requires-Dist: lxml>=6.0.1; extra == "ml"
+Requires-Dist: xlrd>=2.0.2; extra == "ml"
 Dynamic: license-file
 
 # Gomyck-Tools

{gomyck_tools-1.4.5.dist-info → gomyck_tools-1.4.6.dist-info}/RECORD

@@ -69,20 +69,20 @@ ctools/util/env_config.py,sha256=L98G9LPdpD7Yl5XbA_-KfkcA4mDunQoKiYtK5w7QR-s,179
 ctools/util/html_soup.py,sha256=rnr8M3gn3gQGo-wNaNFXDjdzp8AAkv9o4yqfIIfO-zw,1567
 ctools/util/http_util.py,sha256=cx0FRnPLFdJ0mF9UYphl40SZj68fqG30Q0udku9hZIE,769
 ctools/util/image_process.py,sha256=nqJOi2p8wLe8wRsfkH99MyEYSjE9i4fthxBJwrrZVB8,835
-ctools/util/jb_cut.py,sha256=22QUkKVjJVCYXzgM_fNBdOcMKylCZxy1hGPqno64BnM,1576
+ctools/util/jb_cut.py,sha256=h8Ey-LbpHtbAHskITn5GXEO7-DHJ_ZLODmE8Lc_dgSc,1664
 ctools/util/snow_id.py,sha256=KCuQ0zOTlmus8gZetmRA5y0jBSd8J0KXcJ33EzgCKjE,2225
 ctools/web/__init__.py,sha256=koSNYeKF5Z_xbp4Q2qbZ4ZP-3--1phbOYN9e4SJy_gk,98
 ctools/web/aio_web_server.py,sha256=p46BOU3_m4Jb57yAACeedKjhlFc1YC0QJSUe2selBgA,5693
 ctools/web/api_result.py,sha256=i1MjTnnlgkWl_q07xr-TLQeLYlXEh4DEclUFE414nSk,1568
-ctools/web/bottle_web_base.py,sha256=e8Ve4a07e-mH6j8KDbKbHEQOunvdldQb1MAYOEfM86M,8468
-ctools/web/bottle_webserver.py,sha256=kueGN9l9eYlq2KfC-4q355Imw94LV8LrifrdT_kbCec,5059
+ctools/web/bottle_web_base.py,sha256=qpqmu9hxrjgd1UuIGXHs8nq1f3xmOk04L4v1Hw34qhs,8605
+ctools/web/bottle_webserver.py,sha256=0xHLnuGIShxrEHc2mLnyx43NDVkCqM5QnlkY-Ndzrk4,6650
 ctools/web/bottle_websocket.py,sha256=xsu9fAtTuR5DsSsQjiBfaYxLjOWFyfr1sYM6cktTovI,1957
 ctools/web/ctoken.py,sha256=WaB29kqGlKAh21aUw5avl2h8AgLD1aESw8KCpqaN5nM,2539
 ctools/web/download_util.py,sha256=v0JTXiED1bvoWFfwfd-LD5s7_aoRQ0lCkaGwSnSp7WI,1954
 ctools/web/params_util.py,sha256=eJDV3PSq-ZHb8UZf6xqs8kOhbyZzits1H9yPoUBIDXg,828
 ctools/web/upload_util.py,sha256=z1QQCi4SFx08jrAQH5-Y_ShiM4MghuD_5Qz6V9KK_4U,1076
-gomyck_tools-1.4.5.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
-gomyck_tools-1.4.5.dist-info/METADATA,sha256=GCxJTBYsfNJJP1fQLO_QYaqTK32nkyFkbo-rXVrqoaw,1698
-gomyck_tools-1.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gomyck_tools-1.4.5.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.4.5.dist-info/RECORD,,
+gomyck_tools-1.4.6.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
+gomyck_tools-1.4.6.dist-info/METADATA,sha256=7VzJxrSxS8a1A1UBPG0XOGO-_-xE6_-5sXYoBPb3d2I,1826
+gomyck_tools-1.4.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gomyck_tools-1.4.6.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.4.6.dist-info/RECORD,,