mwgencode 1.3.13__tar.gz → 1.4.0__tar.gz

{mwgencode-1.3.13/mwgencode.egg-info → mwgencode-1.4.0}/PKG-INFO

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

{mwgencode-1.3.13 → mwgencode-1.4.0}/gencode/gen_code.py

@@ -134,12 +134,11 @@ class GenProject_Sample(GenProject_base):
             if not os.path.exists('docs'):
                 os.makedirs('docs')
 
-            # shutil.copy(os.path.join(self.sample_path, 'sample.mdj'),
-            #             os.path.join(os.path.realpath(self.rootpath),'docs', '%s.mdj'%p_name))
             template = self.env.get_template(r'sample.mdj')
+            # 不要覆盖原有的文件
             saveUTF8File(os.path.join(os.path.realpath(self.rootpath),'docs', '%s.mdj'%p_name),
                          [template.render(service_name=p_name)],
-                         writegeninfo=False)
+                         writegeninfo=False,exist_ok=False)
         gen_code_file = os.path.join(os.path.realpath(self.rootpath), 'gen_code_run.py')
         if include_gencoderun and not os.path.exists(gen_code_file):
             template = self.env.get_template(r'gen_code_run.pys')
@@ -236,6 +235,13 @@ class GenProject_Flask(GenProject_base):
                          exist_ok=False
                          )
 
