mwgencode 1.4.7__tar.gz → 1.5.0__tar.gz

{mwgencode-1.4.7 → mwgencode-1.5.0}/CHANGES.txt

@@ -1,4 +1,6 @@
 Changes
+1.5.0(2025-11-17)
+- 升级支持python12
 
 1.3.10(2024-02-26)
 - drone.yml 支持tag

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mwgencode
-Version: 1.4.7
+Version: 1.5.0
 Summary: 根据starUML文档产生flask专案的代码
 Home-page: https://bitbucket.org/maxwin-inc/gencode/src/
 Author: cxhjet
@@ -15,26 +15,28 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE.txt
 Requires-Dist: mwutils>=0.1.41
 Requires-Dist: mwauth>=0.4.49
-Requires-Dist: mwsdk>=0.3.2
+Requires-Dist: mwsdk>=0.3.3
 Requires-Dist: mwpermission>=0.1.26
 Requires-Dist: mw-aiohttp-session>=0.1.13
 Requires-Dist: mw-aiohttp-babel>=0.1.7
 Requires-Dist: mw-aiohttp-security>=0.1.13
-Requires-Dist: SQLAlchemy>=1.4.31
+Requires-Dist: mwgencode-mcp>=0.1.4
+Requires-Dist: SQLAlchemy>=2.0.44
 Requires-Dist: pyJWT
 Requires-Dist: python-consul
 Requires-Dist: flask_migrate
 Requires-Dist: flask-babel
 Requires-Dist: Flask-Cors
 Requires-Dist: Flask-Redis
-Requires-Dist: Flask-SQLAlchemy>=2.5.1
+Requires-Dist: Flask-SQLAlchemy>=3.1.1
 Requires-Dist: geojson
 Requires-Dist: redis>=4.0.2
-Requires-Dist: connexion[swagger-ui]>=2.11.1
-Requires-Dist: Flask>=2.0.2
+Requires-Dist: connexion[swagger-ui]>=3.3.0
+Requires-Dist: Flask>=3.1.2
 Requires-Dist: Werkzeug>=0.15.5
 Requires-Dist: yarl>=1.4.2
 Requires-Dist: xlrd
@@ -215,6 +217,8 @@ maxwin 开发框架使用的 lib
 
 
 Changes
+1.5.0(2025-11-17)
+- 升级支持python12
 
 1.3.10(2024-02-26)
 - drone.yml 支持tag

{mwgencode-1.4.7 → mwgencode-1.5.0}/gencode/gen_code.py

@@ -209,6 +209,9 @@ class GenProject_Flask(GenProject_base):
         saveUTF8File(os.path.join(os.path.realpath(self.rootpath), 'Dockerfile'),
                      [self.env.get_template('Dockerfile.tmp').render(swagger=gen.swager)],
                      exist_ok=False)
+        saveUTF8File(os.path.join(os.path.realpath(self.rootpath), 'Dockerfile_dg'),
+                     [self.env.get_template('Dockerfile_dg.tmp').render(swagger=gen.swager)],
+                     exist_ok=False)
         saveUTF8File(os.path.join(os.path.realpath(self.rootpath), '.drone.yml'),
                      [self.env.get_template('drone.tmp').render(swagger=gen.swager)],
                      exist_ok=False)
@@ -235,11 +238,11 @@ 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), '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'),

{mwgencode-1.4.7 → mwgencode-1.5.0}/gencode/gencode/sample/gitignore.git

@@ -11,4 +11,5 @@ uwsgi.ini
 migrate_run.py
 migrate_run.bat
 migrate_run.sh
-migrations
+migrations
+.vscode

mwgencode-1.5.0/gencode/gencode/template/Dockerfile dg.tmp

