valar 1.0.17__py3-none-any.whl → 1.0.19__py3-none-any.whl

valar/data/views.py

@@ -1,5 +1,15 @@
 import json
+from io import BytesIO
 
+from django.core.files.uploadedfile import InMemoryUploadedFile
+from django.http import QueryDict, HttpResponse
+from django.utils.encoding import escape_uri_path
+from urllib3 import HTTPResponse
+
+from .file import get_minio_object_name, get_minio_bucket_name, minio_upload_object, minio_remove_path, \
+    minio_read_object
+from .models import MetaField, VModel, VTree
+from .orm import load_model
 from .query import Query
 from .. import ValarResponse
 from ..channels import ValarSocketSender
@@ -10,12 +20,10 @@ 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)
+    body = json.loads(request.body)
+    data = body.get('data')
+    sender = ValarSocketSender(request)
     await execute_channel(save_many_handler, data, sender)
-
     return ValarResponse(True)
 
 def save_one (request,db, entity):
@@ -56,21 +64,110 @@ def find_one(request, db, entity):
 
 def find_many(request, db, entity):
     body = json.loads(request.body)
-    query = Query(body)
+    query = Query(body.get('query'))
     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)
+    results, total = dao.find_many(query,  query.size,  query.page)
     return ValarResponse({
         'results': transform(db, results, code),
         'total': total
     })
 
-def meta(request, db, entity ):
+
+def tree(request, db, entity):
     body = json.loads(request.body)
-    code = body.get('code')
+    root = body.get('root', 0)
+    query = Query(body)
     dao = get_dao(db, entity)
+    results = [n.json for n in dao.tree(query,root)]
+    return ValarResponse(results)
+
+
+def meta(request):
+    body = json.loads(request.body)
+    code = body.get('code')
+    entity = body.get('entity')
+    dao = get_dao('orm', entity)
     view = dao.meta(code)
     return ValarResponse(view)
 
+def fields(request ):
+    body = json.loads(request.body)
+    entity = body.get('entity')
+    dao = get_dao('orm', entity)
+    _fields =dao.meta_fields
+    return ValarResponse(_fields)
+
+
+
+def add_fields(request):
+    body = json.loads(request.body)
+    entity = body.get('entity')
+    view_id = body.get('view_id')
+    props = body.get('props')
+    dao = get_dao('orm', entity)
+    field_dao = get_dao('orm','data.MetaField')
+    _fields = dao.meta_fields
+    for prop in props:
+        field = _fields.get(prop)
+        if field:
+            field['view_id'] = view_id
+            field_dao.save_one(field)
+    return ValarResponse(True)
+
+def metas(request):
+    mapping = load_model()
+    tree = {}
+    for entity in mapping:
+        _, name = mapping[entity]
+        app, model = entity.split('.')
+        node = {'label': name, 'value': model, 'isTree': issubclass(_, VTree)}
+        root = tree.get(app, {'label': app, 'value': app, 'children': []})
+        root['children'].append(node)
+        tree[app] = root
+    return ValarResponse(list(tree.values()))
+
+def find_file(request, bucket_name, object_name):
+    print(bucket_name, object_name)
+    ret: HTTPResponse = minio_read_object(bucket_name, object_name)
+    file_bytes = BytesIO(ret.read())
+    content = file_bytes
+    response = HttpResponse(content)
+    response['Content-Type'] = 'application/octet-stream;charset=utf-8'
+    response['Content-Disposition'] = "attachment; filename={}".format(escape_uri_path(object_name))
+
+    return response
+
+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 = get_dao(db, entity)
+    item = dao.find_one(params.get('id',0))
+    if item:
+        """删除已有文件"""
+        old_value = getattr(item, prop)
+        if old_value:
+            minio_remove_path(old_value.name)
+        """上传新文件"""
+        bucket_name = get_minio_bucket_name(entity)
+        object_name = get_minio_object_name(_id, prop, file.name)
+        path = minio_upload_object(bucket_name, object_name, file.read())
+        """更新数据"""
+        setattr(item, prop, path)
+        if field:
+            setattr(item, field, file.name)
+        item.save()
+        return ValarResponse({
+            'uploaded': True,
+            "url": f'/files/{path}',
+            'fileName': path,
+            "name": file.name
+        })
+    else:
+        return ValarResponse(False)
+
+    # path = service.save_file(domain, entity, item, prop, file)
+    # dfs.remove_path(old_path)
+
+

