valar 1.3.6__py3-none-any.whl → 1.3.8__py3-none-any.whl

valar/auth/Authentication.py

@@ -4,29 +4,47 @@ from django.conf import settings
 from ..classes.valar_response import ValarResponse
 
 
+class ValaAuthError(Exception):
+    def __init__(self, message, code):
+        self.code = code
+        self.message = message
+
+
 def auth_required(view_func):
     def wrapper(request, *args, **kwargs):
-        payload, response = validate(request)
-        if payload:
+        try:
+            payload = valid_request_token(request)
             request.user_id = payload["user_id"]
             return view_func(request, *args, **kwargs)
-        else:
-            return response
+        except ValaAuthError as e:
+            return ValarResponse(False, e.message, e.code, status=401)
 
     return wrapper
 
 
-def validate(request):
+def get_token_from_request(request):
     auth_header = request.headers.get("Authorization")
-    if not auth_header or not auth_header.startswith("Bearer "):
-        return None, ValarResponse(False, '请登录系统', 'info', status=401)
-    token = auth_header.split(" ")[1]
-    if not token:
-        return None, ValarResponse(False, status=401)
+    if auth_header and auth_header.startswith("Bearer "):
+        return auth_header.split(" ")[1]
+    return None
+
+
+status = {
+    0: (None, None, None),
+    1: ('请登录系统', 'info', 401),
+    2: ('状态已过期，请重新登录', 'warning', 401),
+    3: ('错误状态，请重新登录', 'error', 401),
+}
+
+
+def valid_request_token(request):
+    token = get_token_from_request(request)
+    if not token: raise ValaAuthError('请登录系统', 'info')
     try:
         payload = jwt.decode(token, settings.SECRET_KEY, algorithms=["HS256"])
-        return payload, ValarResponse(False)
+        payload['token'] = token
+        return payload
     except jwt.ExpiredSignatureError:
-        return None, ValarResponse(False, '状态已过期，请重新登录', 'warning', status=401)
+        raise ValaAuthError('状态已过期，请重新登录', 'warning')
     except jwt.InvalidTokenError:
-        return None, ValarResponse(False, '错误状态，请重新登录', 'error', status=401)
+        raise ValaAuthError('错误状态，请重新登录', 'error')

valar/auth/Middleware.py

@@ -4,25 +4,29 @@ import json
 from django.http import HttpRequest
 from django.utils.deprecation import MiddlewareMixin
 
-from ..auth.Authentication import validate
+from ..auth.Authentication import valid_request_token, ValaAuthError
 from ..classes.valar_response import ValarResponse
 
 
 class ValarMiddleware(MiddlewareMixin):
     @staticmethod
     def process_response(request: HttpRequest, response: ValarResponse):
-        auth = request.headers.get("Auth")
-        if auth:
-            payload, _ = validate(request)
-            if not payload:
+        try:
+            payload = valid_request_token(request)
+            response["token"] = payload['token'] or '~~~'
+            """此处可以加入数据级别的权限验证"""
+        except ValaAuthError as e:
+            if request.headers.get("Auth"):
                 return ValarResponse(False, '无效权限', 'error', status=403)
+
         if type(response) == ValarResponse:
             valar_message, valar_code = response.valar_message, response.valar_code
             data = {
                 'payload': json.loads(response.content),
                 'message': valar_message,
-                'code': valar_code
+                'code': valar_code,
             }
             response.content = json.dumps(data, ensure_ascii=False).encode("utf-8")
             response["Content-Type"] = "application/json; charset=utf-8"
+
         return response

valar/channels/sender.py

@@ -7,7 +7,7 @@ from channels.layers import get_channel_layer
 from django.http import HttpRequest
 import threading
 from .consumer import VALAR_CHANNEL_GROUP
-from ..auth.Authentication import validate
+from ..auth.Authentication import valid_request_token
 
 
 class Channel:
@@ -19,6 +19,7 @@ class Channel:
         self.auth = body.get('auth')
         self.broadcast = body.get('broadcast')
         self.data = body.get('data')
+        self.resolve = body.get('resolve')
 
     def to_dict(self, status, payload):
         data = {
@@ -26,6 +27,7 @@ class Channel:
             'url': self.url,
             'auth': self.auth,
             'broadcast': self.broadcast,
+            'resolve': self.resolve,
             'timestamp': datetime.now().timestamp()
         }
         if status:
@@ -55,9 +57,8 @@ class ValarChannelSender(Sender):
         self.__lock__ = threading.Lock()
         self.__interval__ = interval
         if self.__channel__.auth:
-            payload, _ = validate(request)
-            if payload is None:
-                raise Exception('Unauthorized!')
+            payload = valid_request_token(request)
+            self.user_id = payload["user_id"]
 
     def _run(self):
         while self.__loading__:

valar/classes/valar_minio.py

