fastcodedog 3.1.7__tar.gz → 3.2.0__tar.gz

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastcodedog
-Version: 3.1.7
+Version: 3.2.0
 Summary: 
 License: MIT
 Author: taohoo

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/context/api/endpoint.py

@@ -19,3 +19,4 @@ class Endpoint(ContextBase):
         self._types['tags'] = str
         self.params = {}
         self._types['params'] = Param
+        self.oauth2_required = True

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/context/crud/query.py

@@ -37,3 +37,4 @@ class Query(ContextBase):
         self.distinct = ''
         self.orders = []
         self._types['orders'] = str
+        self.oauth2_required = True

fastcodedog-3.2.0/fastcodedog/context/model/case.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from fastcodedog.context.contextbase import ContextBase
+
+
+class Case(ContextBase):
+    def __init__(self):
+        super().__init__()
+        self.title = ''  # 标题，用于描述case的用途
+        self.name = ''  # case属性名
+        self.comment = ''  # 详细说明
+        self.module = ''  # 所属模块
+        self.model_name = ''  # 所属模型
+        self.whens = []  # case条件列表，按顺序定义。自动指定数字和else_
+        self._types['whens'] = str
+

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/context/model/model.py

@@ -3,6 +3,7 @@
 模型
 """
 from fastcodedog.context.contextbase import ContextBase
+from fastcodedog.context.model.case import Case
 from fastcodedog.context.model.column import Column
 from fastcodedog.context.model.computed_property import ComputedProperty
 from fastcodedog.context.model.additional_method import AdditionalMethod
@@ -27,6 +28,8 @@ class Model(ContextBase):
         self._types['relationships'] = Relationship
         self.computed_properties = {}
         self._types['computed_properties'] = ComputedProperty
+        self.cases = {}
+        self._types['cases'] = Case
         self.additional_methods = {}
         self._types['additional_methods'] = AdditionalMethod
         self.copy_methods = {}

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/generation/api/api_function.py

@@ -186,7 +186,7 @@ return {{}}""", possible_imports=[self.crud_imoprt, 'from fastapi import HTTPExc
                                                                   Import('Session', Db().package),
                                                                   Import('get_session', Db().package)])
         # Oauth2依赖
-        if self.api.context.oauth2_enabled:
+        if self.api.context.oauth2_enabled and self.context.oauth2_required:
             self.params['token'] = self.Parameter('token', type='Annotated[str, Depends(oauth2_scheme)]', nullable=True,
                                                   possible_imports=['from fastapi import Depends',
                                                                     Import('Annotated', 'typing')])

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/generation/api/config.py

@@ -121,7 +121,7 @@ return result
 
     def _get_ini_content(self):
         content = "; 可以通过ini文件、环境变量和命令行三种方式配置参数，优先级依次递增\n"
-        content += "; 通过uvicorn或者celery启动时，命令参数容易产生歧义，建议通过环境变量设置不同进程的不同参数\n"
+        content += "; 通过uvicorn或者celery启动时，日志配置仍然以本配置为准，建议通过环境变量设置不同进程的不同参数\n"
         for section, params in self.sections.items():
             if section.startswith('_'):
                 continue

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/generation/api/db.py

@@ -16,10 +16,12 @@ 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, connect_args={{"check_same_thread": False}}
+        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('database_url', Config().package),
+                                                      Import('pool_size', Config().package),
+                                                      Import('max_overflow', Config().package)]))
         self.blocks.append(Variable('Session', value='sessionmaker(bind=engine)',
                                     possible_imports=['from sqlalchemy.orm import sessionmaker']))
         get_session = Function('get_session')

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/generation/api/oauth2.py

@@ -70,14 +70,15 @@ OAuth2.REDIS_URL = 'redis://localhost:6379/oauth2'""")
         if ctx_instance.tenant.enabled:
             tenant_model = ctx_instance.get_tenant_model()
             function.blocks.append(Text(f"""if '@' not in username:            
