valar 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

valar/data/orm/values.py

@@ -0,0 +1,93 @@
+from django.db.models import (ManyToOneRel,  ManyToManyRel, OneToOneField, CharField,ManyToManyField,
+                              OneToOneRel, IntegerField, BooleanField, FloatField, FileField, JSONField, DateField,
+                              DateTimeField, TimeField, TextField, QuerySet)
+from django.db.models.fields.related import ForeignKey
+
+from ..models import VModel, MetaField
+
+
+def get_props(model:VModel, code):
+
+    simple_props,  referred_fields, date_props = [], {}, {}
+    fields = model._meta.get_fields()
+    for field in fields:
+        clazz = type(field)
+        prop = field.name
+        if clazz in [ForeignKey,ManyToOneRel,
+                     ManyToManyRel,ManyToManyField,
+                     OneToOneRel, OneToOneField]:
+            referred_fields[prop] = {
+                'value': 'id', 'label': 'name', 'display': 'id',
+                'field': field
+            }
+        else:
+            simple_props.append(prop)
+        if clazz in [ForeignKey, OneToOneField, OneToOneRel]:
+            simple_props.append(prop)
+        if clazz in [DateField, DateTimeField]:
+            date_props[prop] = clazz
+
+    module, name = model.__module__, model.__name__
+    entity = '%s.%s' % (module.replace('.models', '').split('.')[-1], name)
+    if code:
+        field_set = MetaField.objects.filter(view__code=code, view__meta__entity=entity)
+        customs = field_set.filter(domain='Custom').values('prop')
+        for row in customs:
+            simple_props.append(row['prop'])
+        refers =field_set.filter(prop__in=referred_fields.keys()).values('prop','refer__value','refer__label','refer__display')
+        for row in refers:
+            prop, value, label, display = row['prop'], row['refer__value'], row['refer__label'], row['refer__display']
+            referred_fields[prop]['value'] = value
+            referred_fields[prop]['label'] = label
+            referred_fields[prop]['display'] = display
+    return simple_props, referred_fields, date_props
+
+
+def to_dict(query_set: QuerySet, code=None):
+    model = query_set.model
+    simple_props, referred_fields, date_props = get_props(model, code)
+    values = query_set.values(*[*simple_props]) if len(query_set) else []
+    results = list(values)
+    pks = []
+    for row in results:
+        pks.append(row['id'])
+        for prop in date_props:
+            formating = '%Y-%m-%d' if date_props[prop] == DateField else '%Y-%m-%d %H:%M:%S'
+            val = row[prop]
+            row[prop] =val.strftime(formating) if val else val
+    for prop in referred_fields:
+        _field = referred_fields[prop]
+        value, label, display, field = _field['value'], _field['label'], _field['display'], _field['field']
+        clazz = type(field)
+        keys = {'id', value, display, label}
+        if clazz in [ForeignKey, OneToOneField, OneToOneRel]:
+            related_model = field.related_model
+            related_pks = set([row.get(prop) for row in results if row.get(prop)])
+            related_items = related_model.objects.filter(id__in=related_pks).values(*keys)
+            mapping = {item['id']: item  for item in related_items}
+            for row in results:
+                value = row.get(prop)
+                if value:
+                    row[prop] = mapping[value]
+                    row[f'{prop}_id'] = value
+        elif clazz in [ ManyToManyField, ManyToOneRel, ManyToManyRel]:
+            _prop = f'{prop}__id'
+            linkage = model.objects.filter(id__in=pks).exclude(**{f'{_prop}__isnull':True}).values('id',_prop)
+            row_mapping = {}
+            _pks = set()
+            for link in linkage:
+                _id, _pk = link['id'], link[_prop]
+                _pks.add(_pk)
+                array = row_mapping.get(_id,[])
+                array.append(_pk)
+                row_mapping[_id] = array
+            related_model = field.related_model
+            related_items = related_model.objects.filter(id__in=_pks).values(*keys)
+            mapping = {item['id']: item  for item in related_items}
+            for row in results:
+                _id = row.get('id')
+                __ids = row_mapping.get(_id, [])
+                __set = [ mapping[__id] for __id in __ids]
+                row[prop] = __ids
+                row[f'{prop}_set'] = __set
+    return results

valar/data/query.py

@@ -0,0 +1,48 @@
+from functools import reduce
+
+
+from django.db.models import Q
+
+
+
+
+class Condition:
+    def __init__(self, condition):
+        self.includes = condition.get('includes', {})
+        self.excludes = condition.get('excludes', {})
+
+
+
+class Query:
+    def __init__(self, body=None):
+        if body is None:
+            body = {}
+        self.template = body.get('template',{})
+        self.condition = Condition(body.get('condition',{}))
+        self.search = [ Condition(condition) for condition in body.get('search',[])]
+        self.orders = body.get('orders',{})
+
+    def orm_orders(self):
+        array = []
+        for key in self.orders :
+            value = self.orders .get(key)
+            prefix = '-' if value == -1 else ''
+            array.append(f'{prefix}{key}')
+        return array
+
+    def orm_conditions(self):
+        includes, excludes = self.condition.includes, self.condition.excludes
+        if len(self.search):
+            inc = [ Q(**{**includes, **sea.includes}) for sea in self.search]
+            exc = [ Q(**{**excludes, **sea.excludes}) for sea in self.search]
+            def fun(x, y):return x | y
+            return [reduce(fun, inc), reduce(fun, exc)]
+        else:
+            return [Q(**self.condition.includes), Q(**self.condition.excludes)]
+
+    def mon_conditions(self):
+        includes, excludes = self.condition.includes, self.condition.excludes
+        return {}
+
+
+    # def _mon_conditions(self):

