gomyck-tools 1.2.8__tar.gz → 1.2.9__tar.gz

{gomyck-tools-1.2.8 → gomyck_tools-1.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.8
+Version: 1.2.9
 Summary: A tools collection for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck

{gomyck-tools-1.2.8 → gomyck_tools-1.2.9}/ctools/bottle_web_base.py

@@ -123,18 +123,30 @@ def params_resolve(func):
       queryStr.page_info = page_info
       return func(params=queryStr, *args, **kwargs)
     elif request.method == 'POST':
+      query_params = request.query.decode('utf-8')
       content_type = request.get_header('content-type')
       if content_type == 'application/json':
         params = request.json or {}
-        return func(params=DictWrapper(params), *args, **kwargs)
-      elif content_type and 'multipart/form-data' in content_type:
+        dict_wrapper = DictWrapper(params)
+        dict_wrapper.query_params = query_params
+        return func(params=dict_wrapper, *args, **kwargs)
+      elif 'multipart/form-data' in content_type:
         form_data = request.forms.decode()
         form_files = request.files.decode()
-        params = FormDataParams(data=DictWrapper(form_data), files=form_files)
-        return func(params=params, *args, **kwargs)
-      else:
-        params = request.query.decode('utf-8')
-        return func(params=params, *args, **kwargs)
+        dict_wrapper = DictWrapper(form_data)
+        dict_wrapper.query_params = query_params
+        dict_wrapper.files = form_files
+        return func(params=dict_wrapper, *args, **kwargs)
+      elif 'application/x-www-form-urlencoded' in content_type:
+        params = request.forms.decode()
+        dict_wrapper = DictWrapper(params.dict)
+        dict_wrapper.query_params = query_params
+        return func(params=dict_wrapper, *args, **kwargs)
+      elif 'text/plain' in content_type:
+        params = request.body.read().decode('utf-8')
+        dict_wrapper = DictWrapper({'body': params})
+        dict_wrapper.query_params = query_params
+        return func(params=dict_wrapper, *args, **kwargs)
     else:
       return func(*args, **kwargs)
   return decorated
@@ -144,17 +156,6 @@ class PageInfo:
     self.page_size = page_size
     self.page_index = page_index
 
-class FormDataParams:
-  def __init__(self, data, files):
-    self.data = data
-    self.files = files
-
-  def __getattr__(self, key):
-    try:
-      return self.data[key]
-    except Exception:
-      return self.files[key]
-
 # 通用的鉴权方法
 def common_auth_verify(aes_key):
   if request.path.startswith('/static') or request.path in GlobalState.withOutLoginURI:

{gomyck-tools-1.2.8 → gomyck_tools-1.2.9}/ctools/bottle_webserver.py

@@ -2,7 +2,7 @@ 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
+from bottle import ServerAdapter, Bottle, template, static_file, abort, redirect, response
 
 from ctools import sys_info
 
@@ -56,34 +56,63 @@ class CBottle:
     self.port = port
     self.quiet = quiet
     self.bottle = bottle
+    self.index_root = './'
+    self.index_filename = 'index.html'
+    self.is_tpl = False
+    self.tmp_args = {}
+    self.redirect_url = None
+    self.static_root = './static'
+    self.download_root = './download'
 
-  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)
-    self.bottle.run(server=http_server, quiet=self.quiet)
-
-  def set_index(self, root='./', filename='index.html', is_tpl=False, redirect_url=None, **kwargs):
     @self.bottle.route(['/', '/index'])
     def index():
       try:
-        if redirect_url: return redirect(redirect_url)
-        if is_tpl: return template(f"{root}/{filename}", **kwargs)
-        return static_file(filename=filename, root=root, **kwargs)
+        if self.redirect_url: return redirect(self.redirect_url)
+        if self.is_tpl: return template(f"{self.index_root}/{self.index_filename}", self.tmp_args)
+        return static_file(filename=self.index_filename, root=self.index_root)
       except FileNotFoundError:
         abort(404, "File not found...")
 
-  def set_static(self, root):
     @self.bottle.route('/static/<filepath:path>')
     def static(filepath):
       try:
