valar 1.3.18__tar.gz → 1.3.19__tar.gz

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

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

{valar-1.3.18 → valar-1.3.19}/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.18"
+version = "1.3.19"
 
 requires = [
     'channels==3.0.3',

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

@@ -10,5 +10,6 @@ async def execute_channel(method, sender: ValarChannelSender):
 
 def __execute__(method, sender: ValarChannelSender):
     sender.start()
-    method(sender)
+    response = method(sender)
+    sender.done(response)
     sender.stop()

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

@@ -19,19 +19,19 @@ class Channel:
         self.auth = body.get('auth')
         self.broadcast = body.get('broadcast')
         self.data = body.get('data')
-        self.resolve = body.get('resolve')
+        self.callback = body.get('callback')
 
-    def to_dict(self, status, payload):
+    def to_dict(self, resolver, payload):
         data = {
             'handler': self.handler,
             'url': self.url,
             'auth': self.auth,
             'broadcast': self.broadcast,
-            'resolve': self.resolve,
+            'callback': self.callback,
             'timestamp': datetime.now().timestamp()
         }
-        if status:
-            data.update({'status': status})
+        if resolver:
+            data.update({'resolver': resolver})
         if payload:
             data.update({'payload': payload})
         return data
@@ -86,17 +86,18 @@ class ValarChannelSender(Sender):
         with self.__lock__:
             self.__payload__ = payload
 
-    def done(self, payload):
-        self.__emit__('done', payload)
+    def done(self, response):
+        self.__emit__('done', response)
 
     def error(self, payload):
         self.__emit__('error', payload)
 
     def __emit__(self, status='proceed', data=None):
         scope = 'broadcast' if self.__channel__.broadcast else 'client'
+        pay = self.__payload__ if status == 'proceed' else data
         body = {
             'type': f'{scope}.emit',
-            'data': self.__channel__.to_dict(status, data or self.__payload__),
+            'data': self.__channel__.to_dict(status, pay),
             'clients': [self.client],
             'users': []
         }

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

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.24 on 2025-09-21 19:05
+# Generated by Django 4.2.24 on 2025-09-19 20:35
 
 from django.db import migrations, models
 import django.db.models.deletion

{valar-1.3.18 → valar-1.3.19}/src/valar/views/handler.py

@@ -17,6 +17,7 @@ def valar_test_handler(sender: ValarChannelSender):
         tick = counter.tick()
         tick.update({'name': 'test1'})
         sender.load(tick)
+    return "aba"
 
 
 def batch_handler(sender: ValarChannelSender):

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

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

{valar-1.3.18 → valar-1.3.19}/src/valar.egg-info/SOURCES.txt

@@ -42,9 +42,6 @@ src/valar/dao/defaults/field_keys_default.py
 src/valar/dao/defaults/field_values_default.py
 src/valar/dao/defaults/view_defaults.py
 src/valar/migrations/0001_initial.py
-src/valar/migrations/0002_location.py
-src/valar/migrations/0003_location_code_location_name_cn_location_name_en.py
-src/valar/migrations/0004_remove_location_icon_remove_location_isleaf_and_more.py
 src/valar/migrations/__init__.py
 src/valar/models/__init__.py
 src/valar/models/auth.py

valar-1.3.18/src/valar/migrations/0002_location.py

@@ -1,32 +0,0 @@
-# Generated by Django 4.2.24 on 2025-09-22 11:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('valar', '0001_initial'),
-    ]
-
-    operations = [
-        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='已保存')),
-                ('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)),
-                ('name', models.CharField(max_length=100, null=True)),
-            ],
-            options={
-                'verbose_name': '指标集',
-            },
-        ),
-    ]

valar-1.3.18/src/valar/migrations/0003_location_code_location_name_cn_location_name_en.py

@@ -1,28 +0,0 @@
-# Generated by Django 4.2.24 on 2025-09-22 11:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('valar', '0002_location'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='location',
-            name='code',
-            field=models.CharField(max_length=100, null=True),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='name_cn',
-            field=models.CharField(max_length=100, null=True),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='name_en',
-            field=models.CharField(max_length=100, null=True),
-        ),
-    ]

valar-1.3.18/src/valar/migrations/0004_remove_location_icon_remove_location_isleaf_and_more.py

@@ -1,25 +0,0 @@
-# Generated by Django 4.2.24 on 2025-09-22 11:52
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('valar', '0003_location_code_location_name_cn_location_name_en'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='location',
-            name='icon',
-        ),
-        migrations.RemoveField(
-            model_name='location',
-            name='isLeaf',
-        ),
-        migrations.RemoveField(
-            model_name='location',
-            name='pid',
-        ),
-    ]