gomyck-tools 1.2.8__py3-none-any.whl → 1.2.9__py3-none-any.whl

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:

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)

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:

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.9.dist-info/METADATA

@@ -0,0 +1,57 @@
+Metadata-Version: 2.1
+Name: gomyck-tools
+Version: 1.2.9
+Summary: A tools collection for python development by hao474798383
+Home-page: https://blog.gomyck.com
+Author: gomyck
+Author-email: hao474798383@163.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+Requires-Dist: jsonpickle~=3.4.2
+Requires-Dist: SQLAlchemy~=2.0.36
+Requires-Dist: chardet~=5.2.0
+Requires-Dist: psycopg2-binary~=2.9.10
+Requires-Dist: croniter~=5.0.1
+Requires-Dist: gmssl~=3.2.2
+Requires-Dist: psutil~=6.1.0
+Requires-Dist: jsonpath_ng~=1.7.0
+Requires-Dist: bottle~=0.13.2
+Requires-Dist: requests~=2.32.3
+Requires-Dist: urllib3~=1.26.20
+Requires-Dist: kafka-python~=2.0.2
+Requires-Dist: bs4~=0.0.2
+Requires-Dist: paho-mqtt~=2.1.0
+Requires-Dist: fuzzywuzzy~=0.18.0
+Requires-Dist: pymysql~=1.1.1
+Requires-Dist: pyzipper==0.3.6
+Requires-Dist: prometheus_client==0.21.1
+Requires-Dist: paramiko==3.5.0
+Requires-Dist: pyjwt==2.10.1
+Requires-Dist: cryptography==43.0.1
+Requires-Dist: redis==5.2.1
+
+# Gomyck-Tools
+
+## project
+
+https://github.com/mzxc
+
+## install
+
+This package need python version >= 3.9
+
+```shell
+pip install gomyck-tools
+```
+
+## usage
+
+```python
+from ctools import sys_log
+sys_log.clog.info('hello world')
+```
+
+

{gomyck_tools-1.2.8.dist-info → gomyck_tools-1.2.9.dist-info}/RECORD

@@ -4,8 +4,8 @@ ctools/api_result.py,sha256=UeQXI_zuZB-uY5qECTpz1fC7EGy82yGQqWMx20tyRTw,1572
 ctools/application.py,sha256=DcuSt2m8cDuSftx6eKfJ5gA6_F9dDlzkj0K86EG4F7s,15884
 ctools/b64.py,sha256=_BdhX3p3-MaSSlU2wivN5qPxQfacR3VRBr1WC456tU0,194
 ctools/bashPath.py,sha256=BCN_EhYzqvwsxYso81omMNd3SbEociwSOyb9kLvu8V4,337
-ctools/bottle_web_base.py,sha256=lP4WIvmr-JjO6kDQ-NGIIe2l96hP-aXAiInYsqiWEAU,5974
-ctools/bottle_webserver.py,sha256=p_obHp_9de-A3HbLF5orrqMmDayett9MeaKja7a0N9M,3601
+ctools/bottle_web_base.py,sha256=N4B9DL4k2y-eXzWkOAoeuqHJRSntYpJHWvDk33Ma0-w,6336
+ctools/bottle_webserver.py,sha256=l7t_sN4ayywD1sR0kzuhGioOuaqGR9VhJh7e6Gbd6aE,4642
 ctools/bottle_websocket.py,sha256=zqCE1rGlMeC9oxFOULNd137IWIhdetq83Oq5OoH_zGI,1953
 ctools/browser_element_tools.py,sha256=IFR_tWu5on0LxhuC_4yT6EOjwCsC-juIoU8KQRDqR7E,9952
 ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
@@ -19,9 +19,9 @@ ctools/credis.py,sha256=sW7yDQvxa7B4dWvGwUH7GROq-7ElRMDhFT6g2C8ryfE,4522
 ctools/cron_lite.py,sha256=f9g7-64GsCxcAW-HUAvT6S-kooScl8zaJyqwHY-X_rE,8308
 ctools/ctoken.py,sha256=NZSBGF3lJajJFLRIZoeXmpp8h5cKM0dAH2weySgeORc,882
 ctools/czip.py,sha256=g-2s804R06Bnp19ByVsYeRbwx5HQf_KwrStvHimVyns,632
