valar 1.0.20__py3-none-any.whl → 1.0.22__py3-none-any.whl

valar/data/models.py

@@ -1,91 +1,7 @@
 from django.db import models
 from django.db.models.fields.files import FieldFile
 
-
-
-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
-
-    @property
-    def mapping(self):
-        mapping = {}
-        for field in self._meta.get_fields():
-            prop = field.name
-            domain = type(field).__name__
-            mapping[prop] = {'prop': prop, 'domain': domain, 'field': field}
-        return mapping
-
-    """
-        只序列化基础字段：能用value_from_object直接取出的字段。与values等价
-    """
-
-    def __str__(self):
-        return str(self.json)
-
-    @property
-    def json(self):
-        mapping = self.mapping
-        excludes = ['ManyToOneRel', 'OneToOneRel', 'ManyToManyRel', 'ManyToManyField', 'UUIDField']
-        mapping = {prop: mapping[prop] for prop in mapping if mapping[prop]['domain'] not in excludes}
-        data = {}
-        for prop in mapping:
-            field = mapping[prop]['field']
-            domain = mapping[prop]['domain']
-            value = field.value_from_object(self)
-            if domain in ['ForeignKey', 'OneToOneField']:
-                prop = prop + '_id'
-            elif domain in ['DateField']:
-                value = value.strftime('%Y-%m-%d') if value else None
-            elif domain in ['DateTimeField']:
-                value = value.strftime('%Y-%m-%d %H:%M:%S') if value else None
-            elif domain in ['FileField']:
-                file: FieldFile = value
-                value = file.name
-            # elif domain in ['BigAutoField']:
-            #     value = str(value)
-            data[prop] = value
-        return data
-
-    @property
-    def full(self):
-        data = self.json
-        mapping = self.mapping
-        excludes = ['ManyToManyField', 'ManyToManyRel', 'ForeignKey', 'ManyToOneRel', 'OneToOneField', 'OneToOneRel']
-        mapping = {prop: mapping[prop] for prop in mapping if mapping[prop]['domain'] in excludes}
-        for prop in mapping:
-            field = mapping[prop]['field']
-            domain = mapping[prop]['domain']
-            if domain in ['ForeignKey', 'OneToOneField', 'OneToOneRel']:
-                if hasattr(self, prop):
-                    bean: VModel = getattr(self, prop)
-                    data[prop] = bean.json if bean else None
-                    data['%s_id'%prop] = bean.id if bean else None
-            elif domain in ['ManyToManyField', 'ManyToManyRel', 'ManyToOneRel']:
-                accessor = prop if domain == 'ManyToManyField' else field.get_accessor_name()
-                try:
-                    _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]
-                except Exception as e:
-                    print(e)
-                    pass
-        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
+from ..core.valar_models import VModel, VTree
 
 
 class Meta(VModel):
@@ -101,7 +17,7 @@ class MetaView(VModel):
     meta = models.ForeignKey('Meta', on_delete=models.CASCADE, verbose_name='元数据')
 
     code = models.CharField(max_length=50, verbose_name='类视图', default='default ')
-    view_name = models.CharField(max_length=50, verbose_name='视图名称', null=True)
+    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='表单高度')
@@ -175,14 +91,11 @@ class MetaField(VModel):
 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='代码')  #
-    format = models.JSONField(default=dict, verbose_name='格式参数')  #
 
     class Meta:
         verbose_name = '元数据字段工具'
 #
 #
-class TestM(models.Model):
-    name = models.CharField(max_length=100, verbose_name='<UNK>')
 
 class MetaFieldDomain(VModel):
     name = models.CharField(max_length=255, unique=True, null=True, verbose_name='名称')
@@ -201,36 +114,3 @@ class MetaFieldDomain(VModel):
     class Meta:
         verbose_name = '元数据字段类型'
 
