fastcodedog 3.2.5__tar.gz → 3.2.6__tar.gz

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fastcodedog
-Version: 3.2.5
+Version: 3.2.6
 Summary: 
 License: MIT
 Author: taohoo
@@ -11,6 +11,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: autopep8 (>=2.2.0)
 Requires-Dist: inflect (>=7.2.1)
 Requires-Dist: json5 (>=0.9.25)

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/README.md

@@ -1,5 +1,5 @@
-Based on the pdm file(sap powerdesigner), automatically generate a FastAPI project.    
-Including SQLAlchemy models and CRUD operations.   
-FastAPI schemas and APIs.   
-The database engine should be installed manually based on actual requirements.   
-Version 3 and above temporarily reverts to multithreading and does not support coroutines.
+Based on the pdm file(sap powerdesigner), automatically generate a FastAPI project.    
+Including SQLAlchemy models and CRUD operations.   
+FastAPI schemas and APIs.   
+The database engine should be installed manually based on actual requirements.   
+Version 3 and above temporarily reverts to multithreading and does not support coroutines.

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/README_zh.md

@@ -1,6 +1,6 @@
-# 概述
-基于pdm文件(sap powerdesigner)，自动生成fastapi工程。   
-包括sqlalchemy的model，crud。   
-fastapi的schema，api。   
-数据库引擎根据实际需要安装。   
+# 概述
+基于pdm文件(sap powerdesigner)，自动生成fastapi工程。   
+包括sqlalchemy的model，crud。   
+fastapi的schema，api。   
+数据库引擎根据实际需要安装。   
 3以上版本暂时退回到多线程，不支持协程。

{fastcodedog-3.2.5/fastcodedog/common → fastcodedog-3.2.6/fastcodedog}/__init__.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/fastcodedog/cli.py

@@ -1,53 +1,53 @@
-# -*- coding: utf-8 -*-
-import sys
-
-import json5
-from datetime import datetime
-
-from fastcodedog.common.clean_expired import clean_expired_files_and_dirs
-from fastcodedog.context.context import ctx_instance
-from fastcodedog.generation.api.generation import generate_api
-from fastcodedog.generation.commonfiles.generation import generate_common_files
-from fastcodedog.generation.crud.generation import generate_crud
-from fastcodedog.generation.model.generation import generate_model
-from fastcodedog.generation.schema.generation import genenrate_schema
-from fastcodedog.prepare.model_and_schema_to_crud.prepare import prepare_crud
-from fastcodedog.prepare.model_to_schema.prepare import prepare_schema
-from fastcodedog.prepare.pdm_to_model.prepare import prepare_model
-from fastcodedog.prepare.schema_and_crud_to_api.prepare import prepare_api
-from fastcodedog.util.deep_update import deep_update
-from fastcodedog.util.find_file import find
-
-
-def main():
-    if len(sys.argv) == 1:
-        raise ValueError('缺少参数，请传入json5配置文件')
-    ctx_instance.load(sys.argv[1])
-    pre_process_scripts = {}
-    for file in find('.', ctx_instance.source_directory.pre_process_scripts_file):
-        pre_process_scripts = deep_update(pre_process_scripts, json5.load(open(file, 'r', encoding='utf-8')))
-    prepare_model(pre_process_scripts)
-    ctx_instance.load_models(ctx_instance.source_directory.model)
-    prepare_schema(pre_process_scripts)
-    ctx_instance.load_schemas(ctx_instance.source_directory.schema)
-    prepare_crud(pre_process_scripts)
-    ctx_instance.load_cruds(ctx_instance.source_directory.crud)
-    prepare_api(pre_process_scripts)
-    ctx_instance.load_apis(ctx_instance.source_directory.api)
-
-    last_generate_time = datetime.now()
-    generate_common_files()
-    generate_model()
-    genenrate_schema()
-    generate_crud()
-    generate_api()
-    clean_expired_files_and_dirs(ctx_instance.project.directory, last_generate_time)
-
-
-
-if __name__ == '__main__':
-    """    
-$env:PYTHONPATH = "."
-python fastcodedog/cli.py fastcodegen/test/fastframe.diagram.json5 fastcodegen/test/fastframe.model.json5
-"""
-    main()
+# -*- coding: utf-8 -*-
+import sys
+
+import json5
+from datetime import datetime
+
+from fastcodedog.common.clean_expired import clean_expired_files_and_dirs
+from fastcodedog.context.context import ctx_instance
+from fastcodedog.generation.api.generation import generate_api
+from fastcodedog.generation.commonfiles.generation import generate_common_files
+from fastcodedog.generation.crud.generation import generate_crud
+from fastcodedog.generation.model.generation import generate_model
+from fastcodedog.generation.schema.generation import genenrate_schema
+from fastcodedog.prepare.model_and_schema_to_crud.prepare import prepare_crud
+from fastcodedog.prepare.model_to_schema.prepare import prepare_schema
+from fastcodedog.prepare.pdm_to_model.prepare import prepare_model
+from fastcodedog.prepare.schema_and_crud_to_api.prepare import prepare_api
+from fastcodedog.util.deep_update import deep_update
+from fastcodedog.util.find_file import find
+
+
+def main():
+    if len(sys.argv) == 1:
+        raise ValueError('缺少参数，请传入json5配置文件')
+    ctx_instance.load(sys.argv[1])
+    pre_process_scripts = {}
+    for file in find('.', ctx_instance.source_directory.pre_process_scripts_file):
+        pre_process_scripts = deep_update(pre_process_scripts, json5.load(open(file, 'r', encoding='utf-8')))
+    prepare_model(pre_process_scripts)
+    ctx_instance.load_models(ctx_instance.source_directory.model)
+    prepare_schema(pre_process_scripts)
+    ctx_instance.load_schemas(ctx_instance.source_directory.schema)
+    prepare_crud(pre_process_scripts)
+    ctx_instance.load_cruds(ctx_instance.source_directory.crud)
+    prepare_api(pre_process_scripts)
+    ctx_instance.load_apis(ctx_instance.source_directory.api)
+
+    last_generate_time = datetime.now()
+    generate_common_files()
+    generate_model()
+    genenrate_schema()
+    generate_crud()
+    generate_api()
+    clean_expired_files_and_dirs(ctx_instance.project.directory, last_generate_time)
+
+
+
+if __name__ == '__main__':
+    """    
+$env:PYTHONPATH = "."
+python fastcodedog/cli.py fastcodegen/test/fastframe.diagram.json5 fastcodegen/test/fastframe.model.json5
+"""
+    main()

