gomyck-tools 1.2.10__py3-none-any.whl → 1.2.12__py3-none-any.whl

ctools/bottle_web_base.py

@@ -128,24 +128,24 @@ def params_resolve(func):
       if content_type == 'application/json':
         params = request.json or {}
         dict_wrapper = DictWrapper(params)
-        dict_wrapper.query_params = query_params
+        dict_wrapper.update(query_params.dict)
         return func(params=dict_wrapper, *args, **kwargs)
       elif 'multipart/form-data' in content_type:
         form_data = request.forms.decode()
         form_files = request.files.decode()
         dict_wrapper = DictWrapper(form_data)
-        dict_wrapper.query_params = query_params
+        dict_wrapper.update(query_params.dict)
         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
+        dict_wrapper.update(query_params.dict)
         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
+        dict_wrapper.update(query_params.dict)
         return func(params=dict_wrapper, *args, **kwargs)
     else:
       return func(*args, **kwargs)

ctools/cjson.py

@@ -12,6 +12,7 @@ def dumps(obj, **kwargs) -> str:
   :param obj: 对象
   :return: json 字符串
   """
+  # indent = 2 可以美化输出
   if obj is None: return None
   if type(obj) == str: return obj
   return f'{jsonpickle.encode(obj, unpicklable=False, make_refs=False, **kwargs)}'

ctools/{wordFill.py → cword.py}

@@ -11,14 +11,20 @@
 # tpl.save('/Users/haoyang/Desktop/new_test2.docx')
 
 from docx import Document
-def merge_word_files(input_files, output_file):
+
+def merge_word_files(input_files: [], output_file: str):
     merged_doc = Document()
     for file in input_files:
         doc = Document(file)
         for element in doc.element.body:
             merged_doc.element.body.append(element)
     merged_doc.save(output_file)
-# 示例用法
-input_files = ["/Users/haoyang/Desktop/xxx.docx", "/Users/haoyang/Desktop/xxx 2.docx"]
-output_file = "/Users/haoyang/Desktop/merged_file.docx"
-merge_word_files(input_files, output_file)
+
+
+def read_word_file(input_file: str):
+  doc = Document(input_file)
+  text = []
+  for paragraph in doc.paragraphs:
+    text.append(paragraph.text)
+  return "\n".join(text)
+

ctools/database.py

@@ -87,6 +87,7 @@ def generate_custom_id():
 class BaseMixin(Base):
   __abstract__ = True
   obj_id = Column(Integer, primary_key=True, default=generate_custom_id)
+
   # ext1 = Column(String)
   # ext2 = Column(String)
   # ext3 = Column(String)

ctools/dict_wrapper.py

@@ -4,12 +4,11 @@ __author__ = 'haoyang'
 __date__ = '2024/10/25 09:42'
 
 class DictWrapper(dict):
+
   def __getattr__(self, key):
     res = self.get(key)
     if res is None:
-      res = self.query_params.get(key)
-      if res is None:
-        raise AttributeError(f" ==>> {key} <<== Not Found In This Entity!!!")
+      raise AttributeError(f" ==>> {key} <<== Not Found In This Entity!!!")
     if isinstance(res, dict):
       return DictWrapper(res)
     return res

gomyck_tools-1.2.12.dist-info/METADATA

@@ -0,0 +1,57 @@
+Metadata-Version: 2.1
+Name: gomyck-tools
+Version: 1.2.12
+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 ==44.0.2
+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.10.dist-info → gomyck_tools-1.2.12.dist-info}/RECORD

@@ -4,13 +4,13 @@ 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=N4B9DL4k2y-eXzWkOAoeuqHJRSntYpJHWvDk33Ma0-w,6336
+ctools/bottle_web_base.py,sha256=8Nb9CF8OqWl4HNsiiZuFOH509yAqViqYcC36vFcAI5A,6328
 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
 ctools/cftp.py,sha256=SkHPDvKu58jnMnl68u5WxWEiFWsm2C0CGa5_GR_Obcw,2481
-ctools/cjson.py,sha256=g5OldDeD7bmdw_4NNNPfAREGXNplQxY_l9vtTz-UBTs,1331
+ctools/cjson.py,sha256=d0RZ53b-M18OudRFGRtPCvvGofJcaLHdbNlTCemyJag,1365
 ctools/ckafka.py,sha256=EiiGCFkSbq8yRjQKVjc2_V114hKb8fJAVIOks_XbQ3w,5944
 ctools/compile_tools.py,sha256=Nybh3vnkurIKnPnubdYzigjnzFu4GaTMKPvqFdibxmE,510
 ctools/console.py,sha256=EZumuyynwteKUhUxB_XoulHswDxHd75OQB34RiZ-OBM,1807
@@ -18,10 +18,11 @@ ctools/coord_trans.py,sha256=pzIHxC4aLwvOF3eJG47Dda3vIq-Zp42xnu_FwILDflU,3951
 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/cword.py,sha256=ZRzAFn96yjo-hAbZuGIm4DoBAL2y8tFySWZ5xbYgY6Q,857
 ctools/czip.py,sha256=g-2s804R06Bnp19ByVsYeRbwx5HQf_KwrStvHimVyns,632
-ctools/database.py,sha256=NVdYROhlQfElAoaUloiMeQLwxENS7etY8FTZKaW0rI8,6414
+ctools/database.py,sha256=4j8pPBCJ8DwZrWpeBEiLVtYDMjzkDgkPGQTkOD_kzKI,6415
 ctools/date_utils.py,sha256=h3rvlw_K2F0QTac2Zat_1us76R0P-Qj6_6NeQPfM3VE,1697
-ctools/dict_wrapper.py,sha256=WTU2y7BSELD4fmh3e48k7aiuOxdsa0kJYmXnqDmhy8Y,522
+ctools/dict_wrapper.py,sha256=otxDX0CCKbBCVFtASweo5VEv6_ettH-CptA6azX1mJI,460
 ctools/douglas_rarefy.py,sha256=43WRjGGsQ_o1yPEXypA1Xv_yuo90RVo7qaYGRslx5gQ,4890
 ctools/download_tools.py,sha256=oJbG12Hojd0J17sAlvMU480P3abi4_AB9oZkEBGFPuo,1930
 ctools/enums.py,sha256=QbHa3j7j4-BDdwaga5Y0nYfA2uNSVJDHumYdIZdKVkM,118
@@ -52,11 +53,10 @@ ctools/thread_pool.py,sha256=qb68ULHy1K7u3MC7WP49wDhmgUhgWazd9FRuFbClET4,925
 ctools/upload_tools.py,sha256=sqe6K3ZWiyY58pFE5IO5mNaS1znnS7U4c4UqY8noED4,1068
 ctools/win_canvas.py,sha256=PAxI4i1jalfree9d1YG4damjc2EzaHZrgHZCTgk2GiM,2530
 ctools/win_control.py,sha256=35f9x_ijSyc4ZDkcT32e9ZIhr_ffNxadynrQfFuIdYo,3489
-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.10.dist-info/METADATA,sha256=fO_Tg_lm-pNhui62xw4AG9MQW58gvDQ1bKCyTpLqTkA,1355
-gomyck_tools-1.2.10.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-gomyck_tools-1.2.10.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.2.10.dist-info/RECORD,,
+gomyck_tools-1.2.12.dist-info/METADATA,sha256=Ouk6gMVb3jK374-BFLiozi3oMR-5idLHeBCEqfMdePA,1377
+gomyck_tools-1.2.12.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+gomyck_tools-1.2.12.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.2.12.dist-info/RECORD,,

{gomyck_tools-1.2.10.dist-info → gomyck_tools-1.2.12.dist-info}/WHEEL

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

gomyck_tools-1.2.10.dist-info/METADATA

@@ -1,57 +0,0 @@
-Metadata-Version: 2.1
-Name: gomyck-tools
-Version: 1.2.10
-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')
-```
-
-