@@ -6,20 +6,22 @@ from urllib3 import BaseHTTPResponse
 from ..classes.singleton_meta import SingletonMeta
 
 
-class ValarMinio(metaclass=SingletonMeta):
+class ValarMinio:
 
     def __init__(self, client, entity):
         self.client = client
         self.bucket_name = f'{settings.BASE_DIR.name}.{entity}'.replace('_', '-').lower()
-        if client and not self.client.bucket_exists(self.bucket_name):
-            self.client.make_bucket(self.bucket_name)
-            self.client.set_bucket_policy(self.bucket_name, self.__generate_policy__())
 
     @staticmethod
     def get_object_name(_id, prop, file_name):
         return f"{_id}-{prop}-{file_name}"
 
     def upload(self, object_name, _bytes):
+        if not self.client:
+            raise Exception('未配置Minio')
+        if not self.client.bucket_exists(self.bucket_name):
+            self.client.make_bucket(self.bucket_name)
+            self.client.set_bucket_policy(self.bucket_name, self.__generate_policy__())
         file_data = BytesIO(_bytes)
         file_size = len(_bytes)  # file.siz
         self.client.put_object(

valar/dao/__init__.py

@@ -17,8 +17,8 @@ class Dao(AbstractDao):
     def save_many(self, array: list):
         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/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

@@ -2,16 +2,19 @@ import datetime
 import json
 
 from django.core.paginator import Paginator
+from django.db.models.options import Options
 
 from .abstract import AbstractDao
 from .query import Query
-from django.db.models import ManyToOneRel, ForeignKey, ManyToManyRel, ManyToManyField, OneToOneField, OneToOneRel
+from django.db.models import ManyToOneRel, ForeignKey, ManyToManyRel, ManyToManyField, OneToOneField, OneToOneRel, \
+    CharField, BooleanField, FloatField, IntegerField, BigAutoField
 from django.db.models import QuerySet
 from django.db.models import Manager
 from django.db.models.fields.files import FieldFile
 from django.forms import FileField
 
 from ..dao.orm_field import OrmField
+from ..models.auth import Account
 from ..models.core import VTree, VModel
 from ..models.meta import MetaField
 
@@ -35,7 +38,9 @@ class OrmDao(AbstractDao):
         self.fields = fields
 
     def save_many(self, array: list):
-        pass
+        for item in array:
+            item.update({'saved': True})
+            self.save_one(item)
 
     def values(self, conditions, props: list):
         query_set, _ = self.find(conditions)
@@ -43,7 +48,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):
@@ -150,12 +155,13 @@ class OrmDao(AbstractDao):
                 m2m.clear()
                 m2m.add(*value)
             elif clazz == ManyToOneRel:
-                getattr(bean, model_field.get_accessor_name()).clear()
-                remote_model: VModel = model_field.related_model
-                new_set: QuerySet = remote_model.objects.filter(id__in=value)
-                remote_field: ForeignKey = model_field.remote_field
-                k = remote_field.get_attname()
-                new_set.update(**{k: bean.id})
+                pass
+                # getattr(bean, model_field.get_accessor_name()).clear()
+                # remote_model: VModel = model_field.related_model
+                # new_set: QuerySet = remote_model.objects.filter(id__in=value)
+                # remote_field: ForeignKey = model_field.remote_field
+                # k = remote_field.get_attname()
+                # new_set.update(**{k: bean.id})
             elif clazz == ManyToManyRel:
                 getattr(bean, model_field.get_accessor_name()).clear()
                 remote_model: VModel = model_field.related_model
@@ -207,6 +213,7 @@ class OrmDao(AbstractDao):
         # 简单字段取值
         simple_props = [field.prop for field in meta_fields if field.domain not in __referred_domains__]
         custom_props = __get_custom_props__(self.entity, code)
+
         results = list(query_set.filter().values(*[*simple_props, *custom_props]))
         __set_simple_values__(meta_fields, results)
         # 关系型字段取值
@@ -216,9 +223,72 @@ class OrmDao(AbstractDao):
         for meta_field in referred_fields:
             manager: Manager = query_set.model.objects
             qs = manager.filter(id__in=pks)
-            __linkage__(meta_field, qs, mapping)
+            self.__linkage__(meta_field, qs, mapping)
         return results
 
