fastcodedog 3.2.2__tar.gz → 3.2.4__tar.gz

{fastcodedog-3.2.2 → fastcodedog-3.2.4}/PKG-INFO

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

{fastcodedog-3.2.2 → fastcodedog-3.2.4}/fastcodedog/generation/api/oauth2.py

@@ -3,6 +3,7 @@
 from fastcodedog.context.context import ctx_instance
 from fastcodedog.generation.api.config import Config
 from fastcodedog.generation.api.db import Db
+from fastcodedog.generation.base.class_type import ClassType
 from fastcodedog.generation.base.file import File
 from fastcodedog.generation.base.function import Function
 from fastcodedog.generation.base.location_finder import LocationFinder
@@ -35,10 +36,38 @@ OAuth2.REDIS_URL = 'redis://localhost:6379/oauth2'""")
         self.blocks.append(Text("""if redis_url:
     OAuth2.REDIS_URL = redis_url
         """, possible_imports=Import('redis_url', Config().package)))
+        # read_me方法的response_model
+        self.read_me_response = '' if not ctx_instance.tenant.enabled else self._init_read_me_response_model()
         self._init_login()
         self._init_remove_and_refresh()
         self._init_read_me()
 
+    def _init_read_me_response_model(self):
+        class_user_with_tenant = ClassType('UserWithTenant', base_class='BaseModel', comment='用户信息，包含租户信息')
+
+        module = ctx_instance.oauth2.module
+        model_name = ctx_instance.oauth2.model
+        snake_name = camel_to_snake(model_name)
+        user_api = ctx_instance.apis[module][model_name]
+        from fastcodedog.generation.api.api import Api
+        api = Api(user_api)
+        v_user = Text('user: UserResponse', possible_imports=Import(api.response_model,
+                                                                                   from_=api.package,
+                                                                                   as_='UserResponse'))
+        class_user_with_tenant.blocks.append(v_user)
+
+        tenant_model = ctx_instance.get_tenant_model()
+        v_tenant = Text(f'tenant: Optional[TenantSchema] = None', possible_imports=['from typing import Optional', Import(tenant_model.name,
+                               from_=LocationFinder.get_package(tenant_model.name, 'schema', tenant_model.module),
+                               as_='TenantSchema')])
+        class_user_with_tenant.blocks.append(v_tenant)
+        class_config = ClassType('Config', base_class=None)
+        class_config.blocks.append(Text('from_attributes = True'))
+        class_user_with_tenant.blocks.append(class_config)
+
+        self.blocks.append(class_user_with_tenant)
+        return 'UserWithTenant'
+
     def _init_login(self):
         module = ctx_instance.oauth2.module
         model_name = ctx_instance.oauth2.model
@@ -137,7 +166,7 @@ async def refresh(refresh_token: str= Body(..., embed=True)):
         function = Function('read_me', async_=True)
         function.decorators.append(
             Function.Decorator('app.get', params=[f"'{self.me_url}'", Variable('tags', value=['认证(OAtuh)']),
-                                                  Variable('response_model', value='UserResponse',
+                                                  Variable('response_model', value=self.read_me_response,
                                                            possible_imports=Import(api.response_model,
                                                                                    from_=api.package,
                                                                                    as_='UserResponse')
@@ -175,8 +204,28 @@ if not {snake_name}:
     raise HTTPException(status_code=HTTP_404_NOT_FOUND, detail=f"数据未找到")""",
                                     possible_imports=['from fastapi import HTTPException',
                                                       'from starlette.status import HTTP_404_NOT_FOUND']))
+
+        # 如果启用了租户，则需要构造包含租户信息的返回模型
+        if ctx_instance.tenant.enabled:
+            tenant_model = ctx_instance.get_tenant_model()
+            function.blocks.append(Text(f"""tenant = None
+tenant_id = OAuth2.get_token_user(token).get("tenant_id")
+if tenant_id:
+    tenant_obj = session.query({tenant_model.name}).filter_by(id=tenant_id).first()
+    if tenant_obj:
+        tenant = TenantSchema.model_validate(tenant_obj) 
+""", possible_imports=[Import(tenant_model.name, LocationFinder.get_package(tenant_model.name, 'model', tenant_model.module)),
+                        Import(tenant_model.name,
+                               from_=LocationFinder.get_package(tenant_model.name, 'schema', tenant_model.module),
+                               as_='TenantSchema')]))
         if api.validate_response_model:
