fastcodedog 2.0.8__tar.gz → 2.0.9__tar.gz

{fastcodedog-2.0.8 → fastcodedog-2.0.9}/PKG-INFO

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

{fastcodedog-2.0.8 → fastcodedog-2.0.9}/fastcodedog/context/crud/column.py

@@ -11,3 +11,4 @@ class Column(ContextBase):
         self.nullable = True
         self.option_none = False  # 是否需要处理输入的None。可以在地址中输入变量名而不输入变量值来传递None
         self.description = ''
+

{fastcodedog-2.0.8 → fastcodedog-2.0.9}/fastcodedog/context/crud/crud.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from fastcodedog.context.contextbase import ContextBase
 from fastcodedog.context.crud.column import Column
+from fastcodedog.context.crud.default_value import DefaultValue
 from fastcodedog.context.crud.join_relationship import JoinRelationship
 from fastcodedog.context.crud.query import Query
 
@@ -23,6 +24,8 @@ class Crud(ContextBase):
         self._types['join_relationships'] = JoinRelationship
         self.queries = {}
         self._types['queries'] = Query
+        self.default_values = {}
+        self._types['default_values'] = DefaultValue
 
     def load(self, json):
         for k, v in json.items():

fastcodedog-2.0.9/fastcodedog/context/crud/default_value.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from fastcodedog.context.contextbase import ContextBase
+
+
+class DefaultValue(ContextBase):
+    def __init__(self):
+        super().__init__()
+        self.change_when_update = False
+        self.force_default = False
+        self.import_ = []
+        self._types['import_'] = str
+        self.value_expression = ''

{fastcodedog-2.0.8 → fastcodedog-2.0.9}/fastcodedog/context/model/computed_property.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from fastcodedog.context.common.import_ import Import_
 from fastcodedog.context.contextbase import ContextBase
 
 
@@ -15,5 +14,5 @@ class ComputedProperty(ContextBase):
         self.model_name = ''
         self.nullable = True
         self.script = ''
-        self.import_ = None
-        self._types['import_'] = Import_
+        self.import_ = []
+        self._types['import_'] = str

{fastcodedog-2.0.8 → fastcodedog-2.0.9}/fastcodedog/context/schema/alias_generator.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-from fastcodedog.context.common.import_ import Import_
 from fastcodedog.context.contextbase import ContextBase
 
 
 class AliasGenerator(ContextBase):
     def __init__(self):
         super().__init__()
-        self.import_ = None
-        self._types['import_'] = Import_
+        self.import_ = []
+        self._types['import_'] = str
         self.function = ''

{fastcodedog-2.0.8 → fastcodedog-2.0.9}/fastcodedog/generation/api/main.py

@@ -22,6 +22,7 @@ class Main(File):
     def _init_blocks(self):
         self.blocks.append(
             Variable('app', value='FastAPI()', possible_imports='from fastapi import FastAPI'))
+        self.blocks.append(Text('app.add_middleware(AuthMiddleware)', possible_imports='from fastoauth import AuthMiddleware'))
         self._init_swagger()
         self._init_sqlalchemy_error_handler()
         # 异常捕捉定义和配置之间加空行

{fastcodedog-2.0.8 → fastcodedog-2.0.9}/fastcodedog/generation/crud/crud_functions.py

@@ -89,6 +89,14 @@ class BaseCreate(Crud):
             if not column.nullable:
                 self.blocks.append(Text(f"if not {self.snake_name}.{column.name}:\n    {self.snake_name}.{column.name} = str(uuid.uuid4())",
                                         possible_imports='import uuid'))
+        # 添加默认值
+        for column, default_value in self.context.default_values.items():
+            if default_value.force_default:
+                self.blocks.append(Text(f"{self.snake_name}.{column} = {default_value.value_expression}"))
+            else:
+                self.blocks.append(Text(f"if not {self.snake_name}.{column}:\n    {self.snake_name}.{column} = {default_value.value_expression}"))
+            if default_value.import_:
+                self.add_possible_imports(default_value.import_)
         self.blocks.append(Text(f"session.add({self.snake_name})"))
         self.blocks.append(Text(f"session.commit()"))
         self.blocks.append(Text(f"return {self.snake_name}"))
@@ -129,7 +137,16 @@ class BaseUpdate(Crud):
     continue"""
             self.blocks.append(Text(content, indent=self.DEFAULT_INDENT))
         self.blocks.append(Text(f"setattr({self.snake_name}, key, value)", indent=self.DEFAULT_INDENT))
-
+        # 添加默认值
+        for column, default_value in self.context.default_values.items():
+            if not default_value.change_when_update:
+                continue
+            if default_value.force_default:
+                self.blocks.append(Text(f"{self.snake_name}.{column} = {default_value.value_expression}"))
+            else:
+                self.blocks.append(Text(f"if not {self.snake_name}.{column}:\n    {self.snake_name}.{column} = {default_value.value_expression}"))
+            if default_value.import_:
+                self.add_possible_imports(default_value.import_)
         self.blocks.append(Text(f"session.commit()"))
         self.blocks.append(Text(f"return {self.snake_name}"))
 

fastcodedog-2.0.9/fastcodedog/prepare/model_and_schema_to_crud/default_values.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+import json5
+
+from fastcodedog.common.source_file_path import get_crud_file_path
+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
+
+
+def add_default_value(crud_directory, default_values):
+    for column_name, default_value in default_values.items():
+        k_model = ''
+        k_column = ''
+        if column_name.find('.') > 0:
+            k_model = column_name.split('.')[0]
+            k_column = column_name.split('.')[1]
+        else:
+            k_column = column_name
+        files = find(ctx_instance.source_directory.model, '*/*.json5')
+        for file in files:
+            model = Model()
+            model.load(json5.load(open(file, 'r', encoding='utf-8')))
+            if k_model and k_model != model.name:
+                continue
+            for column in model.columns.keys():
+                if k_column != column:
+                    continue
+                json_file = get_crud_file_path(model.module, model.name)
+                data = json5.load(open(json_file, 'r', encoding='utf-8'))
+                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)
+
+

{fastcodedog-2.0.8 → fastcodedog-2.0.9}/fastcodedog/prepare/model_and_schema_to_crud/prepare.py

@@ -5,6 +5,7 @@ from fastcodedog.common.source_file_path import get_crud_file_path
 from fastcodedog.common.write_file import write_json_file
 from fastcodedog.context.common.get_context_object import get_model_context, get_schema_context
 from fastcodedog.context.context import ctx_instance
+from fastcodedog.prepare.model_and_schema_to_crud.default_values import add_default_value
 from fastcodedog.prepare.model_and_schema_to_crud.queries import add_queries
 
 
@@ -77,6 +78,7 @@ def prepare_crud(pre_process_scripts):
             schema_context = get_schema_context(module, model_context.name)
             file_path = get_crud_file_path(module, model_context.name)
             write_json_file(file_path, model_and_schema_to_crud(model_context, schema_context))
-
+    # 写入默认值
+    add_default_value(ctx_instance.source_directory.crud, pre_process_scripts.get('default_values'))
     # 写入query
     add_queries(ctx_instance.source_directory.crud, pre_process_scripts.get('queries'))

{fastcodedog-2.0.8 → fastcodedog-2.0.9}/pyproject.toml

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

fastcodedog-2.0.8/fastcodedog/context/common/import_.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-from fastcodedog.context.contextbase import ContextBase
-
-
-class Import_(ContextBase):
-    def __init__(self):
-        super().__init__()
-        self.from_ = ''
-        self.import_ = ''
-        self.as_ = ''