+    def __linkage__(self, meta_field: OrmField, query_set: QuerySet, mapping):
+        model_field = meta_field.model_field
+        prop = model_field.name
+        multiple = meta_field.domain in __multiple_domains__
+
+        # 获取级联关系的键索引
+        ref_prop = f'{prop}__id'
+        edges = query_set.exclude(**{f'{ref_prop}__isnull': True}).values('id', ref_prop)
+        if multiple:
+            related_primary_keys = set()
+            results_mapping = {}
+            for edge in edges:
+                _id, rid = edge['id'], edge[ref_prop]
+                related_primary_keys.add(rid)
+                array = results_mapping.get(_id, [])
+                array.append(rid)
+                results_mapping[_id] = array
+        else:
+            results_mapping = {row['id']: row[ref_prop] for row in edges if row[ref_prop]}
+            related_primary_keys = set(results_mapping.values())
+
+        # 获取级联关系从属方的数据
+        related_model = model_field.related_model
+        related_fields = related_model._meta.get_fields()
+        related_props = self.__get_related_props__(related_fields)
+        related_values = list(related_model.objects.filter(id__in=related_primary_keys).values(*related_props))
+        __set_simple_values__(related_fields, related_values)
+        related_mapping = {item['id']: item for item in related_values}
+
+        # 将从属方的数据绑定在主数据上
+        for _id in mapping:
+            row = mapping[_id]
+            if multiple:
+                keys = results_mapping.get(_id, [])
+                items = [related_mapping[pid] for pid in keys]
+                row[prop] = keys
+                row[f'{prop}_set'] = items
+            else:
+                key = results_mapping.get(_id)
+                item = related_mapping.get(key) if key else None
+                row[prop] = item
+                row[f'{prop}_id'] = key
+
+    def __get_related_props__(self, fields):
+        array = []
+        for field in fields:
+            domain = type(field).__name__
+            prop = field.name
+            if field.name in __omit_field_props__ or domain in __multiple_domains__:
+                continue
+            if domain in __referred_domains__:
+                field: ForeignKey = field
+                model = field.related_model
+                meta: Options = model._meta
+                if meta.label != self.entity and meta.label != 'valar.Account':
+                    _fields = meta.get_fields()
+                    for _field in _fields:
+                        if type(_field) in [CharField, BooleanField, FloatField, IntegerField, BigAutoField]:
+                            array.append(f'{prop}__{_field.name}')
+            else:
+                array.append(prop)
+        return array
+
 
 """ 以下为静态方法和变量 """
 
@@ -254,52 +324,6 @@ def __set_simple_values__(fields, values):
         for prop in json_props:
             row[prop] = json.loads(row[prop]) if type(row[prop]) is str else row[prop]
 
-
-def __get_related_props__(fields):
-    def fun(field): return type(field).__name__ not in __referred_domains__ and field.name not in __omit_field_props__
-
-    return [field.name for field in fields if fun(field)]
-
-
-def __linkage__(meta_field: OrmField, query_set: QuerySet, mapping):
-    model_field = meta_field.model_field
-    prop = model_field.name
-    multiple = meta_field.domain in __multiple_domains__
-
-    # 获取级联关系的键索引
-    ref_prop = f'{prop}__id'
-    edges = query_set.exclude(**{f'{ref_prop}__isnull': True}).values('id', ref_prop)
-    if multiple:
-        related_primary_keys = set()
-        results_mapping = {}
-        for edge in edges:
-            _id, rid = edge['id'], edge[ref_prop]
-            related_primary_keys.add(rid)
-            array = results_mapping.get(_id, [])
-            array.append(rid)
-            results_mapping[_id] = array
-    else:
-        results_mapping = {row['id']: row[ref_prop] for row in edges if row[ref_prop]}
-        related_primary_keys = set(results_mapping.values())
-
-    # 获取级联关系从属方的数据
-    related_model = model_field.related_model
-    related_fields = related_model._meta.get_fields()
-    related_props = __get_related_props__(related_fields)
-    related_values = list(related_model.objects.filter(id__in=related_primary_keys).values(*related_props))
-    __set_simple_values__(related_fields, related_values)
-    related_mapping = {item['id']: item for item in related_values}
-
-    # 将从属方的数据绑定在主数据上
-    for _id in mapping:
-        row = mapping[_id]
-        if multiple:
-            keys = results_mapping.get(_id, [])
-            items = [related_mapping[pid] for pid in keys]
-            row[prop] = keys
-            row[f'{prop}_set'] = items
-        else:
-            key = results_mapping.get(_id)
-            item = related_mapping.get(key) if key else None
-            row[prop] = item
-            row[f'{prop}_id'] = key
+    # def fun(field): return type(field).__name__ not in __referred_domains__ and field.name not in __omit_field_props__
+    #
+    # return [field.name for field in fields if fun(field)]

valar/migrations/0001_initial.py

