valar 1.3.4__py3-none-any.whl → 1.3.5__py3-none-any.whl

valar/channels/sender.py

@@ -39,7 +39,7 @@ class Sender:
 
     def __init__(self, request: HttpRequest):
         self.client = request.headers.get('CLIENT')
-        self.uid = request.session.get('UID')
+        # self.uid = request.session.get('UID')
         self.group_send = async_to_sync(get_channel_layer().group_send)
 
 
@@ -88,6 +88,9 @@ class ValarChannelSender(Sender):
     def done(self, payload):
         self.__emit__('done', payload)
 
+    def error(self, payload):
+        self.__emit__('error', payload)
+
     def __emit__(self, status='proceed', data=None):
         scope = 'broadcast' if self.__channel__.broadcast else 'client'
         body = {

valar/dao/defaults/field_keys_default.py

@@ -46,7 +46,7 @@ meta_field_key_defaults = {
         'ref': ('pick', ['id', 'name', 'm2o', 'm2m', 'o2o_id']),
     },
     'valar.Account': {
-        'auth': ('pick', ['user_id', 'username', 'email', 'is_active', 'is_admin', 'roles']),
+        'auth': ('pick', ['user_id', 'username', 'email', 'password', 'is_active', 'is_admin', 'roles']),
     },
     'valar.Role': {
         'auth': ('pick', ['name', 'duty', 'menu', 'account']),

valar/dao/meta.py

@@ -45,7 +45,8 @@ class ValarMeta:
         if view.metafield_set.count() == 0:
             _fields = self.__initial_fields__()
             for _field in _fields:
-                if _field['prop'] not in ['sort', 'create_time', 'modify_time', 'saved']:
+                if (_field['prop'] not in ['id', 'sort', 'create_time', 'modify_time', 'saved', 'disabled']
+                        and _field['domain'] not in ['ManyToManyRel', 'OneToOneRel', 'ManyToOneRel']):
                     _field.update({'view_id': view.id, "saved": True})
                     field_dao.save_one(_field)
 

valar/dao/orm_dao.py

@@ -77,6 +77,7 @@ class OrmDao(AbstractDao):
         return self.manager.filter(id=oid).first() if oid is not None else None
 
     def find(self, conditions=None, orders=None, size=0, page=1):
+
         includes, excludes, orders = Query(conditions, orders).orm()
         query_set = self.manager.filter(includes).exclude(excludes).order_by(*orders)
         total = query_set.count()

valar/models/auth.py

@@ -13,7 +13,7 @@ class Role(VModel):
 class Account(VModel):
     """账户核心信息"""
     username = models.CharField(max_length=255, null=True, unique=True, verbose_name='账号')
-    password = models.CharField(max_length=255, verbose_name='密码')
+    password = models.CharField(max_length=255, null=True, verbose_name='密码')
     email = models.CharField(max_length=255, null=True, unique=True, verbose_name='邮箱')
     """权限"""
     is_admin = models.BooleanField(default=False, verbose_name='超级管理员')

valar/views/auth.py

@@ -41,7 +41,7 @@ def sign_in(request):
                 })
     return ValarResponse(jwt.encode({
         "user_id": account.id,
-        "exp": datetime.datetime.utcnow() + datetime.timedelta(minutes=30)
+        "exp": datetime.datetime.utcnow() + datetime.timedelta(hours=2)
     }, settings.SECRET_KEY, algorithm="HS256"))
 
 

valar/views/handler.py

@@ -1,3 +1,5 @@
+import traceback
+
 from ..channels.counter import Counter
 from ..channels.sender import ValarChannelSender
 from ..dao import Dao
@@ -22,25 +24,30 @@ def batch_handler(sender: ValarChannelSender):
     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)
+
+    try:
+        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)
+    except Exception as e:
+        traceback.print_exc()
+        sender.error(str(e))

valar/views/rest.py

@@ -71,6 +71,9 @@ def search(request, db, entity):
     size = body.get('size')
     page = body.get('page')
     root = body.get('root')
+
+    print(root, 'root', entity)
+
     code = body.get('code', 'default')
     conditions = body.get('conditions')
     dao = Dao(entity, db)

