valar 1.1.4__py3-none-any.whl → 1.2.1__py3-none-any.whl

valar/models/core.py

@@ -1,7 +1,9 @@
+import json
+
 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
+    ForeignKey, OneToOneField, DateField, TimeField, DateTimeField, BigAutoField, JSONField
 from django.db.models.options import Options
 
 
@@ -11,7 +13,8 @@ class VModel(models.Model):
     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)
+    disabled = models.BooleanField(default=False, verbose_name='禁用')
+    saved = models.BooleanField(default=False, verbose_name='已保存')
 
     class Meta:
         abstract = True
@@ -19,7 +22,7 @@ class VModel(models.Model):
     def __str__(self):
         return str(self.full())
 
-    def get_meta(self)->Options:
+    def get_meta(self) -> Options:
         return getattr(self, '_meta')
 
     def get_entity(self):
@@ -47,9 +50,9 @@ class VModel(models.Model):
                 elif domain in [FileField]:
                     value = value.name
                 elif domain in [BigAutoField]:
-                    value = str(value)
+                    value = value
             data[prop] = value
-        data.update({f'${k}': v for k,v in kwargs.items()})
+        data.update({f'${k}': v for k, v in kwargs.items()})
         return data
 
     def full(self):
@@ -59,24 +62,27 @@ class VModel(models.Model):
         for field in fields:
             prop = field.name
             domain = type(field)
-            if domain in [ForeignKey,OneToOneField]:
+            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()
+            elif domain == JSONField:
+                data[prop] = json.loads(data[prop]) if type(data[prop]) is str else data[prop]
+            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='叶子节点')
+    isLeaf = models.BooleanField(default=False, verbose_name='叶子节点')
     icon = models.CharField(max_length=255, null=True, verbose_name='图标')
+
     class Meta:
         abstract = True
-

valar/models/frame.py

@@ -5,9 +5,12 @@ 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='代码')  #
+    align = models.CharField(max_length=10, null=True, verbose_name='对齐方式')
 
     class Meta:
         verbose_name = '元数据字段工具'
+
+
 #
 #
 
@@ -19,12 +22,6 @@ class MetaFieldDomain(VModel):
         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/models/meta.py

@@ -1,11 +1,12 @@
 from django.db import models
-from .core import VModel
+from .core import VModel, VTree
 
 
 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)
+    tree = models.BooleanField(default=False, verbose_name='是否树形')
 
     class Meta:
         verbose_name = '数据实体'
@@ -14,22 +15,27 @@ class Meta(VModel):
 
 class MetaView(VModel):
     meta = models.ForeignKey('Meta', on_delete=models.CASCADE, verbose_name='元数据')
+    property = models.JSONField(default=dict, verbose_name='属性')
 
     code = models.CharField(max_length=50, verbose_name='类视图', default='default ')
     name = models.CharField(max_length=50, verbose_name='视图名称', null=True)
+    lock = models.BooleanField(default=False, verbose_name='锁定元数据')
+    enable = models.BooleanField(default=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='表格高度')
+    form_width = models.IntegerField(null=True, verbose_name='表单宽度')
+    form_height = models.IntegerField(null=True, verbose_name='表单高度')
+    table_width = models.IntegerField(null=True, verbose_name='表格宽度')
+    table_height = models.IntegerField(null=True, 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_edit_on_form = models.BooleanField(default=True, verbose_name='表单编辑')
+    allow_edit_on_cell = models.BooleanField(default=True, verbose_name='表内编辑')
+    allow_edit_on_sort = 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='上传功能')
@@ -52,20 +58,20 @@ class MetaField(VModel):
     refer = models.JSONField(default=dict, verbose_name='索引')  #
     format = models.JSONField(default=dict, verbose_name='格式')  #
 
-
     """rest"""
-    not_null = models.BooleanField(default=False, verbose_name='不为空') #
+    disabled = models.BooleanField(default=False, 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='可更新')
+    allow_upload = models.BooleanField(default=True, verbose_name='可上传')
+    allow_update = models.BooleanField(default=True, 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='对齐方式') #
+    align = models.CharField(max_length=55, null=True, 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)
@@ -80,8 +86,5 @@ class MetaField(VModel):
     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/urls.py

@@ -1,7 +1,29 @@
 from django.urls import path
 
 from .channels.views import handel_channel