@@ -0,0 +1,301 @@
+# Generated by Django 4.2.24 on 2025-09-18 18:23
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Meta',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('db', models.CharField(max_length=100, null=True, verbose_name='数据库')),
+                ('entity', models.CharField(max_length=100, null=True, verbose_name='数据源')),
+                ('name', models.CharField(max_length=50, null=True, verbose_name='实体别名')),
+                ('tree', models.BooleanField(default=False, verbose_name='是否树形')),
+            ],
+            options={
+                'verbose_name': '数据实体',
+                'unique_together': {('db', 'entity')},
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaFieldTool',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('pid', models.IntegerField(default=0, verbose_name='父节点')),
+                ('isLeaf', models.BooleanField(default=False, verbose_name='叶子节点')),
+                ('icon', models.CharField(max_length=255, null=True, verbose_name='图标')),
+                ('name', models.CharField(max_length=255, null=True, verbose_name='名称')),
+                ('code', models.CharField(max_length=100, null=True, unique=True, verbose_name='代码')),
+                ('align', models.CharField(max_length=10, null=True, verbose_name='对齐方式')),
+            ],
+            options={
+                'verbose_name': '元数据字段工具',
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaViewDefault',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('name', models.CharField(max_length=50, null=True)),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+            ],
+            options={
+                'verbose_name': '元数据字段类型',
+            },
+        ),
+        migrations.CreateModel(
+            name='Role',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('name', models.CharField(max_length=50, null=True)),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('duty', models.TextField(null=True, verbose_name='职责描述')),
+            ],
+            options={
+                'verbose_name': '角色',
+            },
+        ),
+        migrations.CreateModel(
+            name='Valar',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('name', models.CharField(max_length=50, null=True)),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('text_field', models.TextField(null=True, verbose_name='Text Field')),
+                ('boolean_field', models.BooleanField(null=True, verbose_name='Boolean Field')),
+                ('integer_field', models.IntegerField(null=True, verbose_name='Integer Field')),
+                ('float_field', models.FloatField(null=True, verbose_name='Float Field')),
+                ('date_field', models.DateField(null=True, verbose_name='Date Field')),
+                ('datetime_field', models.DateTimeField(null=True, verbose_name='Datetime Field')),
+                ('time_field', models.TimeField(null=True, verbose_name='Time Field')),
+                ('json_field', models.JSONField(null=True, verbose_name='Json Field')),
+                ('file', models.FileField(null=True, upload_to='', verbose_name='File Field')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Voo',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='Name')),
+                ('valar', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='valar.valar', verbose_name='Valar')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Vmo',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='Name')),
+                ('valar', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='valar.valar', verbose_name='Valar')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Vmm',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('pid', models.IntegerField(default=0, verbose_name='父节点')),
+                ('isLeaf', models.BooleanField(default=False, verbose_name='叶子节点')),
+                ('icon', models.CharField(max_length=255, null=True, verbose_name='图标')),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='name')),
+                ('valars', models.ManyToManyField(to='valar.valar', verbose_name='valars')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaView',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('property', models.JSONField(default=dict, verbose_name='属性')),
+                ('code', models.CharField(default='default ', max_length=50, verbose_name='类视图')),
+                ('name', models.CharField(max_length=50, null=True, verbose_name='视图名称')),
+                ('lock', models.BooleanField(default=False, verbose_name='锁定元数据')),
+                ('enable', models.BooleanField(default=True, verbose_name='是否启用')),
+                ('form_width', models.IntegerField(null=True, verbose_name='表单宽度')),
+                ('form_height', models.IntegerField(null=True, verbose_name='表单高度')),
+                ('table_width', models.IntegerField(null=True, verbose_name='表格宽度')),
+                ('table_height', models.IntegerField(null=True, verbose_name='表格高度')),
+                ('allow_search', models.BooleanField(default=True, verbose_name='检索功能')),
+                ('allow_order', models.BooleanField(default=True, verbose_name='排序功能')),
+                ('allow_insert', models.BooleanField(default=True, verbose_name='新增功能')),
+                ('allow_edit', models.BooleanField(default=True, verbose_name='编辑功能')),
+                ('allow_edit_on_form', models.BooleanField(default=True, verbose_name='表单编辑')),
+                ('allow_edit_on_cell', models.BooleanField(default=True, verbose_name='表内编辑')),
+                ('allow_edit_on_sort', models.BooleanField(default=True, verbose_name='移动功能')),
+                ('allow_remove', models.BooleanField(default=True, verbose_name='删除功能')),
+                ('allow_download', models.BooleanField(default=True, verbose_name='下载功能')),
+                ('allow_upload', models.BooleanField(default=True, verbose_name='上传功能')),
+                ('meta', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='valar.meta', verbose_name='元数据')),
+            ],
+            options={
+                'verbose_name': '数据视图',
+                'unique_together': {('meta', 'code')},
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaFieldDomain',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('name', models.CharField(max_length=255, null=True, unique=True, verbose_name='名称')),
+                ('default', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='valar.metafieldtool', verbose_name='默认工具')),
+                ('tools', models.ManyToManyField(to='valar.metafieldtool', verbose_name='工具集')),
+            ],
+            options={
+                'verbose_name': '元数据字段类型',
+            },
+        ),
+        migrations.CreateModel(
+            name='MetaField',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('prop', models.CharField(max_length=100, verbose_name='字段名称')),
+                ('label', models.CharField(max_length=100, verbose_name='字段标签')),
+                ('name', models.CharField(max_length=100, verbose_name='字段别名')),
+                ('domain', models.CharField(max_length=100, verbose_name='字段类型')),
+                ('tool', models.CharField(default='default', max_length=100, verbose_name='工具组件')),
+                ('refer', models.JSONField(default=dict, verbose_name='索引')),
+                ('format', models.JSONField(default=dict, verbose_name='格式')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('not_null', models.BooleanField(default=False, verbose_name='不为空')),
+                ('allow_edit', models.BooleanField(default=True, verbose_name='可编辑')),
+                ('allow_order', models.BooleanField(default=True, verbose_name='可排序')),
+                ('allow_search', models.BooleanField(default=True, verbose_name='可搜索')),
+                ('allow_download', models.BooleanField(default=True, verbose_name='可下载')),
+                ('allow_upload', models.BooleanField(default=True, verbose_name='可上传')),
+                ('allow_update', models.BooleanField(default=True, verbose_name='可更新')),
+                ('unit', models.CharField(max_length=55, null=True, verbose_name='单位符')),
+                ('column_width', models.FloatField(default=0, verbose_name='表头宽度')),
+                ('align', models.CharField(max_length=55, null=True, verbose_name='对齐方式')),
+                ('fixed', models.CharField(max_length=100, null=True, verbose_name='固定位置')),
+                ('header_color', models.CharField(max_length=55, null=True, verbose_name='表头颜色')),
+                ('cell_color', models.CharField(max_length=55, null=True, verbose_name='单元颜色')),
+                ('edit_on_table', models.BooleanField(default=True, verbose_name='表格编辑')),
+                ('hide_on_table', models.BooleanField(default=False, verbose_name='表内隐藏')),
+                ('span', models.IntegerField(default=0, verbose_name='表单占位')),
+                ('hide_on_form', models.BooleanField(default=False, verbose_name='表单隐藏')),
+                ('hide_on_form_edit', models.BooleanField(default=False, verbose_name='编辑隐藏')),
+                ('hide_on_form_insert', models.BooleanField(default=False, verbose_name='新增隐藏')),
+                ('hide_on_form_branch', models.BooleanField(default=False, verbose_name='分支隐藏')),
+                ('hide_on_form_leaf', models.BooleanField(default=False, verbose_name='叶子隐藏')),
+                ('view', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='valar.metaview', verbose_name='数据视图')),
+            ],
+            options={
+                'verbose_name': '视图字段',
+            },
+        ),
+        migrations.CreateModel(
+            name='Account',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('name', models.CharField(max_length=50, null=True)),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('username', models.CharField(max_length=255, null=True, unique=True, verbose_name='账号')),
+                ('password', models.CharField(max_length=255, null=True, verbose_name='密码')),
+                ('email', models.CharField(max_length=255, null=True, unique=True, verbose_name='邮箱')),
+                ('is_admin', models.BooleanField(default=False, verbose_name='超级管理员')),
+                ('is_active', models.BooleanField(default=False, verbose_name='激活状态')),
+                ('token', models.CharField(max_length=255, null=True, verbose_name='Token')),
+                ('roles', models.ManyToManyField(to='valar.role')),
+            ],
+            options={
+                'verbose_name': '账户信息',
+            },
+        ),
+        migrations.CreateModel(
+            name='Menu',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('name', models.CharField(max_length=50, null=True)),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('pid', models.IntegerField(default=0, verbose_name='父节点')),
+                ('isLeaf', models.BooleanField(default=False, verbose_name='叶子节点')),
+                ('icon', models.CharField(max_length=255, null=True, verbose_name='图标')),
+                ('scope', models.CharField(max_length=100, null=True, verbose_name='域')),
+                ('path', models.CharField(max_length=255, null=True, verbose_name='地址')),
+                ('is_admin', models.BooleanField(default=False, null=True, verbose_name='超管权限')),
+                ('is_auth', models.BooleanField(default=False, null=True, verbose_name='需要登录')),
+                ('roles', models.ManyToManyField(to='valar.role')),
+            ],
+            options={
+                'verbose_name': '菜单',
+                'unique_together': {('scope', 'path')},
+            },
+        ),
+    ]

