valar 1.1.2__tar.gz → 1.1.4__tar.gz

{valar-1.1.2/src/valar.egg-info → valar-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.1.2
+Version: 1.1.4
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -36,16 +36,28 @@ pip install valar
 # 1. settings
 
 ```python
-
+from django.core.management.utils import get_random_secret_key
 from pathlib import Path
 
-""" Compulsory settings """
+"""       Compulsory settings       """
+
 DEBUG = True
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^'
-""" Minimized compulsory settings """
+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 = {
     'default': {
@@ -53,55 +65,38 @@ DATABASES = {
         'NAME': BASE_DIR / 'db.sqlite3',
     }
 }
-
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'src.valar.data',
+    'valar',
 ]
-
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
 ]
-
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels.layers.InMemoryChannelLayer"
     }
 }
-
 CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
 
-MONGO = {
-    'host': '<IP>',
-    'port': '<PORT>',
-    "username": "<USERNAME>",
-    "password": '<PASSWORD>'
-}
-
-MINIO = {
-    'endpoint': '<IP>:<PORT>',
-    'access_key': '<USERNAME>',
-    "secret_key": "<PASSWORD>",
-    'secure': False
-}
+"""       Optional settings       """
 
-""" Optional settings """
-# ALLOWED_HOSTS = ['*']
-# LANGUAGE_CODE = 'en-us'
-# TIME_ZONE = 'Asia/Shanghai'
-# USE_I18N = True
-# USE_TZ = False
-# SESSION_SAVE_EVERY_REQUEST = True
-# SESSION_COOKIE_AGE = 60 * 60
-# FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
-# DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+ALLOWED_HOSTS = ['*']
+LANGUAGE_CODE = 'en-us'
+TIME_ZONE = 'Asia/Shanghai'
+USE_I18N = True
+USE_TZ = False
+SESSION_SAVE_EVERY_REQUEST = True
+SESSION_COOKIE_AGE = 60 * 60
+FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 
 ```
 # 2. asgi
@@ -110,7 +105,7 @@ MINIO = {
 from django.core.asgi import get_asgi_application
 from channels.routing import ProtocolTypeRouter, URLRouter
 from django.urls import re_path
-from src.valar.channels import ValarConsumer
+from valar.channels.consumer import ValarConsumer
 
 application = ProtocolTypeRouter({
     'http': get_asgi_application(),
@@ -122,41 +117,39 @@ application = ProtocolTypeRouter({
 ```
 
 # 3. migrate
-```shell
-python manage.py makemigrations
-python manage.py migrate
-```
+no need, valar will auto migration
 
 
 # 4. root urls
 
-```python
-from django.urls import path, include
+no need, valar will auto set urlpatterns
 
-urlpatterns = [
-    path('data/', include('src.valar.data.urls')),
-]
+# 5. how to use valar_channel
 
-channel_mapping = {
-    # 'test': test_handler
-}
-```
 
-# 5. channel_handler
+5.1 set HANDLER_MAPPING in settings
 
 ```python
+HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
+```
 
-import time
-
-from src.valar.channels.sender import ValarSocketSender
-from src.valar import Counter
-
+5.2 create a handler
 
+```python
+from valar.channels.sender import ValarSocketSender
 def test_handler(sender: ValarSocketSender):
     data = sender.data
-    length = data.get('length', 50)
-    counter = Counter(length)
+    length = data.get('length',30)
+    counter = sender.create_counter(length)
     for i in range(length):
-        time.sleep(0.1)
-        sender.to_clients(counter.tick(), sender.client, wait=True)
+        # sync method
+        sender.to_clients(counter.tick() ,sender.client, wait=True)
+```
+
+5.3 register handler in channel_mapping
+
+```python
+channel_mapping = {
+    'test': test_handler,
+}
 ```

{valar-1.1.2 → valar-1.1.4}/README.md

@@ -8,16 +8,28 @@ pip install valar
 # 1. settings
 
 ```python
-
+from django.core.management.utils import get_random_secret_key
 from pathlib import Path
 
-""" Compulsory settings """
+"""       Compulsory settings       """
+
 DEBUG = True
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^'
-""" Minimized compulsory settings """
+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 = {
     'default': {
@@ -25,55 +37,38 @@ DATABASES = {
         'NAME': BASE_DIR / 'db.sqlite3',
     }
 }
-
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'src.valar.data',
+    'valar',
 ]
-
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
 ]
-
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels.layers.InMemoryChannelLayer"
     }
 }
-
 CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
 
-MONGO = {
-    'host': '<IP>',
-    'port': '<PORT>',
-    "username": "<USERNAME>",
-    "password": '<PASSWORD>'
-}
-
-MINIO = {
-    'endpoint': '<IP>:<PORT>',
-    'access_key': '<USERNAME>',
-    "secret_key": "<PASSWORD>",
-    'secure': False
-}
+"""       Optional settings       """
 
-""" Optional settings """
-# ALLOWED_HOSTS = ['*']
-# LANGUAGE_CODE = 'en-us'
-# TIME_ZONE = 'Asia/Shanghai'
-# USE_I18N = True
-# USE_TZ = False
-# SESSION_SAVE_EVERY_REQUEST = True
-# SESSION_COOKIE_AGE = 60 * 60
-# FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
-# DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+ALLOWED_HOSTS = ['*']
+LANGUAGE_CODE = 'en-us'
+TIME_ZONE = 'Asia/Shanghai'
+USE_I18N = True
+USE_TZ = False
+SESSION_SAVE_EVERY_REQUEST = True
+SESSION_COOKIE_AGE = 60 * 60
+FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 
 ```
 # 2. asgi
@@ -82,7 +77,7 @@ MINIO = {
 from django.core.asgi import get_asgi_application
 from channels.routing import ProtocolTypeRouter, URLRouter
 from django.urls import re_path
-from src.valar.channels import ValarConsumer
+from valar.channels.consumer import ValarConsumer
 
 application = ProtocolTypeRouter({
     'http': get_asgi_application(),
@@ -94,41 +89,39 @@ application = ProtocolTypeRouter({
 ```
 
 # 3. migrate
-```shell
-python manage.py makemigrations
-python manage.py migrate
-```
+no need, valar will auto migration
 
 
 # 4. root urls
 
-```python
-from django.urls import path, include
+no need, valar will auto set urlpatterns
 
-urlpatterns = [
-    path('data/', include('src.valar.data.urls')),
-]
+# 5. how to use valar_channel
 
-channel_mapping = {
-    # 'test': test_handler
-}
-```
 
-# 5. channel_handler
+5.1 set HANDLER_MAPPING in settings
 
 ```python
+HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
+```
 
-import time
-
-from src.valar.channels.sender import ValarSocketSender
-from src.valar import Counter
-
+5.2 create a handler
 
+```python
+from valar.channels.sender import ValarSocketSender
 def test_handler(sender: ValarSocketSender):
     data = sender.data
-    length = data.get('length', 50)
-    counter = Counter(length)
+    length = data.get('length',30)
+    counter = sender.create_counter(length)
     for i in range(length):
-        time.sleep(0.1)
-        sender.to_clients(counter.tick(), sender.client, wait=True)
+        # sync method
+        sender.to_clients(counter.tick() ,sender.client, wait=True)
+```
+
+5.3 register handler in channel_mapping
+
+```python
+channel_mapping = {
+    'test': test_handler,
+}
 ```

{valar-1.1.2 → valar-1.1.4}/setup.py

@@ -16,14 +16,14 @@ requires = [
 
 setup(
     name="valar",  # 包名
-    version="1.1.2",  # 版本号
+    version="1.1.4",  # 版本号
     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="stc"),  # 需要打包的部分
+    packages=find_packages(where="src"),  # 需要打包的部分
     package_dir={"": "src"},  # 设置src目录为根目录
     python_requires=">=3.9",  # 项目支持的Python版本
     install_requires=requires,                     # 项目必须的依赖

valar-1.1.4/src/valar/apps.py

@@ -0,0 +1,21 @@
+import os
+from django.apps import AppConfig
+
+from .classes.auto_migration_mixin import AutoMigrationMixin
+from .classes.auto_urlpatterns_mixin import AutoUrlPatternsMixin
+
+
+class ValarConfig(AutoMigrationMixin,AutoUrlPatternsMixin,AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = __package__
+
+    def ready(self):
+        if os.environ.get('RUN_MAIN') == 'true':
+            getattr(super(), 'set_url', None)()
+            getattr(super(), 'auto_migrate', None)()
+            print(__package__)
+
+
+
+
+

valar-1.1.4/src/valar/channels/consumer.py

@@ -0,0 +1,48 @@
+
+from channels.generic.websocket import AsyncJsonWebsocketConsumer
+
+VALAR_CHANNEL_GROUP = 'VALAR'
+
+class ValarConsumer(AsyncJsonWebsocketConsumer):
+
+    def __init__(self):
+        self.client = None
+        self.uid = None
+        super().__init__()
+
+    async def connect(self):
+        params = self.scope['url_route']['kwargs']
+        self.client = params.get('client')
+        await self.channel_layer.group_add(VALAR_CHANNEL_GROUP, self.channel_name)
+        await self.accept()
+
+    async def disconnect(self, code):
+        await self.channel_layer.group_discard(VALAR_CHANNEL_GROUP, self.channel_name)
+        await self.close(code)
+
+    async def receive_json(self, data, *args, **kwargs):
+        pass
+
+    async def user_emit(self, event):
+        users: list = event.get('users',[])
+        data = event.get('data',{})
+        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',{})
+        if self.client in clients:
+            await self.send_json(data)
+
+    async def broadcast_emit(self, event):
+        data = event.get('data',{})
+        await self.send_json(data)
+
+    async def register_emit(self, event):
+        users: list = event.get('users', [])
+        clients: list = event.get('clients',[])
+        if self.client in clients:
+            self.uid = users[0]
+
+

valar-1.1.4/src/valar/channels/executer.py

@@ -0,0 +1,13 @@
+import asyncio
+
+async def execute_channel(method, sender):
+    thread = asyncio.to_thread(__execute__, method, sender)
+    asyncio.create_task(thread)
+
+
+def __execute__(method, sender):
+    sender.to_clients(None, [sender.client], 'start')
+    method(sender)
+    sender.to_clients(None, [sender.client], 'stop')
+
+

valar-1.1.4/src/valar/channels/mapping.py

@@ -0,0 +1,23 @@
+import importlib
+
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+
+from ..classes.singleton_meta import SingletonMeta
+
+class ChannelMapping(metaclass=SingletonMeta):
+    def __init__(self):
+        mapping = settings.HANDLER_MAPPING
+        root, name = mapping.rsplit('.', 1)
+        module = importlib.import_module(root)
+        if hasattr(module, name):
+            self.mapping: dict = getattr(module, name)
+        else:
+            raise ImproperlyConfigured("%r has no attribute %r" % (root, name))
+
+    def get_handler(self, handler):
+        method = self.mapping.get(handler)
+        if method is None:
+            raise ImproperlyConfigured("Cannot find handler - %r" % handler)
+        return method
+

valar-1.1.4/src/valar/channels/sender.py

@@ -0,0 +1,64 @@
+import json
+import time
+from datetime import datetime
+
+from asgiref.sync import async_to_sync
+from channels.layers import get_channel_layer
+from django.http import HttpRequest
+
+from .consumer import VALAR_CHANNEL_GROUP
+from ..classes.counter import Counter
+
+
+class ValarSocketSender:
+    def __init__(self, request: HttpRequest, data=None):
+        body = json.loads(request.body)
+        auth = request.headers.get('AUTH')
+        self.client = request.headers.get('CLIENT')
+        self.uid = request.session.get('UID')
+        self.handlerKey = body.get('handlerKey')
+        self.channelKey = body.get('channelKey', 'default')
+        self.data = data or body.get('data')
+        self.send = get_channel_layer().group_send
+        self.start_time = time.time()
+        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 {
+            'type': emit,
+            'data': {
+                'status': status,
+                'handlerKey': self.handlerKey,
+                'channelKey': self.channelKey,
+                'payload': payload,
+                'timestamp': datetime.now().timestamp()
+            },
+            'clients': clients or [],
+            'users': users or [],
+        }
+
+
+    def to_users(self, payload,  users, status='proceed'):
+        body = self.__convert_body(emit='user.emit', payload=payload, status=status, users=users)
+        async_to_sync(self.send)(VALAR_CHANNEL_GROUP, body)
+
+    def to_clients(self,payload, clients, status='proceed', wait=False):
+        current_time = time.time()
+        time_span = current_time - self.start_time
+        if (wait and time_span > 1 and status == 'proceed') or not wait:
+            body = self.__convert_body(emit='client.emit', payload=payload, status=status, clients=clients)
+            async_to_sync(self.send)(VALAR_CHANNEL_GROUP, body)
+            self.start_time = current_time
+
+    def broadcast(self, payload, status):
+        body = self.__convert_body(emit='broadcast.emit', payload=payload, status=status)
+        async_to_sync(self.send)(VALAR_CHANNEL_GROUP, body)
+
+    def register(self):
+        body = self.__convert_body(emit='register.emit',  payload=None, status=None,clients=[self.client], users=[self.uid])
+        async_to_sync(self.send)(VALAR_CHANNEL_GROUP, body)

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

@@ -0,0 +1,12 @@
+
+from .executer import execute_channel
+from .mapping import ChannelMapping
+from .sender import ValarSocketSender
+from ..classes.valar_response import ValarResponse
+
+
+async def handel_channel(request, handler):
+    sender = ValarSocketSender(request)
+    method = ChannelMapping().get_handler(handler)
+    await execute_channel(method, sender)
+    return ValarResponse(True)

valar-1.1.4/src/valar/classes/auto_migration_mixin.py

@@ -0,0 +1,8 @@
+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-1.1.4/src/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.1.4/src/valar/classes/counter.py

@@ -0,0 +1,9 @@
+class Counter:
+    def __init__(self, array_or_int):
+        self.length = array_or_int if isinstance(array_or_int,int) else len(array_or_int)
+        self.index = 0
+
+    def tick(self):
+        self.index += 1
+        percentage = round(self.index * 100 / self.length) if self.length else 0
+        return {"index": self.index, "length": self.length, "percentage": percentage}

valar-1.1.4/src/valar/classes/singleton_meta.py

@@ -0,0 +1,6 @@
+class SingletonMeta(type):
+    _instances = {}
+    def __call__(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            cls._instances[cls] = super(SingletonMeta, cls).__call__(*args, **kwargs)
+        return cls._instances[cls]

valar-1.1.4/src/valar/classes/valar_response.py

@@ -0,0 +1,7 @@
+from django.http import JsonResponse
+
+class ValarResponse(JsonResponse):
+    def __init__(self, data, message='', code='info'):
+        self.message = message
+        self.code = code
+        super(ValarResponse, self).__init__(data, safe=False)

valar-1.1.4/src/valar/migrations/0001_initial.py

@@ -0,0 +1,141 @@
+# Generated by Django 4.2.23 on 2025-07-15 18:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+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)),
+                ('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(
+            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='代码')),
+            ],
+            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='序号')),
+                ('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='类视图')),
+                ('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_search', 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='valar.meta', verbose_name='元数据')),
+            ],
+            options={
+                'verbose_name': '数据视图',
+                'unique_together': {('meta', 'code')},
+            },
+        ),
+        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='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': '元数据字段类型',
+            },
+        ),
+        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='格式')),
+                ('not_null', models.BooleanField(default=False, verbose_name='不为空')),
+                ('allow_edit', 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='可上传')),
+                ('allow_update', models.BooleanField(default=False, verbose_name='可更新')),
+                ('unit', models.CharField(max_length=55, null=True, 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=True, 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='valar.metaview', verbose_name='数据视图')),
+            ],
+            options={
+                'verbose_name': '视图字段',
+            },
+        ),
+    ]

