valar 1.3.7__py3-none-any.whl → 1.3.9__py3-none-any.whl

valar/dao/__init__.py

@@ -15,10 +15,10 @@ class Dao(AbstractDao):
         self.manager = self.dao.manager
 
     def save_many(self, array: list):
-        self.dao.save_many(array)
+        return self.dao.save_many(array)
 
-    def save_one(self, item, with_id=False):
-        return self.dao.save_one(item, with_id)
+    def save_one(self, item):
+        return self.dao.save_one(item)
 
     def delete_one(self, _id):
         return self.dao.delete_one(_id)

valar/dao/abstract.py

@@ -46,7 +46,7 @@ class AbstractDao(ABC):
         return self.fields[prop]
 
     @abstractmethod
-    def save_one(self, item, with_id=False):
+    def save_one(self, item):
         pass
 
     @abstractmethod

valar/dao/engine.py

@@ -1,10 +1,10 @@
-import pymongo
 from django.apps import apps
 from django.conf import settings
 from urllib.parse import urlparse
 
 from django.core.mail import EmailMessage
 from minio import Minio
+from pymongo import MongoClient
 from pymongo.synchronous.collection import Collection
 
 from ..classes.singleton_meta import SingletonMeta
@@ -26,7 +26,7 @@ class ValarEngine(metaclass=SingletonMeta):
 
         # mon
         if hasattr(settings, 'MONGO_URI'):