@@ -0,0 +1,59 @@
+FROM maxwinch/flask-py3.12:v1 as build
+COPY ./requirements.txt /var/requirements.txt
+COPY . /var/{{swagger.name}}
+ENV PIP_INDEX_URL https://mirrors.aliyun.com/pypi/simple
+WORKDIR /var/{{swagger.name}}
+RUN echo "https://mirrors.aliyun.com/alpine/latest-stable/main" > /etc/apk/repositories \
+    && echo "https://mirrors.aliyun.com/alpine/latest-stable/community" >> /etc/apk/repositories \
+    && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
+    && apk add --update --no-cache --virtual  .build-deps \
+                make \
+                gcc \
+                libc-dev \
+                jpeg-dev \
+                zlib-dev \
+                linux-headers \
+                python3-dev \
+                # 解决 ImageFont.truetype 出错的问题
+                freetype \
+                freetype-dev \
+    && pip install --upgrade pip \
+    && pip3 install -r /var/requirements.txt \
+    && python /var/{{swagger.name}}/setup.py install \
+    && find /var/{{swagger.name}} -depth \
+		\( \
+		    \( -type d -a -name app -o -name docs -o -name build -o -name .git  -o -name migrations \
+		      -o -name .idea -o -name __pycache__ -o -name swagger -o -name seeds -o -name -tests \) \
+		    -o \
+		    \( -type f -a -name '*.pyc' -o -name '*.pyo'  -o -name '*.c' \
+		       -o -name '*.md' -o -name '*.pot' -o -name 'config-sample.ini' \
+		       -o -name 'migrate_run.*' -o -name '*.mdj' -o -name '*.sqlite' -o -name '*.yaml' \
+		        -o -name 'gen_code_run.py' -o -name 'run.sh'  -o -name 'run-dev.sh' -o -name 'uwsgi-dev.ini' \
+		       -o -name 'setup.py' -o -name 'requirements.txt' -o -name 'Dockerfile' -o -name 'Dockerfile_dev' \
+		       -o -name 'docker-compose-dev.yaml' \) \
+		\) -exec rm -rf '{}' + \
+	# 删除APP package 中的源码
+	&& find /usr/local/lib/python3.12/site-packages/app -depth \
+		\( \
+		    \( -type d -a -name __pycache__ \) \
+		    -o \
+		    \( -type f -a -name '*.pyc' -o -name '*.pyo'  -o -name '*.c' -o -name '*.py' \) \
+		\) -exec rm -rf '{}' + \
+    && find /usr/local -depth \
+		\( \
+		    \( -type d -a -name test -o -name tests -o -name __pycache__ \) \
+		    -o \
+		    \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
+		\) -exec rm -rf '{}' + \
+	&& runDeps="$( \
+		scanelf --needed --nobanner --recursive /usr/local \
+			| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
+			| sort -u \
+			| xargs -r apk info --installed \
+			| sort -u \
+	)" \
+	&& apk add --virtual .python-rundeps $runDeps \
+    && apk del .build-deps
+FROM maxwinch/flask-py3.12:v1
+COPY --from=build /var/{{swagger.name}} /var/{{swagger.name}}
+COPY --from=build /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages

{mwgencode-1.4.7 → mwgencode-1.5.0}/gencode/gencode/template/Dockerfile.tmp

@@ -1,4 +1,4 @@
-FROM maxwinch/flask-py3.7:v2 as build
+FROM maxwinch/flask-py3.12:v1 as build
 COPY ./requirements.txt /var/requirements.txt
 COPY . /var/{{swagger.name}}
 WORKDIR /var/{{swagger.name}}
@@ -29,7 +29,7 @@ RUN apk add --update --no-cache --virtual  .build-deps \
 		       -o -name 'docker-compose-dev.yaml' \) \
 		\) -exec rm -rf '{}' + \
 	# 删除APP package 中的源码
-	&& find /usr/local/lib/python3.7/site-packages/app -depth \
+	&& find /usr/local/lib/python3.12/site-packages/app -depth \
 		\( \
 		    \( -type d -a -name __pycache__ \) \
 		    -o \
@@ -50,6 +50,6 @@ RUN apk add --update --no-cache --virtual  .build-deps \
 	)" \
 	&& apk add --virtual .python-rundeps $runDeps \
     && apk del .build-deps
