valar 1.3.19__tar.gz → 1.3.20__tar.gz

{valar-1.3.19/src/valar.egg-info → valar-1.3.20}/PKG-INFO

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

{valar-1.3.19 → valar-1.3.20}/setup.py

@@ -7,7 +7,7 @@ from typing import Dict, Type
 with open("README.md", "r", encoding="utf-8") as f:
     long_description = f.read()
 
-version = "1.3.19"
+version = "1.3.20"
 
 requires = [
     'channels==3.0.3',

{valar-1.3.19 → valar-1.3.20}/src/valar/auth/Authentication.py

@@ -1,5 +1,6 @@
 import jwt
 from django.conf import settings
+from django.http import HttpRequest
 
 from ..classes.valar_response import ValarResponse
 
@@ -11,7 +12,7 @@ class ValaAuthError(Exception):
 
 
 def auth_required(view_func):
-    def wrapper(request, *args, **kwargs):
+    def wrapper(request: HttpRequest, *args, **kwargs):
         try:
             payload = valid_request_token(request)
             request.user_id = payload["user_id"]

{valar-1.3.19 → valar-1.3.20}/src/valar/channels/consumer.py

@@ -1,4 +1,5 @@
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
+from django.conf import settings
 
 VALAR_CHANNEL_GROUP = 'VALAR'
 
@@ -15,6 +16,10 @@ class ValarConsumer(AsyncJsonWebsocketConsumer):
         self.client = params.get('client')
         await self.channel_layer.group_add(VALAR_CHANNEL_GROUP, self.channel_name)
         await self.accept()
+        await self.send_json({
+            "tag": 'system',
+            "minio": getattr(settings, 'MINIO_ROOT') if hasattr(settings, 'MINIO_ROOT') else '/minio'
+        })
 
     async def disconnect(self, code):
         await self.channel_layer.group_discard(VALAR_CHANNEL_GROUP, self.channel_name)
@@ -30,17 +35,23 @@ class ValarConsumer(AsyncJsonWebsocketConsumer):
     async def user_emit(self, event):
         users: list = event.get('users', [])
         data = event.get('data', {})
+        tag = event.get('tag')
+        data.update({'tag': tag})
         if self.uid in users:
             await self.send_json(data)
 
     async def client_emit(self, event):
         clients: list = event.get('clients', [])
         data = event.get('data', {})
+        tag = event.get('tag')
+        data.update({'tag': tag})
         if self.client in clients:
             await self.send_json(data)
 
     async def broadcast_emit(self, event):
         data = event.get('data', {})
+        tag = event.get('tag')
+        data.update({'tag': tag})
         await self.send_json(data)
 
     async def register_emit(self, event):

{valar-1.3.19 → valar-1.3.20}/src/valar/channels/executer.py

@@ -1,6 +1,7 @@
 import asyncio
 
 from ..channels.sender import ValarChannelSender
+import traceback
 
 
 async def execute_channel(method, sender: ValarChannelSender):
@@ -10,6 +11,10 @@ async def execute_channel(method, sender: ValarChannelSender):
 
 def __execute__(method, sender: ValarChannelSender):
     sender.start()
-    response = method(sender)
-    sender.done(response)
-    sender.stop()
+    try:
+        response = method(sender)
+        sender.done(response)
+        sender.stop()
+    except Exception as e:
+        traceback.print_exc()
+        sender.error(str(e))

{valar-1.3.19 → valar-1.3.20}/src/valar/channels/sender.py

@@ -18,8 +18,9 @@ class Channel:
         self.url = body.get('url')
         self.auth = body.get('auth')
         self.broadcast = body.get('broadcast')
+
         self.data = body.get('data')
-        self.callback = body.get('callback')
+        self.token = body.get('token')
 
     def to_dict(self, resolver, payload):
         data = {
@@ -27,7 +28,7 @@ class Channel:
             'url': self.url,
             'auth': self.auth,
             'broadcast': self.broadcast,
-            'callback': self.callback,
+            'token': self.token,
             'timestamp': datetime.now().timestamp()
         }
         if resolver:
@@ -97,6 +98,7 @@ class ValarChannelSender(Sender):
         pay = self.__payload__ if status == 'proceed' else data
         body = {
             'type': f'{scope}.emit',
+            'tag': 'batch',
             'data': self.__channel__.to_dict(status, pay),
             'clients': [self.client],
             'users': []

{valar-1.3.19 → valar-1.3.20}/src/valar/dao/defaults/field_keys_default.py

@@ -4,7 +4,7 @@ meta_field_key_defaults = {
     },
     'valar.MetaView': {
         'list': ('pick', ['code', 'name']),
-        'core': ('pick', ['name', 'enable', 'lock', 'property']),
+        'core': ('pick', ['name', 'enable', 'lock']),
         'style': ('pick', ['form_width', 'form_height', 'table_width', 'table_height']),
         'rest': ('pick',
                  ['allow_search', 'allow_order', 'allow_insert', 'allow_remove', 'allow_download', 'allow_upload']),

{valar-1.3.19 → valar-1.3.20}/src/valar/dao/defaults/field_values_default.py

@@ -27,11 +27,8 @@ meta_field_value_defaults = {
         },
         "core": {
             "name": {
-                'span': 16
+                'span': 24
             },
-            "enable": {
-                "span": 8
-            }
         }
     },
     'valar.MetaFieldDomain': {
@@ -104,7 +101,6 @@ meta_field_value_defaults = {
             },
             "tool": {
                 'column_width': 100,
-                'span': 24,
                 'tool': 'tree',
                 'refer': {
                     'entity': 'valar.MetaFieldTool',
@@ -119,11 +115,13 @@ meta_field_value_defaults = {
             },
             "refer": {
                 'allow_edit': False,
-                'column_width': 80
+                'column_width': 80,
+                "hide_on_form": True
             },
             "format": {
                 'allow_edit': False,
-                'column_width': 80
+                'column_width': 80,
+                "hide_on_form": True
             },
             'header_color': {
                 'tool': 'color',

{valar-1.3.19 → valar-1.3.20}/src/valar/dao/meta.py

@@ -1,7 +1,6 @@
 import copy
 
 from deepmerge import always_merger
-from django.conf import settings
 
 from ..dao.defaults.field_keys_default import meta_field_key_defaults
 from ..dao.defaults.field_values_default import meta_field_value_defaults
@@ -11,7 +10,6 @@ from ..dao.frame import meta_field_tool_mapping
 from ..dao.mon_dao import MonDao
 from ..dao.orm_dao import OrmDao
 from ..dao.orm_field import column_width
-from ..models.frame import MetaFieldDomain
 from ..models.meta import Meta, MetaView
 
 
@@ -56,18 +54,15 @@ class ValarMeta:
         name, entity = meta['name'], meta['entity']
         fields = self.view.metafield_set.all().order_by('-sort')
         _fields = {}
-        _minio = settings.MINIO_ROOT if hasattr(settings, 'MINIO_ROOT') else '/minio'
         for field in fields:
-            _field = field.json(entity=entity, code=self.code, db='orm', minio=_minio)
+            _field = field.json(entity=entity, code=self.code, db='orm')
             align, tool, width, domain = _field['align'], _field['tool'], _field['column_width'], _field['domain']
             _field['align'] = align if align else meta_field_tool_mapping.get(tool, 'left')
             _field['column_width'] = width if width else column_width(domain, tool)
 
             _fields[field.prop] = _field
 
-        _minio = settings.MINIO_ROOT if hasattr(settings, 'MINIO_ROOT') else '/minio'
         _view.update({
-            '$minio': _minio,
             '$db': 'orm',
             '$entity': entity,
             '$code': self.code,
@@ -87,17 +82,6 @@ class ValarMeta:
         view_item.update({
             "name": self.code.upper(),
             "saved": True,
-            "property": {
-                "value": "id",
-                "label": "name",
-                "display": "id",
-                "sort": "sort",
-                "disabled": "disabled",
-                "isLeaf": "isLeaf",
-                "icon": "icon",
-                "children": "children",
-                "pid": "pid",
-            }
         })
         values = always_merger.merge(default_values, code_values)
         view_item.update(values)

{valar-1.3.19 → valar-1.3.20}/src/valar/dao/orm_dao.py

@@ -1,7 +1,6 @@
 import datetime
 import json
 
-from django.conf import settings
 from django.core.paginator import Paginator
 from django.db.models.options import Options
 
@@ -15,7 +14,6 @@ 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
 
@@ -52,7 +50,6 @@ class OrmDao(AbstractDao):
         return list(query_set.values(*props))
 
     def insert_one(self, item):
-        print(item)
         return self.__save__(item)
 
     def update_one(self, item):
@@ -332,7 +329,6 @@ def __set_simple_values__(fields, values):
         elif domain == 'JSONField':
             json_props.append(prop)
     for row in values:
-        row['$minio'] = settings.MINIO_ROOT
         for prop, formating in date_props_mapping.items():
             if row.get(prop):
                 row[prop] = row[prop].strftime(formating)

{valar-1.3.19 → valar-1.3.20}/src/valar/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.24 on 2025-09-19 20:35
+# Generated by Django 4.2.24 on 2025-10-19 15:26
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -30,6 +30,25 @@ class Migration(migrations.Migration):
                 'verbose_name': '指标集',
             },
         ),
+        migrations.CreateModel(
+            name='Location',
+            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='已保存')),
+                ('scope', models.CharField(max_length=100, null=True)),
+                ('code', models.CharField(max_length=100, null=True)),
+                ('name', models.CharField(max_length=100, null=True)),
+                ('name_cn', models.CharField(max_length=100, null=True)),
+                ('name_en', models.CharField(max_length=100, null=True)),
+            ],
+            options={
+                'verbose_name': '指标集',
+            },
+        ),
         migrations.CreateModel(
             name='Meta',
             fields=[
@@ -184,7 +203,6 @@ class Migration(migrations.Migration):
                 ('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='锁定元数据')),

{valar-1.3.19 → valar-1.3.20}/src/valar/models/core.py

@@ -1,7 +1,6 @@
 import json
 
 from django.apps import AppConfig
-from django.conf import settings
 from django.db import models
 from django.db.models import ManyToOneRel, OneToOneRel, ManyToManyRel, ManyToManyField, UUIDField, FileField, \
     ForeignKey, OneToOneField, DateField, TimeField, DateTimeField, BigAutoField, JSONField
@@ -76,7 +75,6 @@ class VModel(models.Model):
                 _set = getattr(self, accessor).all().order_by('-sort')
                 data[prop] = [item.id for item in _set]
                 data[f'{prop}_set'] = [item.json() for item in _set]
-        data['$minio'] = settings.MINIO_ROOT
         return data
 
 

{valar-1.3.19 → valar-1.3.20}/src/valar/models/meta.py

@@ -15,7 +15,6 @@ class Meta(VModel):
 
 class MetaView(VModel):
     meta = models.ForeignKey('Meta', on_delete=models.CASCADE, verbose_name='元数据')
-    property = models.JSONField(default=dict, verbose_name='属性')
 
     code = models.CharField(max_length=50, verbose_name='类视图', default='default ')
     name = models.CharField(max_length=50, verbose_name='视图名称', null=True)

{valar-1.3.19 → valar-1.3.20}/src/valar/urls.py

@@ -5,6 +5,9 @@ from django.urls import path, re_path
 urlpatterns = [
     path('socket/<str:handler>', handel_channel),
     path('batch', rest.batch),
+
+    path('<str:db>/<str:entity>/save_many', rest.save_many),
+    path('<str:db>/<str:entity>/delete_many', rest.delete_many),
     path('<str:db>/<str:entity>/save_one', rest.save_one),
     path('<str:db>/<str:entity>/insert_one', rest.insert_one),
     path('<str:db>/<str:entity>/delete_one', rest.delete_one),
@@ -20,7 +23,7 @@ urlpatterns = [
     path('load_customs', meta.load_customs),
     path('get_fields', meta.get_fields),
     path('save_custom', meta.save_custom),
-    path('upload_mapping', meta.upload_mapping),
+    path('upload_frame', meta.upload_frame),
 
     path('<str:db>/<str:entity>/save_file', file.save_file),
     path('<str:db>/<str:entity>/remove_file', file.remove_file),

{valar-1.3.19 → valar-1.3.20}/src/valar/views/auth.py

@@ -14,24 +14,23 @@ from ..models.auth import Account, AbstractUser, Menu
 
 def sign_in(request):
     body = json.loads(request.body)
-    username = body.get("username")
-    email = body.get("email")
-    password = body.get("password")
-    signin = body.get("signin")
+    keys = ['username', 'email', 'password', 'signin']
+    username, email, password, signin = [body.get(k) for k in keys]
     dao = Dao('valar.Account')
     account = dao.search({"username": username}).first()
+
     if account is not None:
         if signin:
             if not account.is_auth(password):
-                return ValarResponse(False, '密码错误', 'warning', status=400)
+                return ValarResponse(False, '密码错误', 'warning')
         else:
-            return ValarResponse(False, f"{username}已被占用", 'warning', status=400)
+            return ValarResponse(False, f"{username}已被占用", 'warning')
     else:
         if signin:
-            return ValarResponse(False, f"{username}不存在", 'warning', status=400)
+            return ValarResponse(False, f"{username}不存在", 'warning')
         else:
             if username == 'admin' and password != settings.SECRET_KEY:
-                return ValarResponse(False, "请输入正确的admin密码", 'warning', status=400)
+                return ValarResponse(False, "请输入正确的admin密码", 'warning')
             else:
                 account = dao.save_one({
                     "username": username,

valar-1.3.20/src/valar/views/handler.py

@@ -0,0 +1,47 @@
+import traceback
+
+from ..channels.counter import Counter
+from ..channels.sender import ValarChannelSender
+from ..dao import Dao
+from ..dao.engine import ValarEngine
+
+import time
+
+
+def valar_test_handler(sender: ValarChannelSender):
+    data = sender.data
+    length = data.get('length', 100)
+    counter = Counter(length)
+    for i in range(length):
+        time.sleep(0.1)
+        tick = counter.tick()
+        tick.update({'name': 'test1'})
+        sender.load(tick)
+    return "aba"
+
+
+def batch_handler(sender: ValarChannelSender):
+    data = sender.data
+    entity, db, method = data.get("entity"), data.get("db"), data.get("method")
+    dao = Dao(entity, db)
+    if method == 'save_many':
+        array = data.get("data", [])
+        counter = Counter(array)
+        keys = []
+        for item in array:
+            item.update({'saved': True})
+            bean = dao.save_one(item)
+            keys.append(bean.id)
+            payload = counter.tick()
+            sender.load(payload)
+        return keys
+    elif method == 'delete_many':
+        conditions = data.get("data", [])
+        paths = dao.delete(conditions)
+        counter = Counter(len(paths))
+        minio = ValarEngine().get_minio_bucket(entity)
+        for path in paths:
+            minio.remove(path)
+            payload = counter.tick()
+            sender.load(payload)
+    return []

{valar-1.3.19 → valar-1.3.20}/src/valar/views/meta.py

@@ -10,7 +10,7 @@ from ..dao.meta import ValarMeta
 from ..models.meta import MetaView, Meta, MetaField
 
 
-def upload_mapping(request):
+def upload_frame(request):
     body = json.loads(request.body)
     db = body.get('db')
     entity = body.get('entity')
@@ -19,9 +19,17 @@ def upload_mapping(request):
         view__meta__db=db,
         view__meta__entity=entity,
         view__code=code,
-        domain__in=['ManyToManyField', 'ManyToManyRel', 'ManyToOneRel', 'OneToOneField', 'OneToOneRel', 'ForeignKey']
+        domain__in=[
+            'ManyToManyField',
+            'ManyToManyRel',
+            'ManyToOneRel',
+            'OneToOneField',
+            'OneToOneRel',
+            'ForeignKey',
+            'CharField'
+        ]
     ).filter(Q(allow_upload=True) | Q(allow_update=True))
-    mapping = {}
+    frame = {}
     for field in fields:
         prop = field.prop
         refer = field.refer
@@ -29,14 +37,18 @@ def upload_mapping(request):
         entity = refer['entity']
         value = refer['value']
         label = refer['label']
-        includes = {prop: refer['includes'][prop] for prop in refer['includes'] if not prop.startswith('$')}
-        excludes = {prop: refer['excludes'][prop] for prop in refer['excludes'] if not prop.startswith('$')}
-        values = Dao(entity, db).manager.filter(**includes).exclude(**excludes).values(*[value, label])
-        mapping[prop] = {
-            row[value]: row[label]
-            for row in values if row[value]
-        }
-    return ValarResponse(mapping)
+        try:
+            includes = {prop: refer['includes'][prop] for prop in refer['includes'] if not prop.startswith('$')}
+            excludes = {prop: refer['excludes'][prop] for prop in refer['excludes'] if not prop.startswith('$')}
+            values = Dao(entity, db).manager.filter(**includes).exclude(**excludes).values(*[value, label])
+            frame[prop] = [
+                {"value": row[value], "label": row[label]}
+                for row in values if row[value]
+            ]
+        except Exception:
+            pass
+
+    return ValarResponse(frame)
 
 
 def meta_view(request, db, entity):
@@ -121,7 +133,7 @@ def add_fields(request):
 
 
 def metas(request):
-    values = Meta.objects.all().values('db', 'entity', 'name', 'tree', 'metaview__name')
+    values = Meta.objects.all().values('db', 'entity', 'name', 'tree')
     mapping = {'orm': {'valar': []}, 'mon': []}
     for row in values:
         db = row['db']

{valar-1.3.19 → valar-1.3.20}/src/valar/views/password.py

@@ -57,4 +57,4 @@ def __send__(account):
         return ValarResponse(False, '该账户未登记邮箱信息', code='error')
     content = f'Your temporary password is {token}, please change it as soon as possible.'
     ValarEngine().send_email('Retrieve Password', content, email)
-    return ValarResponse(True, '临时密码发送成功', 'success')
+    return ValarResponse(f'临时密码已发送至{email}')

{valar-1.3.19 → valar-1.3.20}/src/valar/views/rest.py

@@ -8,6 +8,7 @@ from ..channels.executer import execute_channel
 from ..channels.sender import ValarChannelSender
 from ..classes.valar_response import ValarResponse
 from ..dao import Dao
+from ..dao.engine import ValarEngine
 
 
 async def batch(request):
@@ -16,10 +17,30 @@ async def batch(request):
     return ValarResponse(True)
 
 
+def save_many(request, db, entity):
+    array = json.loads(request.body)
+    dao = Dao(entity, db)
+    keys = []
+    for item in array:
+        item.update({'saved': True})
+        bean = dao.save_one(item)
+        keys.append(bean.id)
+    return ValarResponse(keys)
+
+
+def delete_many(request, db, entity):
+    conditions = json.loads(request.body)
+    dao = Dao(entity, db)
+    paths = dao.delete(conditions)
+    minio = ValarEngine().get_minio_bucket(entity)
+    for path in paths:
+        minio.remove(path)
+    return ValarResponse(True)
+
+
 def insert_one(request, db, entity):
     item = json.loads(request.body)
     dao = Dao(entity, db)
-    print(item)
     bean = dao.insert_one(item)
     item = dao.serialize(bean)
     return ValarResponse(item)
@@ -56,7 +77,6 @@ def find_one(request, db, entity):
     dao = Dao(entity, db)
     bean = dao.find_one(_id)
     item = dao.serialize(bean)
-    item['$minio'] = settings.MINIO_ROOT
     return ValarResponse(item)
 
 

{valar-1.3.19 → valar-1.3.20/src/valar.egg-info}/PKG-INFO

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

valar-1.3.19/src/valar/views/handler.py

@@ -1,54 +0,0 @@
-import traceback
-
-from ..channels.counter import Counter
-from ..channels.sender import ValarChannelSender
-from ..dao import Dao
-from ..dao.engine import ValarEngine
-
-import time
-
-
-def valar_test_handler(sender: ValarChannelSender):
-    data = sender.data
-    length = data.get('length', 100)
-    counter = Counter(length)
-    for i in range(length):
-        time.sleep(0.1)
-        tick = counter.tick()
-        tick.update({'name': 'test1'})
-        sender.load(tick)
-    return "aba"
-
-
-def batch_handler(sender: ValarChannelSender):
-    data = sender.data
-    entity, db, method = data.get("entity"), data.get("db"), data.get("method")
-    dao = Dao(entity, db)
-    body = {"method": method}
-
-    try:
-        if method == 'save_many':
-            array = data.get("array", [])
-            counter = Counter(array)
-            keys = []
-            for item in array:
-                item.update({'saved': True})
-                bean = dao.save_one(item)
-                keys.append(bean.id)
-                payload = counter.tick()
-                sender.load(payload)
-            body.update({'keys': keys})
-            sender.done(body)
-        elif method == 'delete_many':
-            conditions = data.get("conditions", [])
-            paths = dao.delete(conditions)
-            counter = Counter(len(paths))
-            minio = ValarEngine().get_minio_bucket(entity)
-            for path in paths:
-                minio.remove(path)
-                payload = counter.tick()
-                sender.load(payload)
-            sender.done(body)
-    except Exception as e:
-        traceback.print_exc()
-        sender.error(str(e))