fastcodedog 3.2.3__tar.gz → 3.2.4__tar.gz

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

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

{fastcodedog-3.2.3 → 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.3 → 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.3 → 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.3 → fastcodedog-3.2.4}/pyproject.toml

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