{valar-1.0.17.dist-info → valar-1.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.0.17
+Version: 1.0.19
 Summary: valar for morghulis
 Author: LYP
 Author-email: liuyinpeng@buaa.edu.cn
@@ -11,6 +11,10 @@ Requires-Dist: channels==3.0.3
 Requires-Dist: pymongo~=4.11.2
 Requires-Dist: asgiref~=3.8.1
 Requires-Dist: django-cors-headers==4.2.0
+Requires-Dist: pandas==2.2.3
+Requires-Dist: openpyxl==3.1.5
+Requires-Dist: deepmerge~=2.0
+Requires-Dist: minio==7.2.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

valar-1.0.19.dist-info/RECORD

@@ -0,0 +1,27 @@
+valar/__init__.py,sha256=ekQ2XVpfTAc9RUYjriUY2On5dZBIjZGnew__TeKVWws,858
+valar/channels/__init__.py,sha256=scvypQLiH-gp-Y0gZfSBAP5eoXFEyYgY7TSafzqP5Wk,3432
+valar/channels/utils.py,sha256=lQQZp6XJhTHJSBvfsxgZ7PcDKYGLo5rMpWH5wtteHww,1298
+valar/channels/views.py,sha256=GjcFw_WswaJnlSrv2tFx12jLk6RtzxSjW1D2kBskImY,413
+valar/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/data/handlers.py,sha256=2WQfJ5PJuGLPFqBpYg2my6Mh6RqAeI6jHEj4tRAsSXw,858
+valar/data/models.py,sha256=XXKT1DXcAQCv8mTKWB8AP7zO6Bt0RB9QQosmJ7vUT6Q,10621
+valar/data/query.py,sha256=Cx-DDJQmMP8Qc9Sv5dvQ-QFE-aRVeYI6ccE8zUhFsVQ,1585
+valar/data/urls.py,sha256=32EqAi4A2zR-_-FE3Ued8gVetHuY3hdgausP7eIFL3w,929
+valar/data/utils.py,sha256=d5mdx_hV6Vs-SoAZLBdzQCvrbeuoXCozFzrCT-njCn0,2061
+valar/data/views.py,sha256=wiKBRsrBDT4arusLh9NKBgZFK7lwaTgsTZiuTnNsJFQ,5292
+valar/data/file/__init__.py,sha256=YwBQ0Vhfg3wbcCa6k57c9vL-AnpOgnDO6lInERlIyPc,2880
+valar/data/migrations/0001_initial.py,sha256=jBWKQwSclN8NctNIctqied1ibVYMEXUyimzQICLMJEA,15681
+valar/data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/data/mon/__init__.py,sha256=99b04h-j9HbmKlVB2qNl2ZVyUMC9pH0sofu7yXAi_Zg,3818
+valar/data/mon/query_translator.py,sha256=g5rurgUOATarrO_hCuImr2VV6U1axwVSKAZx8zGeOuw,4646
+valar/data/orm/__init__.py,sha256=beQOUIDMEx83sMERr4NtZikgGxjhEDUJReYz4x8Zf7E,4730
+valar/data/orm/detacher.py,sha256=coZtVFzOVSl8AsoX2zLy7ZOkKVBLeg1HIKyKkstU1Tc,2660
+valar/data/orm/meta.py,sha256=gzrqBp6VEryIApu1Ab3WxLRtXXcnGJ7O9UlCSjElYcw,2719
+valar/data/orm/meta_frame.py,sha256=63mKMHw6lGVAq_R2Ml-KG3Xstd8s1Rxv2e9xDAazeRg,1538
+valar/data/orm/meta_loader.py,sha256=aAOtZSkIONT85tld9UxK2FFClltnyZ0zJZAeyrTU1-A,6031
+valar/data/orm/values.py,sha256=5B4zpxhW9tplz4qPaNx5ONzYt5JosS0_K4XfDUQKD38,4716
+valar-1.0.19.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+valar-1.0.19.dist-info/METADATA,sha256=cauwp8rZdtCogK5NpMyy2ZuZTctGHegNubueoJv4JsY,2902
+valar-1.0.19.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+valar-1.0.19.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
+valar-1.0.19.dist-info/RECORD,,

{valar-1.0.17.dist-info → valar-1.0.19.dist-info}/WHEEL

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

valar-1.0.17.dist-info/RECORD

@@ -1,24 +0,0 @@
-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=hPEv76a-dzyCcS6CbDjwGq8VR3zUaMZAIR54f5YogBY,3000
-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-1.0.17.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-1.0.17.dist-info/METADATA,sha256=dvKaH8nKya3qM7dkw09RLWvse1VXCf7C6jcT3WV8_s4,2784
-valar-1.0.17.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-valar-1.0.17.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-1.0.17.dist-info/RECORD,,