valar-1.1.4/src/valar/models/__init__.py

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

valar-1.1.4/src/valar/models/core.py

@@ -0,0 +1,82 @@
+from django.apps import AppConfig
+from django.db import models
+from django.db.models import ManyToOneRel, OneToOneRel, ManyToManyRel, ManyToManyField, UUIDField, FileField, \
+    ForeignKey, OneToOneField, DateField, TimeField, DateTimeField, BigAutoField
+from django.db.models.options import Options
+
+
+class VModel(models.Model):
+    objects = models.Manager()
+    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)
+
+    class Meta:
+        abstract = True
+
+    def __str__(self):
+        return str(self.full())
+
+    def get_meta(self)->Options:
+        return getattr(self, '_meta')
+
+    def get_entity(self):
+        name = type(self).__name__
+        config: AppConfig = self.get_meta().app_config
+        return f'{config.label}.{name}'
+
+    def json(self, *args, **kwargs):
+        excludes = [ManyToOneRel, OneToOneRel, ManyToManyField, ManyToManyRel, UUIDField]
+        fields = [field for field in self.get_meta().get_fields() if type(field) not in excludes]
+        data = {}
+        for field in fields:
+            value = field.value_from_object(self)
+            prop = field.name
+            domain = type(field)
+            if value is not None:
+                if domain in [ForeignKey, OneToOneField]:
+                    prop = f'{prop}_id'
+                elif domain in [DateTimeField]:
+                    value = value.strftime('%Y-%m-%d %H:%M:%S')
+                elif domain in [DateField]:
+                    value = value.strftime('%Y-%m-%d')
+                elif domain in [TimeField]:
+                    value = value.strftime('%H:%M:%S')
+                elif domain in [FileField]:
+                    value = value.name
+                elif domain in [BigAutoField]:
+                    value = str(value)
+            data[prop] = value
+        data.update({f'${k}': v for k,v in kwargs.items()})
+        return data
+
+    def full(self):
+        includes = [ManyToManyField, ManyToManyRel, ForeignKey, ManyToOneRel, OneToOneField, OneToOneRel]
+        fields = [field for field in self.get_meta().get_fields() if type(field) in includes]
+        data = self.json()
+        for field in fields:
+            prop = field.name
+            domain = type(field)
+            if domain in [ForeignKey,OneToOneField]:
+                bean: VModel = getattr(self, prop)
+                data[prop] = bean.json() if bean else None
+            elif domain == OneToOneRel:
+                print('OneToOneRel')
+                pass
+            elif domain in [ManyToManyField,ManyToManyRel,ManyToOneRel]:
+                accessor = prop if domain ==  ManyToManyField else field.get_accessor_name()
+                _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]
+        return data
+
+
+class VTree(VModel):
+    pid = models.IntegerField(null=False, default=0, verbose_name='父节点')
+    isLeaf = models.BooleanField( default=False, verbose_name='叶子节点')
+    icon = models.CharField(max_length=255, null=True, verbose_name='图标')
+    class Meta:
+        abstract = True
+

