valar 1.0.29__tar.gz → 1.1.1__tar.gz

{valar-1.0.29/src/valar.egg-info → valar-1.1.1}/PKG-INFO

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

{valar-1.0.29 → valar-1.1.1}/setup.py

@@ -16,15 +16,15 @@ requires = [
 
 setup(
     name="valar",  # 包名
-    version="1.0.29",  # 版本号
+    version="1.1.1",  # 版本号
     author="LYP",  # 作者
     author_email="liuyinpeng@buaa.edu.cn",  # 邮箱
     description="valar for morghulis",  # 简短描述
     long_description=long_description,  # 详细说明
     long_description_content_type="text/markdown",  # 详细说明使用标记类型
     url="https://gitee.com/GRIFFIN120/valar_dev",                     # 项目主页
-    packages=find_packages(where="src"),  # 需要打包的部分
-    package_dir={"": "src"},  # 设置src目录为根目录
+    packages=find_packages(where="valar"),  # 需要打包的部分
+    package_dir={"": "valar"},  # 设置src目录为根目录
     python_requires=">=3.9",  # 项目支持的Python版本
     install_requires=requires,                     # 项目必须的依赖
     include_package_data=False  # 是否包含非Python文件（如资源文件）

{valar-1.0.29/src → valar-1.1.1}/valar/channels/consumer.py

@@ -1,7 +1,7 @@
 
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
 
-from ..channels import VALAR_CHANNEL_GROUP
+VALAR_CHANNEL_GROUP = 'VALAR'
 
 class ValarConsumer(AsyncJsonWebsocketConsumer):
 

{valar-1.0.29/src → valar-1.1.1}/valar/channels/mapping.py

@@ -3,11 +3,13 @@ import importlib
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
-class ChannelMapping:
+from ..classes.singleton_meta import SingletonMeta
+
+class ChannelMapping(metaclass=SingletonMeta):
     def __init__(self):
-        root = settings.ROOT_URLCONF
+        mapping = settings.HANDLER_MAPPING
+        root, name = mapping.rsplit('.', 1)
         module = importlib.import_module(root)
-        name = 'channel_mapping'
         if hasattr(module, name):
             self.mapping: dict = getattr(module, name)
         else:

{valar-1.0.29/src → valar-1.1.1}/valar/channels/sender.py

@@ -6,7 +6,8 @@ from asgiref.sync import async_to_sync
 from channels.layers import get_channel_layer
 from django.http import HttpRequest
 
-from ..channels import VALAR_CHANNEL_GROUP
+from .consumer import VALAR_CHANNEL_GROUP
+from ..classes.counter import Counter
 
 
 class ValarSocketSender:
@@ -23,6 +24,9 @@ class ValarSocketSender:
         if auth and not self.uid:
             raise Exception('Unauthorized!')
 
+    @staticmethod
+    def create_counter(length:int):
+        return Counter(length)
 
     def __convert_body(self, emit, payload, status ,clients = None, users = None):
         return {

{valar-1.0.29/src → valar-1.1.1}/valar/channels/views.py

@@ -2,7 +2,7 @@
 from .executer import execute_channel
 from .mapping import ChannelMapping
 from .sender import ValarSocketSender
-from ..core.response import ValarResponse
+from ..classes.valar_response import ValarResponse
 
 
 async def handel_channel(request, handler):

valar-1.1.1/valar/classes/auto_migration_mixin.py

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

valar-1.1.1/valar/classes/auto_urlpatterns_mixin.py

@@ -0,0 +1,15 @@
+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('data/', include(url)))
+
+

{valar-1.0.29/src/valar/data → valar-1.1.1/valar}/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.23 on 2025-07-06 02:42
+# Generated by Django 4.2.23 on 2025-07-15 16:22
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -20,11 +20,13 @@ class Migration(migrations.Migration):
                 ('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='数据源')),
+                ('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='实体别名')),
             ],
             options={
                 'verbose_name': '数据实体',
+                'unique_together': {('db', 'entity')},
             },
         ),
         migrations.CreateModel(
@@ -61,16 +63,15 @@ class Migration(migrations.Migration):
                 ('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_sort', 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_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='元数据')),
+                ('meta', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='valar.meta', verbose_name='元数据')),
             ],
             options={
                 'verbose_name': '数据视图',
@@ -87,9 +88,9 @@ class Migration(migrations.Migration):
                 ('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='工具集')),
+                ('default', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='valar.metafieldtool', verbose_name='默认工具')),
+                ('search', 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': '元数据字段类型',
@@ -112,7 +113,7 @@ class Migration(migrations.Migration):
                 ('format', models.JSONField(default=dict, verbose_name='格式')),
                 ('not_null', models.BooleanField(default=False, verbose_name='不为空')),
                 ('allow_edit', models.BooleanField(default=True, verbose_name='可编辑')),
-                ('allow_sort', 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=False, verbose_name='可上传')),
@@ -131,7 +132,7 @@ class Migration(migrations.Migration):
                 ('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='数据视图')),
+                ('view', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='valar.metaview', verbose_name='数据视图')),
             ],
             options={
                 'verbose_name': '视图字段',

valar-1.1.1/valar/models/__init__.py

@@ -0,0 +1 @@
+from . import core, frame, meta

valar-1.1.1/valar/models/frame.py

@@ -0,0 +1,30 @@
+from django.db import models
+from .core import VModel, VTree
+
+
+class MetaFieldTool(VTree):
+    name = models.CharField(max_length=255, null=True, verbose_name='名称')
+    code = models.CharField(max_length=100, unique=True, null=True, verbose_name='代码')  #
+
+    class Meta:
+        verbose_name = '元数据字段工具'
+#
+#
+
+class MetaFieldDomain(VModel):
+    name = models.CharField(max_length=255, unique=True, null=True, verbose_name='名称')
+    tools = models.ManyToManyField(to=MetaFieldTool, verbose_name='工具集')
+    default = models.ForeignKey(
+        to=MetaFieldTool, null=True,
+        on_delete=models.SET_NULL,
+        related_name='+',
+        verbose_name='默认工具')
+    search = models.ForeignKey(
+        to=MetaFieldTool, null=True,
+        on_delete=models.SET_NULL,
+        related_name='+',
+        verbose_name='搜索工具')
+    align = models.CharField(max_length=10, null=True, verbose_name='对齐方式')
+    class Meta:
+        verbose_name = '元数据字段类型'
+

valar-1.0.29/src/valar/data/models.py → valar-1.1.1/valar/models/meta.py

@@ -1,16 +1,15 @@
 from django.db import models
-from django.db.models.fields.files import FieldFile
-
-from ..core.valar_models import VModel, VTree
+from .core import VModel
 
 
 class Meta(VModel):
-    entity = models.CharField(max_length=100, verbose_name='数据源', null=True, unique=True)
+    db = models.CharField(max_length=100, verbose_name='数据库', null=True)
+    entity = models.CharField(max_length=100, verbose_name='数据源', null=True)
     name = models.CharField(max_length=50, verbose_name='实体别名', null=True)
 
     class Meta:
         verbose_name = '数据实体'
-        # unique_together = ('domain', 'entity')
+        unique_together = ('db', 'entity')
 
 
 class MetaView(VModel):
@@ -86,30 +85,3 @@ class MetaField(VModel):
         verbose_name = '视图字段'
 
 
-
-class MetaFieldTool(VTree):
-    name = models.CharField(max_length=255, null=True, verbose_name='名称')
-    code = models.CharField(max_length=100, unique=True, null=True, verbose_name='代码')  #
-
-    class Meta:
-        verbose_name = '元数据字段工具'
-#
-#
-
-class MetaFieldDomain(VModel):
-    name = models.CharField(max_length=255, unique=True, null=True, verbose_name='名称')
-    tools = models.ManyToManyField(to=MetaFieldTool, verbose_name='工具集')
-    default = models.ForeignKey(
-        to=MetaFieldTool, null=True,
-        on_delete=models.SET_NULL,
-        related_name='+',
-        verbose_name='默认工具')
-    search = models.ForeignKey(
-        to=MetaFieldTool, null=True,
-        on_delete=models.SET_NULL,
-        related_name='+',
-        verbose_name='搜索工具')
-    align = models.CharField(max_length=10, null=True, verbose_name='对齐方式')
-    class Meta:
-        verbose_name = '元数据字段类型'
-

{valar-1.0.29 → valar-1.1.1/valar/valar.egg-info}/PKG-INFO

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

valar-1.1.1/valar/valar.egg-info/SOURCES.txt

@@ -0,0 +1,28 @@
+LICENSE
+README.md
+setup.py
+valar/channels/__init__.py
+valar/channels/consumer.py
+valar/channels/executer.py
+valar/channels/mapping.py
+valar/channels/sender.py
+valar/channels/views.py
+valar/classes/__init__.py
+valar/classes/auto_migration_mixin.py
+valar/classes/auto_urlpatterns_mixin.py
+valar/classes/counter.py
+valar/classes/singleton_meta.py
+valar/classes/valar_response.py
+valar/frame/__init__.py
+valar/migrations/0001_initial.py
+valar/migrations/__init__.py
+valar/models/__init__.py
+valar/models/core.py
+valar/models/frame.py
+valar/models/meta.py
+valar/valar.egg-info/PKG-INFO
+valar/valar.egg-info/SOURCES.txt
+valar/valar.egg-info/dependency_links.txt
+valar/valar.egg-info/requires.txt
+valar/valar.egg-info/top_level.txt
+valar/views/__init__.py

valar-1.1.1/valar/valar.egg-info/top_level.txt

@@ -0,0 +1,6 @@
+channels
+classes
+frame
+migrations
+models
+views

valar-1.0.29/src/valar/channels/__init__.py

@@ -1 +0,0 @@
-VALAR_CHANNEL_GROUP = 'VALAR'

valar-1.0.29/src/valar/core/dao/_mon_array2tree.py

@@ -1,18 +0,0 @@
-def array2tree(data, mapping):
-    mapping = mapping or {}
-    lookup = {}
-    for array in data:
-        for i in range(len(array)):
-            key = '/'.join(array[0:i+1])
-            item = mapping.get(key, {})
-            value = item.get('value', array[i])
-            label = item.get('label', value)
-            display = item.get('display')
-            item = lookup.get(key, {'value': value,'label':label,'display':display})
-            if i < len(array) -1:
-                item['children'] = item.get('children', [])
-            lookup[key] = item
-            if i > 0:
-                parent =   '/'.join(array[0:i])
-                lookup[parent]['children'].append(lookup[key])
-    return [lookup[root] for root in [*set([array[0] for array in data])]]

valar-1.0.29/src/valar/core/dao/dao_base.py

@@ -1,50 +0,0 @@
-from .dao_mon import MonDao
-from .dao_orm import OrmDao
-from ..dao_abstract import AbstractDao
-
-
-class Dao(AbstractDao):
-
-    def __init__(self, entity, db='orm'):
-        self.entity = entity
-        self.db = db
-        self.dao: AbstractDao = OrmDao(entity) if db == 'orm' else MonDao(entity)
-
-    def get_model(self):
-        self.dao.get_model()
-
-    def save_one(self, item):
-        return self.dao.save_one(item)
-
-    def delete_one(self, _id):
-        return self.dao.delete_one(_id)
-
-    def find_one(self, _id):
-        return self.dao.find_one(_id)
-
-    def find(self, conditions=None, orders=None, size=0, page=1):
-        return self.dao.find(conditions, orders, size, page)
-
-    def update(self, template, conditions):
-        return self.dao.update(template, conditions)
-
-    def delete(self, conditions):
-        return self.dao.delete(conditions)
-
-    def transform(self, o, code=None):
-        return self.dao.transform(o)
-
-    def tree(self, root, conditions=None):
-        return self.dao.tree(root, conditions)
-
-
-
-    # def values(self, props, conditions, orders=None):
-    #     pass
-    #
-    # def group(self, props, conditions, orders=None):
-    #     pass
-    #
-    # def count(self, props, conditions):
-    #     pass
-

valar-1.0.29/src/valar/core/dao/dao_mon.py

@@ -1,76 +0,0 @@
-from pymongo.results import InsertOneResult
-from pymongo.synchronous.cursor import Cursor
-
-from .engine import DaoEngine
-from .model_mon import MonModel
-from .query_mon import MonQuery
-from ..dao_abstract import AbstractDao
-
-
-class MonDao(AbstractDao):
-    def __init__(self, entity):
-        self.entity = entity
-        engine = DaoEngine().mon
-        self.model:MonModel = engine.get_model(entity)
-        self.objects = self.model.manager
-
-    def get_model(self):
-        return self.model
-
-    def save_one(self, item):
-        oid, item = self.model.detach_item(item)
-        if oid:
-            self.objects.update_one({'_id': oid}, {'$set': item})
-        else:
-            bean: InsertOneResult = self.objects.insert_one(item)
-            oid = bean.inserted_id
-            self.objects.update_one({'_id': oid}, {'$set': {'sort': str(oid)}})
-        return self.objects.find_one({'_id': oid})
-
-    def delete_one(self, _id):
-        oid = self.model.object_id(_id)
-        flag = False
-        if oid:
-            self.objects.delete_one({'_id': oid})
-            flag = True
-        return flag
-
-    def find_one(self, _id):
-        oid = self.model.object_id(_id)
-        return self.objects.find_one({'_id': oid}) if oid else None
-
-    def find(self, conditions=None, orders=None, size=0, page=1):
-        query = MonQuery(conditions, orders)
-        skip = (page - 1) * size
-        total = self.objects.count_documents(query.finder)
-        cursor = self.objects.find(query.finder, query.orders).skip(skip)
-        if size:
-            cursor = cursor.limit(size)
-        return cursor, total
-
-    def update(self, template, conditions):
-        if template and len(template.keys()):
-            oid, item = self.model.detach_item(template)
-            query = MonQuery(conditions)
-            self.objects.update_many(query.finder, {'$set': item})
-            return True
-        return False
-
-    def delete(self, conditions):
-        query = MonQuery(conditions)
-        self.objects.delete_many(query.finder)
-
-    def transform(self, o, code=None):
-        if isinstance(o, Cursor):
-            return [__to_item__(doc) for doc in o]
-        else:
-            return __to_item__(o)
-
-    def tree(self, root, conditions=None):
-        pass
-
-
-def __to_item__(o):
-    o['id'] = str(o['_id'])
-    del o['_id']
-    return o

valar-1.0.29/src/valar/core/dao/dao_orm.py

@@ -1,99 +0,0 @@
-import datetime
-from django.core.paginator import Paginator
-from django.db.models import QuerySet
-
-from .engine import DaoEngine
-from .query_orm import OrmQuery
-from ..dao_abstract import AbstractDao
-
-
-class OrmDao(AbstractDao):
-    def __init__(self, entity):
-        self.entity = entity
-        engine = DaoEngine().orm
-        self.model = engine.get_model(entity)
-        self.objects = self.model.manager
-
-    def get_model(self):
-        return self.model
-
-    def save_one(self, item, with_id=False):
-        oid, simple_item, complex_item  = self.model.detach_item(item)
-        query_set = self.objects.filter(id=oid) if oid else []
-        if len(query_set):
-            simple_item['modify_time'] = datetime.datetime.now()
-            query_set.update(**simple_item)
-            bean = query_set.first()
-        else:
-            if with_id:
-                bean = self.objects.create(**{**simple_item, "id": oid})
-            else:
-                bean = self.objects.create(**simple_item)
-                bean.sort = bean.id
-                bean.save()
-        self.model.save_complex_field(complex_item, bean)
-        bean.save()
-        return bean
-
-    def delete_one(self, _id):
-        oid = self.model.object_id(_id)
-        flag = False
-        if oid:
-            query_set = self.objects.filter(id=oid)
-            self.model.remove_files(query_set)
-            query_set.delete()
-            flag = True
-        return flag
-
-    def find_one(self, _id):
-        oid = self.model.object_id(_id)
-        return self.objects.filter(id=oid).first() if oid else None
-
-
-
-    def find(self, conditions=None, orders=None,size=0, page=1):
-        query = OrmQuery(conditions, orders)
-        query_set = self.objects.filter(query.includes).exclude(query.excludes).order_by(*query.orders)
-        total = query_set.count()
-        if size:
-            paginator = Paginator(query_set, size)
-            query_set = paginator.page(page).object_list
-        return query_set, total
-
-    def update(self, template, conditions):
-        if template and len(template.keys()):
-            oid, simple_item, complex_item = self.model.detach_item(template)
-            query_set, total = self.find(conditions)
-            query_set.update(**simple_item)
-            return True
-        return False
-
-    def delete(self, conditions):
-        query_set, total = self.find(conditions)
-        # self.model.remove_files(query_set)
-        query_set.delete()
-
-    def transform(self, o, code=None):
-        if isinstance(o, QuerySet):
-            return self.model.to_dict(o, code)
-        else:
-            return o.full()
-
-    def tree(self, root, conditions=None):
-        all_set, _ = self.find()
-        query = OrmQuery(conditions)
-        if query.is_empty(conditions):
-            return all_set
-        values = all_set.values('id', 'pid')
-        mapping = {item['id']: item['pid'] for item in values}
-        results, _ = self.find(conditions)
-        id_set = {root}
-        for item in results:
-            _id = item.id
-            route = []
-            while _id is not None:
-                route.append(_id)
-                _id = mapping.get(_id)
-            if root in route:
-                id_set.update(route)
-        return all_set.filter(id__in=id_set).order_by('-sort')

valar-1.0.29/src/valar/core/dao/engine.py

@@ -1,12 +0,0 @@
-
-from ..singleton_meta import SingletonMeta
-from .engine_mon import MonEngine
-from .engine_orm import OrmEngine
-
-
-class DaoEngine(metaclass=SingletonMeta):
-
-    def __init__(self):
-        self.mon = MonEngine()
-        self.orm = OrmEngine()
-