internal 1.1.35.2__tar.gz → 1.1.35.4__tar.gz

{internal-1.1.35.2 → internal-1.1.35.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.1.35.2
+Version: 1.1.35.4
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.1.35.2 → internal-1.1.35.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.1.35.2"
+version = "1.1.35.4"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"

{internal-1.1.35.2 → internal-1.1.35.4}/src/internal/model/base_model.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from idlelib import query
 
 from typing import List, Tuple, Union, Dict, Type, Optional, Any, Literal, Union, Set, Mapping
 import typing_extensions
@@ -28,7 +29,7 @@ class InternalBaseDocument(Document):
     async def get_pagination_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None,
                                   page_size: int = DEF_PAGE_SIZE, page_no: int = DEF_PAGE_NO,
                                   ignore_cache: bool = False, fetch_links: bool = False,
-                                  exclude_fields: List[str] = None):
+                                  exclude_field_list: List[str] = None):
         if not query:
             final_query = []
         else:
@@ -48,26 +49,55 @@ class InternalBaseDocument(Document):
                     continue
             final_sort.append((cls.id, pymongo.ASCENDING))
 
-        total_num = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
-            *final_sort).count()
-
-        total_pages = (total_num + page_size - 1) // page_size
-
-        if total_pages == 0:
-            page_no = 1
-            page_data = []
+        if exclude_field_list:
+            # 當需要排除欄位時，使用 Motor 直接操作
+            collection = cls.get_motor_collection()
+            projection = {field: 0 for field in exclude_field_list}
+
+            # 建立查詢條件
+            mongo_query = {}
+            for q in final_query:
+                if hasattr(q, 'query'):
+                    mongo_query.update(q.query)
+
+            # 計算總數
+            total_num = await collection.count_documents(mongo_query)
+            total_pages = (total_num + page_size - 1) // page_size
+
+            if total_pages == 0:
+                page_no = 1
+                page_data = []
+            else:
+                page_no = max(1, min(page_no, total_pages))
+
+                # 執行分頁查詢
+                cursor = collection.find(mongo_query, projection).sort(final_sort).skip(
+                    (page_no - 1) * page_size).limit(page_size)
+                documents = await cursor.to_list(None)
+
+                # 轉換為 Pydantic 模型
+                page_data = []
+                for doc in documents:
+                    try:
+                        page_data.append(cls.model_validate(doc))
+                    except Exception as e:
+                        print(f"模型驗證失敗: {e}")
+                        continue
         else:
-            page_no = max(1, min(page_no, total_pages))
+            # 沒有排除欄位時使用 Beanie 的方法
+            total_num = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
+                *final_sort).count()
 
-            # 建立查詢物件用於取得分頁資料
-            data_query = cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links)
+            total_pages = (total_num + page_size - 1) // page_size
 
-            # 如果有指定要排除的欄位，使用 project() 方法
-            if exclude_fields:
-                projection = {field: 0 for field in exclude_fields}
-                data_query = data_query.project(projection)
+            if total_pages == 0:
+                page_no = 1
+                page_data = []
+            else:
+                page_no = max(1, min(page_no, total_pages))
 
-            page_data = await data_query.sort(*final_sort).limit(page_size).skip((page_no - 1) * page_size).to_list()
+                page_data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
+                    *final_sort).limit(page_size).skip((page_no - 1) * page_size).to_list()
 
         return page_no, page_size, total_num, page_data
 
@@ -96,7 +126,7 @@ class InternalBaseDocument(Document):
 
     @classmethod
     async def get_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None, ignore_cache: bool = False,
-                       fetch_links: bool = False, exclude_fields: List[str] = None):
+                       fetch_links: bool = False, exclude_field_list: List[str] = None):
         if not query:
             final_query = []
         else:
@@ -116,15 +146,34 @@ class InternalBaseDocument(Document):
                     continue
             final_sort.append((cls.id, pymongo.ASCENDING))
 
-        # 建立查詢物件
-        query_obj = cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links)
-
-        # 如果有指定要排除的欄位，使用 project() 方法
-        if exclude_fields:
-            projection = {field: 0 for field in exclude_fields}
-            query_obj = query_obj.project(projection)
+        if exclude_field_list:
+            # 當需要排除欄位時，使用 Motor 直接操作
+            collection = cls.get_motor_collection()
+            projection = {field: 0 for field in exclude_field_list}
+
+            # 建立查詢條件
+            mongo_query = {}
+            for q in final_query:
+                if hasattr(q, 'query'):
+                    mongo_query.update(q.query)
+
+            # 執行查詢
+            cursor = collection.find(mongo_query, projection).sort(final_sort)
+            documents = await cursor.to_list(None)
+
+            # 轉換為 Pydantic 模型
+            data = []
+            for doc in documents:
+                try:
+                    data.append(cls.model_validate(doc))
+                except Exception as e:
+                    print(f"模型驗證失敗: {e}")
+                    continue
+        else:
+            # 沒有排除欄位時使用 Beanie 的方法
+            data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
+                *final_sort).to_list()
 
-        data = await query_obj.sort(*final_sort).to_list()
         return data
 
     def model_dump(