{valar-1.3.4.dist-info → valar-1.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.3.4
+Version: 1.3.5
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP

{valar-1.3.4.dist-info → valar-1.3.5.dist-info}/RECORD

@@ -9,7 +9,7 @@ valar/channels/consumer.py,sha256=fEP52wBHWccturn2QAkqOt9-_Fr8akiw95AoVc6dEMM,13
 valar/channels/counter.py,sha256=K8aQUI1RiIrSOg3280tV102soC-ZC1qSRZvBXuwNYQ0,377
 valar/channels/executer.py,sha256=_Ap859nvxRl8Ln0BWMqhnL6cQNl-1NQSmMR4Akh-afY,333
 valar/channels/mapping.py,sha256=1SBqxEYO4epbRkSOUw5zm6gau15imz1gokrRTQcy94A,755
-valar/channels/sender.py,sha256=QSIkInIYHtuv8ZPqKUbXqhbMl0y0GtaA_vQdqhbGBdI,3732
+valar/channels/sender.py,sha256=65hylPGXreN4hDetg5Ysl_72BbbRIVF2ERDk7Nky1Lg,3805
 valar/channels/views.py,sha256=4J_f-Bn3VR0o0spOa9D52aRcxMRZ0YYgo-dMzJqFrd4,375
 valar/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/classes/singleton_meta.py,sha256=aa9DZKG4Q9Cr67ZWrQ0yaFLrEjwFoTMQbDrpoIqgJZs,245
@@ -22,32 +22,32 @@ valar/dao/__init__.py,sha256=WGjXrnjmgcfOvtTYIVjtdsmh9mlc0IJCrZD2ScZ6Kx0,1335
 valar/dao/abstract.py,sha256=wBqSwfZkPrkhlGX7Ue__UmhblIllP87Bwt5G7shWX8E,2449
 valar/dao/engine.py,sha256=YM8YdhWmdO2BX_T51u9q64a2GAaVCdaYHBmOpCKM4sA,3023
 valar/dao/frame.py,sha256=9vDsJfB-Ztb4YN8Lt6pHJeF_RndqHsVeA_ygWIOgALM,7468
-valar/dao/meta.py,sha256=qEdTmdLrurp3CCMiGGtsDwVkXys6Rb5P0s_pru2w90A,4930
+valar/dao/meta.py,sha256=2o720rFqPdDxQ0yXW74zHU0m914PfKkzvLwPINtiRbg,5051
 valar/dao/mon_dao.py,sha256=TRrHUBdWBbOn47uV5ot_B2GcvWGoNpadJW_CkS0TEhc,3588
 valar/dao/mon_field.py,sha256=AJp-KS19oRiRHtMidC_1uTv2oCplqO4-bdKNDLMllWU,570
-valar/dao/orm_dao.py,sha256=yq3WoWsRQQCXKsX-jBMmyNBicpE22K1SkEldRbGPCHI,12322
+valar/dao/orm_dao.py,sha256=su3ah1lhpAlZj-yytPJpwfyzxCEcFIqI8t_sKv6GEJQ,12323
 valar/dao/orm_field.py,sha256=qADDGPM_EUVxP2VEGfnb2m97gYeSFxXt5fOmY2Df11c,4981
 valar/dao/query.py,sha256=7MqCdwjdhXWBWjEggHVFQfC0zlZH3TrwuVxKE7E0OKA,1049
 valar/dao/defaults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar/dao/defaults/field_keys_default.py,sha256=GVbtLC5g6dTKcewH2iqxZPdgvEo7SrgVuNjRU3wATDI,2141
+valar/dao/defaults/field_keys_default.py,sha256=ZgF-7s4yABz2uoInxuhg4uy9flbAR7btHDipJkqZj0M,2153
 valar/dao/defaults/field_values_default.py,sha256=6zKPqbw0vJKW_9ilj6PC7IgDyayiWjHsNc4y7aVzuNw,3552
 valar/dao/defaults/view_defaults.py,sha256=v2wEgiaXqEcM4lcjM2uV83cLA5EJZf6qHfLZ7YJikIg,572
 valar/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/models/__init__.py,sha256=ueEan3T0sdZRiKJJrIpwrRj_6BXdKfMecIqKIqOGnzA,44
-valar/models/auth.py,sha256=9jmtHZuqavo07f2_j_M8yWvZvetc3nlbf9CHGabWwig,1610
+valar/models/auth.py,sha256=ymjg4B-Xj9h0_DvyG8o1dlo7ahgpoqAUHxI814NMxvs,1621
 valar/models/core.py,sha256=ghtfs8uFH6SC0xvd-gkARr-FUWDXG0IMGWSuETOvecw,3695
 valar/models/frame.py,sha256=N13Bok7XNJDLoYDCpCIq8tEUktQVNerrLtk_U0KDJAE,851
 valar/models/meta.py,sha256=JPa-Rap2sdSYnG6Sk7_vFrg5flP3r6fAM7tRvlwb4Vw,4871
 valar/models/test.py,sha256=3yfyZHJgviEybV1NyN4Qs1BGKE3DvAtb_e4oFI2MVos,1319
 valar/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar/views/auth.py,sha256=HFGINsqH6mlrKyW7qPG0bVHnD4QZKdhxm5S3A2zYquA,4097
+valar/views/auth.py,sha256=KZiWPEcL_ZpF6DT99D3U3EdX0qjhOBFNAmnLWNJCXsU,4094
 valar/views/file.py,sha256=NxfbxT4EJRDFgXol06kD0vcSp4lN4BCVJ5wq43rh8Yg,1537
-valar/views/handler.py,sha256=C7-aRfoA6YvBVul9ioswMRSRvYmxslFF4ETTZBvjX6o,1417
+valar/views/handler.py,sha256=KlXWhVU-b_b5uxrUwQBHW7H4shSPy4NnXj6AINM_Joo,1619
 valar/views/meta.py,sha256=H3_raG-LEcfg1p_CBpluhPXBsLFQB_jtaI5CKGgYOKk,4774
 valar/views/password.py,sha256=O094qG8Sh4ilT_wpEMw4IZtAlcQjrDVcFD5BHaWKg2Q,2127
-valar/views/rest.py,sha256=HnmPR6_Q_NTtotaeDjfwIGwVG7eigtKBXfoaedUgar8,2349
-valar-1.3.4.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-1.3.4.dist-info/METADATA,sha256=-mBoDzgke_bRYzVTdiioCI4z8Yg2rGJRBeGCVWFUm00,5142
-valar-1.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-valar-1.3.4.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-1.3.4.dist-info/RECORD,,
+valar/views/rest.py,sha256=_KC2BPsAiTdYCDd3RPt5MTvaWiHd9W3PEx_3l7EwOWE,2383
+valar-1.3.5.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+valar-1.3.5.dist-info/METADATA,sha256=ZkkGNPXArta8QA3ANkeIrGa10uA8mSBFAT60J3bFgN4,5142
+valar-1.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+valar-1.3.5.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
+valar-1.3.5.dist-info/RECORD,,