mwgencode 1.4.4__tar.gz → 1.4.6__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: mwgencode
-Version: 1.4.4
+Version: 1.4.6
 Summary: 根据starUML文档产生flask专案的代码
 Home-page: https://bitbucket.org/maxwin-inc/gencode/src/
 Author: cxhjet
@@ -46,7 +46,6 @@ Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
 Dynamic: home-page
-Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{mwgencode-1.4.4 → mwgencode-1.4.6}/gencode/gen_code.py

@@ -337,7 +337,7 @@ class GenProject_Flask(GenProject_base):
                          exist_ok=False
                          )
         try:
-            k8s = upgrade.Upgrade_k8s('.',gen.swager)
-            k8s.merge_code()
+            upgrade.Upgrade_manage('.',gen.swager).upgrade()
+
         except Exception as e:
             print('升级 k8s 失败,error:',str(e))

{mwgencode-1.4.4 → mwgencode-1.4.6}/gencode/gencode/gen_bo_models_code.py

@@ -628,6 +628,11 @@ class BoCodeGenerator_flask(BoCodeGenerator_base):
                     if code.startswith('# create '):
                         continue
                     codes.append(code.rstrip())
+        else:
+            temp_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'template','flask_models.pys')
+            with codecs.open(temp_path, "r", "utf-8") as file:
+                for code in file.readlines():
+                    codes.append(code.rstrip())
         return codes
 
     def _gen_model_py_code(self,outfile):

mwgencode-1.4.6/gencode/gencode/template/flask_models.pys

@@ -0,0 +1,17 @@
+from .models_base import *
+from flask_babel import gettext as _
+
+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)
+
+

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