+from .views import rest, meta, file
 
 urlpatterns = [
     path('socket/<str:handler>', handel_channel),
+    path('batch', rest.batch),
+    path('<str:db>/<str:entity>/save_one', rest.save_one),
+    path('<str:db>/<str:entity>/delete_one', rest.delete_one),
+    path('<str:db>/<str:entity>/find_one', rest.find_one),
+    path('<str:db>/<str:entity>/find', rest.find),
+    path('<str:db>/<str:entity>/update', rest.update),
+    path('<str:db>/<str:entity>/search', rest.search),
+    path('<str:db>/<str:entity>/values', rest.values),
+    # path('<str:db>/<str:entity>/tree', rest.tree),
+
+    path('<str:db>/<str:entity>/meta_view', meta.meta_view),
+    path('metas', meta.metas),
+    path('add_fields', meta.add_fields),
+    path('load_customs', meta.load_customs),
+    path('get_fields', meta.get_fields),
+    path('save_custom', meta.save_custom),
+    path('upload_mapping', meta.upload_mapping),
+
+    path('<str:db>/<str:entity>/save_file', file.save_file),
+    path('<str:db>/<str:entity>/remove_file', file.remove_file),
+
 ]

valar/views/file.py

@@ -0,0 +1,49 @@
+import json
+
+from minio import Minio
+
+from ..classes.valar_response import ValarResponse
+from django.core.files.uploadedfile import InMemoryUploadedFile
+from django.http import QueryDict
+
+from ..dao import Dao, OrmDao
+from ..dao.engine import ValarEngine
+
+
+def save_file(request, db, entity):
+    params: QueryDict = request.POST.dict()
+    _id, prop, field = (params.get(key) for key in ['id', 'prop', 'field'])
+    file: InMemoryUploadedFile = request.FILES['file']
+    dao = Dao(entity, db)
+    engine = ValarEngine().get_minio_bucket(entity)
+    item = dao.find_one(_id)
+    if engine is None or item is None:
+        return ValarResponse(False)
+    old_value = getattr(item, prop)
+    if old_value:
+        engine.remove(old_value.name)
+    object_name = engine.get_object_name(_id, prop, file.name)
+    path = engine.upload(object_name, file.read())
+    setattr(item, prop, path)
+    if field:
+        setattr(item, field, file.name)
+    item.save()
+    return ValarResponse(path)
+
+
+def remove_file(request, db, entity):
+    body = json.loads(request.body)
+    _id, prop, field = (body.get(key) for key in ['id', 'prop', 'field'])
+    dao = Dao(entity, db)
+    item = dao.find_one(_id)
+    engine = ValarEngine().get_minio_bucket(entity)
+    if engine is None or item is None:
+        return ValarResponse(False)
+    old_value = getattr(item, prop)
+    if old_value:
+        engine.remove(old_value.name)
+    setattr(item, prop, None)
+    if field:
+        setattr(item, field, None)
+    item.save()
+    return ValarResponse(True)

valar/views/handler.py

@@ -0,0 +1,33 @@
+from ..channels.counter import Counter
+from ..channels.sender import ValarChannelSender
+from ..dao import Dao
+from ..dao.engine import ValarEngine
+
+
+def batch_handler(sender: ValarChannelSender):
+    data = sender.data
+    entity, db, method = data.get("entity"), data.get("db"), data.get("method")
+    dao = Dao(entity, db)
+    body = {"method": method}
+    if method == 'save_many':
+        array = data.get("array", [])
+        counter = Counter(array)
+        keys = []
+        for item in array:
+            item.update({'saved': True})
+            bean = dao.save_one(item)
+            keys.append(bean.id)
+            payload = counter.tick()
+            sender.load(payload)
+        body.update({'keys': keys})
+        sender.done(body)
+    elif method == 'delete_many':
+        conditions = data.get("conditions", [])
+        paths = dao.delete(conditions)
+        counter = Counter(len(paths))
+        minio = ValarEngine().get_minio_bucket(entity)
+        for path in paths:
+            minio.remove(path)
+            payload = counter.tick()
+            sender.load(payload)
+        sender.done(body)

valar/views/meta.py