-FROM maxwinch/flask-py3.7:v2
+FROM maxwinch/flask-py3.12:v1
 COPY --from=build /var/{{swagger.name}} /var/{{swagger.name}}
-COPY --from=build /usr/local/lib/python3.7/site-packages /usr/local/lib/python3.7/site-packages
+COPY --from=build /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages

{mwgencode-1.4.7 → mwgencode-1.5.0}/gencode/gencode/template/__init__.pys

@@ -90,10 +90,12 @@ def create_app_swagger(config_name):
 
     return app_swg
 
-@babel.localeselector
+# @babel.localeselector
 def get_locale():
     # 默认取英文
     lang =  get_lang(None)
     # 当前版本的 flask_babel 只支持 “_”区隔
     return lang.replace('-','_')
 
+babel.locale_selector = get_locale
+

{mwgencode-1.4.7 → mwgencode-1.5.0}/gencode/gencode/template/setup.tmp

@@ -29,17 +29,17 @@ try:
         # 有多个目录
         # package_data={'app': package_datas},
         data_files=[
-                    # ('/usr/local/lib/python3.7/site-packages/app/translations/en/LC_MESSAGES',
+                    # ('/usr/local/lib/python3.12/site-packages/app/translations/en/LC_MESSAGES',
                     #          ['app/translations/en/LC_MESSAGES/messages.mo']),
-                    # ('/usr/local/lib/python3.7/site-packages/app/translations/zh_Hans_CN/LC_MESSAGES',
+                    # ('/usr/local/lib/python3.12/site-packages/app/translations/zh_Hans_CN/LC_MESSAGES',
                     #          ['app/translations/zh_Hans_CN/LC_MESSAGES/messages.mo']),
-                    # ('/usr/local/lib/python3.7/site-packages/app/translations/zh_Hant_TW/LC_MESSAGES',
+                    # ('/usr/local/lib/python3.12/site-packages/app/translations/zh_Hant_TW/LC_MESSAGES',
                     #          ['app/translations/zh_Hant_TW/LC_MESSAGES/messages.mo']),
-                    # ('/usr/local/lib/python3.7/site-packages/app/translations/vi_VN/LC_MESSAGES',
+                    # ('/usr/local/lib/python3.12/site-packages/app/translations/vi_VN/LC_MESSAGES',
                     #          ['app/translations/vi_VN/LC_MESSAGES/messages.mo']),
-                    # ('/usr/local/lib/python3.7/site-packages/app/translations/ja/LC_MESSAGES',
+                    # ('/usr/local/lib/python3.12/site-packages/app/translations/ja/LC_MESSAGES',
                     #          ['app/translations/ja/LC_MESSAGES/messages.mo']),
-                    ('/usr/local/lib/python3.7/site-packages/swagger/v1_0',
+                    ('/usr/local/lib/python3.12/site-packages/swagger/v1_0',
                      ['swagger/v1_0/{{swagger.name}}.yaml'])
                     ]
         )

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

@@ -36,40 +36,42 @@ 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": 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"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json"}
+    return set_timezone(data.to_json()), 201, {"content-type": "application/json"}
             {% endif %}
 
             {% if act.action == 'put' %}
     try:
         body = todatetime({k: v for k, v in body.items() if k in {{act.default_resp.ref_name.capitalize()}}.__table__.columns.keys()},[])
         {{act.default_resp.ref_name.capitalize()}}.query.filter({{act.default_resp.ref_name.capitalize()}}.id == id).update(body)
+        db.session.commit()
     except Exception as e:
         db.session.rollback()
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json"}
     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"}
+    return set_timezone(data.to_json()), 201, {"content-type": "application/json"}
             {% endif %}
             {% if act.action == 'delete' %}
     try:
         db.session.query({{act.default_resp.ref_name.capitalize()}}).filter({{act.default_resp.ref_name.capitalize()}}.id == id).delete()