-    # 临时兼容性方案，后续需要强制传入租户domain
-    username += '@szedd'
-    # raise HTTPException(status_code=HTTP_400_BAD_REQUEST, detail="用户名格式错误，需要包含域名后缀。比如1001@example.com")
+    if not oauth2_default_domain:
+        raise HTTPException(status_code=HTTP_400_BAD_REQUEST, detail="用户名格式错误，需要包含域名后缀。比如1001@example.com")
+    username = f'{{username}}@{{oauth2_default_domain}}'
 username, domain = username.split('@')
 tenant = session.query({tenant_model.name}).filter_by(domain=domain).filter_by(enabled=True).first()
 if not tenant:
     raise HTTPException(status_code=HTTP_400_BAD_REQUEST, detail="域名后缀不存在或未启用")""",
                                    possible_imports=[Import(tenant_model.name, LocationFinder.get_package(tenant_model.name, 'model', tenant_model.module)),
+                                                     Import('oauth2_default_domain', Config().package),
                                                      'from starlette.status import HTTP_400_BAD_REQUEST']))
             # 如果用户表有tenant_id字段，则需要加上tenant_id的过滤
             if ctx_instance.tenant.local_column_code in user_model.columns:

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/generation/crud/crud_functions.py

@@ -36,6 +36,7 @@ class Crud(Function):
             self.return_list = False
         if not hasattr(self, 'summary'):
             self.summary = None
+        self.oauth2_required = context.oauth2_required if hasattr(context, 'oauth2_required') else True
 
     @staticmethod
     def get_luckyname(name):

fastcodedog-3.2.0/fastcodedog/generation/model/case.py

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+from fastcodedog.context.model.case import Case as CaseContext
+from fastcodedog.generation.base.call import Call
+from fastcodedog.generation.base.required_import import Import
+from fastcodedog.generation.base.variable import Variable
+
+
+class Case(Variable):
+    def __init__(self, context: CaseContext = None, parent=None):
+        super().__init__(context.name, context=context, parent=parent)
+        self.title = context.title  # 标题
+        self.whens = context.whens  # case条件列表
+
+        self.value = self.get_value()
+        self.comment = context.comment if context.comment else self.title
+
+        self.add_possible_imports([
+            Import('from sqlalchemy import case'),
+        ])
+
+    def get_value(self):
+        """
+        生成类似如下的代码:
+        case(
+            (result.is_(None), 0),
+            (result == False, 1),
+            (result == True, 2),
+            else_=3
+        )
+        """
+        case_params = []
+
+        # 为每个when条件创建一个元组，自动分配数字值
+        for index, when_condition in enumerate(self.whens):
+            # 创建元组形式: (condition, value)
+            case_params.append(f"({when_condition}, {index})")
+
+        # 添加else_子句，值为条件数量
+        case_params.append(f"else_={len(self.whens)}")
+
+        return Call('case', params=case_params)
+

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/generation/model/model.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from fastcodedog.context.model.model import Model as ModelContext
+from fastcodedog.generation.model.case import Case
 from fastcodedog.generation.model.copy_method import CopyMethod
 from fastcodedog.generation.base.class_type import ClassType
 from fastcodedog.generation.base.line_break import LineBreak
@@ -27,7 +28,9 @@ class Model(ClassType):
         # relationships
         self.blocks.extend([Relationship(relationship, self) for relationship in context.relationships.values() if
                             not relationship.disabled])
-
+        # case
+        self.blocks.append(LineBreak())  # 空行
+        self.blocks.extend([Case(case, self) for case in context.cases.values()])
         for additional_method in context.additional_methods.values():
             self.blocks.append(AdditionalMethod(additional_method))
         for copy_method in context.copy_methods.values():

fastcodedog-3.2.0/fastcodedog/prepare/pdm_to_model/after/case.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+import json5
+import os
+
+from fastcodedog.util.case_converter import camel_to_snake
+
+
+def add_cases(model_directory, cases):
+    """
+    对应sqlalchemy的case，可用于order_by, filter, select, group_by, update等场景
+    这些属性不保存到数据库，通过各种条件计算得到对应的值
+    通过在model和schema中自定义属性的方法定义这些属性
+    """
+    for case in cases:
+        module = case.get('module')
+        model_name = case.get('model_name')
+        name = case.get('name')
+        if module and model_name and name:
+            json_file = os.path.join(model_directory, module, f'{camel_to_snake(model_name)}.json5')
+            data = json5.load(open(json_file, 'r', encoding='utf-8'))
+            # 移除 case 中的 module 和 model_name
+            case.pop('module')
+            case.pop('model_name')
+            # 确保 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)
+

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/prepare/pdm_to_model/prepare.py

@@ -12,6 +12,7 @@ from fastcodedog.prepare.pdm_to_model.before.additional_foreign_keys import fill
 from fastcodedog.prepare.pdm_to_model.before.fill_tenant_id import fill_tenant_id
 from fastcodedog.prepare.pdm_to_model.before.specified_column_types import rename_specified_column_types
 from fastcodedog.prepare.pdm_to_model.before.specified_relationship_names import add_specified_relationship_names
+from fastcodedog.prepare.pdm_to_model.after.case import add_cases
 from fastcodedog.prepare.pdm_to_model.pdm import Pdm
 
 
@@ -36,5 +37,6 @@ def prepare_model(pre_process_scripts):
     # rename_specified_class_names(ctx_instance.source_directory.model, pre_process_scripts['specified_class_names'])
     add_computed_properties(ctx_instance.source_directory.model, pre_process_scripts['computed_properties'])
     specified_relationship_orderby(ctx_instance.source_directory.model, pre_process_scripts['specified_relationship_by'])
+    add_cases(ctx_instance.source_directory.model, pre_process_scripts['cases'])
     add_additional_methods(ctx_instance.source_directory.model, pre_process_scripts['additional_methods'])
     add_copy_methods(ctx_instance.source_directory.model, pre_process_scripts['copy_methods'])

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/prepare/schema_and_crud_to_api/endpoint.py

@@ -27,6 +27,7 @@ class Endpoint:
             'url': self._get_url(),
             'tags': self._get_tags(),
             'params': self._get_params(),
+            'oauth2_required': self.block.oauth2_required
         }
 
     def _get_action(self):

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/fastcodedog/prepare/schema_and_crud_to_api/prepare.py

@@ -26,11 +26,13 @@ def crud_and_schema_to_api(crud_context, schema_context):
     }
 
 
-def prepare_api(pre_process_scripts):
+def prepare_api(pre_process_scripts, specify_api=None):
     # 先清空目录
     shutil.rmtree(ctx_instance.source_directory.api, ignore_errors=True)
     for module, cruds in ctx_instance.cruds.items():
-        for crud_context in cruds.values():
+        for model, crud_context in cruds.items():
+            if specify_api and model not in specify_api:
+                continue
             schema_context = get_schema_context(module, crud_context.name)
             file_path = get_api_file_path(module, crud_context.name)
             write_json_file(file_path, crud_and_schema_to_api(crud_context, schema_context))

{fastcodedog-3.1.7 → fastcodedog-3.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastcodedog"
-version = "3.1.7"
+version = "3.2.0"
 description = ""
 authors = ["taohoo <taohoo@163.com>"]
 license = "MIT"