valar 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

valar/apps.py

@@ -1,9 +1,7 @@
 import os
 from django.apps import AppConfig
-from .classes.app_mixins.auto_migration_mixin import AutoMigrationMixin
-from .classes.app_mixins.auto_urlpatterns_mixin import AutoUrlPatternsMixin
-
-valar_app = __package__.replace('src.', '')
+from valar_app_mixins.auto_migration_mixin import AutoMigrationMixin
+from valar_app_mixins.auto_urlpatterns_mixin import AutoUrlPatternsMixin
 
 
 class ValarConfig(AutoMigrationMixin, AutoUrlPatternsMixin, AppConfig):

{valar-1.2.0.dist-info → valar-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.2.0
+Version: 1.2.2
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -16,6 +16,7 @@ Requires-Dist: pandas==2.2.3
 Requires-Dist: openpyxl==3.1.5
 Requires-Dist: deepmerge~=2.0
 Requires-Dist: minio==7.2.2
+Requires-Dist: valar-auto-mixins~=0.0.1
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -27,12 +28,13 @@ Dynamic: requires-python
 Dynamic: summary
 
 valar for morghulis
+
 # 1. install
+
 ```shell
 pip install valar
 ```
 
-
 # 1. settings
 
 ```python
@@ -47,16 +49,12 @@ BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 SECRET_KEY = get_random_secret_key()
 
-
-
 """       Valar Options       """
 
 HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
 MONGO_URI = 'mongodb://root:19870120@121.41.111.175:27017/'
 MINIO_URL = "s3://admin:password@120.27.8.186:9000"
 
-
-
 """       Minimized compulsory settings       """
 
 DATABASES = {
@@ -69,7 +67,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'valar',
+    'valar.apps.ValarConfig',
 ]
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -99,6 +97,7 @@ FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 
 ```
+
 # 2. asgi
 
 ```python
@@ -117,8 +116,8 @@ application = ProtocolTypeRouter({
 ```
 
 # 3. migrate
-no need, valar will auto migration
 
+no need, valar will auto migration
 
 # 4. root urls
 
@@ -126,7 +125,6 @@ no need, valar will auto set urlpatterns
 
 # 5. how to use valar_channel
 
-
 5.1 set HANDLER_MAPPING in settings
 