valar/data/urls.py

@@ -0,0 +1,15 @@
+from django.urls import path
+
+from ..data import views
+
+urlpatterns = [
+    path('save_one', views.save_one),
+    path('save_many', views.save_many),
+    path('update_many', views.update_many),
+    path('delete_one', views.delete_one),
+    path('delete_many', views.delete_many),
+    path('find_one', views.find_one),
+    path('find_many', views.find_many),
+    path('meta', views.meta),
+
+]

valar/data/utils.py

@@ -0,0 +1,70 @@
+from django.db.models import QuerySet
+from pymongo.synchronous.cursor import Cursor
+
+from .orm.values import to_dict
+from ..data.mon import MongoDao
+from ..data.orm import OrmDao
+
+
+
+
+
+
+def get_dao(db,entity):
+    if db == 'orm':
+        return OrmDao(entity)
+    elif db == 'mon':
+        return MongoDao(entity)
+    else:
+        raise ValueError('Invalid database %s' % db)
+
+def transform(db, results, code=None):
+    if isinstance(results, Cursor):
+        return [to_item(db, bean) for bean in results]
+    elif isinstance(results, QuerySet):
+        return to_dict(results, code)
+    else:
+        return to_item(db, results)
+
+def to_item(db, bean):
+    if db == 'orm':
+        return bean.full
+    elif db == 'mon':
+        bean['id'] = str(bean['_id'])
+        del bean['_id']
+        return bean
+
+
+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])]]
+
+
+
+    # for parent, child in data:
+    #     if parent not in lookup:
+    #         lookup[parent] = {'label': parent, 'value':parent, 'children': []}
+    #     if child not in lookup:
+    #         lookup[child] = {'label': child, 'value':child, 'children': []}
+    #     lookup[parent]['children'].append(lookup[child])
+    # children_set = {child for _, child in data}
+    # root_nodes = [node for name, node in lookup.items() if name not in children_set]
+    # return root_nodes
+
+
+

valar/data/views.py

@@ -0,0 +1,76 @@
+import json
+
+from .query import Query
+from .. import ValarResponse
+from ..channels import ValarSocketSender
+from ..channels.utils import execute_channel
+
+from ..data.handlers import save_many_handler
+from ..data.utils import get_dao, transform
+
+
+async def save_many(request,db, entity):
+
+    data = json.loads(request.body)
+    handler = '%s/%s' % (db, entity)
+    sender = ValarSocketSender(handler, request)
+    await execute_channel(save_many_handler, data, sender)
+
+    return ValarResponse(True)
+
+def save_one (request,db, entity):
+    item = json.loads(request.body)
+    dao = get_dao(db, entity)
+    bean = dao.save_one(item)
+    return ValarResponse(transform(db,bean))
+
+
+def update_many(request, db, entity):
+    body = json.loads(request.body)
+    query = Query(body['query'])
+    item  = body['item']
+    dao = get_dao(db, entity)
+    dao.update_many(query, item)
+    return ValarResponse(True)
+
+def delete_one(request, db, entity):
+    body = json.loads(request.body)
+    _id = body['id']
+    dao = get_dao(db, entity)
+    dao.delete_one(_id)
+    return ValarResponse(True)
+
+def delete_many(request, db, entity):
+    body = json.loads(request.body)
+    query = Query(body)
+    dao = get_dao(db, entity)
+    dao.delete_many(query)
+    return ValarResponse(True)
+
+def find_one(request, db, entity):
+    body = json.loads(request.body)
+    _id = body['id']
+    dao = get_dao(db, entity)
+    bean = dao.find_one(_id)
+    return ValarResponse(transform(db,bean))
+
+def find_many(request, db, entity):
+    body = json.loads(request.body)
+    query = Query(body)
+    dao = get_dao(db, entity)
+    page = body.get('page', 1)
+    size = body.get('size', 0)
+    code = body.get('code')
+    results, total = dao.find_many(query, size, page)
+    return ValarResponse({
+        'results': transform(db, results, code),
+        'total': total
+    })
+
+def meta(request, db, entity ):
+    body = json.loads(request.body)
+    code = body.get('code')
+    dao = get_dao(db, entity)
+    view = dao.meta(code)
+    return ValarResponse(view)
+

