internal 1.1.35.1__py3-none-any.whl → 1.1.35.3__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of internal might be problematic. Click here for more details.

Files changed (4) hide show
  1. internal/model/base_model.py +12 -16
  2. {internal-1.1.35.1.dist-info → internal-1.1.35.3.dist-info}/METADATA +1 -1
  3. {internal-1.1.35.1.dist-info → internal-1.1.35.3.dist-info}/RECORD +4 -4
  4. {internal-1.1.35.1.dist-info → internal-1.1.35.3.dist-info}/WHEEL +0 -0
internal/model/base_model.py CHANGED
@@ -1,4 +1,5 @@
1
1
  from datetime import datetime
2
+ from idlelib import query
2
3
 
3
4
  from typing import List, Tuple, Union, Dict, Type, Optional, Any, Literal, Union, Set, Mapping
4
5
  import typing_extensions
@@ -27,8 +28,7 @@ class InternalBaseDocument(Document):
27
28
  @classmethod
28
29
  async def get_pagination_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None,
29
30
  page_size: int = DEF_PAGE_SIZE, page_no: int = DEF_PAGE_NO,
30
- ignore_cache: bool = False, fetch_links: bool = False,
31
- exclude_fields: List[str] = None):
31
+ ignore_cache: bool = False, fetch_links: bool = False, exclude: Dict = None):
32
32
  if not query:
33
33
  final_query = []
34
34
  else:
@@ -48,10 +48,6 @@ class InternalBaseDocument(Document):
48
48
  continue
49
49
  final_sort.append((cls.id, pymongo.ASCENDING))
50
50
 
51
- pymongo_kwargs = {}
52
- if exclude_fields:
53
- pymongo_kwargs['projection'] = {field: 0 for field in exclude_fields}
54
-
55
51
  total_num = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
56
52
  *final_sort).count()
57
53
 
@@ -63,9 +59,11 @@ class InternalBaseDocument(Document):
63
59
  else:
64
60
  page_no = max(1, min(page_no, total_pages))
65
61
 
66
- page_data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links,
67
- **pymongo_kwargs).sort(*final_sort).limit(page_size).skip(
68
- (page_no - 1) * page_size).to_list()
62
+ _query = cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links)
63
+ if exclude:
64
+ _query = _query.project(exclude)
65
+
66
+ page_data = await _query.sort(*final_sort).limit(page_size).skip((page_no - 1) * page_size).to_list()
69
67
 
70
68
  return page_no, page_size, total_num, page_data
71
69
 
@@ -94,7 +92,7 @@ class InternalBaseDocument(Document):
94
92
 
95
93
  @classmethod
96
94
  async def get_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None, ignore_cache: bool = False,
97
- fetch_links: bool = False, exclude_fields: List[str] = None):
95
+ fetch_links: bool = False, exclude: Dict = None):
98
96
  if not query:
99
97
  final_query = []
100
98
  else:
@@ -114,13 +112,11 @@ class InternalBaseDocument(Document):
114
112
  continue
115
113
  final_sort.append((cls.id, pymongo.ASCENDING))
116
114
 
117
- # 準備 pymongo 的 projection 參數
118
- pymongo_kwargs = {}
119
- if exclude_fields:
120
- pymongo_kwargs['projection'] = {field: 0 for field in exclude_fields}
115
+ _query = cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links)
116
+ if exclude:
117
+ _query = _query.project(exclude)
121
118
 
122
- data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links,
123
- **pymongo_kwargs).sort(*final_sort).to_list()
119
+ data = await _query.sort(*final_sort).to_list()
124
120
 
125
121
  return data
126
122
 
{internal-1.1.35.1.dist-info → internal-1.1.35.3.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: internal
3
- Version: 1.1.35.1
3
+ Version: 1.1.35.3
4
4
  Summary:
5
5
  Author: Ray
6
6
  Author-email: ray@cruisys.com
{internal-1.1.35.1.dist-info → internal-1.1.35.3.dist-info}/RECORD RENAMED
@@ -31,10 +31,10 @@ internal/interface/base_interface.py,sha256=3YaVjIgLi_pZpLk5SEIk8WVkuICM8qPavT8r
31
31
  internal/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
32
32
  internal/middleware/log_request.py,sha256=OFwWnGfzXnllcQsBHolAWVsahXKoEhw3OQ1YWOm7RHM,2087
33
33
  internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
34
- internal/model/base_model.py,sha256=znEpL1ztwvALWUhhTBTDdFQi_AUg204l_Ovm0BjOKtI,5992
34
+ internal/model/base_model.py,sha256=V21OUoLAzeTrYRPV4cUsyGCOaDcS-OpXC49SCiHjAkg,5707
35
35
  internal/model/operate.py,sha256=QSM6yXYXpJMwrqkUGEWZLrEBaUgqHwVHY_Fi4S42hKc,3190
36
36
  internal/utils.py,sha256=wK1QumW1AaWE1ga2-WcDH2rtXRr2hSLwXzy-iI5dTzY,3962
37
37
  internal/validator_utils.py,sha256=CqjaVFoAu5MqvBG_AkTP-r7AliWawtUWB851USj4moI,1519
38
- internal-1.1.35.1.dist-info/METADATA,sha256=mlqCPVT97ABLaQ7uR5rOD9VcfchwffZOyh6UxQFCY4Y,941
39
- internal-1.1.35.1.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
40
- internal-1.1.35.1.dist-info/RECORD,,
38
+ internal-1.1.35.3.dist-info/METADATA,sha256=zfu2VUwh7UVMML8jA7DVB3O0IRfq3XY98SMkdpImJSo,941
39
+ internal-1.1.35.3.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
40
+ internal-1.1.35.3.dist-info/RECORD,,