@@ -16,6 +16,15 @@ def write_gen_info(f):
     f.write('# create time :%s'%datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')+'\n')
     f.write('#' * 40+'\n')
 
+class Upgrade_manage:
+    def __init__(self,dir,swagger):
+        self.upgrade_k8s = Upgrade_k8s(dir,swagger)
+        self.upgrade_models = Upgrade_models(dir,swagger)
+
+    def upgrade(self):
+        self.upgrade_k8s.merge_config()
+        self.upgrade_models.merge_code()
+
 class Upgrade_base:
     def __init__(self,dir,swagger):
         self.root_path =dir
@@ -109,5 +118,38 @@ class Upgrade_k8s(Upgrade_base):
         self.merge_run()
         self.merge_config()
 
+class Upgrade_models(Upgrade_base):
+    def merge_models_err_msg(self):
+        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)
+        '''
 
+        try:
+            scodes.index('db_custom_error = {')
+            # 如果有定义类, 则把代码插入到类的前面一行,否则,追加在代码最后一行
+            try:
+                code_ins_indx = scodes.index('class ')
+            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
+           
 
+    def merge_code(self):
+        self.merge_models_err_msg()

{mwgencode-1.4.4 → mwgencode-1.4.6}/manage.py

@@ -186,9 +186,9 @@ if __name__ == '__main__':
     if len(sys.argv) == 1:
         # 调试时使用的默认参数
         # sys.argv.extend(['init', '-p', 'testproject', '-t', 'flask','-c'])
-        # sys.argv.extend(['-r','./testproject','build'])
+        sys.argv.extend(['-r','./testproject','build'])
         # sys.argv.extend(['-r','./testproject','exp','-c','order'])
-        sys.argv.extend(['-r','./testproject','add','-p','ordermng','-o','delete_orders','-t','delete'])
+        # sys.argv.extend(['-r','./testproject','add','-p','ordermng','-o','delete_orders','-t','delete'])
         # sys.argv.extend(['upgrade','-d','./testproject'])
     main()
  

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: mwgencode
-Version: 1.4.4
+Version: 1.4.6
 Summary: 根据starUML文档产生flask专案的代码
 Home-page: https://bitbucket.org/maxwin-inc/gencode/src/
 Author: cxhjet
@@ -46,7 +46,6 @@ Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
 Dynamic: home-page
-Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

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

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

mwgencode-1.4.4/gencode/gencode/template/flask_models.pys

@@ -1,107 +0,0 @@
-from sqlalchemy import Table,Column, Integer, String, ForeignKey, Boolean,\
-                DateTime,Time,Date,Float
-from sqlalchemy.orm import relationship,aliased
-from sqlalchemy import or_
-from .ext import Base as Model
-import json
-from enum import Enum
-
-class SqlType(Enum):
-    mysql = 0 #'mysql+mysqldb'
-    mssql = 1 #'mssql+pymssql'
-    sqlite = 2 #'sqlite:'
-def getSqlType():
-    sql_uri =  current_app.config['SQLALCHEMY_DATABASE_URI']
-    if sql_uri.startswith('mysql+mysqldb'):
-        return SqlType.mysql.value
-    elif sql_uri.startswith('mssql+pymssql'):
-        return SqlType.mssql.value
-    elif sql_uri.startswith('sqlite:'):
-        return SqlType.sqlite.value
-    else:
-        assert False,'不能识别的SQL驱动,%s'%sql_uri
-def new_id():
-    if getSqlType() == SqlType.sqlite.value:
-        import uuid
-        return str(uuid.uuid1())
-    else:
-        connection = db.engine.raw_connection()
-        try:
-            cursor = connection.cursor()
-            if getSqlType()==SqlType.mysql.value:
-                cursor.callproc("sp_getobjectids_new", [1])
-            elif getSqlType()==SqlType.mssql.value:
-                # 不知为何cursor.callproc 在 mssql中取不到资料？？
-                cursor.execute("exec pro_gettableid 1")
-            newid = cursor.fetchone()[0]
-            cursor.close()
-            connection.commit()
-        finally:
-            connection.close()
-        return str(newid)
-
-{% for enum in enumerations %}
-class {{enum.name}}(Enum):
-    {% for k,v in enum.columns.items() %}
-    {{k}} ={{v}}
-    {% endfor %}
-{% endfor %}
-
-{% for _,table in metatables.items() %}
-{{ table.class_name }} = Table('{{table.table_name}}', Model.metadata,
-    Column('{{table['columns'][0].dbname}}',{{table['columns'][0].type}}, ForeignKey('{{table['columns'][0].reftable}}.{{table['columns'][0].refid}}')),
-    Column('{{table['columns'][1].dbname}}',{{table['columns'][1].type}}, ForeignKey('{{table['columns'][1].reftable}}.{{table['columns'][1].refid}}'))
-)
-{% endfor %}
-
-
-{% for _,table in tables.items() %}
-class {{ table.class_name }}({% if table.parent_name %}{{table.parent_name}}{% else %}Model{% endif %}):
-    {% if table.doc %}
-    """
-    {{table.doc}}
-    """
-    {% endif %}
-    {% if table.table_name %}
-    __tablename__ = '{{table.table_name}}'
-    {% endif %}
-    {% if table.discriminator_column %}
-    {{table.discriminator_column.name}} = Column({{table.discriminator_column.dbname}}{{table.discriminator_column.type}})
-    {% endif %}
-    {% if table.mapper_args %}
-    __mapper_args__ = {{table.mapper_args}}
-    {% endif %}
-    {% for uc in table.unique_constraints %}
-    {{ uc }}
-    {% endfor %}
-    {% for fld in table.columns %}
-    {% if fld.doc %}
-    # {{fld.doc}}
-    {% endif %}
-    {{fld.name}} = Column({{fld.dbname}}{{fld.type}}{{fld.default}}{{fld.unique}}{{fld.nullable}}{{fld.primary_key}})
-    {% endfor %}
-    {% for fld in table.fkeyids %}
-    {{fld.name}} = Column({{fld.dbname}}{{fld.type}},ForeignKey("{{fld.reftable}}.{{fld.refid}}"){{fld.default}}{{fld.unique}}{{fld.nullable}}{{fld.primary_key}})
-    {% endfor %}
-    {% for rs in table.relationsips %}
-    {{rs.name}} = relationship("{{rs.relationship_cls}}"{{rs.back_populates}}{{rs.uselist}}{{rs.foreign_keys}}{{rs.secondary}}{{rs.lazy}}{{rs.cascade}}{{rs.remote_side}}{{rs.primaryjoin}}{{rs.order_by}})
-    {% endfor %}
-
-    {% for func in table.funcs %}
-    {%if func.isstatic%}
-    @staticmethod
-    {% endif %}
-    def {{func.name}}({{func.self_param}}{{func.params}}):
-{{func.codes}}
-    {% endfor %}
-
-
-    def __repr__(self):
-        return json.dumps(self.to_json())
-
-    def to_json(self):
-        return {key: getattr(self, key) for key in self.__table__.columns.keys()
-                   if hasattr(self,key)
-               }
-
-{% endfor %}