{valar-0.0.11.dist-info → valar-0.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: valar
-Version: 0.0.11
+Version: 0.0.13
 Summary: valar for morghulis
 Author: LYP
 Author-email: liuyinpeng@buaa.edu.cn
@@ -12,6 +12,7 @@ Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -41,7 +42,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'valar.dao'
+    'valar.data'
 ]
 
 MIDDLEWARE = [

valar-0.0.13.dist-info/RECORD

@@ -0,0 +1,24 @@
+valar/__init__.py,sha256=ekQ2XVpfTAc9RUYjriUY2On5dZBIjZGnew__TeKVWws,858
+valar/channels/__init__.py,sha256=PRgoYDSdwH0ya77v2X5l8McthLBWiAA98b7x_GBpKDM,3263
+valar/channels/utils.py,sha256=lQQZp6XJhTHJSBvfsxgZ7PcDKYGLo5rMpWH5wtteHww,1298
+valar/channels/views.py,sha256=iKkfiRMn2_xCQvKseL_ZiPQcPlBHgdtKaLjcQ11Yrs4,393
+valar/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/data/handlers.py,sha256=2WQfJ5PJuGLPFqBpYg2my6Mh6RqAeI6jHEj4tRAsSXw,858
+valar/data/models.py,sha256=U0LQDRDoLZJiEBOjmNB2px2fMKlJa-ii9IeUNuruffg,10338
+valar/data/query.py,sha256=-T8BCVluSwHGlL7-66im6D5uds5o8OO-CTGmGPmyL0s,1439
+valar/data/urls.py,sha256=oh3t8c1umbkQIZwlMjmcIKB0bF5Yn97Ka-ZqkJEdl3I,391
+valar/data/utils.py,sha256=d5mdx_hV6Vs-SoAZLBdzQCvrbeuoXCozFzrCT-njCn0,2061
+valar/data/views.py,sha256=XI-HzVuW_uenb4diavZif_oLqg0loXeGl8KQnIMnNSg,2032
+valar/data/migrations/0001_initial.py,sha256=FhGiP9HXw-0kWB0tdyGcCpW7-I6_5WqR8dHjhcC-XwQ,14004
+valar/data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/data/mon/__init__.py,sha256=tQp_U-nyjCYxwHajs7jsP1T6QS0lIBtKRv74p2juXjA,2497
+valar/data/orm/__init__.py,sha256=BZHhGq7ybfHPN-LXR8Xmxe6kLGMrkcNxUfaJUvjcWJk,2967
+valar/data/orm/detacher.py,sha256=coZtVFzOVSl8AsoX2zLy7ZOkKVBLeg1HIKyKkstU1Tc,2660
+valar/data/orm/meta.py,sha256=AYxuKyL_9hVPb3hMwZsrZWdkk36-YIgCWeZF9CG5lqY,861
+valar/data/orm/meta_loader.py,sha256=XWFCypyeHqEEftl6j0olMsMfwaGnN-khxZJVXep2v0E,4327
+valar/data/orm/values.py,sha256=A0g2G2_ccsIu4YjCBHV_MMeYBDvgFAmh3gKCEJ8Q9bU,4295
+valar-0.0.13.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+valar-0.0.13.dist-info/METADATA,sha256=74wz2Txqek6q82QMS6zHU1fGG35p6e_4pclf0mRJm7c,2681
+valar-0.0.13.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+valar-0.0.13.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
+valar-0.0.13.dist-info/RECORD,,

{valar-0.0.11.dist-info → valar-0.0.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

valar/dao/migrations/0001_initial.py

@@ -1,22 +0,0 @@
-# Generated by Django 4.2.20 on 2025-03-08 12:34
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Example',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=100)),
-                ('content', models.TextField()),
-            ],
-        ),
-    ]

valar/dao/models.py

@@ -1,7 +0,0 @@
-from django.db import models
-
-# Create your models here.
-
-class Example(models.Model):
-    title = models.CharField(max_length=100)
-    content = models.TextField()

valar/dao/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

valar-0.0.11.dist-info/RECORD

@@ -1,13 +0,0 @@
-valar/__init__.py,sha256=8IqN-NsTjKsUogq7km3kncq__tIm0cMqhnhPx445dkc,744
-valar/channels/__init__.py,sha256=U5JYsuTMvqqhxdNyfTWCQPu3M3-B_AEFWSG53WiBdrU,2753
-valar/channels/views.py,sha256=I9uQzrvbI3ShJQTNwa7Wq2KKHn66WYS1UCtXk_rIuJ4,1406
-valar/dao/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar/dao/models.py,sha256=wsieA4rUU3r9Yzs_FQzN3QxZNUCv_mTODLdyz5rtXlE,165
-valar/dao/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
-valar/dao/migrations/0001_initial.py,sha256=VKfAlhQKfij8PeLFYnoOnDd2lKmddvfGzW_n1TklXlo,541
-valar/dao/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar-0.0.11.dist-info/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-0.0.11.dist-info/METADATA,sha256=giK3uXy7pHEJpyhWvmJbAO3B3QxrAHb9DWy-Cr-7pYc,2658
-valar-0.0.11.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-valar-0.0.11.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-0.0.11.dist-info/RECORD,,