valar 1.0.26__tar.gz → 1.0.28__tar.gz

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 valar might be problematic. Click here for more details.

Files changed (54) hide show
  1. {valar-1.0.26/src/valar.egg-info → valar-1.0.28}/PKG-INFO +1 -1
  2. {valar-1.0.26 → valar-1.0.28}/setup.py +1 -1
  3. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/model_orm.py +5 -2
  4. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/utils_orm.py +3 -1
  5. {valar-1.0.26 → valar-1.0.28/src/valar.egg-info}/PKG-INFO +1 -1
  6. {valar-1.0.26 → valar-1.0.28}/LICENSE +0 -0
  7. {valar-1.0.26 → valar-1.0.28}/README.md +0 -0
  8. {valar-1.0.26 → valar-1.0.28}/setup.cfg +0 -0
  9. {valar-1.0.26 → valar-1.0.28}/src/valar/__init__.py +0 -0
  10. {valar-1.0.26 → valar-1.0.28}/src/valar/channels/__init__.py +0 -0
  11. {valar-1.0.26 → valar-1.0.28}/src/valar/channels/consumer.py +0 -0
  12. {valar-1.0.26 → valar-1.0.28}/src/valar/channels/executer.py +0 -0
  13. {valar-1.0.26 → valar-1.0.28}/src/valar/channels/mapping.py +0 -0
  14. {valar-1.0.26 → valar-1.0.28}/src/valar/channels/sender.py +0 -0
  15. {valar-1.0.26 → valar-1.0.28}/src/valar/channels/views.py +0 -0
  16. {valar-1.0.26 → valar-1.0.28}/src/valar/core/__init__.py +0 -0
  17. {valar-1.0.26 → valar-1.0.28}/src/valar/core/counter.py +0 -0
  18. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/__init__.py +0 -0
  19. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/_mon_array2tree.py +0 -0
  20. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/dao_base.py +0 -0
  21. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/dao_mon.py +0 -0
  22. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/dao_orm.py +0 -0
  23. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/engine.py +0 -0
  24. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/engine_minio.py +0 -0
  25. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/engine_mon.py +0 -0
  26. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/engine_orm.py +0 -0
  27. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/model_mon.py +0 -0
  28. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/query_mon.py +0 -0
  29. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/query_orm.py +0 -0
  30. {valar-1.0.26 → valar-1.0.28}/src/valar/core/dao_abstract.py +0 -0
  31. {valar-1.0.26 → valar-1.0.28}/src/valar/core/meta/__init__.py +0 -0
  32. {valar-1.0.26 → valar-1.0.28}/src/valar/core/meta/defaults/__init__.py +0 -0
  33. {valar-1.0.26 → valar-1.0.28}/src/valar/core/meta/defaults/field_keys_default.py +0 -0
  34. {valar-1.0.26 → valar-1.0.28}/src/valar/core/meta/defaults/field_values_default.py +0 -0
  35. {valar-1.0.26 → valar-1.0.28}/src/valar/core/meta/defaults/frame_defaults.py +0 -0
  36. {valar-1.0.26 → valar-1.0.28}/src/valar/core/meta/defaults/view_defaults.py +0 -0
  37. {valar-1.0.26 → valar-1.0.28}/src/valar/core/meta/field_orm.py +0 -0
  38. {valar-1.0.26 → valar-1.0.28}/src/valar/core/meta/init_meta_frame.py +0 -0
  39. {valar-1.0.26 → valar-1.0.28}/src/valar/core/meta/meta_orm.py +0 -0
  40. {valar-1.0.26 → valar-1.0.28}/src/valar/core/middleware.py +0 -0
  41. {valar-1.0.26 → valar-1.0.28}/src/valar/core/response.py +0 -0
  42. {valar-1.0.26 → valar-1.0.28}/src/valar/core/singleton_meta.py +0 -0
  43. {valar-1.0.26 → valar-1.0.28}/src/valar/core/valar_models.py +0 -0
  44. {valar-1.0.26 → valar-1.0.28}/src/valar/data/__init__.py +0 -0
  45. {valar-1.0.26 → valar-1.0.28}/src/valar/data/migrations/__init__.py +0 -0
  46. {valar-1.0.26 → valar-1.0.28}/src/valar/data/models.py +0 -0
  47. {valar-1.0.26 → valar-1.0.28}/src/valar/data/urls.py +0 -0
  48. {valar-1.0.26 → valar-1.0.28}/src/valar/data/views/__init__.py +0 -0
  49. {valar-1.0.26 → valar-1.0.28}/src/valar/data/views/handler.py +0 -0
  50. {valar-1.0.26 → valar-1.0.28}/src/valar/data/views/rest.py +0 -0
  51. {valar-1.0.26 → valar-1.0.28}/src/valar.egg-info/SOURCES.txt +0 -0
  52. {valar-1.0.26 → valar-1.0.28}/src/valar.egg-info/dependency_links.txt +0 -0
  53. {valar-1.0.26 → valar-1.0.28}/src/valar.egg-info/requires.txt +0 -0
  54. {valar-1.0.26 → valar-1.0.28}/src/valar.egg-info/top_level.txt +0 -0
{valar-1.0.26/src/valar.egg-info → valar-1.0.28}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: valar
3
- Version: 1.0.26
3
+ Version: 1.0.28
4
4
  Summary: valar for morghulis