valar/migrations/0002_indicatortree.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IndicatorTree',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('pid', models.IntegerField(default=0, verbose_name='父节点')),
+                ('isLeaf', models.BooleanField(default=False, verbose_name='叶子节点')),
+                ('icon', models.CharField(max_length=255, null=True, verbose_name='图标')),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='名称')),
+                ('frequency', models.CharField(max_length=100, null=True, verbose_name='频度')),
+                ('scope', models.CharField(max_length=100, null=True, verbose_name='尺度')),
+            ],
+            options={
+                'verbose_name': '指标集',
+                'unique_together': {('name', 'pid')},
+            },
+        ),
+    ]

valar/migrations/0003_remove_indicatortree_frequency_and_more.py

@@ -0,0 +1,46 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0002_indicatortree'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='indicatortree',
+            name='frequency',
+        ),
+        migrations.RemoveField(
+            model_name='indicatortree',
+            name='scope',
+        ),
+        migrations.AddField(
+            model_name='indicatortree',
+            name='V1',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='indicatortree',
+            name='V2',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='indicatortree',
+            name='V3',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='indicatortree',
+            name='V4',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name='indicatortree',
+            name='name',
+            field=models.CharField(max_length=50, null=True),
+        ),
+    ]

valar/migrations/0004_delete_indicatortree.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0003_remove_indicatortree_frequency_and_more'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='IndicatorTree',
+        ),
+    ]