{fastcodedog-3.2.5/fastcodedog/context → fastcodedog-3.2.6/fastcodedog/common}/__init__.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/fastcodedog/common/clean_expired.py

@@ -1,61 +1,61 @@
-import os
-import os.path
-from datetime import datetime
-
-
-def clean_expired_files_and_dirs(current_dir, last_generate_time):
-    """
-    清理目录的方法，按照指定规则处理目录及其子目录
-
-    参数:
-    current_dir: 当前要处理的目录路径
-    last_generate_time: 最后生成时间，datetime类型
-    """
-    # 1. 优先处理子目录（递归）
-    for item in os.listdir(current_dir):
-        item_path = os.path.join(current_dir, item)
-        if os.path.isdir(item_path) and not os.path.islink(item_path):
-            clean_expired_files_and_dirs(item_path, last_generate_time)
-
-    # 2. 处理当前目录下的py文件
-    for item in os.listdir(current_dir):
-        item_path = os.path.join(current_dir, item)
-        if os.path.isfile(item_path) and item.endswith('.py'):
-            # 检查文件修改时间
-            file_mtime = datetime.fromtimestamp(os.path.getmtime(item_path))
-            if file_mtime < last_generate_time:
-                # 检查是否包含指定关键字
-                try:
-                    content = open(item_path, 'r', encoding='utf-8').read()
-                    if '@author: fastcodedog' in content:
-                        os.remove(item_path)
-                        print(f"已删除文件: {item_path}")
-                except Exception as e:
-                    print(f"处理文件 {item_path} 时出错: {e}")
-
-    # 3. 检查并处理空的__init__.py
-    init_file = os.path.join(current_dir, '__init__.py')
-    if os.path.exists(init_file) and os.path.isfile(init_file):
-        # 检查目录是否还有其他文件或子目录
-        has_other_items = False
-        for item in os.listdir(current_dir):
-            if item != '__init__.py' or not os.path.isfile(os.path.join(current_dir, item)):
-                has_other_items = True
-                break
-
-        if not has_other_items:
-            # 检查__init__.py是否为空
-            try:
-                if os.path.getsize(init_file) == 0:
-                    os.remove(init_file)
-                    print(f"已删除空的__init__.py: {init_file}")
-            except Exception as e:
-                print(f"处理__init__.py {init_file} 时出错: {e}")
-
-    # 4. 如果目录为空则删除
-    try:
-        if not os.listdir(current_dir):  # 检查目录是否为空
-            os.rmdir(current_dir)
-            print(f"已删除空目录: {current_dir}")
-    except Exception as e:
-        print(f"删除目录 {current_dir} 时出错: {e}")
+import os
+import os.path
+from datetime import datetime
+
+
+def clean_expired_files_and_dirs(current_dir, last_generate_time):
+    """
+    清理目录的方法，按照指定规则处理目录及其子目录
+
+    参数:
+    current_dir: 当前要处理的目录路径
+    last_generate_time: 最后生成时间，datetime类型
+    """
+    # 1. 优先处理子目录（递归）
+    for item in os.listdir(current_dir):
+        item_path = os.path.join(current_dir, item)
+        if os.path.isdir(item_path) and not os.path.islink(item_path):
+            clean_expired_files_and_dirs(item_path, last_generate_time)
+
+    # 2. 处理当前目录下的py文件
+    for item in os.listdir(current_dir):
+        item_path = os.path.join(current_dir, item)
+        if os.path.isfile(item_path) and item.endswith('.py'):
+            # 检查文件修改时间
+            file_mtime = datetime.fromtimestamp(os.path.getmtime(item_path))
+            if file_mtime < last_generate_time:
+                # 检查是否包含指定关键字
+                try:
+                    content = open(item_path, 'r', encoding='utf-8').read()
+                    if '@author: fastcodedog' in content:
+                        os.remove(item_path)
+                        print(f"已删除文件: {item_path}")
+                except Exception as e:
+                    print(f"处理文件 {item_path} 时出错: {e}")
+
+    # 3. 检查并处理空的__init__.py
+    init_file = os.path.join(current_dir, '__init__.py')
+    if os.path.exists(init_file) and os.path.isfile(init_file):
+        # 检查目录是否还有其他文件或子目录
+        has_other_items = False
+        for item in os.listdir(current_dir):
+            if item != '__init__.py' or not os.path.isfile(os.path.join(current_dir, item)):
+                has_other_items = True
+                break
+
+        if not has_other_items:
+            # 检查__init__.py是否为空
+            try:
+                if os.path.getsize(init_file) == 0:
+                    os.remove(init_file)
+                    print(f"已删除空的__init__.py: {init_file}")
+            except Exception as e:
+                print(f"处理__init__.py {init_file} 时出错: {e}")
+
+    # 4. 如果目录为空则删除
+    try:
+        if not os.listdir(current_dir):  # 检查目录是否为空
+            os.rmdir(current_dir)
+            print(f"已删除空目录: {current_dir}")
+    except Exception as e:
+        print(f"删除目录 {current_dir} 时出错: {e}")

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/fastcodedog/common/source_file_path.py