-
-class ValaTree(VTree):
-    text = models.TextField(null=True, verbose_name='text')
-    class Meta:
-        verbose_name = '树形测试'
-
-class Vala(VModel):
-    text_field = models.TextField(null=True, verbose_name='text')
-    boolean_field = models.BooleanField(null=True, verbose_name='boolean')
-    integer_field = models.IntegerField(null=True, verbose_name='integer')
-    float_field = models.FloatField(null=True, verbose_name='float')
-    date_field = models.DateField(null=True, verbose_name='date')
-    datetime_field = models.DateTimeField(null=True, verbose_name='datetime')
-    time_field = models.TimeField(null=True, verbose_name='time')
-    json_field = models.JSONField(null=True, verbose_name='json')
-    file = models.FileField(null=True, verbose_name='File')
-    # menus = models.ManyToManyField(to=MetaField, related_name='+')
-    # menu = models.ForeignKey(to=MetaField, null=True, on_delete=models.CASCADE, verbose_name='vala')
-
-
-class M2O(VModel):
-    vala = models.ForeignKey(to=Vala, null=True, on_delete=models.CASCADE, verbose_name='vala')
-    name = models.CharField(max_length=100, null=True, verbose_name='name')
-
-
-class O2O(VModel):
-    vala = models.OneToOneField(to=Vala, null=True, on_delete=models.CASCADE, verbose_name='vala')
-    name = models.CharField(max_length=100, null=True, verbose_name='name')
-
-
-class M2M(VTree):
-    valas = models.ManyToManyField(to=Vala, verbose_name='valas')
-    name = models.CharField(max_length=100, null=True, verbose_name='name')

valar/data/urls.py

@@ -1,24 +1,18 @@
-from django.urls import path, include
+from django.urls import path
 
-from ..data import views
+from ..channels.views import handel_channel
+from .views.rest import save_many,delete_many,save_one,delete_one,find_one,find,update,table, tree, meta_view
 
 urlpatterns = [
-    path('<str:db>/<str:entity>/save_one', views.save_one),
-    path('<str:db>/<str:entity>/save_many', views.save_many),
-    path('<str:db>/<str:entity>/save_file', views.save_file),
-
-    path('<str:db>/<str:entity>/update_many', views.update_many),
-    path('<str:db>/<str:entity>/delete_one', views.delete_one),
-    path('<str:db>/<str:entity>/delete_many', views.delete_many),
-    path('<str:db>/<str:entity>/find_one', views.find_one),
-    path('<str:db>/<str:entity>/find_many', views.find_many),
-    path('find_file/<str:bucket_name>/<str:object_name>', views.find_file),
-    path('<str:db>/<str:entity>/tree', views.tree),
-
-    # path('data/<str:db>/<str:entity>/', include('src.valar.data.urls')),
-
-    path('add_fields', views.add_fields),
-    path('fields', views.fields),
-    path('meta', views.meta),
-    path('metas', views.metas),
-]
+    path('socket/<str:handler>', handel_channel),
+    path('save_many', save_many),
+    path('delete_many', delete_many),
+    path('<str:db>/<str:entity>/save_one', save_one),
+    path('<str:db>/<str:entity>/delete_one', delete_one),
+    path('<str:db>/<str:entity>/find_one', find_one),
+    path('<str:db>/<str:entity>/find', find),
+    path('<str:db>/<str:entity>/update', update),
+    path('<str:db>/<str:entity>/table', table),
+    path('<str:db>/<str:entity>/tree', tree),
+    path('<str:db>/<str:entity>/meta_view', meta_view),
+]

valar/data/views/handler.py

@@ -0,0 +1,41 @@
+from ...channels.sender import ValarSocketSender
+from ...core.counter import Counter
+from ...core.dao.dao_base import Dao
+from ...core.dao.dao_mon import MonDao
+from ...core.dao.dao_orm import OrmDao
+
+
+
+
+def save_many_handler(sender: ValarSocketSender):
+    data = sender.data
+    entity, array, db = data.get("entity"), data.get("array",[]), data.get("db")
+    dao = Dao(entity, db)
+    counter = Counter(array)
+    for item in array:
+        item['saved'] = True
+        dao.save_one(item)
+        payload = counter.tick()
+        sender.to_clients(payload, sender.client, wait=True)
+
+
+
+def delete_many_handler(sender: ValarSocketSender):
+    data = sender.data
+    entity, conditions, db = data.get("entity"), data.get("conditions", []), data.get("db")
+    if db == 'orm':
+        dao = OrmDao(entity)
+        query_set, _ = dao.find(conditions)
+        paths = dao.model.get_file_paths(query_set)
+        query_set.delete()
+        counter = Counter(len(paths))
+        for path in paths:
+            dao.model.minio.remove_path(path)
+            payload = counter.tick()
+            sender.to_clients(payload, sender.client, wait=True)
+    else:
+        dao = MonDao(entity)
+        dao.delete(conditions)
+
+
+

valar/data/views/rest.py