valar/migrations/0005_indicatortree_indicatorset.py

@@ -0,0 +1,54 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0004_delete_indicatortree'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IndicatorTree',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('name', models.CharField(max_length=50, null=True)),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('pid', models.IntegerField(default=0, verbose_name='父节点')),
+                ('isLeaf', models.BooleanField(default=False, verbose_name='叶子节点')),
+                ('icon', models.CharField(max_length=255, null=True, verbose_name='图标')),
+                ('V1', models.CharField(max_length=100, null=True)),
+                ('V2', models.CharField(max_length=100, null=True)),
+                ('V3', models.CharField(max_length=100, null=True)),
+                ('V4', models.CharField(max_length=100, null=True)),
+            ],
+            options={
+                'verbose_name': '指标集',
+                'unique_together': {('name', 'pid')},
+            },
+        ),
+        migrations.CreateModel(
+            name='IndicatorSet',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='名称')),
+                ('frequency', models.CharField(max_length=100, null=True, verbose_name='频度')),
+                ('scope', models.CharField(max_length=100, null=True, verbose_name='尺度')),
+            ],
+            options={
+                'verbose_name': '指标集',
+                'unique_together': {('name', 'pid')},
+            },
+        ),
+    ]

valar/migrations/0006_alter_indicatorset_unique_together_and_more.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0005_indicatortree_indicatorset'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='indicatorset',
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name='indicatortree',
+            unique_together=set(),
+        ),
+    ]

valar/migrations/0007_indicatorset_file_indicatorset_unit.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0006_alter_indicatorset_unique_together_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='indicatorset',
+            name='file',
+            field=models.FileField(null=True, upload_to='', verbose_name='数据文件'),
+        ),
+        migrations.AddField(
+            model_name='indicatorset',
+            name='unit',
+            field=models.CharField(max_length=100, null=True, verbose_name='尺度'),
+        ),
+    ]

valar/migrations/0008_indicatorset_object_id_alter_indicatorset_unit.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0007_indicatorset_file_indicatorset_unit'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='indicatorset',
+            name='object_id',
+            field=models.CharField(max_length=100, null=True, verbose_name='尺度'),
+        ),
+        migrations.AlterField(
+            model_name='indicatorset',
+            name='unit',
+            field=models.CharField(max_length=100, null=True, verbose_name='单位'),
+        ),
+    ]

valar/migrations/0009_alter_indicatorset_object_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.24 on 2025-09-19 09:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0008_indicatorset_object_id_alter_indicatorset_unit'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='indicatorset',
+            name='object_id',
+            field=models.CharField(max_length=100, null=True, verbose_name='ObjectId'),
+        ),
+    ]

valar/models/__init__.py

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

valar/models/auth.py

@@ -34,6 +34,7 @@ class Menu(VTree):
     path = models.CharField(max_length=255, null=True, verbose_name='地址')
     roles = models.ManyToManyField(Role)
     is_admin = models.BooleanField(null=True, default=False, verbose_name='超管权限')
+    is_auth = models.BooleanField(null=True, default=False, verbose_name='需要登录')
 
     class Meta:
         verbose_name = '菜单'

valar/models/indicator.py

@@ -0,0 +1,24 @@
+from ..models.core import VTree, VModel
+from django.db import models
+
+
+class IndicatorTree(VTree):
+    V1 = models.CharField(max_length=100, null=True)
+    V2 = models.CharField(max_length=100, null=True)
+    V3 = models.CharField(max_length=100, null=True)
+    V4 = models.CharField(max_length=100, null=True)
+
+    class Meta:
+        verbose_name = '指标集'
+
+
+class IndicatorSet(VModel):
+    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/models/meta.py

@@ -88,3 +88,8 @@ class MetaField(VModel):
 
     class Meta:
         verbose_name = '视图字段'
+
+
+class MetaViewDefault(VModel):
+    class Meta:
+        verbose_name = '元数据字段类型'

valar/views/auth.py

@@ -41,18 +41,17 @@ def sign_in(request):
                 })
     return ValarResponse(jwt.encode({
         "user_id": account.id,
-        "exp": datetime.datetime.utcnow() + datetime.timedelta(hours=2)
+        "exp": datetime.datetime.utcnow() + datetime.timedelta(hours=5)
     }, settings.SECRET_KEY, algorithm="HS256"))
 
 
 def free_menus(request):
     body = json.loads(request.body)
     scope = body.get("scope", 'admin')