@@ -0,0 +1,150 @@
+import json
+
+from django.db.models import Count, Q
+
+from ..classes.valar_response import ValarResponse
+from ..dao import Dao
+from ..dao.abstract import AbstractField
+
+from ..dao.meta import ValarMeta
+from ..models.meta import MetaView, Meta, MetaField
+
+
+def upload_mapping(request):
+    body = json.loads(request.body)
+    db = body.get('db')
+    entity = body.get('entity')
+    code = body.get('code')
+    fields = MetaField.objects.filter(
+        view__meta__db=db,
+        view__meta__entity=entity,
+        view__code=code,
+        domain__in=['ManyToManyField', 'ManyToManyRel', 'ManyToOneRel', 'OneToOneField', 'OneToOneRel', 'ForeignKey']
+    ).filter(Q(allow_upload=True) | Q(allow_update=True))
+    mapping = {}
+    for field in fields:
+        prop = field.prop
+        refer = field.refer
+        db = refer['db']
+        entity = refer['entity']
+        value = refer['value']
+        label = refer['label']
+        includes = {prop: refer['includes'][prop] for prop in refer['includes'] if not prop.startswith('$')}
+        excludes = {prop: refer['excludes'][prop] for prop in refer['excludes'] if not prop.startswith('$')}
+        values = Dao(entity, db).manager.filter(**includes).exclude(**excludes).values(*[value, label])
+        mapping[prop] = {
+            row[value]: row[label]
+            for row in values if row[value]
+        }
+    return ValarResponse(mapping)
+
+
+def meta_view(request, db, entity):
+    body = json.loads(request.body)
+    code = body.get('code')
+    meta = ValarMeta(db, entity, code)
+    _view = meta.meta_view()
+    return ValarResponse(_view)
+
+
+def load_customs(request):
+    body = json.loads(request.body)
+    db = body.get('db')
+    entity = body.get('entity')
+    code = body.get('code')
+    ps = MetaField.objects.filter(
+        view__code=code, view__meta__db=db, view__meta__entity=entity,
+        domain='Custom').values('prop')
+    current = [p.get('prop') for p in ps]
+    return ValarResponse(current)
+
+
+def get_fields(request):
+    body = json.loads(request.body)
+    db = body.get('db')
+    entity = body.get('entity')
+    route = body.get('route')
+    dao = Dao(entity, db)
+    array = []
+    for prop in dao.fields:
+        field: AbstractField = dao.fields.get(prop)
+        if field is None:
+            continue
+        domain: str = field.domain
+        if domain is None or domain.startswith('ManyTo'):
+            continue
+        elif domain in ['ForeignKey', 'OneToOneRel', 'OneToOneField']:
+            refer = field.refer or {}
+            _db = refer.get('db')
+            _entity = refer.get('entity')
+            _dao = Dao(_entity, _db)
+            if f'{_db}.{_entity}' in route:
+                continue
+            array.append({
+                'label': field.label,
+                'value': field.prop.replace('_id', ''),
+                'isLeaf': False,
+                'db': _db,
+                'entity': _entity,
+            })
+        elif len(route) > 1:
+            array.append({
+                'label': field.label,
+                'value': field.prop,
+                'isLeaf': True,
+            })
+    return ValarResponse(array)
+
+
+def save_custom(request):
+    return ValarResponse(True)
+
+
+def add_fields(request):
+    body = json.loads(request.body)
+    view_id = body.get('view_id')
+    props = body.get('props')
+    view_dao = Dao('valar.MetaView')
+    field_dao = Dao('valar.MetaField')
+    view: MetaView = view_dao.find_one(view_id)
+    entity = view.meta.entity
+    db = view.meta.db
+    dao = Dao(entity, db)
+    for prop in props:
+        field: AbstractField = dao.fields.get(prop)
+        if field:
+            _field = field.to_dict()
+            _field['view_id'] = view_id
+            field_dao.save_one(_field)
+
+    return ValarResponse(True)
+
+
+def metas(request):
+    values = Meta.objects.all().values('db', 'entity', 'name', 'tree', 'metaview__name')
+    mapping = {'orm': {'valar': []}, 'mon': []}
+    for row in values:
+        db = row['db']
+        label = row['name']
+        value = row['entity']
+        tree = row['tree']
+        icon = 'folder-tree' if tree else 'table'
+        row.update({'label': label, 'value': value, 'icon': icon})
+        if db == 'orm':
+            app, _ = value.split('.')
+            array = mapping['orm'].get(app, [])
+            array.append(row)
+            mapping['orm'][app] = array
+        elif db == 'mon':
+            mapping['mon'].append(row)
+
+    mon = {'label': 'MongoDB', 'value': 'mon', 'icon': 'boxes', 'children': mapping['mon']}
+    orm = {
+        'label': 'SQL', 'value': 'orm', 'icon': 'boxes',
+        'children': [
+            {'label': app, 'value': app, 'icon': 'box', 'children': mapping['orm'][app]}
+            for app in mapping['orm']
+        ]
+    }
+
+    return ValarResponse([orm, mon])

