mwgencode 1.4.6__tar.gz → 1.4.7__tar.gz

{mwgencode-1.4.6/mwgencode.egg-info → mwgencode-1.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mwgencode
-Version: 1.4.6
+Version: 1.4.7
 Summary: 根据starUML文档产生flask专案的代码
 Home-page: https://bitbucket.org/maxwin-inc/gencode/src/
 Author: cxhjet

{mwgencode-1.4.6 → mwgencode-1.4.7}/gencode/gencode/template/swg_ctrl_code.pys

@@ -36,7 +36,7 @@ def {{path.name.replace('{', '').replace('}', '').replace('-', '_').replace('/',
     except Exception as e:
         db.session.rollback()
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": _(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
     return set_timezone(data.to_json()), 201, {"content-type": "application/json;charset=utf8"}
             {% endif %}
 
@@ -47,7 +47,7 @@ def {{path.name.replace('{', '').replace('}', '').replace('-', '_').replace('/',
     except Exception as e:
         db.session.rollback()
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": _(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
     data = {{act.default_resp.ref_name.capitalize()}}.query.filter_by(id=id).first_or_404()
     return set_timezone(data.to_json()), 201, {"content-type": "application/json;charset=utf8"}
             {% endif %}
@@ -57,7 +57,7 @@ def {{path.name.replace('{', '').replace('}', '').replace('-', '_').replace('/',
     except Exception as e:
         db.session.rollback()
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": _(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
     return "", 204
             {% endif %}
 
@@ -97,28 +97,28 @@ def {{path.name.replace('{', '').replace('}', '').replace('-', '_').replace('/',
         return data, 201, {"content-type": "application/json;charset=utf8"}
     except Exception as e:
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": _(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
             {% elif act.action == 'put' %}
     try:
         data = {}
         return data, 201, {"content-type": "application/json;charset=utf8"}
     except Exception as e:
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": _(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
             {% elif act.action == 'delete' %}
     try:
         data = {}
         return "", 204
     except Exception as e:
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": _(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
             {% elif act.action == 'get' %}
     try:
         data = {}
         return data, 200, {"content-type": "application/json;charset=utf8"}
     except Exception as e:
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": _(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
             {% else %}
     pass
             {% endif %}

{mwgencode-1.4.6 → mwgencode-1.4.7}/gencode/upgrade.py

@@ -123,33 +123,36 @@ class Upgrade_models(Upgrade_base):
         filename = os.path.join(os.path.realpath(self.root_path),'app','models.py')
         scodes = self.load_file(filename)
         code_ins = '''
-            # 支持自定义错误信息
-            db_custom_error = {
-                # 'uq_member_typeandemail': _('The email is duplicated. Please re-enter it.'),
-            }
-            def get_err_msg(message:str) -> str:
-                """
-                根据关键字获取自定义错误信息。
-                Args:
-                    message (str): 原始错误信息。
-                Returns:
-                    str: 返回错误信息，如果原始信息包含关键字则返回自定义信息，否则返回原始信息。
-                """
-                return next((custom_msg for key_word, custom_msg in db_custom_error.items() if key_word in message), message)
-        '''
+# 支持自定义错误信息
+db_custom_error = {
+    # 'uq_member_typeandemail': _('The email is duplicated. Please re-enter it.'),
+}
+def get_err_msg(message:str) -> str:
+    """
+    根据关键字获取自定义错误信息。
+    Args:
+        message (str): 原始错误信息。
+    Returns:
+        str: 返回错误信息，如果原始信息包含关键字则返回自定义信息，否则返回原始信息。
+    """
+    return next((custom_msg for key_word, custom_msg in db_custom_error.items() if key_word in message), message)
+'''
 
         try:
             scodes.index('db_custom_error = {')
+        except Exception as e:
             # 如果有定义类, 则把代码插入到类的前面一行,否则,追加在代码最后一行
             try:
-                code_ins_indx = scodes.index('class ')
+                code_ins_indx = 0
+                for line in scodes:
+                    if line.startswith('class '):
+                        break
+                    code_ins_indx += 1
+                scodes.insert(code_ins_indx, code_ins)
+                self.saveUTF8File(filename, scodes, exist_ok=True)
+
             except Exception as e:
-                code_ins_indx = len(scodes) + 2
-            scodes.insert(code_ins_indx, code_ins)
-            self.saveUTF8File(filename, scodes, exist_ok=True)
-        except Exception as e:
-            return
-           
+                return
 
     def merge_code(self):
         self.merge_models_err_msg()

{mwgencode-1.4.6 → mwgencode-1.4.7/mwgencode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mwgencode
-Version: 1.4.6
+Version: 1.4.7
 Summary: 根据starUML文档产生flask专案的代码
 Home-page: https://bitbucket.org/maxwin-inc/gencode/src/
 Author: cxhjet

{mwgencode-1.4.6 → mwgencode-1.4.7}/setup.py

@@ -7,7 +7,7 @@ def read(f):
 
 setup(
     name='mwgencode',
-    version='1.4.6',
+    version='1.4.7',
     author='cxhjet',
     author_email='cxhjet@qq.com',
     description="根据starUML文档产生flask专案的代码",