gomyck-tools 1.2.10__tar.gz → 1.2.11__tar.gz

{gomyck_tools-1.2.10 → gomyck-tools-1.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.10
+Version: 1.2.11
 Summary: A tools collection for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -30,7 +30,7 @@ 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: cryptography==44.0.2
 Requires-Dist: redis==5.2.1
 
 # Gomyck-Tools

{gomyck_tools-1.2.10 → gomyck-tools-1.2.11}/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)

{gomyck_tools-1.2.10 → gomyck-tools-1.2.11}/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)}'

gomyck_tools-1.2.10/ctools/wordFill.py → gomyck-tools-1.2.11/ctools/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)
+

{gomyck_tools-1.2.10 → gomyck-tools-1.2.11}/ctools/database.py

@@ -87,6 +87,15 @@ def generate_custom_id():
 class BaseMixin(Base):
   __abstract__ = True
   obj_id = Column(Integer, primary_key=True, default=generate_custom_id)
+
+  @property
+  def query_params(self):
+    return self._query_params
+
+  @query_params.setter
+  def query_params(self, value):
+    self._query_params = value
+
   # ext1 = Column(String)
   # ext2 = Column(String)
   # ext3 = Column(String)

{gomyck_tools-1.2.10 → gomyck-tools-1.2.11}/ctools/dict_wrapper.py

@@ -4,6 +4,7 @@ __author__ = 'haoyang'
 __date__ = '2024/10/25 09:42'
 
 class DictWrapper(dict):
+
   def __getattr__(self, key):
     res = self.get(key)
     if res is None:

{gomyck_tools-1.2.10 → gomyck-tools-1.2.11}/gomyck_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.10
+Version: 1.2.11
 Summary: A tools collection for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck
@@ -30,7 +30,7 @@ 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: cryptography==44.0.2
 Requires-Dist: redis==5.2.1
 
 # Gomyck-Tools

{gomyck_tools-1.2.10 → gomyck-tools-1.2.11}/gomyck_tools.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ ctools/coord_trans.py
 ctools/credis.py
 ctools/cron_lite.py
 ctools/ctoken.py
+ctools/cword.py
 ctools/czip.py
 ctools/database.py
 ctools/date_utils.py
@@ -54,7 +55,6 @@ ctools/thread_pool.py
 ctools/upload_tools.py
 ctools/win_canvas.py
 ctools/win_control.py
-ctools/wordFill.py
 ctools/word_fill.py
 ctools/word_fill_entity.py
 ctools/work_path.py

{gomyck_tools-1.2.10 → gomyck-tools-1.2.11}/gomyck_tools.egg-info/requires.txt

@@ -18,5 +18,5 @@ pyzipper==0.3.6
 prometheus_client==0.21.1
 paramiko==3.5.0
 pyjwt==2.10.1
-cryptography==43.0.1
+cryptography==44.0.2
 redis==5.2.1

{gomyck_tools-1.2.10 → gomyck-tools-1.2.11}/setup.py

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