+        db.session.commit()
     except Exception as e:
         db.session.rollback()
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json"}
     return "", 204
             {% endif %}
 
             {% if act.action == 'get' and not act.default_resp.is_array %}
     data = {{act.default_resp.ref_name.capitalize()}}.query.filter_by(id=id).first_or_404()
-    return set_timezone(data.to_json()), 200, {"content-type": "application/json;charset=utf8"}
+    return set_timezone(data.to_json()), 200, {"content-type": "application/json"}
             {% endif %}
 
             {% if act.action == 'get' and act.default_resp.is_array %}
                {% if act.has_page %}
     datap = {{act.default_resp.ref_name.capitalize()}}.query
-    header = {"content-type": "application/json;charset=utf8"}
+    header = {"content-type": "application/json"}
     # todo add custom filter,sample:
     #if name:
     #    datap = datap.filter({{act.default_resp.ref_name.capitalize()}}.name.like('%'+name+'%'))
@@ -86,7 +88,7 @@ def {{path.name.replace('{', '').replace('}', '').replace('-', '_').replace('/',
     #if name:
     #    datap = datap.filter({{act.default_resp.ref_name.capitalize()}}.name.like('%'+name+'%'))
     datas = datap.all()
-    return [set_timezone(data.to_json()) for data in datas],200,{"content-type": "application/json;charset=utf8"}
+    return [set_timezone(data.to_json()) for data in datas],200,{"content-type": "application/json"}
                {% endif %}
             {% endif %}
 
@@ -94,31 +96,31 @@ def {{path.name.replace('{', '').replace('}', '').replace('-', '_').replace('/',
             {% if act.action == 'post' %}
     try:
         data = {}
-        return data, 201, {"content-type": "application/json;charset=utf8"}
+        return data, 201, {"content-type": "application/json"}
     except Exception as e:
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json"}
             {% elif act.action == 'put' %}
     try:
         data = {}
-        return data, 201, {"content-type": "application/json;charset=utf8"}
+        return data, 201, {"content-type": "application/json"}
     except Exception as e:
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json"}
             {% elif act.action == 'delete' %}
     try:
         data = {}
         return "", 204
     except Exception as e:
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json"}
             {% elif act.action == 'get' %}
     try:
         data = {}
-        return data, 200, {"content-type": "application/json;charset=utf8"}
+        return data, 200, {"content-type": "application/json"}
     except Exception as e:
         current_app.logger.error(str(e),exc_info=True)
-        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json;charset=utf8"}
+        return {"error": get_err_msg(str(e))}, 422, {"content-type": "application/json"}
             {% else %}
     pass
             {% endif %}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mwgencode
-Version: 1.4.7
+Version: 1.5.0
 Summary: 根据starUML文档产生flask专案的代码
 Home-page: https://bitbucket.org/maxwin-inc/gencode/src/
 Author: cxhjet
@@ -15,26 +15,28 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE.txt
 Requires-Dist: mwutils>=0.1.41
 Requires-Dist: mwauth>=0.4.49
-Requires-Dist: mwsdk>=0.3.2
+Requires-Dist: mwsdk>=0.3.3
 Requires-Dist: mwpermission>=0.1.26
 Requires-Dist: mw-aiohttp-session>=0.1.13
 Requires-Dist: mw-aiohttp-babel>=0.1.7
 Requires-Dist: mw-aiohttp-security>=0.1.13
-Requires-Dist: SQLAlchemy>=1.4.31
+Requires-Dist: mwgencode-mcp>=0.1.4
+Requires-Dist: SQLAlchemy>=2.0.44
 Requires-Dist: pyJWT
 Requires-Dist: python-consul
 Requires-Dist: flask_migrate
 Requires-Dist: flask-babel
 Requires-Dist: Flask-Cors
 Requires-Dist: Flask-Redis
-Requires-Dist: Flask-SQLAlchemy>=2.5.1
+Requires-Dist: Flask-SQLAlchemy>=3.1.1
 Requires-Dist: geojson
 Requires-Dist: redis>=4.0.2
-Requires-Dist: connexion[swagger-ui]>=2.11.1
-Requires-Dist: Flask>=2.0.2
+Requires-Dist: connexion[swagger-ui]>=3.3.0
+Requires-Dist: Flask>=3.1.2
 Requires-Dist: Werkzeug>=0.15.5
 Requires-Dist: yarl>=1.4.2
 Requires-Dist: xlrd
@@ -215,6 +217,8 @@ maxwin 开发框架使用的 lib
 
 
 Changes
+1.5.0(2025-11-17)
+- 升级支持python12
 
 1.3.10(2024-02-26)
 - drone.yml 支持tag

{mwgencode-1.4.7 → mwgencode-1.5.0}/mwgencode.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ gencode/gencode/sample/seeds/seed_init.pys
 gencode/gencode/sample/seeds/seed_rm.pys
 gencode/gencode/sample/seeds/seed_run.pys
 gencode/gencode/sample/seeds/seed_utils.pys
+gencode/gencode/template/Dockerfile dg.tmp
 gencode/gencode/template/Dockerfile.tmp
 gencode/gencode/template/README.md
 gencode/gencode/template/__init__.py

{mwgencode-1.4.7 → mwgencode-1.5.0}/mwgencode.egg-info/requires.txt

@@ -1,22 +1,23 @@
 mwutils>=0.1.41
 mwauth>=0.4.49
-mwsdk>=0.3.2
+mwsdk>=0.3.3
 mwpermission>=0.1.26
 mw-aiohttp-session>=0.1.13
 mw-aiohttp-babel>=0.1.7
 mw-aiohttp-security>=0.1.13
-SQLAlchemy>=1.4.31
+mwgencode-mcp>=0.1.4
+SQLAlchemy>=2.0.44
 pyJWT
 python-consul
 flask_migrate
 flask-babel
 Flask-Cors
 Flask-Redis
-Flask-SQLAlchemy>=2.5.1
+Flask-SQLAlchemy>=3.1.1
 geojson
 redis>=4.0.2
-connexion[swagger-ui]>=2.11.1
-Flask>=2.0.2
+connexion[swagger-ui]>=3.3.0
+Flask>=3.1.2
 Werkzeug>=0.15.5
 yarl>=1.4.2
 xlrd

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

@@ -7,7 +7,7 @@ def read(f):
 
 setup(
     name='mwgencode',
-    version='1.4.7',
+    version='1.5.0',
     author='cxhjet',
     author_email='cxhjet@qq.com',
     description="根据starUML文档产生flask专案的代码",
@@ -38,28 +38,30 @@ setup(
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ],
     install_requires=[
                       'mwutils>=0.1.41',
                       'mwauth>=0.4.49',
-                      'mwsdk>=0.3.2',
+                      'mwsdk>=0.3.3',
                       'mwpermission>=0.1.26',
                       'mw-aiohttp-session>=0.1.13',
                       'mw-aiohttp-babel>=0.1.7',
                       'mw-aiohttp-security>=0.1.13',
-                      'SQLAlchemy>=1.4.31',
+                      'mwgencode-mcp>=0.1.4',
+                      'SQLAlchemy>=2.0.44',
                       'pyJWT',
                       'python-consul',
                       'flask_migrate',
                       'flask-babel',
                       'Flask-Cors',
                       'Flask-Redis',
-                      'Flask-SQLAlchemy>=2.5.1',
+                      'Flask-SQLAlchemy>=3.1.1',
                       'geojson',
                       'redis>=4.0.2',
-                      'connexion[swagger-ui]>=2.11.1',
+                      'connexion[swagger-ui]>=3.3.0',
                       # 'pymssql==2.1.3'
-                      'Flask>=2.0.2',
+                      'Flask>=3.1.2',
                       'Werkzeug>=0.15.5',
                       'yarl>=1.4.2',
                       'xlrd',