fastcodedog 3.2.6__tar.gz → 3.2.8__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcodedog
-Version: 3.2.6
+Version: 3.2.8
 Summary: 
 License: MIT
 Author: taohoo

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

@@ -13,6 +13,11 @@ import subprocess
 from fastcodedog.context.context import ctx_instance
 
 
+def normalize_lf(content: str) -> str:
+    """统一换行为 Linux LF（\\n），与最终发布环境一致"""
+    return content.replace('\r\n', '\n').replace('\r', '\n')
+
+
 def write_python_file(path, content, repalce_async=True):
     """
     写入python文件
@@ -21,14 +26,14 @@ def write_python_file(path, content, repalce_async=True):
     :return:
     """
     _make_pathon_package(os.path.dirname(path))
-    with open(path, 'w', encoding='utf-8') as f:
-        f.write(content)
+    with open(path, 'w', encoding='utf-8', newline='\n') as f:
+        f.write(normalize_lf(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()
+    with open(path, 'r+', encoding='utf-8', newline='\n') as f:
+        content = normalize_lf(f.read())
         if repalce_async:
             content = content.replace('async def ', 'def ')
         f.seek(0)
@@ -46,7 +51,9 @@ def _make_pathon_package(directory):
         os.makedirs(directory)
         if directory.startswith(ctx_instance.project.directory):
             init_file = os.path.join(directory, '__init__.py')
-            open(init_file, 'a').close()
+            if not os.path.exists(init_file):
+                with open(init_file, 'w', encoding='utf-8', newline='\n'):
+                    pass
 
 
 def write_json_file(path, data):
@@ -59,5 +66,5 @@ def write_json_file(path, data):
     directory = os.path.dirname(path)
     if os.path.exists(directory) is False:
         os.makedirs(directory)
-    with open(path, 'w', encoding='utf-8') as f:
+    with open(path, 'w', encoding='utf-8', newline='\n') as f:
         json5.dump(data, f, ensure_ascii=False, indent=4)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/generation/api/config.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from fastcodedog.common.write_file import normalize_lf
 from fastcodedog.context.context import ctx_instance
 from fastcodedog.generation.base.file import File
 from fastcodedog.generation.base.function import Function
@@ -117,7 +118,8 @@ return result
 
     def save(self):
         super().save()
-        open(self.ini_file, 'w', encoding='utf-8').write(self.ini_content)
+        with open(self.ini_file, 'w', encoding='utf-8', newline='\n') as f:
+            f.write(normalize_lf(self.ini_content))
 
     def _get_ini_content(self):
         content = "; 可以通过ini文件、环境变量和命令行三种方式配置参数，优先级依次递增\n"

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/generation/api/db.py

@@ -16,12 +16,27 @@ class Db(File):
         self._init_blocks_and_imports()
 
     def _init_blocks_and_imports(self):
-        self.blocks.append(Variable('engine', value=f"""create_engine(database_url, pool_size=pool_size, max_overflow=max_overflow, connect_args={{"check_same_thread": False}}
-                       ) if database_url.startswith('sqlite') else create_engine(database_url)""",
-                                    possible_imports=['from sqlalchemy import create_engine',
-                                                      Import('database_url', Config().package),
-                                                      Import('pool_size', Config().package),
-                                                      Import('max_overflow', Config().package)]))
+        engine_imports = ['from sqlalchemy import create_engine',
+                          Import('database_url', Config().package),
+                          Import('pool_size', Config().package),
+                          Import('max_overflow', Config().package)]
+        self.blocks.append(Variable(
+            '_connect_args',
+            value='{"check_same_thread": False} if database_url.startswith(\'sqlite\') else {}',
+            possible_imports=engine_imports,
+        ))
+        self.blocks.append(Variable(
+            'engine',
+            value="""create_engine(
+    database_url,
+    pool_size=pool_size,
+    max_overflow=max_overflow,
+    pool_pre_ping=True,
+    pool_recycle=3600,
+    connect_args=_connect_args,
+)""",
+            possible_imports=engine_imports,
+        ))
         self.blocks.append(Variable('Session', value='sessionmaker(bind=engine)',
                                     possible_imports=['from sqlalchemy.orm import sessionmaker']))
         get_session = Function('get_session', comment="""生成器方式获取数据库会话（主要适用于依赖注入场景）。

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/model_and_schema_to_crud/default_values.py

@@ -6,6 +6,7 @@ from fastcodedog.context.context import ctx_instance
 from fastcodedog.context.crud.crud import Crud
 from fastcodedog.context.model.model import Model
 from fastcodedog.util.find_file import find
+from fastcodedog.common.write_file import write_json_file
 
 
 def add_default_value(crud_directory, default_values):
@@ -31,6 +32,6 @@ def add_default_value(crud_directory, default_values):
                 if 'default_values' not in data:
                     data['default_values'] = {}
                 data['default_values'][column_name] = default_value
-                json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+                write_json_file(json_file, data)
 
 

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/model_and_schema_to_crud/queries.py

@@ -2,6 +2,7 @@
 import json5
 
 from fastcodedog.common.source_file_path import get_crud_file_path
+from fastcodedog.common.write_file import write_json_file
 
 
 def add_queries(crud_directory, queries):
@@ -15,7 +16,7 @@ def add_queries(crud_directory, queries):
         data['queries'][query['name']] = query
         # _refill_order_by(data['queries'][query['name']])
         # order_by要改写
-        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+        write_json_file(json_file, data)
 
 
 # def _refill_order_by(query):

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/model_to_schema/alias_generator.py

@@ -2,6 +2,8 @@
 import json5
 import os
 
+from fastcodedog.common.write_file import write_json_file
+
 
 def set_alias_generator(schema_directory, alias_generator):
     if not alias_generator:
@@ -14,4 +16,4 @@ def set_alias_generator(schema_directory, alias_generator):
                         json_file = os.path.join(root, module, file)
                         data = json5.load(open(json_file, 'r', encoding='utf-8'))
                         data['alias_generator'] = alias_generator
-                        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+                        write_json_file(json_file, data)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/model_to_schema/no_input_fields.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import json5
 import os
+from fastcodedog.common.write_file import write_json_file
 
 
 def set_no_input_fields(schema_directory, no_input_fields):
@@ -17,4 +18,4 @@ def set_no_input_fields(schema_directory, no_input_fields):
                         for field_name, field in data['fields'].items():
                             if field_name in no_input_fields or f'{schema_name}.{field_name}' in no_input_fields:
                                 field['no_input'] = True
-                        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+                        write_json_file(json_file, data)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/model_to_schema/no_response_fields.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import json5
 import os
+from fastcodedog.common.write_file import write_json_file
 
 
 def set_no_response_fields(schema_directory, no_response_fields):
@@ -17,4 +18,4 @@ def set_no_response_fields(schema_directory, no_response_fields):
                         for field_name, field in data['fields'].items():
                             if field_name in no_response_fields or f'{schema_name}.{field_name}' in no_response_fields:
                                 field['no_response'] = True
-                        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+                        write_json_file(json_file, data)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/model_to_schema/response_schemas.py

@@ -3,6 +3,7 @@ import json5
 
 from fastcodedog.common.source_file_path import get_schema_file_path
 from fastcodedog.context.common.get_relationship import get_class_type_by_model_and_relationship_name
+from fastcodedog.common.write_file import write_json_file
 
 
 def generate_sub_objects(expression, schema_data):
@@ -57,4 +58,4 @@ def add_response_schemas(response_schemas):
         if 'response_schemas' not in data:
             data['response_schemas'] = {}
         data['response_schemas'][name] = schema_data
-        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+        write_json_file(json_file, data)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/model_to_schema/specified_field_types.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import json5
 import os
+from fastcodedog.common.write_file import write_json_file
 
 
 def rename_specified_field_types(schema_directory, specified_field_types):
@@ -19,5 +20,5 @@ def rename_specified_field_types(schema_directory, specified_field_types):
                                 field['pydantic_type'] = field['pydantic_type_with_length'] = specified_field_types[field_name]
                             elif f'{schema_name}.{field_name}' in specified_field_types:
                                 field['pydantic_type'] = field['pydantic_type_with_length'] = specified_field_types[f'{schema_name}.{field_name}']
-                        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+                        write_json_file(json_file, data)
 

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/pdm_to_model/after/additional_methods.py

@@ -3,6 +3,7 @@ import json5
 import os
 
 from fastcodedog.util.case_converter import camel_to_snake
+from fastcodedog.common.write_file import write_json_file
 
 
 def add_additional_methods(model_directory, additional_methods):
@@ -15,4 +16,4 @@ def add_additional_methods(model_directory, additional_methods):
         if 'additional_methods' not in data:
             data['additional_methods'] = {}
         data['additional_methods'][additional_method['name']] = additional_method
-        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+        write_json_file(json_file, data)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/pdm_to_model/after/additional_relationships.py

@@ -4,6 +4,7 @@ import os
 import re
 
 from fastcodedog.util.case_converter import camel_to_snake
+from fastcodedog.common.write_file import write_json_file
 
 
 def add_relationships(model_directory, additional_relationships):
@@ -19,6 +20,6 @@ def add_relationships(model_directory, additional_relationships):
             additional_relationship.pop('module')
             additional_relationship.pop('model_name')
             data['relationships'][name] = additional_relationship
-            json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+            write_json_file(json_file, data)
 
 

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/pdm_to_model/after/case.py

@@ -3,6 +3,7 @@ import json5
 import os
 
 from fastcodedog.util.case_converter import camel_to_snake
+from fastcodedog.common.write_file import write_json_file
 
 
 def add_cases(model_directory, cases):
@@ -25,5 +26,5 @@ def add_cases(model_directory, cases):
             if 'cases' not in data:
                 data['cases'] = {}
             data['cases'][name] = case
-            json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+            write_json_file(json_file, data)
 

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/pdm_to_model/after/computed_properties.py

@@ -3,6 +3,7 @@ import json5
 import os
 
 from fastcodedog.util.case_converter import camel_to_snake
+from fastcodedog.common.write_file import write_json_file
 
 
 def add_computed_properties(model_directory, computed_properties):
@@ -15,4 +16,4 @@ def add_computed_properties(model_directory, computed_properties):
         if 'computed_properties' not in data:
             data['computed_properties'] = {}
         data['computed_properties'][computed_property['name']] = computed_property
-        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+        write_json_file(json_file, data)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/pdm_to_model/after/copy_methods.py

@@ -3,6 +3,7 @@ import json5
 import os
 
 from fastcodedog.util.case_converter import camel_to_snake
+from fastcodedog.common.write_file import write_json_file
 
 
 def add_copy_methods(model_directory, copy_methods):
@@ -15,4 +16,4 @@ def add_copy_methods(model_directory, copy_methods):
         if 'copy_methods' not in data:
             data['copy_methods'] = {}
         data['copy_methods'][copy_method['name']] = copy_method
-        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+        write_json_file(json_file, data)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/pdm_to_model/after/disable_relationships.py

@@ -4,6 +4,7 @@ import os
 import re
 
 from fastcodedog.util.case_converter import camel_to_snake
+from fastcodedog.common.write_file import write_json_file
 
 
 def disable_relationships(model_directory, disabled_relationships):
@@ -22,7 +23,7 @@ def disable_relationships(model_directory, disabled_relationships):
                         relationship['disabled'] = True
                         no_backpopulates.append({'model_directory': model_directory, 'relationship': relationship})
                         break
-            json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+            write_json_file(json_file, data)
             # 和disable独立执行，防止修改同一个文件时互相覆盖
             for no_backpopulate in no_backpopulates:
                 _add_no_backpopulates(no_backpopulate['model_directory'], no_backpopulate['relationship'])
@@ -38,4 +39,4 @@ def _add_no_backpopulates(model_directory, another_side_relationship):
         if name == another_side_relationship['back_populates']:
             relationship['no_back_populates'] = True
             break
-    json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+    write_json_file(json_file, data)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/pdm_to_model/after/specified_class_names.py

@@ -2,6 +2,7 @@ import json5
 import os
 
 from fastcodedog.util.case_converter import camel_to_snake
+from fastcodedog.common.write_file import write_json_file
 
 
 def add_specified_class_names(pdm, specified_class_name):
@@ -36,4 +37,4 @@ def add_specified_class_names(pdm, specified_class_name):
 #     for name, relationship in data['relationships'].items():
 #         if name == another_side_relationship['back_populates']:
 #             relationship['back_populates_model'] = dst
-#     json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+#     write_json_file(json_file, data)

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/fastcodedog/prepare/pdm_to_model/after/specified_relationship_orderby.py

@@ -2,6 +2,7 @@
 import json5
 import os
 from fastcodedog.util.case_converter import camel_to_snake
+from fastcodedog.common.write_file import write_json_file
 
 def specified_relationship_orderby(model_directory, specified_relationship_by):
     for srb in specified_relationship_by:
@@ -16,7 +17,7 @@ def specified_relationship_orderby(model_directory, specified_relationship_by):
         if 'relationships' not in data or relationship_name not in data['relationships']:
             continue
         data['relationships'][relationship_name]['order_by'] = order_by
-        json5.dump(data, open(json_file, 'w', encoding='utf-8'), ensure_ascii=False, indent=4)
+        write_json_file(json_file, data)
 
 
 

{fastcodedog-3.2.6 → fastcodedog-3.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastcodedog"
-version = "3.2.6"
+version = "3.2.8"
 description = ""
 authors = ["taohoo <taohoo@163.com>"]
 license = "MIT"
@@ -13,11 +13,11 @@ json5 = ">=0.9.25"
 inflect = ">=7.2.1"
 autopep8 = ">=2.2.0"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 setuptools = ">=70.0.0"
 pytest = ">=8.2.2"
 virtualenv = ">=20.26.0"
-poetry = ">=1.8.3"  # 注意：通常不需要显式列出poetry作为dev依赖，除非有特殊需求
+poetry = ">=1.8.3"
 
 [build-system]
 requires = ["poetry-core"]