fastcodedog 2.0.4__tar.gz → 2.0.6__tar.gz

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/PKG-INFO

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

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/fastcodedog/context/api/endpoint.py

@@ -7,6 +7,7 @@ class Endpoint(ContextBase):
     def __init__(self):
         super().__init__()
         self.name = ''
+        self.have_select_models = False
         self.summary = ''
         self.comment = ''
         self.action = ''

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/fastcodedog/context/crud/query.py

@@ -17,6 +17,9 @@ class Query(ContextBase):
         self.name = ''
         self.model = ''
         self.module = ''
+        self.select_models = []
+        self._types['select_models'] = str
+        # self.select_from = ''
         self.summary = ''
         self.description = ''
         self.max_size = None     # 一个请求允许的最大返回值

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/fastcodedog/generation/api/api_function.py

@@ -112,15 +112,21 @@ return {{}}""", possible_imports=[self.crud_imoprt, 'from fastapi import HTTPExc
             params_class_name = 'CustomParams'
         if self.api.validate_response_model:
             self.blocks.append(Text(
-                f"""return create_page([response_model.model_validate({self.api.snake_name}) for {self.api.snake_name} in query.offset(skip).limit(limit).all()],
+                f"""return create_page([response_model.model_validate({self.api.snake_name}) for {self.api.snake_name}{', *_' if self.context.have_select_models else ''} in query.offset(skip).limit(limit).all()],
    total=total, params={params_class_name}(page=page, size=size))""",
                 possible_imports=['from fastapi_pagination import create_page',
                                   'from fastapi_pagination import Params']))
         else:
-            self.blocks.append(Text(f"""return create_page(query.offset(skip).limit(limit).all(),
-   total=total, params={params_class_name}(page=page, size=size))""",
-                                    possible_imports=['from fastapi_pagination import create_page',
-                                                      'from fastapi_pagination import Params']))
+            if self.context.have_select_models:
+                self.blocks.append(Text(f"""return create_page([for {self.api.snake_name}, *_ in query.offset(skip).limit(limit).all()],
+       total=total, params={params_class_name}(page=page, size=size))""",
+                                        possible_imports=['from fastapi_pagination import create_page',
+                                                          'from fastapi_pagination import Params']))
+            else:
+                self.blocks.append(Text(f"""return create_page(query.offset(skip).limit(limit).all(),
+       total=total, params={params_class_name}(page=page, size=size))""",
+                                        possible_imports=['from fastapi_pagination import create_page',
+                                                          'from fastapi_pagination import Params']))
 
     def _fill_option_none(self):
         if any([param.option_none for param in self.context.params.values()]):

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/fastcodedog/generation/api/generation.py

@@ -15,5 +15,7 @@ def generate_api(specify_api=None):
     Oauth2().save()
     for module, apis in ctx_instance.apis.items():
         for api_context in apis.values():
+            if specify_api and api_context.name not in specify_api:
+                continue
             api_file = Api(api_context)
             api_file.save()

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/fastcodedog/generation/api/main.py

@@ -70,6 +70,7 @@ logging.getLogger('sqlalchemy.engine').setLevel(get_config('logging', 'level', l
 @app.exception_handler(DataError)
 @app.exception_handler(ValidationError)
 async def fastapi_exception_handler_400(request, exc):
+    logging.warning(traceback.format_exc())
     if f"{exc}".find("duplicate key") != -1:
         p = r'(Key\s+.*already\s+exists)'
         detail = re.findall(p, f"{exc}")
@@ -85,6 +86,7 @@ async def fastapi_exception_handler_400(request, exc):
 
 @app.exception_handler(SQLAlchemyError)
 async def fastapi_exception_handler_500(request, exc):
+    logging.error(traceback.format_exc())
     raise HTTPException(
         status_code=HTTP_500_INTERNAL_SERVER_ERROR,
         detail=f"Database operation failed: {exc}",
@@ -93,4 +95,4 @@ async def fastapi_exception_handler_500(request, exc):
                             'from pydantic import ValidationError',
                             'from starlette.status import HTTP_400_BAD_REQUEST',
                             'from starlette.status import HTTP_500_INTERNAL_SERVER_ERROR',
-                            'import re']))
+                            'import re', 'import traceback']))

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/fastcodedog/generation/crud/crud_functions.py

@@ -13,8 +13,8 @@ from fastcodedog.util.inflect_wrapper import plural
 
 
 class Crud(Function):
-    POSSIBLE_IMPORTS = ['from datetime import datetime', 'from datetime import date', 'from datetime import time',
-                        'from sqlalchemy import exists', 'from sqlalchemy import select',
+    POSSIBLE_IMPORTS = ['import datetime', 'from datetime import datetime', 'from datetime import date', 'from datetime import time',
+                        'from sqlalchemy import exists', 'from sqlalchemy import select', 'from sqlalchemy import join',
                         'from sqlalchemy import or_', 'from sqlalchemy import and_']
 
     class Action(Enum):
@@ -51,6 +51,9 @@ class Crud(Function):
             for model in models.values():
                 if model.name == model_name:
                     return LocationFinder.get_package(model_name, 'model', model.module)
+        # 支持的系统模型
+        if model_name == 'datetime':
+            return None
         raise Exception(f'未找到模型：{model_name}')
 
 

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/fastcodedog/generation/crud/query_functions.py

@@ -150,6 +150,7 @@ class Query(Crud):
         super().__init__(f'get_{context.name}', context=context, comment=context.description)
         self.action = Crud.Action.READ
         self.return_list = True
+        self.have_select_models = bool(self.context.select_models)
         self.summary = context.summary
         self.params['session'] = Function.Parameter('session', nullable=False)
         for parameter in context.parameters.values():
@@ -171,7 +172,21 @@ class Query(Crud):
         self._init_blocks_and_possible_imports()
 
     def _init_blocks_and_possible_imports(self):
-        self.blocks.append(Text(f'query = session.query({self.context.model})'))
+        # 添加session.query
+        if self.context.select_models:
+            # self.add_possible_imports(Import(self.context.select_models[0], self.get_package_by_model_name(self.context.select_models[0])))
+            self.blocks.append(Text(f'query = session.query({", ".join([self.context.model] + self.context.select_models)})'))
+            for select_model in self.context.select_models:
+                if select_model not in self.context.aliases.keys():
+                    self.add_possible_imports(Import(select_model, self.get_package_by_model_name(select_model)))
+        else:
+            self.blocks.append(Text(f'query = session.query({self.context.model})'))
+        # # 添加select_from，一般需要先有select_models
+        # if self.context.select_from:
+        #     self.blocks.append(Text(f'query = query.select_from({self.context.select_from})'))
+        #     for select_from in extract_variables(self.context.select_from):
+        #         if select_from not in ['join', 'outerjoin'] and select_from not in self.context.aliases.keys():
+        #             ...
         for alias_name, alias_value in self.context.aliases.items():
             model_name = alias_value.split('.')[0]
             self.add_possible_imports(Import(model_name, self.get_package_by_model_name(model_name)))

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/fastcodedog/prepare/schema_and_crud_to_api/endpoint.py

@@ -18,6 +18,7 @@ class Endpoint:
     def to_json(self):
         return {
             'name': self.name,
+            'have_select_models': False if not hasattr(self.block, 'have_select_models') else self.block.have_select_models,
             'summary': self.block.summary,
             'comment': self.block.comment,
             'action': self._get_action(),

{fastcodedog-2.0.4 → fastcodedog-2.0.6}/pyproject.toml

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