-    menus = Menu.objects.filter(isLeaf=True, scope=scope, is_admin=False, path__isnull=False,
-                                roles__isnull=True).values('path')
-    payload = {
-        "permissions": [m['path'] for m in menus]
-    }
+    menus = Menu.objects.filter(
+        isLeaf=True, scope=scope, is_admin=False, path__isnull=False, is_auth=False,
+        roles__isnull=True).values('path')
+    payload = {"permissions": [m['path'] for m in menus]}
     token = jwt.encode(payload, settings.SECRET_KEY, algorithm="HS256")
     return ValarResponse(token)
 
@@ -104,6 +103,7 @@ def user_profile(request):
         if hasattr(account, accessor):
             user = getattr(account, accessor)
             name = getattr(user, 'name')
-            payload.update({'name': name})
+            key = getattr(user, 'id')
+            payload.update({'name': name, 'user_key': key})
     token = jwt.encode(payload, settings.SECRET_KEY, algorithm="HS256")
     return ValarResponse(token)

valar/views/file.py

@@ -17,6 +17,7 @@ def save_file(request, db, entity):
     dao = Dao(entity, db)
     engine = ValarEngine().get_minio_bucket(entity)
     item = dao.find_one(_id)
+
     if engine is None or item is None:
         return ValarResponse(False)
     old_value = getattr(item, prop)

valar/views/rest.py

@@ -1,5 +1,7 @@
 import json
 
+from django.db.models import QuerySet
+
 from .handler import batch_handler
 from ..channels.executer import execute_channel
 from ..channels.sender import ValarChannelSender
@@ -71,13 +73,13 @@ def search(request, db, entity):
     size = body.get('size')
     page = body.get('page')
     root = body.get('root')
-
-    print(root, 'root', entity)
-
     code = body.get('code', 'default')
     conditions = body.get('conditions')
     dao = Dao(entity, db)
 
+    qs, _ = dao.find(conditions)
+    if db == 'orm': qs.filter(saved=False).delete()
+
     if _type == 'tree':
         query_set = dao.tree(root, conditions)
         total = query_set.count()

{valar-1.3.6.dist-info → valar-1.3.8.dist-info}/METADATA

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

{valar-1.3.6.dist-info → valar-1.3.8.dist-info}/RECORD

@@ -1,53 +1,63 @@
 valar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/apps.py,sha256=_FYAPq33FTimVOeSpdp6eQ8bWZBtT-tfG9lgZqGC3O8,746
 valar/urls.py,sha256=cKmlVu8TttqM8mVGmwE442DQHUs3zsubtUadyur_ofU,1349
-valar/auth/Authentication.py,sha256=xjJagg1otAewj3Gtk7mjcYGnpWQJgnTqKgfHYcffDIc,1143
-valar/auth/Middleware.py,sha256=8D0JVAigiqK-95n_p2fuaxalzuwv2KQpAoaL8Q0UN4E,1034
+valar/auth/Authentication.py,sha256=8HCQ7U0SWMyIKgi5ZMXhVAkduaixJEF-RvNYM5IJpRA,1513
+valar/auth/Middleware.py,sha256=axg1UnA9NRY4Ug1WaR7i8uoq19OLEPnbtpRo1TSUllQ,1197
 valar/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/channels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/channels/consumer.py,sha256=fEP52wBHWccturn2QAkqOt9-_Fr8akiw95AoVc6dEMM,1395
 valar/channels/counter.py,sha256=K8aQUI1RiIrSOg3280tV102soC-ZC1qSRZvBXuwNYQ0,377
 valar/channels/executer.py,sha256=_Ap859nvxRl8Ln0BWMqhnL6cQNl-1NQSmMR4Akh-afY,333
 valar/channels/mapping.py,sha256=1SBqxEYO4epbRkSOUw5zm6gau15imz1gokrRTQcy94A,755
-valar/channels/sender.py,sha256=WLww4_3zh-rXfZ9f3z2VYLM9ieXW94GuN-KrsVwvKSc,3788
+valar/channels/sender.py,sha256=6TJR5RlG9K44chhSUC34gvl1G2MgjRxnRpz9lGrs0rU,3852
 valar/channels/views.py,sha256=4J_f-Bn3VR0o0spOa9D52aRcxMRZ0YYgo-dMzJqFrd4,375
 valar/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/classes/singleton_meta.py,sha256=aa9DZKG4Q9Cr67ZWrQ0yaFLrEjwFoTMQbDrpoIqgJZs,245