 ```python
@@ -137,13 +135,11 @@ HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
 
 ```python
 from valar.channels.sender import ValarSocketSender
+
+
 def test_handler(sender: ValarSocketSender):
     data = sender.data
-    length = data.get('length',30)
-    counter = sender.create_counter(length)
-    for i in range(length):
-        # sync method
-        sender.to_clients(counter.tick() ,sender.client, wait=True)
+    sender.load(data)
 ```
 
 5.3 register handler in channel_mapping

{valar-1.2.0.dist-info → valar-1.2.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 valar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar/apps.py,sha256=OGgsSN7nsa5GEA3kF0EqtY5eFWI5pnuR2tw32cZXmpo,632
+valar/apps.py,sha256=zqmRr7_c0iMtaQ9Wt6vYLFQCObla2n5-fMw5-fgEz-w,581
 valar/urls.py,sha256=tE_gvrzla_RDza7JOsINssxBmQfm_R-esUpNtwHUkf4,1099
 valar/channels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/channels/consumer.py,sha256=fEP52wBHWccturn2QAkqOt9-_Fr8akiw95AoVc6dEMM,1395
@@ -12,9 +12,6 @@ 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_response.py,sha256=nwOOjT1AeORkxAIRTrXMPa6-xtMZP7XaLJnHG-yfudA,252
-valar/classes/app_mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar/classes/app_mixins/auto_migration_mixin.py,sha256=PpqZaIYXMDmlMzfDbmdMNv18T_d7wA8yfVSgU4Qw3uM,337
-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=2M5OLxze-uQDAJIgJtuGKoDjpwVw97Rg_wOeOq6gFTA,2318
 valar/dao/engine.py,sha256=B41ScN2OqWpPmVX6n6EEqHPfNejCsMhAo4oBNOTOUAQ,2759
@@ -40,8 +37,15 @@ valar/views/file.py,sha256=NxfbxT4EJRDFgXol06kD0vcSp4lN4BCVJ5wq43rh8Yg,1537
 valar/views/handler.py,sha256=zlJoCnFnXK_2hyTXaNQrwj7svWQJk4ixIldCosIoCpY,1113
 valar/views/meta.py,sha256=H3_raG-LEcfg1p_CBpluhPXBsLFQB_jtaI5CKGgYOKk,4774
 valar/views/rest.py,sha256=HnmPR6_Q_NTtotaeDjfwIGwVG7eigtKBXfoaedUgar8,2349
-valar-1.2.0.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-1.2.0.dist-info/METADATA,sha256=8VwVIvq2k2Ck8ZSJ2t3mfUqWTMLOCgNUt-olqZmaM4k,3431
-valar-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-valar-1.2.0.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-1.2.0.dist-info/RECORD,,
+valar-1.2.2.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+vtest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+vtest/apps.py,sha256=Bla5GoyOYUPGg0RMvKf-A4SNE3wUc3MA5C438Nu0sz0,491
+vtest/handlers.py,sha256=VQ9Lv5_zvlPmRjV81mX8QTsncm4bOlSHadBcX33SfxE,404
+vtest/models.py,sha256=2xf9qSVbjj8j8dbSp0vx4SHIBdQAGzbVfsyt7nxKTq4,2567
+vtest/views.py,sha256=o0ElFeXGRkmvtpblitAtGQqhwjnu6NIGiIetLNxdauE,172
+vtest/migrations/0001_initial.py,sha256=l4D-fKYjX8qht95iY5dDpFO6bsz7RQY2mbCWRdvhaGo,9434
+vtest/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar-1.2.2.dist-info/METADATA,sha256=9ad7MaPQDXWkRmv_4DUAaJJ14PE6rqP_5VehOeqw9wQ,3312
+valar-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+valar-1.2.2.dist-info/top_level.txt,sha256=BM6TVgqVM6zSHp9lZmbN46veSedwX0ezelOKL8C6IT4,12
+valar-1.2.2.dist-info/RECORD,,

{valar-1.2.0.dist-info → valar-1.2.2.dist-info}/top_level.txt

@@ -1 +1,2 @@
 valar
+vtest

vtest/apps.py

@@ -0,0 +1,17 @@
+import os
+from django.apps import AppConfig
+
+from valar_app_mixins.auto_migration_mixin import AutoMigrationMixin
+
+valar_app = __package__.replace('src.', '')
+
+
+class VTestConfig(AutoMigrationMixin, AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = __package__
+
+    def ready(self):
+        if os.environ.get('RUN_MAIN') == 'true':
+            from ..valar.dao.frame import MetaFrame
+            getattr(super(), 'auto_migrate', None)()
+            MetaFrame()

vtest/handlers.py

@@ -0,0 +1,15 @@
+import time
+
+from ..valar.channels.counter import Counter
+from ..valar.channels.sender import ValarChannelSender
+
+
+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)

vtest/migrations/0001_initial.py

@@ -0,0 +1,155 @@
+# Generated by Django 4.2.23 on 2025-08-28 10:15
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Case',
+            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='已保存')),
+                ('a1', models.FloatField(default=0, verbose_name='余额')),
+                ('a2', models.FloatField(default=0, verbose_name='已用信用额度')),
+                ('a3', models.FloatField(default=0, verbose_name='年还款额')),
+                ('a4', models.FloatField(default=0, verbose_name='年收入/年还款')),
+                ('a5', models.FloatField(default=0, verbose_name='负债')),
+                ('a6', models.FloatField(default=0, verbose_name='利率*期数')),
+                ('a7', models.FloatField(default=0, verbose_name='分期付款/年收入')),
+                ('a8', models.FloatField(default=0, verbose_name='贷款人均负债')),
+                ('a9', models.FloatField(default=0, verbose_name='匿名特征加总')),
+                ('a10', models.FloatField(default=0, verbose_name='有效不良记录数')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Tree',
+            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='图标')),
+                ('text', models.TextField(null=True, verbose_name='text')),
+            ],
+            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='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('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='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='修改时间')),
+                ('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')),
+                ('vala', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='vtest.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='修改时间')),
+                ('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')),
+                ('vala', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='vtest.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='修改时间')),
+                ('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')),
+                ('valas', models.ManyToManyField(to='vtest.vala', verbose_name='valas')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Forcast',
+            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='已保存')),
+                ('type', models.CharField(max_length=100, verbose_name='类别')),
+                ('test', models.FloatField(default=0, verbose_name='测试集')),
+                ('train', models.FloatField(default=0, verbose_name='训练集')),
+                ('varify', models.FloatField(default=0, verbose_name='验证集')),
+                ('value', models.FloatField(default=0, verbose_name='预测结果')),
+                ('case', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='vtest.case')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

vtest/models.py

@@ -0,0 +1,59 @@
+from django.db import models
+
+from ..valar.models.core import VModel, VTree
+
+
+class Case(VModel):
+    a1 = models.FloatField(default=0, verbose_name='余额')
+    a2 = models.FloatField(default=0, verbose_name='已用信用额度')
+    a3 = models.FloatField(default=0, verbose_name='年还款额')
+    a4 = models.FloatField(default=0, verbose_name='年收入/年还款')
+    a5 = models.FloatField(default=0, verbose_name='负债')
+    a6 = models.FloatField(default=0, verbose_name='利率*期数')
+    a7 = models.FloatField(default=0, verbose_name='分期付款/年收入')
+    a8 = models.FloatField(default=0, verbose_name='贷款人均负债')
+    a9 = models.FloatField(default=0, verbose_name='匿名特征加总')
+    a10 = models.FloatField(default=0, verbose_name='有效不良记录数')
+
+
+class Forcast(VModel):
+    case = models.ForeignKey(Case, on_delete=models.CASCADE, null=True)
+    type = models.CharField(max_length=100, verbose_name='类别')
+    test = models.FloatField(default=0, verbose_name='测试集')
+    train = models.FloatField(default=0, verbose_name='训练集')
+    varify = models.FloatField(default=0, verbose_name='验证集')
+    value = models.FloatField(default=0, verbose_name='预测结果')
+
+
+class Vala(VModel):
+    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, verbose_name='File')
+
+
+class M2O(VModel):
+    vala = models.ForeignKey(to=Vala, null=True, on_delete=models.CASCADE, verbose_name='vala')
+    name = models.CharField(max_length=100, null=True, verbose_name='name')
+
+
+class O2O(VModel):
+    vala = models.OneToOneField(to=Vala, null=True, on_delete=models.CASCADE, verbose_name='vala')
+    name = models.CharField(max_length=100, null=True, verbose_name='name')
+
+
+class M2M(VTree):
+    valas = models.ManyToManyField(to=Vala, verbose_name='valas')
+    name = models.CharField(max_length=100, null=True, verbose_name='name')
+
+
+class Tree(VTree):
+    text = models.TextField(null=True, verbose_name='text')
+
+    class Meta:
+        verbose_name = '树形测试'

vtest/views.py

@@ -0,0 +1,8 @@
+import json
+
+from ..valar.classes.valar_response import ValarResponse
+
+
+def valar_test_request(request):
+    body = json.loads(request.body)
+    return ValarResponse(body)

valar/classes/app_mixins/auto_migration_mixin.py

@@ -1,8 +0,0 @@
-class AutoMigrationMixin:
-    name = None  # 子类必须提供
-    def auto_migrate(self):
-        from django.core.management import call_command
-        app = self.name.replace('src.','')
-        call_command('makemigrations', app, interactive=False, verbosity=0)
-        call_command('migrate', app, interactive=False, verbosity=0)
-

valar/classes/app_mixins/auto_urlpatterns_mixin.py

@@ -1,15 +0,0 @@
-import importlib
-
-from django.conf import settings
-from django.urls import path, include
-
-
-class AutoUrlPatternsMixin:
-    name = None  # 子类必须提供
-
-    def set_url(self):
-        root = settings.ROOT_URLCONF
-        module = importlib.import_module(root)
-        urlpatterns: list = getattr(module, 'urlpatterns')
-        url = f'{self.name}.urls'
-        urlpatterns.append(path('valar/', include(url)))