@@ -1,21 +1,21 @@
-# -*- coding: utf-8 -*-
-import os
-
-from fastcodedog.context.context import ctx_instance
-from fastcodedog.util.case_converter import camel_to_snake
-
-
-def get_model_file_path(module, model_name):
-    return os.path.join(ctx_instance.source_directory.model, module, f'{camel_to_snake(model_name)}.json5')
-
-
-def get_schema_file_path(module, schema_name):
-    return os.path.join(ctx_instance.source_directory.schema, module, f'{camel_to_snake(schema_name)}.json5')
-
-
-def get_crud_file_path(module, crud_name):
-    return os.path.join(ctx_instance.source_directory.crud, module, f'{camel_to_snake(crud_name)}.json5')
-
-
-def get_api_file_path(module, crud_name):
-    return os.path.join(ctx_instance.source_directory.api, module, f'{camel_to_snake(crud_name)}.json5')
+# -*- coding: utf-8 -*-
+import os
+
+from fastcodedog.context.context import ctx_instance
+from fastcodedog.util.case_converter import camel_to_snake
+
+
+def get_model_file_path(module, model_name):
+    return os.path.join(ctx_instance.source_directory.model, module, f'{camel_to_snake(model_name)}.json5')
+
+
+def get_schema_file_path(module, schema_name):
+    return os.path.join(ctx_instance.source_directory.schema, module, f'{camel_to_snake(schema_name)}.json5')
+
+
+def get_crud_file_path(module, crud_name):
+    return os.path.join(ctx_instance.source_directory.crud, module, f'{camel_to_snake(crud_name)}.json5')
+
+
+def get_api_file_path(module, crud_name):
+    return os.path.join(ctx_instance.source_directory.api, module, f'{camel_to_snake(crud_name)}.json5')

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/fastcodedog/common/write_file.py