5
5
  Home-page: https://gitee.com/GRIFFIN120/valar_dev
6
6
  Author: LYP
{valar-1.0.26 → valar-1.0.28}/setup.py RENAMED
@@ -16,7 +16,7 @@ requires = [
16
16
 
17
17
  setup(
18
18
  name="valar", # 包名
19
- version="1.0.26", # 版本号
19
+ version="1.0.28", # 版本号
20
20
  author="LYP", # 作者
21
21
  author_email="liuyinpeng@buaa.edu.cn", # 邮箱
22
22
  description="valar for morghulis", # 简短描述
{valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/model_orm.py RENAMED
@@ -181,12 +181,15 @@ class OrmModel:
181
181
  # 简单字段取值
182
182
  simple_props = [field.prop for field in orm_fields if field.domain not in utils.referred_domains]
183
183
  custom_props = utils.custom_props(self.entity, code)
184
- results = list(query_set.values(*[*simple_props, *custom_props]))
184
+ results = list(query_set.filter().values(*[*simple_props, *custom_props]))
185
185
  utils.date_values(orm_fields, results)
186
186
  # 关系型字段取值
187
187
  mapping = { row['id']: row for row in results}
188
188
  referred_fields = [field for field in orm_fields if field.domain in utils.referred_domains]
189
+ pks = mapping.keys()
189
190
  for field in referred_fields:
190
- utils.linkage(field, query_set, mapping)
191
+ manager: Manager = query_set.model.objects
192
+ qs = manager.filter(id__in=pks)
193
+ utils.linkage(field, qs, mapping)
191
194
  return results
192
195
 
{valar-1.0.26 → valar-1.0.28}/src/valar/core/dao/utils_orm.py RENAMED
@@ -1,3 +1,5 @@
1
+ from django.db.models import QuerySet
2
+
1
3
  from ..valar_models import VModel
2
4
  from ...core.meta.field_orm import OrmField
3
5
  from ...data.models import MetaField
@@ -21,7 +23,7 @@ class OrmUtils:
21
23
  return [item['prop'] for item in field_set if item['prop']]
22
24
 
23
25
 
24
- def linkage(self, field, query_set, mapping):
26
+ def linkage(self, field, query_set: QuerySet, mapping):
25
27
  model_field = field.model_field
26
28
  prop = model_field.name
27
29
  multiple = field.domain in self.multiple_domains
{valar-1.0.26 → valar-1.0.28/src/valar.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: valar
3
- Version: 1.0.26
3
+ Version: 1.0.28
4
4
  Summary: valar for morghulis
5
5
  Home-page: https://gitee.com/GRIFFIN120/valar_dev
6
6
  Author: LYP
{valar-1.0.26 → valar-1.0.28}/LICENSE RENAMED
File without changes
{valar-1.0.26 → valar-1.0.28}/README.md RENAMED
File without changes
{valar-1.0.26 → valar-1.0.28}/setup.cfg RENAMED
File without changes
{valar-1.0.26 → valar-1.0.28}/src/valar/__init__.py RENAMED
File without changes
{valar-1.0.26 → valar-1.0.28}/src/valar/core/counter.py RENAMED
File without changes
{valar-1.0.26 → valar-1.0.28}/src/valar/data/models.py RENAMED
File without changes
{valar-1.0.26 → valar-1.0.28}/src/valar/data/urls.py RENAMED
File without changes