valar-1.1.4/src/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.1.4/src/valar/models/meta.py

@@ -0,0 +1,87 @@
+from django.db import models
+from .core import VModel
+
+
+class Meta(VModel):
+    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 = ('db', 'entity')
+
+
+class MetaView(VModel):
+    meta = models.ForeignKey('Meta', on_delete=models.CASCADE, verbose_name='元数据')
+
+    code = models.CharField(max_length=50, verbose_name='类视图', default='default ')
+    name = models.CharField(max_length=50, verbose_name='视图名称', null=True)
+
+    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_search = 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='上传功能')
+
+    class Meta:
+        verbose_name = '数据视图'
+        unique_together = ('meta', 'code')
+
+
+class MetaField(VModel):
+    # 标识
+    view = models.ForeignKey('MetaView', on_delete=models.CASCADE, verbose_name='数据视图')
+    prop = models.CharField(max_length=100, verbose_name='字段名称')  #
+    label = models.CharField(max_length=100, verbose_name='字段标签')  #
+    name = models.CharField(max_length=100, verbose_name='字段别名')  #
+
+    """tool"""
+    domain = models.CharField(max_length=100, verbose_name='字段类型')  #
+    tool = models.CharField(max_length=100, default='default', verbose_name='工具组件')
+    refer = models.JSONField(default=dict, verbose_name='索引')  #
+    format = models.JSONField(default=dict, verbose_name='格式')  #
+
+
+    """rest"""
+    not_null = models.BooleanField(default=False, verbose_name='不为空') #
+    allow_edit = 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='可上传')
+    allow_update = models.BooleanField(default=False, verbose_name='可更新')
+
+    """table"""
+    unit = models.CharField(max_length=55, verbose_name='单位符', null=True)
+    column_width = models.FloatField(default=0, verbose_name='表头宽度')
+    align = models.CharField(max_length=55, default='left', verbose_name='对齐方式') #
+    fixed = models.CharField(max_length=100, verbose_name='固定位置', null=True)
+    header_color = models.CharField(max_length=55, verbose_name='表头颜色', null=True)
+    cell_color = models.CharField(max_length=55, verbose_name='单元颜色', null=True)
+    edit_on_table = models.BooleanField(default=True, verbose_name='表格编辑')
+    hide_on_table = models.BooleanField(default=False, verbose_name='表内隐藏')
+
+    """form"""
+    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='叶子隐藏')
+
+
+    class Meta:
+        verbose_name = '视图字段'
+
+