-            self.mongo_client = pymongo.MongoClient(
+            self.mongo_client: MongoClient = MongoClient(
                 settings.MONGO_URI,
                 **{
                     'maxPoolSize': 10,
@@ -39,7 +39,7 @@ class ValarEngine(metaclass=SingletonMeta):
             )
             self.mongo_engine = self.mongo_client[settings.BASE_APP]
         else:
-            self.mongo_client = None
+            self.mongo_client: MongoClient = None
             self.mongo_engine = None
 
         # minio

valar/dao/frame.py

@@ -20,7 +20,7 @@ class MetaFrame(metaclass=SingletonMeta):
             item.update({"saved": True})
             if item['isLeaf']:
                 mapping[code] = _id
-            tool_dao.save_one(item, True)
+            tool_dao.save_one(item)
         for row in meta_field_domain:
             row = copy.deepcopy(row)
             default_id, tools = row['default_id'], row['tools']

valar/dao/mon_dao.py

@@ -57,7 +57,7 @@ class MonDao(AbstractDao):
     def values(self, conditions, props):
         return None
 
-    def save_one(self, item, with_id=False):
+    def save_one(self, item):
         oid, item = self.__detach_item__(item)
         if oid:
             self.manager.update_one({'_id': oid}, {'$set': item})

valar/dao/orm_dao.py

@@ -38,7 +38,11 @@ class OrmDao(AbstractDao):
         self.fields = fields
 
     def save_many(self, array: list):
-        pass
+        results = []
+        for item in array:
+            item.update({'saved': True})
+            results.append(self.save_one(item))
+        return results
 
     def values(self, conditions, props: list):
         query_set, _ = self.find(conditions)
@@ -46,7 +50,7 @@ class OrmDao(AbstractDao):
             props.append('id')
         return list(query_set.values(*props))
 
-    def save_one(self, item, with_id=False):
+    def save_one(self, item):
         oid, simple_item, complex_item = self.__detach_item__(item)
         query_set = self.manager.filter(id=oid) if oid else []
         if len(query_set):

valar/models/__init__.py

@@ -1 +1 @@
-from . import core, frame, meta, auth, test
+from . import core, frame, meta, auth, test, indicator

valar/models/indicator.py

@@ -0,0 +1,39 @@
+from ..models.core import VTree, VModel
+from django.db import models
+
+
+class IndicatorSet(VTree):
+    name = models.CharField(max_length=100, null=True)
+
+    class Meta:
+        verbose_name = '指标集'
+
+
+class Indicator(VModel):
+    set = models.ForeignKey(IndicatorSet, null=True, on_delete=models.CASCADE, verbose_name='指标集')
+    domain = models.CharField(max_length=100, verbose_name='domain', null=True)
+    category = models.CharField(max_length=100, verbose_name='category', null=True)
+    name = models.CharField(max_length=100, verbose_name='名称', null=True)
+    frequency = models.CharField(max_length=100, verbose_name='频度', null=True)
+    unit = models.CharField(max_length=100, verbose_name='单位', null=True)
+    scope = models.CharField(max_length=100, verbose_name='尺度', null=True)
+    object_id = models.CharField(max_length=100, verbose_name='ObjectId', null=True)
+    file = models.FileField(null=True, verbose_name='数据文件')
+
+    class Meta:
+        verbose_name = '指标项'
+
+
+class IndicatorLocation(VModel):
+    set = models.ForeignKey(IndicatorSet, null=True, on_delete=models.CASCADE, verbose_name='指标集')
+    domain = models.CharField(max_length=100, verbose_name='domain', null=True)
+    category = models.CharField(max_length=100, verbose_name='category', null=True)
+    name = models.CharField(max_length=100, verbose_name='名称', null=True)
+    frequency = models.CharField(max_length=100, verbose_name='频度', null=True)
+    unit = models.CharField(max_length=100, verbose_name='单位', null=True)
+    scope = models.CharField(max_length=100, verbose_name='尺度', null=True)
+    object_id = models.CharField(max_length=100, verbose_name='ObjectId', null=True)
+    file = models.FileField(null=True, verbose_name='数据文件')
+
+    class Meta:
+        verbose_name = '指标项'

valar/views/rest.py

@@ -78,7 +78,7 @@ def search(request, db, entity):
     dao = Dao(entity, db)
 
     qs, _ = dao.find(conditions)
-    qs.filter(saved=False).delete()
+    if db == 'orm': qs.filter(saved=False).delete()
 
     if _type == 'tree':
         query_set = dao.tree(root, conditions)

{valar-1.3.7.dist-info → valar-1.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.3.7
+Version: 1.3.9
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP

{valar-1.3.7.dist-info → valar-1.3.9.dist-info}/RECORD

@@ -18,14 +18,14 @@ valar/classes/valar_response.py,sha256=C7jfWZFy5jPWioIHbq7XprzoCfNy1slmhcaQw7KBI
 valar/classes/app_mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/classes/app_mixins/auto_migration_mixin.py,sha256=lHKY5UnWyDVuEntmiJxF2AcoHFGwa4IRTygGW3zfO7w,330
 valar/classes/app_mixins/auto_urlpatterns_mixin.py,sha256=FX-t-TJWawXyS2r6jbj_IrJBpzwMbWzIjyK6PsHL6XE,415
-valar/dao/__init__.py,sha256=WGjXrnjmgcfOvtTYIVjtdsmh9mlc0IJCrZD2ScZ6Kx0,1335
-valar/dao/abstract.py,sha256=wBqSwfZkPrkhlGX7Ue__UmhblIllP87Bwt5G7shWX8E,2449
-valar/dao/engine.py,sha256=YM8YdhWmdO2BX_T51u9q64a2GAaVCdaYHBmOpCKM4sA,3023
-valar/dao/frame.py,sha256=9vDsJfB-Ztb4YN8Lt6pHJeF_RndqHsVeA_ygWIOgALM,7468
+valar/dao/__init__.py,sha256=WHV6lPXhHkjUoo_Sp1SBoYKOLYtP6RPk0_4HE9Gp5Lg,1318
+valar/dao/abstract.py,sha256=3_9lS4bShAlrp_nv0wbBGrLVDnkvaeH2FxJTcJT-orA,2434
+valar/dao/engine.py,sha256=wiMOGr_RQYAzLr91C0WkxCQMMlJ-qsZf3IV-NlEwf04,3058
+valar/dao/frame.py,sha256=cz2SWcRgKww0XVNZpCcPD3ACcW6q6piMba2StshT60M,7462
 valar/dao/meta.py,sha256=2o720rFqPdDxQ0yXW74zHU0m914PfKkzvLwPINtiRbg,5051
-valar/dao/mon_dao.py,sha256=TRrHUBdWBbOn47uV5ot_B2GcvWGoNpadJW_CkS0TEhc,3588
+valar/dao/mon_dao.py,sha256=dyBM3B8qbcJrbtnTA6SabrtMKQnWkdK56N4u7uYdN7Y,3573
 valar/dao/mon_field.py,sha256=AJp-KS19oRiRHtMidC_1uTv2oCplqO4-bdKNDLMllWU,570
-valar/dao/orm_dao.py,sha256=2kLOHB35ojF1Jpn9wSPTG21HiLfvd9MMtsMY9y5Plc0,13526
+valar/dao/orm_dao.py,sha256=cspQs3Qis5ZuVQ13537l5-9wo3c9uRpAiXVf1Jw6-jM,13658
 valar/dao/orm_field.py,sha256=qADDGPM_EUVxP2VEGfnb2m97gYeSFxXt5fOmY2Df11c,4981
 valar/dao/query.py,sha256=7MqCdwjdhXWBWjEggHVFQfC0zlZH3TrwuVxKE7E0OKA,1049
 valar/dao/defaults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,10 +33,11 @@ valar/dao/defaults/field_keys_default.py,sha256=ZgF-7s4yABz2uoInxuhg4uy9flbAR7bt
 valar/dao/defaults/field_values_default.py,sha256=6zKPqbw0vJKW_9ilj6PC7IgDyayiWjHsNc4y7aVzuNw,3552
 valar/dao/defaults/view_defaults.py,sha256=v2wEgiaXqEcM4lcjM2uV83cLA5EJZf6qHfLZ7YJikIg,572
 valar/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar/models/__init__.py,sha256=ueEan3T0sdZRiKJJrIpwrRj_6BXdKfMecIqKIqOGnzA,44
+valar/models/__init__.py,sha256=GMosgOi_o4kFIyReJg1qFqtbWSob5Mazd5FSGT_zfqI,55
 valar/models/auth.py,sha256=nxtLgJwBEgvYWXATcN-RN1e5LIzeUzK97jExUSjoIOk,1710
 valar/models/core.py,sha256=ghtfs8uFH6SC0xvd-gkARr-FUWDXG0IMGWSuETOvecw,3695
 valar/models/frame.py,sha256=N13Bok7XNJDLoYDCpCIq8tEUktQVNerrLtk_U0KDJAE,851
+valar/models/indicator.py,sha256=53DshABsfATdnPMo9w810cxmNDru4AT2NmTg0UPrP_Y,1851
 valar/models/meta.py,sha256=sNCYJZKzx8JNbRidgRQunwIHYn9WXm89Svoc7-uutd4,4967
 valar/models/test.py,sha256=3yfyZHJgviEybV1NyN4Qs1BGKE3DvAtb_e4oFI2MVos,1319
 valar/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,9 +46,9 @@ valar/views/file.py,sha256=MdsmuoauyPJTDb89_-mk57IFId5w8HJNpBVozBKAG7s,1538
 valar/views/handler.py,sha256=KlXWhVU-b_b5uxrUwQBHW7H4shSPy4NnXj6AINM_Joo,1619
 valar/views/meta.py,sha256=H3_raG-LEcfg1p_CBpluhPXBsLFQB_jtaI5CKGgYOKk,4774
 valar/views/password.py,sha256=O094qG8Sh4ilT_wpEMw4IZtAlcQjrDVcFD5BHaWKg2Q,2127
-valar/views/rest.py,sha256=tFAqvD-ZRbkOXal8y_Esa0CYVBIo_B64TLl6pXMLQuk,2458
-valar-1.3.7.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-1.3.7.dist-info/METADATA,sha256=rPPD-sVRvIKlbl1cdi499Cwu4vw0jWmy3GdzYRmvYcc,5172
-valar-1.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-valar-1.3.7.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-1.3.7.dist-info/RECORD,,
+valar/views/rest.py,sha256=uTx9LdSvM80YB8iYTEG_GjPhLxoNwXa5-tn3P7by-tg,2474
+valar-1.3.9.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+valar-1.3.9.dist-info/METADATA,sha256=Iblg3OYoWI2cmpuQd5CeW1vN6SCejfb5r6CrVRzxmQA,5172
+valar-1.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+valar-1.3.9.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
+valar-1.3.9.dist-info/RECORD,,