@@ -0,0 +1,86 @@
+import json
+
+from .handler import save_many_handler,delete_many_handler
+from ...channels.executer import execute_channel
+from ...channels.sender import ValarSocketSender
+from ...core.dao.dao_base import Dao
+from ...core.meta.meta_orm import OrmMeta
+from ...core.response import ValarResponse
+
+async def save_many(request):
+    sender = ValarSocketSender(request)
+    await execute_channel(save_many_handler, sender)
+    return ValarResponse(True)
+
+async def delete_many(request):
+    sender = ValarSocketSender(request)
+    await execute_channel(delete_many_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.transform(bean)
+    return ValarResponse(item)
+
+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.transform(bean)
+    return ValarResponse(item)
+
+def find (request,db, entity):
+    conditions = json.loads(request.body)
+    dao = Dao(entity, db)
+    results, _ = dao.find(conditions)
+    results = dao.transform(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 table(request, db, entity):
+    body = json.loads(request.body)
+    conditions = body.get('conditions', [])
+    orders = body.get('orders')
+    size = body.get('size')
+    page = body.get('page')
+    dao = Dao(entity, db)
+    results, total = dao.find(conditions, orders, size, page)
+    results = dao.transform(results)
+    return ValarResponse({
+        "results":results,
+        "total": total
+    })
+
+def tree(request, db, entity):
+    body = json.loads(request.body)
+    conditions = body.get('conditions', [])
+    root = body.get('page')
+    dao = Dao(entity, db)
+    query_set = dao.tree(root, conditions)
+    results = dao.transform(query_set)
+    return ValarResponse(results)
+
+
+def meta_view(request, db, entity):
+    body = json.loads(request.body)
+    code = body.get('code')
+    _meta = OrmMeta(entity, code)
+    _view = _meta.get_view()
+    return ValarResponse(_view)

{valar-1.0.20.dist-info → valar-1.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.0.20
+Version: 1.0.22
 Summary: valar for morghulis
 Author: LYP
 Author-email: liuyinpeng@buaa.edu.cn

valar-1.0.22.dist-info/RECORD

@@ -0,0 +1,51 @@
+valar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/channels/__init__.py,sha256=-FkuzO-KqxZkCjJ9t5XhBvnTJvK7yFYW0MsUY3WOgGI,29
+valar/channels/consumer.py,sha256=RYQ6TAKK_nowib2oHLwte8kQH7pY7aesOTxlGtBIIrM,1434
+valar/channels/executer.py,sha256=lurFYyUETq6eWjFUXA-m7mmQTeZtwfxrzuOayWxs4BE,314
+valar/channels/mapping.py,sha256=_y_ckouO-0MX9OcyLV00JOkdywajgludT-o9egyzE2c,661
+valar/channels/sender.py,sha256=GDJ74DoTydtUfLlIdHD5SWXe-6ZMIpCSXYju8N0ePFU,2343
+valar/channels/views.py,sha256=6-v30odhzKhyBCdgQui1QArvnq8IZat-XOqberBcVow,365
+valar/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/core/counter.py,sha256=_xIqL04fJ9gF-xgVPa0JEYQXfJnN9wjnzqQchPeQkTI,355
+valar/core/dao_abstract.py,sha256=2HAhZ5452yUy38wkVgaT9ggIOvhEDkxSPy0MDaQZ7Ew,1247
+valar/core/middleware.py,sha256=m702KYo96UzsE9tcsBoN1RFagnBFFpZ0uJP0giZzH2A,669
+valar/core/response.py,sha256=kQnHWm8McUKTE_Q20JjLQsXOAv-IX979FRg6O42Tsng,246
+valar/core/singleton_meta.py,sha256=aa9DZKG4Q9Cr67ZWrQ0yaFLrEjwFoTMQbDrpoIqgJZs,245
+valar/core/valar_models.py,sha256=a-EEN6-s_wdKrgw8nJTPvWcvxRiSG-ff7k_L5_crW-0,3439
+valar/core/dao/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/core/dao/_mon_array2tree.py,sha256=_uIEA4JBI8gJBvOmxzJ28Hk5ade1u5BKO2LMRfTxqH0,767
+valar/core/dao/dao_base.py,sha256=6jeARsqlovWpz4bqxEVJf58ch1Zm4b8_slp0-Yot9fE,1247
+valar/core/dao/dao_mon.py,sha256=MeMjo6vBzB_HR81q5FMFg-Q0vBeWexdymLwi7cwjMpc,2338
+valar/core/dao/dao_orm.py,sha256=iQtJLdxYODKFcY2ik_tAUYf6RSApLy1R9L4DzIQafmw,3155
+valar/core/dao/engine.py,sha256=PifdmulmDKtLW63-ibdmD8ozfRwiCR0f5iHcKT4soF8,244
+valar/core/dao/engine_minio.py,sha256=0Pycbq9eoJizvmElZYtstXBLPEa--b0H0AA3ZuHbfQk,2798
+valar/core/dao/engine_mon.py,sha256=P0qOtG0Usu-nAkYa-2dSiFwbUPIhHULoBZoHm-60ypo,1051
+valar/core/dao/engine_orm.py,sha256=nUjjkVLD-enpbkXCZSkQib5hWJJPXT2TYhACKn6Pro0,752
+valar/core/dao/model_mon.py,sha256=uCHDARQRB_P3EjIgE58LOGboVDwPIAbfnaKVKnP4870,601
+valar/core/dao/model_orm.py,sha256=PkWJMYykr00KpfR5JvR3XpHgW8L7Dbym4hhJhZWZzlQ,7554
+valar/core/dao/query_mon.py,sha256=QfQoT74HFEVtcaukSqGVXaIGf63WkgZWY94H8QAvFOg,318
+valar/core/dao/query_orm.py,sha256=sBBZNkGMyF6ttRcDEPXWfvPM_agLHwKShz3YO3SF0zw,1067
+valar/core/dao/utils_orm.py,sha256=8nL8e2b8NOsBTyPUWkjDpNWzwruhatppWaw_EeSZQOA,3610
+valar/core/meta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/core/meta/field_orm.py,sha256=oKaESEAtzQN5LRQSa9FVYtEgBdqg7YMUmVAAiyFNhu4,4586
+valar/core/meta/init_meta_frame.py,sha256=5jEHzDfh5z5YLDJ0hu-a9MW3U-zg6Rk35pDZnjXZjes,921
+valar/core/meta/meta_orm.py,sha256=b7514F9InFModldKKPrzHt8USykm5FsUvlIPsfbExlo,2343
+valar/core/meta/defaults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/core/meta/defaults/field_keys_default.py,sha256=dT2QfwkhZ-h6k2WGkDhX9dRyOx7Pv3DCN0-V-yrQ_aU,813
+valar/core/meta/defaults/field_values_default.py,sha256=6m9Qb31K6C5S_X3h_Hlu5zrD4zcvWHEWjv0HZzE9d80,2303
+valar/core/meta/defaults/frame_defaults.py,sha256=swz3zhWvGYEPX_KP9IRKe6sfg86SysO1i0UZoJC0Kv0,5637
+valar/core/meta/defaults/view_defaults.py,sha256=GvgK_1W1oJXucTFzt3a0ibL_j7jcP9mRHI1I5-lpN8c,124
+valar/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/data/apps.py,sha256=eDNtIahBMf8Acxs9GiOTzqegoMYQZ1l_n5t0eA5AHOk,569
+valar/data/models.py,sha256=79dgu-kFfRn7ha6sOXTbAYFxC2MsDVz0m3mxvFzKG6Y,5513
+valar/data/urls.py,sha256=phZGHxpQy00SkJBKnE_xAfkzdzoFVRycK5gRE2Y2Lj0,736
+valar/data/migrations/0001_initial.py,sha256=qpcnjVP0wORgcbzoJpMhs0AftluJxtQWIxplVKBmmpo,9769
+valar/data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/data/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valar/data/views/handler.py,sha256=h769dO9ZiJXwgkGyIWVzMaz3LKpqafjwAM7ZH2oCSkQ,1214
+valar/data/views/rest.py,sha256=r13F3CKjF9bnlaqRzyLk9iu5CdNsmQSEBRcHseLiZ0I,2535
+valar-1.0.22.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+valar-1.0.22.dist-info/METADATA,sha256=v3KS5PUtw0yt9HYgNbVZ0ukY3Z4M9lqkVGyfHGmYp3U,3249
+valar-1.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+valar-1.0.22.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
+valar-1.0.22.dist-info/RECORD,,

{valar-1.0.20.dist-info → valar-1.0.22.dist-info}/WHEEL

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

valar/channels/utils.py

@@ -1,43 +0,0 @@
-import asyncio
-
-import importlib
-from django.core.exceptions import ImproperlyConfigured
-from django.conf import settings
-
-
-
-
-async def execute_channel(method, data, sender):
-    thread = asyncio.to_thread(method,  data, sender)
-    asyncio.create_task(thread)
-
-
-
-def channel_wrapper(func):
-    def wrapper(*args, **kwargs):
-        data, sender = args
-        sender.to_clients(None, [sender.client],'start')
-        result = func(*args, **kwargs)
-        sender.to_clients(None, [sender.client], 'stop')
-        return result
-    return wrapper
-
-
-def get_channel_handler(handler):
-    try:
-        root = settings.VALAR_CHANNEL_HANDLER_MAPPING
-        path, name = root.rsplit(".", 1)
-    except (ValueError, AttributeError):
-        raise ImproperlyConfigured("Cannot find VALAR_CHANNEL_HANDLER_MAPPING setting.")
-    try:
-        module = importlib.import_module(path)
-        mapping = getattr(module, name)
-    except ImportError:
-        raise ImproperlyConfigured("Cannot import VALAR_CHANNEL_HANDLER_MAPPING module %r" % path)
-    except AttributeError:
-        raise ImproperlyConfigured("module %r has no attribute %r" % (path, name))
-    try:
-        method = mapping[handler]
-    except KeyError:
-        raise ImproperlyConfigured("Cannot find handler in %r" % root)
-    return method

valar/data/file/__init__.py

@@ -1,91 +0,0 @@
-import json
-from io import BytesIO
-
-from django.conf import settings
-from minio import Minio
-from urllib3 import HTTPResponse
-
-def minio_upload_object(bucket_name, object_name, _bytes):
-    client = __get_minio_client__()
-    __create_bucket__(bucket_name, client)
-    file_data = BytesIO(_bytes)
-    file_size = len(_bytes)  # file.siz
-    client.put_object(bucket_name=bucket_name, object_name=object_name, data=file_data, length=file_size)
-    return f'{bucket_name}/{object_name}'
-
-def minio_remove_object(bucket_name, object_name):
-    client = __get_minio_client__()
-    client.remove_object(bucket_name=bucket_name, object_name=object_name)
-
-def minio_remove_path(path):
-    [bucket_name, object_name] = path.split('/')
-    client = __get_minio_client__()
-    client.remove_object(bucket_name=bucket_name, object_name=object_name)
-
-
-def minio_read_object(bucket_name, object_name) -> HTTPResponse:
-    client = __get_minio_client__()
-    return client.get_object(bucket_name=bucket_name, object_name=object_name)
-
-
-
-
-
-def __get_minio_client__(bucket_name=None):
-    options = settings.MINIO_SETTINGS
-    client =  Minio(**options)
-    if bucket_name:
-        __create_bucket__(bucket_name, client)
-    return client
-
-def __create_bucket__(bucket_name, client=None):
-    client = client or __get_minio_client__()
-    exists = client.bucket_exists(bucket_name)
-    if not exists:
-        client.make_bucket(bucket_name)
-        policy = generate_policy(bucket_name)
-        client.set_bucket_policy(bucket_name, policy)
-
-
-def get_minio_bucket_name(entity):
-    value = f'{settings.BASE_DIR.name}.{entity}'
-    bucket_name = value.replace('_','-').lower()
-    __create_bucket__(bucket_name)
-    return bucket_name
-
-def get_minio_object_name(_id, prop, file_name):
-    return f"{_id}-{prop}-{file_name}"
-
-def generate_policy(bucket_name):
-    return json.dumps({
-        "Version": "2012-10-17",
-        "Statement": [
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetBucketLocation",
-                "Resource": f"arn:aws:s3:::{bucket_name}"
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:ListBucket",
-                "Resource": f"arn:aws:s3:::{bucket_name}"
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:GetObject",
-                "Resource": f"arn:aws:s3:::{bucket_name}/*"
-            },
-            {
-                "Sid": "",
-                "Effect": "Allow",
-                "Principal": {"AWS": "*"},
-                "Action": "s3:PutObject",
-                "Resource": f"arn:aws:s3:::{bucket_name}/*"
-            }
-      ]})

valar/data/handlers.py

@@ -1,28 +0,0 @@
-import time
-
-from ..channels import ValarSocketSender
-from ..channels.utils import channel_wrapper
-from ..data.utils import get_dao
-
-@channel_wrapper
-def save_many_handler(data, sender: ValarSocketSender):
-    start_time = time.time()
-    entity, array, db = data.get("entity"), data.get("array",[]), data.get("db")
-    dao = get_dao(db, entity)
-    index, length = 1, len(array)
-    for item in array:
-        item['saved'] = True
-        dao.save_one(item)
-        current_time = time.time()
-        time_span = current_time - start_time
-        if time_span > 1:
-            start_time = current_time
-            send(index, length, sender)
-        index += 1
-
-
-
-def send(index, length, sender):
-    percentage = round(index * 100 / length)
-    tick = {'length': length, 'index': index, 'percentage': percentage}
-    sender.to_clients(tick, sender.client)

valar/data/mon/__init__.py

@@ -1,123 +0,0 @@
-from bson import ObjectId
-from pymongo.results import InsertOneResult
-
-from django.conf import settings
-import pymongo
-
-from ..query import Query
-
-from pymongo import MongoClient
-from typing import Dict, Any, List, Optional
-
-try:
-    MONGO = settings.MONGO_SETTINGS
-except AttributeError:
-    MONGO = {
-        'host': 'localhost',
-        'port': 27017,
-    }
-host, port, username, password = MONGO.get('host'), MONGO.get('port'), MONGO.get('username'), MONGO.get('password')
-
-if username and password:
-    uri = f'mongodb://{username}:{password}@{host}:{port}/'
-else:
-    uri = f'mongodb://{host}:{port}/'
-mongo_params = {
-    'maxPoolSize': 10,
-    'minPoolSize': 0,
-    'maxIdleTimeMS': 10000,
-    'connectTimeoutMS': 10000,
-    'socketTimeoutMS': 10000,
-    'serverSelectionTimeoutMS': 10000,
-}
-
-def get_mongo_client():
-    client = pymongo.MongoClient(uri, **mongo_params)
-    client['admin'].command('ping')
-    return client
-
-
-
-class MongoDao:
-    def __init__(self, ref):
-        self.ref = ref
-        db_name = settings.BASE_APP
-        col_name = ref.replace('.', '_')
-        self.client = get_mongo_client()
-        self.collection = self.client[db_name][col_name]
-    def save_one(self, item):
-        _id = item.get('id', None)
-        _id = None if isinstance(_id, int) else _id
-        if _id is None:
-            bean:InsertOneResult = self.collection.insert_one(item)
-            _id = bean.inserted_id
-            self.collection.update_one({'_id': _id}, {'$set': {'sort':str(_id)}})
-        else:
-            del item['id']
-            _id = ObjectId(_id)
-            self.collection.update_one({'_id': _id}, {'$set': item})
-        return self.collection.find_one({'_id': _id})
-
-
-    def update_many(self, query, template):
-        self.collection.update_many(query.mon_conditions(), {'$set': template})
-
-
-    def delete_one(self, _id):
-        self.collection.delete_one({'_id': ObjectId(_id)})
-
-    def delete_many(self, query):
-        self.collection.delete_many(query.mon_conditions())
-
-
-    def find_one(self, _id):
-        return self.collection.find_one({'_id': ObjectId(_id)})
-
-    def find_many(self, query: Query, size=0, page=1) :
-        skip = (page - 1) * size
-        condition = query.mon_conditions()
-        total = self.collection.count_documents(condition)
-        cursor = self.collection.find(condition)
-
-        sort_fields = []
-        for key, value in query.orders.items():
-            sort_direction = pymongo.DESCENDING if value == -1 else pymongo.ASCENDING
-            sort_fields.append((key, sort_direction))
-
-        if sort_fields:
-            cursor = cursor.sort(sort_fields)
-            
-        if size:
-            cursor = cursor.skip(skip).limit(size)
-            
-        return cursor, total
-
-    def meta(self):
-        one = self.collection.find_one()
-        return one
-
-class MongoDBQuery:
-    #Mongo的查询
-    def __init__(self, connection_string: str, database_name: str):
-        self.client = MongoClient(connection_string)
-        self.db = self.client[database_name]
-        
-    def find(self, collection: str, query: Dict[str, Any], 
-             projection: Optional[Dict[str, Any]] = None,
-             sort: Optional[List[tuple]] = None,
-             limit: Optional[int] = None,
-             skip: Optional[int] = None) -> List[Dict[str, Any]]:
-        cursor = self.db[collection].find(query, projection)
-        if sort:
-            cursor = cursor.sort(sort) #好像有警告……但是能跑
-        if skip:
-            cursor = cursor.skip(skip)
-        if limit:
-            cursor = cursor.limit(limit)
-        return list(cursor)
-        
-    def count(self, collection: str, query: Dict[str, Any]) -> int:
-        return self.db[collection].count_documents(query)
-        
-    def close(self):
-        self.client.close()