valar-1.1.4/src/valar/urls.py

@@ -0,0 +1,7 @@
+from django.urls import path
+
+from .channels.views import handel_channel
+
+urlpatterns = [
+    path('socket/<str:handler>', handel_channel),
+]

{valar-1.1.2 → valar-1.1.4/src/valar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.1.2
+Version: 1.1.4
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -36,16 +36,28 @@ pip install valar
 # 1. settings
 
 ```python
-
+from django.core.management.utils import get_random_secret_key
 from pathlib import Path
 
-""" Compulsory settings """
+"""       Compulsory settings       """
+
 DEBUG = True
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^'
-""" Minimized compulsory settings """
+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 = {
     'default': {
@@ -53,55 +65,38 @@ DATABASES = {
         'NAME': BASE_DIR / 'db.sqlite3',
     }
 }
-
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'src.valar.data',
+    'valar',
 ]
-
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
 ]
-
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels.layers.InMemoryChannelLayer"
     }
 }
-
 CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
 
-MONGO = {
-    'host': '<IP>',
-    'port': '<PORT>',
-    "username": "<USERNAME>",
-    "password": '<PASSWORD>'
-}
-
-MINIO = {
-    'endpoint': '<IP>:<PORT>',
-    'access_key': '<USERNAME>',
-    "secret_key": "<PASSWORD>",
-    'secure': False
-}
+"""       Optional settings       """
 
-""" Optional settings """
-# ALLOWED_HOSTS = ['*']
-# LANGUAGE_CODE = 'en-us'
-# TIME_ZONE = 'Asia/Shanghai'
-# USE_I18N = True
-# USE_TZ = False
-# SESSION_SAVE_EVERY_REQUEST = True
-# SESSION_COOKIE_AGE = 60 * 60
-# FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
-# DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+ALLOWED_HOSTS = ['*']
+LANGUAGE_CODE = 'en-us'
+TIME_ZONE = 'Asia/Shanghai'
+USE_I18N = True
+USE_TZ = False
+SESSION_SAVE_EVERY_REQUEST = True
+SESSION_COOKIE_AGE = 60 * 60
+FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 
 ```
 # 2. asgi
@@ -110,7 +105,7 @@ MINIO = {
 from django.core.asgi import get_asgi_application
 from channels.routing import ProtocolTypeRouter, URLRouter
 from django.urls import re_path
-from src.valar.channels import ValarConsumer
+from valar.channels.consumer import ValarConsumer
 
 application = ProtocolTypeRouter({
     'http': get_asgi_application(),
@@ -122,41 +117,39 @@ application = ProtocolTypeRouter({
 ```
 
 # 3. migrate
-```shell
-python manage.py makemigrations
-python manage.py migrate
-```
+no need, valar will auto migration
 
 
 # 4. root urls
 
-```python
-from django.urls import path, include
+no need, valar will auto set urlpatterns
 
-urlpatterns = [
-    path('data/', include('src.valar.data.urls')),
-]
+# 5. how to use valar_channel
 
-channel_mapping = {
-    # 'test': test_handler
-}
-```
 
-# 5. channel_handler
+5.1 set HANDLER_MAPPING in settings
 
 ```python
+HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
+```
 
-import time
-
-from src.valar.channels.sender import ValarSocketSender
-from src.valar import Counter
-
+5.2 create a handler
 
+```python
+from valar.channels.sender import ValarSocketSender
 def test_handler(sender: ValarSocketSender):
     data = sender.data
-    length = data.get('length', 50)
-    counter = Counter(length)
+    length = data.get('length',30)
+    counter = sender.create_counter(length)
     for i in range(length):
-        time.sleep(0.1)
-        sender.to_clients(counter.tick(), sender.client, wait=True)
+        # sync method
+        sender.to_clients(counter.tick() ,sender.client, wait=True)
+```
+
+5.3 register handler in channel_mapping
+
+```python
+channel_mapping = {
+    'test': test_handler,
+}
 ```

valar-1.1.4/src/valar.egg-info/SOURCES.txt

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

valar-1.1.4/src/valar.egg-info/top_level.txt

@@ -0,0 +1 @@
+valar

valar-1.1.2/src/valar.egg-info/SOURCES.txt

@@ -1,8 +0,0 @@
-LICENSE
-README.md
-setup.py
-src/valar.egg-info/PKG-INFO
-src/valar.egg-info/SOURCES.txt
-src/valar.egg-info/dependency_links.txt
-src/valar.egg-info/requires.txt
-src/valar.egg-info/top_level.txt

valar-1.1.2/src/valar.egg-info/top_level.txt

@@ -1 +0,0 @@
-