-valar/classes/valar_minio.py,sha256=20FpP7fbSuKG4cTF0-gmYUvHnPsVvwWOchfljb92o-8,2720
+valar/classes/valar_minio.py,sha256=acQQbSCBPu1YiAVxU2k-l8BJ_b7JBox3hyt7j7s9MR4,2758
 valar/classes/valar_response.py,sha256=C7jfWZFy5jPWioIHbq7XprzoCfNy1slmhcaQw7KBIp4,310
 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/__init__.py,sha256=8RTx5vcHk98JFMETjyue1jEyf-rLAEYX_5DMMA1YTVI,1311
+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=9vDsJfB-Ztb4YN8Lt6pHJeF_RndqHsVeA_ygWIOgALM,7468
 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=su3ah1lhpAlZj-yytPJpwfyzxCEcFIqI8t_sKv6GEJQ,12323
+valar/dao/orm_dao.py,sha256=qt761SWRZx2-4bt8KSRNC-sxif8FkkqclAJCqPuHOk4,13598
 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
 valar/dao/defaults/field_keys_default.py,sha256=ZgF-7s4yABz2uoInxuhg4uy9flbAR7btHDipJkqZj0M,2153
 valar/dao/defaults/field_values_default.py,sha256=6zKPqbw0vJKW_9ilj6PC7IgDyayiWjHsNc4y7aVzuNw,3552
 valar/dao/defaults/view_defaults.py,sha256=v2wEgiaXqEcM4lcjM2uV83cLA5EJZf6qHfLZ7YJikIg,572
+valar/migrations/0001_initial.py,sha256=444IkQRbG65g8KZjXr_qjINIUY8CszVOKjoPd8RA5Cc,20483
+valar/migrations/0002_indicatortree.py,sha256=bJJmmaROHnD0au27Fp12fjFNAIff5tucM1BAx8zpRwg,1632
+valar/migrations/0003_remove_indicatortree_frequency_and_more.py,sha256=YI5Zm1xTqgQ63YYsT5lwMzIvLa8jd_q8SqXHdS_gKng,1282
+valar/migrations/0004_delete_indicatortree.py,sha256=BD7VeVij2-euyZ-AKAROB95In3cy_nwaW8i-FIqNGLE,322
+valar/migrations/0005_indicatortree_indicatorset.py,sha256=OLYuvBV0xDbfuviyWRMs0ppLhvcynoVFylqv__kOnq4,2843
+valar/migrations/0006_alter_indicatorset_unique_together_and_more.py,sha256=vXhZmI91lkRjeJrLb-iI1NarQWlkSo3CgpvhF3T3Tjw,471
+valar/migrations/0007_indicatorset_file_indicatorset_unit.py,sha256=Bz9gX853D6odAOSHte2UYtRLvpxNVXUtlNN0yH1A47c,641
+valar/migrations/0008_indicatorset_object_id_alter_indicatorset_unit.py,sha256=jPtL6CyNDIJ5y8s11e3i8L7mtnkDzwYBFx4debomMSE,636
+valar/migrations/0009_alter_indicatorset_object_id.py,sha256=g9cIptXYxISWDFJ7cGujs7tGoXH1XwcR1_d4DKYy5X4,459
 valar/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar/models/__init__.py,sha256=ueEan3T0sdZRiKJJrIpwrRj_6BXdKfMecIqKIqOGnzA,44
-valar/models/auth.py,sha256=ymjg4B-Xj9h0_DvyG8o1dlo7ahgpoqAUHxI814NMxvs,1621
+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/meta.py,sha256=JPa-Rap2sdSYnG6Sk7_vFrg5flP3r6fAM7tRvlwb4Vw,4871
+valar/models/indicator.py,sha256=3_Z3_RPdJN_6q3bOC16mLd8IL3C3ehmacKedkWj6x5c,916
+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
-valar/views/auth.py,sha256=KZiWPEcL_ZpF6DT99D3U3EdX0qjhOBFNAmnLWNJCXsU,4094
-valar/views/file.py,sha256=NxfbxT4EJRDFgXol06kD0vcSp4lN4BCVJ5wq43rh8Yg,1537
+valar/views/auth.py,sha256=zVsXJkMacpHZjQfwQ-LFS4rtUmM2tBbH56L7JSzG55w,4135
+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=_KC2BPsAiTdYCDd3RPt5MTvaWiHd9W3PEx_3l7EwOWE,2383
-valar-1.3.6.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-1.3.6.dist-info/METADATA,sha256=uOcOdoHgme_wRLdocG8hlU0RVrO_1gVEovads3xAJsw,5172
-valar-1.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-valar-1.3.6.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-1.3.6.dist-info/RECORD,,
+valar/views/rest.py,sha256=uTx9LdSvM80YB8iYTEG_GjPhLxoNwXa5-tn3P7by-tg,2474
+valar-1.3.8.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+valar-1.3.8.dist-info/METADATA,sha256=1t40q0kXwZEjSjIQaH7n6hiHPiZIepOwECi7L76sewY,5172
+valar-1.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+valar-1.3.8.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
+valar-1.3.8.dist-info/RECORD,,