valar/views/rest.py

@@ -0,0 +1,90 @@
+import json
+
+from .handler import batch_handler
+from ..channels.executer import execute_channel
+from ..channels.sender import ValarChannelSender
+from ..classes.valar_response import ValarResponse
+from ..dao import Dao
+
+
+async def batch(request):
+    sender = ValarChannelSender(request)
+    await execute_channel(batch_handler, sender)
+    return ValarResponse(True)
+
+
+def save_one(request, db, entity):
+    item = json.loads(request.body)
+    dao = Dao(entity, db)
+    bean = dao.save_one(item)
+    item = dao.serialize(bean)
+    return ValarResponse(item)
+
+
+def values(request, db, entity):
+    body = json.loads(request.body)
+    dao = Dao(entity, db)
+    conditions = body.get('conditions', [])
+    props = body.get('props', ['id'])
+    array = dao.values(conditions, props)
+    return ValarResponse(array)
+
+
+def delete_one(request, db, entity):
+    body = json.loads(request.body)
+    _id = body['id']
+    dao = Dao(entity, db)
+    flag = dao.delete_one(_id)
+    return ValarResponse(flag)
+
+
+def find_one(request, db, entity):
+    body = json.loads(request.body)
+    _id = body['id']
+    dao = Dao(entity, db)
+    bean = dao.find_one(_id)
+    item = dao.serialize(bean)
+    return ValarResponse(item)
+
+
+def find(request, db, entity):
+    conditions = json.loads(request.body)
+    dao = Dao(entity, db)
+    results, _ = dao.find(conditions)
+    results = dao.serialize(results)
+    return ValarResponse(results)
+
+
+def update(request, db, entity):
+    body = json.loads(request.body)
+    conditions = body.get('conditions', [])
+    template = body.get('template')
+    dao = Dao(entity, db)
+    flag = dao.update(template, conditions)
+    return ValarResponse(flag)
+
+
+def search(request, db, entity):
+    body = json.loads(request.body)
+    _type = body.get('type')
+    orders = body.get('orders')
+    size = body.get('size')
+    page = body.get('page')
+    root = body.get('root')
+    code = body.get('code', 'default')
+    conditions = body.get('conditions')
+    dao = Dao(entity, db)
+
+    if _type == 'tree':
+        query_set = dao.tree(root, conditions)
+        total = query_set.count()
+    else:
+        query_set, total = dao.find(conditions, orders, size, page)
+    results = dao.serialize(query_set, code)
+
+    return ValarResponse({
+        "results": results,
+        "type": _type,
+        "total": total,
+        "root": root
+    })

{valar-1.1.4.dist-info → valar-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.1.4
+Version: 1.2.1
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -27,12 +27,13 @@ Dynamic: requires-python
 Dynamic: summary
 
 valar for morghulis
+
 # 1. install
+
 ```shell
 pip install valar
 ```
 
-
 # 1. settings
 
 ```python
@@ -47,16 +48,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 +66,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'valar',
+    'valar.apps.ValarConfig',
 ]
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -99,6 +96,7 @@ FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 
 ```
+
 # 2. asgi
 
 ```python
@@ -117,8 +115,8 @@ application = ProtocolTypeRouter({
 ```
 
 # 3. migrate
-no need, valar will auto migration
 
+no need, valar will auto migration
 
 # 4. root urls
 
@@ -126,7 +124,6 @@ no need, valar will auto set urlpatterns
 
 # 5. how to use valar_channel
 
-
 5.1 set HANDLER_MAPPING in settings
 
 ```python
@@ -137,13 +134,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