@@ -1,63 +1,63 @@
-# -*- coding: utf-8 -*-
-"""
-@author: hubo
-@project: fastframe
-@file: write_file
-@time: 2024/5/30 15:39
-@desc:
-"""
-import json5
-import os
-import subprocess
-
-from fastcodedog.context.context import ctx_instance
-
-
-def write_python_file(path, content, repalce_async=True):
-    """
-    写入python文件
-    :param path:
-    :param content:
-    :return:
-    """
-    _make_pathon_package(os.path.dirname(path))
-    with open(path, 'w', encoding='utf-8') as f:
-        f.write(content)
-    # 调用autopep8格式化文件
-    # subprocess.run(['autopep8', '--in-place', '--aggressive', '--max-line-length=120', path], check=True)
-    subprocess.run(['autopep8', '--in-place', '--max-line-length=120', path], check=True)
-    # 临时版本，把异步支持去掉,把文件中的 `async def` 替换为 `def`
-    with open(path, 'r+', encoding='utf-8') as f:
-        content = f.read()
-        if repalce_async:
-            content = content.replace('async def ', 'def ')
-        f.seek(0)
-        f.write(content)
-        f.truncate()
-    print(f'writed {path}')  # 先临时放这里，后续再改
-    # # 调用flake8格式化文件
-    # subprocess.run(['flake8', path], check=True)
-
-
-def _make_pathon_package(directory):
-    if not os.path.exists(directory):
-        parent_directory = os.path.dirname(directory)
-        _make_pathon_package(parent_directory)
-        os.makedirs(directory)
-        if directory.startswith(ctx_instance.project.directory):
-            init_file = os.path.join(directory, '__init__.py')
-            open(init_file, 'a').close()
-
-
-def write_json_file(path, data):
-    """
-    写入json文件
-    :param path:
-    :param data:
-    :return:
-    """
-    directory = os.path.dirname(path)
-    if os.path.exists(directory) is False:
-        os.makedirs(directory)
-    with open(path, 'w', encoding='utf-8') as f:
-        json5.dump(data, f, ensure_ascii=False, indent=4)
+# -*- coding: utf-8 -*-
+"""
+@author: hubo
+@project: fastframe
+@file: write_file
+@time: 2024/5/30 15:39
+@desc:
+"""
+import json5
+import os
+import subprocess
+
+from fastcodedog.context.context import ctx_instance
+
+
+def write_python_file(path, content, repalce_async=True):
+    """
+    写入python文件
+    :param path:
+    :param content:
+    :return:
+    """
+    _make_pathon_package(os.path.dirname(path))
+    with open(path, 'w', encoding='utf-8') as f:
+        f.write(content)
+    # 调用autopep8格式化文件
+    # subprocess.run(['autopep8', '--in-place', '--aggressive', '--max-line-length=120', path], check=True)
+    subprocess.run(['autopep8', '--in-place', '--max-line-length=120', path], check=True)
+    # 临时版本，把异步支持去掉,把文件中的 `async def` 替换为 `def`
+    with open(path, 'r+', encoding='utf-8') as f:
+        content = f.read()
+        if repalce_async:
+            content = content.replace('async def ', 'def ')
+        f.seek(0)
+        f.write(content)
+        f.truncate()
+    print(f'writed {path}')  # 先临时放这里，后续再改
+    # # 调用flake8格式化文件
+    # subprocess.run(['flake8', path], check=True)
+
+
+def _make_pathon_package(directory):
+    if not os.path.exists(directory):
+        parent_directory = os.path.dirname(directory)
+        _make_pathon_package(parent_directory)
+        os.makedirs(directory)
+        if directory.startswith(ctx_instance.project.directory):
+            init_file = os.path.join(directory, '__init__.py')
+            open(init_file, 'a').close()
+
+
+def write_json_file(path, data):
+    """
+    写入json文件
+    :param path:
+    :param data:
+    :return:
+    """
+    directory = os.path.dirname(path)
+    if os.path.exists(directory) is False:
+        os.makedirs(directory)
+    with open(path, 'w', encoding='utf-8') as f:
+        json5.dump(data, f, ensure_ascii=False, indent=4)

{fastcodedog-3.2.5/fastcodedog/context/api → fastcodedog-3.2.6/fastcodedog/context}/__init__.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-

{fastcodedog-3.2.5/fastcodedog → fastcodedog-3.2.6/fastcodedog/context/api}/__init__.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/fastcodedog/context/api/api.py

