valar 0.0.11__tar.gz → 0.0.13__tar.gz

{valar-0.0.11/src/valar.egg-info → valar-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: valar
-Version: 0.0.11
+Version: 0.0.13
 Summary: valar for morghulis
 Author: LYP
 Author-email: liuyinpeng@buaa.edu.cn
@@ -12,6 +12,7 @@ Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -41,7 +42,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'valar.dao'
+    'valar.data'
 ]
 
 MIDDLEWARE = [

{valar-0.0.11 → valar-0.0.13}/README.md

@@ -23,7 +23,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'valar.dao'
+    'valar.data'
 ]
 
 MIDDLEWARE = [

{valar-0.0.11 → valar-0.0.13}/setup.py

@@ -10,7 +10,7 @@ requires = ['channels==3.0.3']
 
 setup(
     name="valar",  # 包名
-    version="0.0.11",  # 版本号
+    version="0.0.13",  # 版本号
     author="LYP",  # 作者
     author_email="liuyinpeng@buaa.edu.cn",  # 邮箱
     description="valar for morghulis",  # 简短描述

{valar-0.0.11 → valar-0.0.13}/src/valar/__init__.py

@@ -11,11 +11,16 @@ class ValarResponse(JsonResponse):
 class Middleware(MiddlewareMixin):
     @staticmethod
     def process_response(request: HttpRequest, response: ValarResponse):
-        message, code = response.message, response.code
-        user_id = request.session.get('USER_ID')
         headers = response.headers
-        headers['valar_message'] = message
-        headers['valar_code'] = code
-        if user_id:
-            headers['user_id'] = user_id
+        if type(response)==ValarResponse:
+            message, code = response.message, response.code
+            headers['valar_message'] = message
+            headers['valar_code'] = code
+
+        keys = ['client','auth','uid']
+        for key in keys:
+            value = request.headers.get(key)
+            if value:
+                headers[key] = value
+
         return response

{valar-0.0.11 → valar-0.0.13}/src/valar/channels/__init__.py

@@ -1,9 +1,11 @@
 from datetime import datetime
 
+from asgiref.sync import async_to_sync
 from channels.layers import get_channel_layer
 
-from channels.generic.websocket import AsyncJsonWebsocketConsumer
+from channels.generic.websocket import AsyncJsonWebsocketConsumer, JsonWebsocketConsumer
 from django.conf import settings
+from django.http import HttpRequest
 
 try:
     GROUP = settings.VALAR_CHANNEL_GROUP_NAME
@@ -11,16 +13,24 @@ except AttributeError:
     GROUP = 'VALAR'
 
 class ValarSocketSender:
-    def __init__(self, handler: str, client: str, uid):
+    def __init__(self, handler: str, request: HttpRequest):
+        client = request.headers.get('CLIENT')
+        auth = request.headers.get('AUTH')
+        uid = request.session.get('UID')
+        if auth and not uid:
+            raise Exception('Unauthorized!')
         self.client = client
         self.uid = uid
         self.handler = handler
         self.send = get_channel_layer().group_send
 
-    def __convert_body(self, emit, data ,clients = None, users = None):
+
+
+    def __convert_body(self, emit, data, status ,clients = None, users = None):
         return {
             'type': emit,
             'data': {
+                'status': status,
                 'handler': self.handler,
                 'payload': data,
                 'timestamp': datetime.now().timestamp()
@@ -30,22 +40,22 @@ class ValarSocketSender:
         }
 
 
-    async def to_users(self, data, *users):
-        body = self.__convert_body('user.emit', data, users=users)
-        await self.send(GROUP, body)
+    def to_users(self, data,  users, status='proceed'):
+        body = self.__convert_body(emit='user.emit', data=data, status=status, users=users)
+        async_to_sync(self.send)(GROUP, body)
 
-    async def to_clients(self,data, *clients):
-        body = self.__convert_body('client.emit', data, clients=clients)
-        await self.send(GROUP, body)
+    def to_clients(self,data, clients, status='proceed'):
+        body = self.__convert_body(emit='client.emit', data=data, status=status, clients=clients)
+        async_to_sync(self.send)(GROUP, body)
 
-    async def broadcast(self, data):
-        body = self.__convert_body('broadcast.emit', data)
-        await self.send(GROUP, body)
 
-    async def register(self):
-        body = self.__convert_body('register.emit',  None,[self.client], [self.uid])
-        await self.send(GROUP, body)
+    def broadcast(self, data, status):
+        body = self.__convert_body(emit='broadcast.emit', data=data, status=status)
+        async_to_sync(self.send)(GROUP, body)
 
+    def register(self):
+        body = self.__convert_body(emit='register.emit',  data=None, status=None,clients=[self.client], users=[self.uid])
+        async_to_sync(self.send)(GROUP, body)
 
 class ValarConsumer(AsyncJsonWebsocketConsumer):
 
@@ -91,11 +101,3 @@ class ValarConsumer(AsyncJsonWebsocketConsumer):
             self.uid = users[0]
 
 
-
-
-
-
-
-
-
-

valar-0.0.11/src/valar/channels/views.py → valar-0.0.13/src/valar/channels/utils.py

@@ -1,32 +1,29 @@
 import asyncio
+
 import importlib
-import json
 from django.core.exceptions import ImproperlyConfigured
 from django.conf import settings
 
-from .. import ValarResponse
-from ..channels import ValarSocketSender
-
 
 
 
+async def execute_channel(method, data, sender):
+    thread = asyncio.to_thread(method,  data, sender)
+    asyncio.create_task(thread)
 
-async def handel_channel(request, handler):
-    client = request.headers.get('CLIENT')
-    uid = request.session.get('UID')
-    data = json.loads(request.body)
-    method = get_valar_channel_handler(handler)
-    sender = ValarSocketSender(handler, client, uid)
-    if uid and client:
-        await sender.register()
-    loop = asyncio.get_event_loop()
-    loop.create_task(method(data, sender))
-    return ValarResponse({'status':'OK'})
 
 
+def channel_wrapper(func):
+    def wrapper(*args, **kwargs):
+        data, sender = args
+        sender.to_clients(None, [sender.client],'start')
+        result = func(*args, **kwargs)
+        sender.to_clients(None, [sender.client], 'stop')
+        return result
+    return wrapper
 
 
-def get_valar_channel_handler(handler):
+def get_channel_handler(handler):
     try:
         root = settings.VALAR_CHANNEL_HANDLER_MAPPING
         path, name = root.rsplit(".", 1)
@@ -43,4 +40,4 @@ def get_valar_channel_handler(handler):
         method = mapping[handler]
     except KeyError:
         raise ImproperlyConfigured("Cannot find handler in %r" % root)
-    return method
+    return method

valar-0.0.13/src/valar/channels/views.py

@@ -0,0 +1,16 @@
+import json
+
+from .utils import execute_channel, get_channel_handler
+from .. import ValarResponse
+from ..channels import ValarSocketSender
+
+
+async def handel_channel(request, handler):
+    method = get_channel_handler(handler)
+    data = json.loads(request.body)
+    sender = ValarSocketSender(handler,request)
+    await execute_channel(method, data, sender)
+    return ValarResponse(True)
+
+
+

valar-0.0.13/src/valar/data/handlers.py

@@ -0,0 +1,28 @@
+import time
+
+from ..channels import ValarSocketSender
+from ..channels.utils import channel_wrapper
+from ..data.utils import get_dao
+
+@channel_wrapper
+def save_many_handler(data, sender: ValarSocketSender):
+    start_time = time.time()
+    entity, array, db = data.get("entity"), data.get("array",[]), data.get("db")
+    dao = get_dao(db, entity)
+    index, length = 1, len(array)
+    for item in array:
+        item['saved'] = True
+        dao.save_one(item)
+        current_time = time.time()
+        time_span = current_time - start_time
+        if time_span > 1:
+            start_time = current_time
+            send(index, length, sender)
+        index += 1
+
+
+
+def send(index, length, sender):
+    percentage = round(index * 100 / length)
+    tick = {'length': length, 'index': index, 'percentage': percentage}
+    sender.to_clients(tick, sender.client)

valar-0.0.13/src/valar/data/migrations/0001_initial.py

@@ -0,0 +1,210 @@
+# Generated by Django 5.1.7 on 2025-04-04 14:58
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+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='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('entity', models.CharField(max_length=100, null=True, unique=True, verbose_name='数据源')),
+                ('name', models.CharField(max_length=50, null=True, verbose_name='实体别名')),
+            ],
+            options={
+                'verbose_name': '数据实体',
+            },
+        ),
+        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='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('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='代码')),
+                ('format', models.JSONField(default=dict, verbose_name='格式参数')),
+            ],
+            options={
+                'verbose_name': '元数据字段工具',
+            },
+        ),
+        migrations.CreateModel(
+            name='Vala',
+            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='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('text_field', models.TextField(null=True, verbose_name='text')),
+                ('boolean_field', models.BooleanField(null=True, verbose_name='boolean')),
+                ('integer_field', models.IntegerField(null=True, verbose_name='integer')),
+                ('float_field', models.FloatField(null=True, verbose_name='float')),
+                ('date_field', models.DateField(null=True, verbose_name='date')),
+                ('datetime_field', models.DateTimeField(null=True, verbose_name='datetime')),
+                ('time_field', models.TimeField(null=True, verbose_name='time')),
+                ('json_field', models.JSONField(null=True, verbose_name='json')),
+                ('file', models.FileField(null=True, upload_to='', verbose_name='File')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        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='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('name', models.CharField(max_length=255, null=True, unique=True, verbose_name='名称')),
+                ('align', models.CharField(max_length=10, null=True, verbose_name='对齐方式')),
+                ('default', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='data.metafieldtool', verbose_name='默认工具')),
+                ('search', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='data.metafieldtool', verbose_name='搜索工具')),
+                ('tools', models.ManyToManyField(to='data.metafieldtool', verbose_name='工具集')),
+            ],
+            options={
+                'verbose_name': '元数据字段类型',
+            },
+        ),
+        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='序号')),
+                ('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='修改时间')),
+                ('saved', models.BooleanField(default=False)),
+                ('code', models.CharField(default='default ', max_length=50, verbose_name='类视图')),
+                ('view_name', models.CharField(max_length=50, null=True, verbose_name='视图名称')),
+                ('form_width', models.IntegerField(default=0, verbose_name='表单宽度')),
+                ('form_height', models.IntegerField(default=0, verbose_name='表单高度')),
+                ('table_width', models.IntegerField(default=0, verbose_name='表格宽度')),
+                ('table_height', models.IntegerField(default=0, verbose_name='表格高度')),
+                ('enable', models.BooleanField(default=True, verbose_name='是否启用')),
+                ('show_header', models.BooleanField(default=True, verbose_name='展示头部')),
+                ('allow_batch', models.BooleanField(default=True, verbose_name='批处理')),
+                ('allow_search', models.BooleanField(default=True, verbose_name='检索功能')),
+                ('allow_sort', models.BooleanField(default=True, verbose_name='排序功能')),
+                ('allow_pop', models.BooleanField(default=True, verbose_name='移动功能')),
+                ('allow_insert', models.BooleanField(default=True, verbose_name='新增功能')),
+                ('allow_edit', 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='data.meta', verbose_name='元数据')),
+            ],
+            options={
+                'verbose_name': '数据视图',
+                'unique_together': {('meta', 'code')},
+            },
+        ),
+        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)),
+                ('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='格式')),
+                ('unit', models.CharField(max_length=55, null=True, verbose_name='单位符')),
+                ('not_null', models.BooleanField(default=False, verbose_name='不为空')),
+                ('read_only', models.BooleanField(default=False, verbose_name='只读')),
+                ('sortable', models.BooleanField(default=False, verbose_name='可排序')),
+                ('allow_search', models.BooleanField(default=True, verbose_name='可搜索')),
+                ('allow_download', models.BooleanField(default=True, verbose_name='可下载')),
+                ('allow_upload', models.BooleanField(default=False, verbose_name='可上传')),
+                ('allow_update', models.BooleanField(default=False, verbose_name='可更新')),
+                ('column_width', models.FloatField(default=0, verbose_name='表头宽度')),
+                ('align', models.CharField(default='left', max_length=55, 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=False, 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='data.metaview', verbose_name='数据视图')),
+            ],
+            options={
+                'verbose_name': '视图字段',
+            },
+        ),
+        migrations.CreateModel(
+            name='O2O',
+            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)),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='name')),
+                ('vala', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='data.vala', verbose_name='vala')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='M2O',
+            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)),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='name')),
+                ('vala', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='data.vala', verbose_name='vala')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='M2M',
+            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)),
+                ('name', models.CharField(max_length=100, null=True, verbose_name='name')),
+                ('valas', models.ManyToManyField(to='data.vala', verbose_name='valas')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]