valar 1.3.7__tar.gz → 1.3.9__tar.gz

{valar-1.3.7/src/valar.egg-info → valar-1.3.9}/PKG-INFO

@@ -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 → valar-1.3.9}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 with open("README.md", "r", encoding="utf-8") as f:
     long_description = f.read()
 
-version = "1.3.7"
+version = "1.3.9"
 
 requires = [
     'channels==3.0.3',

{valar-1.3.7 → valar-1.3.9}/src/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-1.3.7 → valar-1.3.9}/src/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-1.3.7 → valar-1.3.9}/src/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-1.3.7 → valar-1.3.9}/src/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-1.3.7 → valar-1.3.9}/src/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-1.3.7 → valar-1.3.9}/src/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-1.3.9/src/valar/models/__init__.py

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

valar-1.3.9/src/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-1.3.7 → valar-1.3.9}/src/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 → valar-1.3.9/src/valar.egg-info}/PKG-INFO

@@ -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 → valar-1.3.9}/src/valar.egg-info/SOURCES.txt

@@ -45,6 +45,7 @@ src/valar/models/__init__.py
 src/valar/models/auth.py
 src/valar/models/core.py
 src/valar/models/frame.py
+src/valar/models/indicator.py
 src/valar/models/meta.py
 src/valar/models/test.py
 src/valar/views/__init__.py

valar-1.3.7/src/valar/models/__init__.py

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