-            function.blocks.append(Text(f"""return response_model.model_validate({snake_name})"""))
+            if ctx_instance.tenant.enabled:
+                function.blocks.append(Text(f"""return {self.read_me_response}({snake_name}=response_model.model_validate({snake_name}), tenant=tenant)"""))
+            else:
+                function.blocks.append(Text(f"""return response_model.model_validate({snake_name})"""))
         else:
-            function.blocks.append(Text(f"""return {snake_name}"""))
+            if ctx_instance.tenant.enabled:
+                function.blocks.append(Text(f"""return {self.read_me_response}({snake_name}={snake_name}, tenant=tenant)"""))
+            else:
+                function.blocks.append(Text(f"""return {snake_name}"""))
         self.blocks.append(function)

{fastcodedog-3.2.2 → fastcodedog-3.2.4}/fastcodedog/generation/base/block.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import re
+
 from fastcodedog.context.contextbase import ContextBase
 from fastcodedog.generation.base.required_import import RequiredImport, Import
 from fastcodedog.util.extractor import extract_variables
@@ -29,12 +31,19 @@ class Block:
         key = import_statement.as_ if import_statement.as_ else import_statement.import_
         self.possible_imports[key] = import_statement
 
-    def get_required_imports(self) -> RequiredImport:
+    def get_required_imports(self, strict=True) -> RequiredImport:
+        """
+        strict=True（默认）：使用 AST 解析，仅匹配代码中出现的变量名；
+        strict=False：不做语法解析，将代码段中所有单词逐一与 possible_imports 的 key 比对。
+        """
         required_import = RequiredImport()
         content = self.serialize(with_comment=False)
-        all_variables = extract_variables(content)
+        if strict:
+            all_tokens = extract_variables(content)
+        else:
+            all_tokens = re.findall(r'\b[a-zA-Z_]\w*\b', content)
         for varibale, import_ in self.possible_imports.items():
-            if varibale in all_variables:
+            if varibale in all_tokens:
                 required_import.add(import_)
         return required_import
 

{fastcodedog-3.2.2 → fastcodedog-3.2.4}/fastcodedog/generation/base/text.py

@@ -6,9 +6,10 @@ from fastcodedog.util.indent import add_indent
 
 
 class Text(Block):
-    def __init__(self, content, indent=None, possible_imports: list | str = None, parent=None):
+    def __init__(self, content, indent=None, possible_imports: list | str = None, parent=None, strict=True):
         """纯文本类型"""
         super().__init__(name='__content__', possible_imports=possible_imports, parent=parent)
+        self.strict = strict    # 解析import的时候是否采用ast
         self.content = content
         self.indent = indent
 
@@ -19,4 +20,4 @@ class Text(Block):
     def get_required_imports(self) -> RequiredImport:
         if not self.possible_imports:
             return RequiredImport()
-        return super().get_required_imports()
+        return super().get_required_imports(strict=self.strict)

{fastcodedog-3.2.2 → fastcodedog-3.2.4}/fastcodedog/generation/crud/query_functions.py

@@ -216,7 +216,7 @@ class Query(Crud):
             self.blocks.append(Text(f'query = query.distinct({self.context.distinct})'))
         if self.context.orders:
             self.blocks.append(Text(f"""if order_by and order_by not in {self.context.orders}:
-    raise Exception(f'未知的排序方式：{{order_by}}，可选值：{", ".join(self.context.orders)}')"""))
+    raise Exception(f'未知的排序方式：{{order_by}}，可选值：{", ".join(self.context.orders)}')""", possible_imports=['from sqlalchemy import nullslast'], strict=False))
             self.blocks.append(Text(f"""if order_by:
     query = eval(f'query.order_by({{order_by}})')   # 采用eval，由上面的if语句确保不执行危险代码"""))
         self.blocks.append(Text(f'return query'))

{fastcodedog-3.2.2 → fastcodedog-3.2.4}/pyproject.toml

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