-ctools/database.py,sha256=619rlE6LMZ5x9ijLv8WVmtUwbSL5tCHGwt_K-V_VmQY,6094
+ctools/database.py,sha256=NVdYROhlQfElAoaUloiMeQLwxENS7etY8FTZKaW0rI8,6414
 ctools/date_utils.py,sha256=h3rvlw_K2F0QTac2Zat_1us76R0P-Qj6_6NeQPfM3VE,1697
-ctools/dict_wrapper.py,sha256=6lZUyHomdn5QdjQTg7EL1sC_I6tOlh8ofMRQT3XGQjM,398
+ctools/dict_wrapper.py,sha256=KYFeNcaaumFXVQePnh-z7q5ANK_Arapki1qOlQBoc3k,473
 ctools/douglas_rarefy.py,sha256=43WRjGGsQ_o1yPEXypA1Xv_yuo90RVo7qaYGRslx5gQ,4890
 ctools/download_tools.py,sha256=oJbG12Hojd0J17sAlvMU480P3abi4_AB9oZkEBGFPuo,1930
 ctools/enums.py,sha256=QbHa3j7j4-BDdwaga5Y0nYfA2uNSVJDHumYdIZdKVkM,118
@@ -56,7 +56,7 @@ ctools/wordFill.py,sha256=dB1OLt6GLmWdkDV8H20VWbJmY4ggNNI8iHD1ocae2iM,875
 ctools/word_fill.py,sha256=xeo-P4DOjQUqd-o9XL3g66wQrE2diUPGwFywm8TdVyw,18210
 ctools/word_fill_entity.py,sha256=eX3G0Gy16hfGpavQSEkCIoKDdTnNgRRJrFvKliETZK8,985
 ctools/work_path.py,sha256=OmfYu-Jjg2huRY6Su8zJ_2EGFFhtBZFbobYTwbjJtG4,1817
-gomyck_tools-1.2.8.dist-info/METADATA,sha256=gUL87nZKJGUAwG9w5FJAMdTMQXDndYMOWKjK0ndbOL8,1376
-gomyck_tools-1.2.8.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.2.8.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.2.8.dist-info/RECORD,,
+gomyck_tools-1.2.9.dist-info/METADATA,sha256=WENt6ng1HZQLWvo5aTrEdurWq0HZc6AT-J092T1j62I,1354
+gomyck_tools-1.2.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+gomyck_tools-1.2.9.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.2.9.dist-info/RECORD,,

{gomyck_tools-1.2.8.dist-info → gomyck_tools-1.2.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

gomyck_tools-1.2.8.dist-info/METADATA

@@ -1,57 +0,0 @@
-Metadata-Version: 2.1
-Name: gomyck-tools
-Version: 1.2.8
-Summary: A tools collection for python development by hao474798383
-Home-page: https://blog.gomyck.com
-Author: gomyck
-Author-email: hao474798383@163.com
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-Requires-Dist: jsonpickle ~=3.4.2
-Requires-Dist: SQLAlchemy ~=2.0.36
-Requires-Dist: chardet ~=5.2.0
-Requires-Dist: psycopg2-binary ~=2.9.10
-Requires-Dist: croniter ~=5.0.1
-Requires-Dist: gmssl ~=3.2.2
-Requires-Dist: psutil ~=6.1.0
-Requires-Dist: jsonpath-ng ~=1.7.0
-Requires-Dist: bottle ~=0.13.2
-Requires-Dist: requests ~=2.32.3
-Requires-Dist: urllib3 ~=1.26.20
-Requires-Dist: kafka-python ~=2.0.2
-Requires-Dist: bs4 ~=0.0.2
-Requires-Dist: paho-mqtt ~=2.1.0
-Requires-Dist: fuzzywuzzy ~=0.18.0
-Requires-Dist: pymysql ~=1.1.1
-Requires-Dist: pyzipper ==0.3.6
-Requires-Dist: prometheus-client ==0.21.1
-Requires-Dist: paramiko ==3.5.0
-Requires-Dist: pyjwt ==2.10.1
-Requires-Dist: cryptography ==43.0.1
-Requires-Dist: redis ==5.2.1
-
-# Gomyck-Tools
-
-## project
-
-https://github.com/mzxc
-
-## install
-
-This package need python version >= 3.9
-
-```shell
-pip install gomyck-tools
-```
-
-## usage
-
-```python
-from ctools import sys_log
-sys_log.clog.info('hello world')
-```
-
-