@@ -1,18 +1,18 @@
-# -*- coding: utf-8 -*-
-from fastcodedog.context.api.endpoint import Endpoint
-from fastcodedog.context.contextbase import ContextBase
-
-
-class Api(ContextBase):
-    def __init__(self):
-        super().__init__()
-        self.title = ''
-        self.comment = ''
-        self.module = ''
-        self.name = ''
-        self.primary_key_name = ''
-        self.oauth2_enabled = False
-        self.validate_response_models = []
-        self._types['validate_response_models'] = str
-        self.endpoints = {}
-        self._types['endpoints'] = Endpoint
+# -*- coding: utf-8 -*-
+from fastcodedog.context.api.endpoint import Endpoint
+from fastcodedog.context.contextbase import ContextBase
+
+
+class Api(ContextBase):
+    def __init__(self):
+        super().__init__()
+        self.title = ''
+        self.comment = ''
+        self.module = ''
+        self.name = ''
+        self.primary_key_name = ''
+        self.oauth2_enabled = False
+        self.validate_response_models = []
+        self._types['validate_response_models'] = str
+        self.endpoints = {}
+        self._types['endpoints'] = Endpoint

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/fastcodedog/context/api/endpoint.py

@@ -1,22 +1,22 @@
-# -*- coding: utf-8 -*-
-from fastcodedog.context.api.param import Param
-from fastcodedog.context.contextbase import ContextBase
-
-
-class Endpoint(ContextBase):
-    def __init__(self):
-        super().__init__()
-        self.name = ''
-        self.have_select_models = False
-        self.summary = ''
-        self.comment = ''
-        self.action = ''
-        self.return_list = False
-        self.url = ''
-        self.max_size = None
-        self._types['max_size'] = int
-        self.tags = []
-        self._types['tags'] = str
-        self.params = {}
-        self._types['params'] = Param
-        self.oauth2_required = True
+# -*- coding: utf-8 -*-
+from fastcodedog.context.api.param import Param
+from fastcodedog.context.contextbase import ContextBase
+
+
+class Endpoint(ContextBase):
+    def __init__(self):
+        super().__init__()
+        self.name = ''
+        self.have_select_models = False
+        self.summary = ''
+        self.comment = ''
+        self.action = ''
+        self.return_list = False
+        self.url = ''
+        self.max_size = None
+        self._types['max_size'] = int
+        self.tags = []
+        self._types['tags'] = str
+        self.params = {}
+        self._types['params'] = Param
+        self.oauth2_required = True

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/fastcodedog/context/api/oauth2.py

@@ -1,12 +1,12 @@
-# -*- coding: utf-8 -*-
-from fastcodedog.context.contextbase import ContextBase
-
-
-class OAuth2(ContextBase):
-    def __init__(self):
-        super().__init__()
-        self.enabled = False
-        self.model = 'User'
-        self.module = 'admin'
-        self.user_name_column = 'number'
-        self.password_column = 'password'
+# -*- coding: utf-8 -*-
+from fastcodedog.context.contextbase import ContextBase
+
+
+class OAuth2(ContextBase):
+    def __init__(self):
+        super().__init__()
+        self.enabled = False
+        self.model = 'User'
+        self.module = 'admin'
+        self.user_name_column = 'number'
+        self.password_column = 'password'

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/fastcodedog/context/api/param.py

@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
-from fastcodedog.context.contextbase import ContextBase
-
-
-class Param(ContextBase):
-    def __init__(self):
-        super().__init__()
-        self.name = ''
-        self.type = ''
-        self.option_none = False
-        self.description = ''
-        self.nullable = True
-        self.enum = []
-        self._types['enum'] = str
-        self.default_value = ''
+# -*- coding: utf-8 -*-
+from fastcodedog.context.contextbase import ContextBase
+
+
+class Param(ContextBase):
+    def __init__(self):
+        super().__init__()
+        self.name = ''
+        self.type = ''
+        self.option_none = False
+        self.description = ''
+        self.nullable = True
+        self.enum = []
+        self._types['enum'] = str
+        self.default_value = ''

fastcodedog-3.2.6/fastcodedog/context/common/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

{fastcodedog-3.2.5 → fastcodedog-3.2.6}/fastcodedog/context/common/get_context_object.py

@@ -1,10 +1,10 @@
-# -*- coding: utf-8 -*-
-from fastcodedog.context.context import ctx_instance
-
-
-def get_model_context(module, model_name):
-    return ctx_instance.models[module][model_name]
-
-
-def get_schema_context(module, schema_name):
-    return ctx_instance.schemas[module][schema_name]
+# -*- coding: utf-8 -*-
+from fastcodedog.context.context import ctx_instance
+
+
+def get_model_context(module, model_name):
+    return ctx_instance.models[module][model_name]
+
+
+def get_schema_context(module, schema_name):
+    return ctx_instance.schemas[module][schema_name]