+        # saveUTF8File(os.path.join(os.path.realpath(self.rootpath), 'gen_code_run.py'),
+        #                  [self.env.get_template('gen_code_run.pys').render(root_path=os.path.split(self.rootpath)[-1],
+        #                                                         swagger=gen.swager)],
+        #                  exist_ok=False
+        #                  )
+
+
         saveUTF8File(os.path.join(os.path.realpath(self.rootpath), f'{gen.swager.name}-k8s.yml'),
                      [self.env.get_template('k8s-tmp.yml').render(root_path=os.path.split(self.rootpath)[-1],
                                                                           swagger=gen.swager, plugins=plugins)],
@@ -258,8 +264,8 @@ class GenProject_Flask(GenProject_base):
         #              os.path.join(os.path.realpath(self.rootpath),'config-sample.ini'))
         self.save_as(os.path.join(self.sample_path,'babel.cfg'),
                      os.path.join(os.path.realpath(self.rootpath), 'babel.cfg'))
-        self.save_as(os.path.join(self.sample_path,'gen_code_run.pys'),
-                     os.path.join(os.path.realpath(self.rootpath),'gen_code_run.py'))
+        # self.save_as(os.path.join(self.sample_path,'gen_code_run.pys'),
+        #              os.path.join(os.path.realpath(self.rootpath),'gen_code_run.py'))
         self.save_as(os.path.join(self.sample_path, 'requirements.txt'),
                      os.path.join(os.path.realpath(self.rootpath), 'requirements.txt'))
         self.save_as(os.path.join(self.sample_path, 'gitignore.git'),
@@ -278,12 +284,12 @@ class GenProject_Flask(GenProject_base):
         if include_model:
             self.save_as(os.path.join(self.sample_path, 'utils.pys'),
                          os.path.join(os.path.realpath(self.rootpath), 'app', 'utils.py'))
-            self.save_as(os.path.join(self.sample_path, 'migrate_run.pys'),
-                         os.path.join(os.path.realpath(self.rootpath), 'migrate_run.py'))
-            self.save_as(os.path.join(self.sample_path, 'migrate_run.bat'),
-                         os.path.join(os.path.realpath(self.rootpath), 'migrate_run.bat'))
-            self.save_as(os.path.join(self.sample_path, 'migrate_run.bat'),
-                         os.path.join(os.path.realpath(self.rootpath), 'migrate_run.sh'))
+            # self.save_as(os.path.join(self.sample_path, 'migrate_run.pys'),
+            #              os.path.join(os.path.realpath(self.rootpath), 'migrate_run.py'))
+            # self.save_as(os.path.join(self.sample_path, 'migrate_run.bat'),
+            #              os.path.join(os.path.realpath(self.rootpath), 'migrate_run.bat'))
+            # self.save_as(os.path.join(self.sample_path, 'migrate_run.bat'),
+            #              os.path.join(os.path.realpath(self.rootpath), 'migrate_run.sh'))
         if include_seeds:
             # self.save_as(os.path.join(self.sample_path, 'config.ini'),
             #              os.path.join(os.path.realpath(self.rootpath), 'seeds', 'config.ini'))

{mwgencode-1.3.13 → mwgencode-1.4.0}/gencode/gencode/template/gen_code_run.pys

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from gencode.gen_code import GenCode,GenProject_Flask
+from gencode.gen_code import GenCode,GenProject_Flask,GenSwagger
 
 if __name__ == '__main__':
     rootpath = r'.'
@@ -8,6 +8,14 @@ if __name__ == '__main__':
     g = GenCode(umlfile,rootpath)
     #  把boclass 汇出成 swagger class
     g.export(umlfile,umlfile,exclude_classes=['employee','depart','company','company_auth'])
+
+    # 从modelfile中汇入到swagerfile中，并生成swagger类，不会重复导入
+    # swg = GenSwagger(umlfile,rootpath)
+    # swg.export_one_swgclass('MemberUser',xmifile)
+    # # 为swagger类增加 方法,范例
+    # swg.add_operation('EmpUsermng', 'empuser_register', 'post')
+    # swg.add_operation('verificationcode_mng', 'email_verificationcode', 'get')
+
     #  产生model单元，type= flask:产生flask_sqlalchemy 的 model
     #               type = sql ：产生 sqlalchemy 的 model
     g.model()

{mwgencode-1.3.13 → mwgencode-1.4.0}/gencode/upgrade.py

@@ -57,15 +57,15 @@ class Upgrade_k8s(Upgrade_base):
         filename = os.path.join(os.path.realpath(self.root_path),'app','config.py')
         scodes = self.load_file(filename)
         code_ins = f'''
-    # 支持k8s
-    SUPPORT_K8S = os.environ.get('SUPPORT_K8S', 'false').lower() == 'true'
-    @classmethod
-    def get_host_addr(cls):
-        from mwsdk import AgentConf
-        if cls.SUPPORT_K8S:
-            return '{self.swagger.name}-server'
-        return AgentConf().bind_ip
-        '''
+            # 支持k8s
+            SUPPORT_K8S = os.environ.get('SUPPORT_K8S', 'false').lower() == 'true'
+            @classmethod
+            def get_host_addr(cls):
+                from mwsdk import AgentConf
+                if cls.SUPPORT_K8S:
+                    return '{self.swagger.name}-server'
+                return AgentConf().bind_ip
+                '''
         try:
             scodes.index('    def get_host_addr(cls):')
         except Exception as e:

{mwgencode-1.3.13 → mwgencode-1.4.0}/manage.py

@@ -1,6 +1,7 @@
 from typing import TextIO
 import logging
 from gencode.gen_code import GenCode,GenProject_Sample,GenProject_Flask,GenProject_Aiohttp,GenSwagger
+from gencode.importmdj.import_swagger2_class import  ImportSwagger
 import argparse
 import os
 import sys
@@ -48,7 +49,7 @@ class Gen_Code():
         try:
             return os.path.join(self._get_rootpath(),
                                    self._get_config()['project']['doc_dir'],
-                                   self._get_config().get('project',{}).get('models',{}).get(self.args.model)['file'])
+                                   self._get_config()['project']['models']['main']['file'])
         except Exception as e:
             raise Exception('gen_code.yaml 文件内容出错，%s'%e)
 
@@ -61,44 +62,17 @@ class Gen_Code():
                         r'%s' % self.args.project_name)
         gp.gen_code(self.args.python_code)
 
-    def gen_model(self,outfile='model_base.py'):
-        '''
-        产生model单元
-        :return:
-        '''
-        logging.info(self.args)
-        g = GenCode(self.umlfile, self.rootpath)
-        g.model(outfile=outfile)
-
-    def gen_swagger(self):
-        '''
-        产生swagger.yaml单元
-        :return:
-        '''
-        g = GenCode(self.umlfile, self.rootpath)
-        g.swagger()
 
     def gen_export(self):
-        exp = ExportClass2SWGClass(self.umlfile,self.umlfile)
-        exp.export()
+        umlfile = self._get_umlfile()
+        swg = GenSwagger(umlfile)
+        swg.export_one_swgclass(self.args.umlclass,umlfile)
 
     def gen_add(self):
-        prj_type = self._get_apptype()
         umlfile = self._get_umlfile()
-        prj_rootpath = self._get_rootpath()
-        if prj_type == 'flask':
-            '''
-            1，修改gen_code.yaml
-            2，生成uml
-            3，修改代码
-            '''
-            pass
-        elif prj_type =='aiohttp':
-            pass
-        else:
-            raise Exception('不支持该project type(%s)'%prj_type)
-
-
+        swg = GenSwagger(umlfile)
+        swg.add_operation(self.args.swagger_package, self.args.umlclass_operation, self.args.http_method_type)
+ 
     def gen_build(self):
         prj_type = self._get_apptype()
         umlfile = self._get_umlfile()
@@ -112,12 +86,17 @@ class Gen_Code():
         else:
             raise Exception('不支持该project type(%s)'%prj_type)
         gp.gen_code()
+        g = GenCode(umlfile, prj_rootpath)
+        # 产生model
+        g.model()
 
     def gen_upgrade(self):
         # logging.info(self.args)
         dir = self.args.dir
+        umlfile = self._get_umlfile()
+        swg = ImportSwagger().impUMLModels(umlfile)
         if self.args.type=='k8s':
-            k8s = upgrade.Upgrade_k8s(dir)
+            k8s = upgrade.Upgrade_k8s(dir,swg)
             k8s.merge_code()
 
 def main():
@@ -128,7 +107,7 @@ def main():
     subparsers = parser.add_subparsers(title='Command')
 
     # 初始项目，建立sample umlmodel，config等文件
-    gp_parser = subparsers.add_parser('init', help='创建项目的初始文件，包括uml，cconfig等文件', add_help=False)
+    gp_parser = subparsers.add_parser('init', help='创建项目的初始文件，包括uml，cconfig等文件', add_help=True)
     gp_parser.set_defaults(command='init_project')
     gp_parser.add_argument('-f', '--umlfile',
                         type = str,
@@ -145,20 +124,24 @@ def main():
                         help='产生gen_code_run.py 单元',
                         action='store_true')
 
-    gp_parser = subparsers.add_parser('build', help='产生项目相关的文件'
-                                                 '-m model名称', add_help=False)
+    gp_parser = subparsers.add_parser('build', help='产生项目相关的文件,UMLmodel或gen_code.yaml有变更时,需要重新执行,以生成代码'
+                                                 '-m model名称', add_help=True)
     gp_parser.set_defaults(command='gen_build')
-    gp_parser.add_argument('-m','--model', help='model名称',type=str,default = 'main')
+    # gp_parser.add_argument('-m','--model', help='model名称',type=str,default = 'main')
 
-    gp_parser = subparsers.add_parser('add', help='添加新的model', add_help=False)
+    gp_parser = subparsers.add_parser('add', help='添加一个方法到swagger相关类', add_help=True)
     gp_parser.set_defaults(command='gen_add')
-    gp_parser.add_argument('-m','--model', help='model名称',type=str)
+    # gp_parser.add_argument('-m','--model', help='model名称,暂',type=str)
+    gp_parser.add_argument('-p','--swagger_package', help='swagger package class名称,如:employeemng',type=str)
+    gp_parser.add_argument('-o','--umlclass_operation', help='uml class的operation名称,如: get_employee',type=str)
+    gp_parser.add_argument('-t','--http_method_type', help='操作类别,如:get,post,put,delete',type=str,default='get')
 
-    gp_parser = subparsers.add_parser('exp', help='把mdj的umlclass 转成 swagger class', add_help=False)
+    gp_parser = subparsers.add_parser('exp', help='把logic view中的umlclass 生成 swagger class,包含 get,post,put,delete 的operation', add_help=True)
     gp_parser.set_defaults(command='gen_export')
+    gp_parser.add_argument('-c','--umlclass', help='logic view中的uml class 名称, 如:employee',type=str)
 
     gp_parser = subparsers.add_parser('upgrade', help='升级项目相关的文件,如:k8s'
-                                                 '-t 升级类型名称', add_help=False)
+                                                 '-t 升级类型名称', add_help=True)
     gp_parser.set_defaults(command='gen_upgrade')
     gp_parser.add_argument('-t','--type',
                            help='升级类型的名称,如:k8s',
@@ -168,17 +151,28 @@ def main():
                            help='专案目录(default: 当前目录名)',
                            default='.')
 
-
-
-    # gp_parser = subparsers.add_parser('gctrl', help='根据xmi创建umlclass 的 swagger ctrole单元', add_help=False)
-    # gp_parser.set_defaults(command='gen_ctrl')
-
     if len(sys.argv)==1:
         parser.print_help()
-        print('sample 1 : python gen_code.py -f ./docs/test.mdj -p d:/temp/swg -t aiohttp gp')
-        print('sample 2 : gencode -f ./docs/test.mdj  -t aiohttp gp')
-        print('sample 3 : gencode -f ./docs/test.mdj gp')
-        print('sample 4 : gencode gp #-f gencode.mdj -t flask')
+        print('一)  初始化专案的命令')
+        print('     gencode init -h   # 查看命令帮助,所有参数都可以独立使用,也可以组合使用')
+        print('     gencode init      # 产生一个以当前目录名为专案名称的flask项目, 如果想修改专案参数, 请直接修改gen_code.yaml文件')
+        print('     gencode init -p drts-order -t flask   # 产生一个专案名称为drts-order 的flask项目')
+        print('     gencode init -c  # 产生gen_code_run.py单元')
+        print('二)  产生专案所有的命令,有变更model或配置时时,需要重新执行,以生成代码:')
+        print('     gencode build  # 按gen_code.yaml文件,产生项目的所有文件')
+        print('三)  根据类名生成swagger class,需要在staruml中 执行 reload ')
+        print('     gencode exp -h   # 查看命令帮助,所有参数都可以独立使用,也可以组合使用')
+        print('     gencode exp -c employee  # 把logic view中的employee 生成 swagger class,包含 get,post,put,delete 的operation')
+        print('四)  给swagger class 增加一个操作(operation),需要在staruml中 执行 reload ')
+        print('     gencode add -h   # 查看命令帮助,所有参数都可以独立使用,也可以组合使用')
+        print('     gencode add -p employeemng -o get_employee -t get  # 给swagger class employeemng 增加一个get_employee的操作,操作类型为get')
+        print('五)  升级代码,如: 支持 k8s')
+        print('     gencode upgrade -h   # 查看命令帮助,所有参数都可以独立使用,也可以组合使用')
+        print('     gencode upgrade -t k8s   # 升级旧专案支持 k8s')        
+        print('备注: 当不是在当前项目的根目录执行时,需要指定rootpath参数,如:')
+        print('     gencode -r ./mwwork/projects/drts-order build  ')
+        print('     gencode -r ./mwwork/projects/drts-order exp -c employee  ')
+        print('     gencode -r ./mwwork/projects/drts-order  add -p employeemng -o get_employee -t get' )
         sys.exit()
     args = parser.parse_args(sys.argv[1:])
     print(args)
@@ -187,26 +181,14 @@ def main():
     print('gen code success!')
 
 if __name__ == '__main__':
-    # main()
-    rootpath = r'./order_system'
-    # umlfile = r'./docs/order_system.mdj'
-    umlfile = r'D:\mwwork\projects\mwgencode\order_system\docs\test.mdj'
-    # umlfile = r'D:\mwwork\projects\mwgencode\order_system\docs\routemng.mdj'
-    g = GenCode(umlfile, rootpath)
-    # # #  把boclass 汇出成 swagger class
-    g.export(umlfile,umlfile,exclude_classes=['user'])
-    # # #  产生model单元，type= flask:产生flask_sqlalchemy 的 model
-    # # #               type = sql ：产生 sqlalchemy 的 model
-    g.model()
-    gen_swg = GenSwagger(umlfile)
-    gen_swg.export_one_swgclass('xxxx')
-    gen_swg.add_operation('xxxxmng','tttt',)
-    p = GenProject_Flask(umlfile, rootpath)
-    # # 产生专案代码
-    p.gen_code()
-    # # umlfile=r'D:\mwwork\projects\mwgencode\order_system\docs\realtime.mdj'
-    # # gen_swg = GenSwagger(umlfile)
-    # # gen_swg.add_operation('geomng','tttt','post')
-    # #
-    # # p = GenProject_Aiohttp(umlfile,rootpath)
-    # # p.gen_code()
+    # 设置环境变量
+    os.environ['PYTHONPATH'] = os.path.dirname(os.path.abspath(__file__))
+    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','exp','-c','order'])
+        sys.argv.extend(['-r','./testproject','add','-p','ordermng','-o','delete_orders','-t','delete'])
+        # sys.argv.extend(['upgrade','-d','./testproject'])
+    main()
+ 

{mwgencode-1.3.13 → mwgencode-1.4.0/mwgencode.egg-info}/PKG-INFO

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

{mwgencode-1.3.13 → mwgencode-1.4.0}/mwgencode.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ MANIFEST.in
 README.rst
 help.md
 manage.py
+pyproject.toml
 setup.py
 gencode/__init__.py
 gencode/dd_models.py

mwgencode-1.4.0/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"

{mwgencode-1.3.13 → mwgencode-1.4.0}/setup.py

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