-        return static_file(filepath, root=root)
+        return static_file(filepath, root=self.static_root)
       except FileNotFoundError:
         abort(404, "File not found...")
 
-  def set_download(self, root):
     @self.bottle.route('/download/<filepath:path>')
     def download(filepath):
-      return static_file(filepath, root=root, download=True)
+      return static_file(filepath, root=self.download_root, download=True)
+
+    @self.bottle.route('/favicon.ico')
+    def favicon():
+      response.content_type = 'image/svg+xml'
+      svg_icon = '''<?xml version="1.0" encoding="UTF-8"?>
+      <svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+          <circle cx="16" cy="16" r="14" fill="#007bff"/>
+          <path d="M16 8a8 8 0 0 0-8 8h2a6 6 0 0 1 12 0h2a8 8 0 0 0-8-8z" fill="white"/>
+          <circle cx="16" cy="20" r="2" fill="white"/>
+      </svg>
+      '''
+      return svg_icon
+
+  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)
+    self.bottle.run(server=http_server, quiet=self.quiet)
+
+  def set_index(self, filename='index.html', root='./', is_tpl=False, redirect_url=None, **kwargs):
+    self.index_root = root
+    self.index_filename = filename
+    self.is_tpl = is_tpl
+    self.redirect_url = redirect_url
+    self.tmp_args = kwargs
+
+  def set_static(self, root='./static'):
+    self.static_root = root
+
+  def set_download(self, root='./download'):
+    self.download_root = root
 
   def mount(self, context_path, app, **kwargs):
     self.bottle.mount(context_path, app, **kwargs)

{gomyck-tools-1.2.8 → gomyck_tools-1.2.9}/ctools/database.py

@@ -11,6 +11,13 @@ from ctools import call, string_tools
 from ctools.thread_pool import thread_local
 
 """
+class XXXX(BaseMixin):
+  __tablename__ = 't_xxx_info'
+  __table_args__ = {'comment': 'xxx信息表'}
+  server_content: Column = Column(String(50), nullable=True, default='', comment='123123')
+  server_ip: Column = Column(String(30), index=True)
+  user_id: Column = Column(BigInteger)
+
 database.init_db('postgresql://postgres:123456@192.168.3.107:32566/abc', default_schema='public', db_key='source', pool_size=100)
 with database.get_session('source') as s:
   s.execute(text('insert into xxx (name) values (:name)'), {'name': string_tools.get_random_str(5)})
@@ -56,6 +63,7 @@ def init_db(db_url: str, db_key: str='default', connect_args: dict={}, default_s
   sessionMakers[db_key] = sessionMaker
   inited_db[db_key] = True
   if default_schema: event.listen(engine, 'connect', lambda dbapi_connection, connection_record: _set_search_path(dbapi_connection, default_schema))
+  Base.metadata.create_all(engine)
 
 def _set_search_path(dbapi_connection, default_schema):
   with dbapi_connection.cursor() as cursor:

{gomyck-tools-1.2.8 → gomyck_tools-1.2.9}/ctools/dict_wrapper.py

@@ -7,7 +7,9 @@ class DictWrapper(dict):
   def __getattr__(self, key):
     res = self.get(key)
     if res is None:
-      raise AttributeError(f"'{key}' not found in this Entity")
+      res = self.query_params.get(key)
+      if res is None:
+        raise AttributeError(f" ==>> {key} <<== Not Found In This Entity!!!")
     if isinstance(res, dict):
       return DictWrapper(res)
     return res

{gomyck-tools-1.2.8 → gomyck_tools-1.2.9}/gomyck_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.8
+Version: 1.2.9
 Summary: A tools collection for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck

{gomyck-tools-1.2.8 → gomyck_tools-1.2.9}/setup.py

@@ -11,7 +11,7 @@ requirements = parse_requirements(os.path.join(os.path.dirname(__file__), 'requi
 
 setup(
   name="gomyck-tools",
-  version="1.2.8",
+  version="1.2.9",
   author="gomyck",
   author_email="hao474798383@163.com",
   description="A tools collection for python development by hao474798383",