valar 1.3.4__tar.gz → 1.3.6__tar.gz

{valar-1.3.4/src/valar.egg-info → valar-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.3.4
+Version: 1.3.6
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -17,6 +17,7 @@ Requires-Dist: openpyxl==3.1.5
 Requires-Dist: deepmerge~=2.0
 Requires-Dist: minio==7.2.2
 Requires-Dist: PyJWT~=2.10.1
+Requires-Dist: PyMySQL~=1.1.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{valar-1.3.4 → valar-1.3.6}/setup.py

@@ -3,6 +3,8 @@ from setuptools import setup, find_packages
 with open("README.md", "r", encoding="utf-8") as f:
     long_description = f.read()
 
+version = "1.3.6"
+
 requires = [
     'channels==3.0.3',
     'pymongo~=4.11.2',
@@ -12,11 +14,13 @@ requires = [
     'openpyxl==3.1.5',
     'deepmerge~=2.0',
     'minio==7.2.2',
-    'PyJWT~=2.10.1'
+    'PyJWT~=2.10.1',
+    'PyMySQL~=1.1.2'
 ]
+
 setup(
     name="valar",  # 包名
-    version="1.3.4",  # 版本号
+    version=version,  # 版本号
     author="LYP",  # 作者
     author_email="liuyinpeng@buaa.edu.cn",  # 邮箱
     description="valar for morghulis",  # 简短描述

{valar-1.3.4 → valar-1.3.6}/src/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)
 
 
@@ -54,7 +54,7 @@ class ValarChannelSender(Sender):
         self.__thread__ = None
         self.__lock__ = threading.Lock()
         self.__interval__ = interval
-        if self.__channel__.auth and not self.uid:
+        if self.__channel__.auth:
             payload, _ = validate(request)
             if payload is None:
                 raise Exception('Unauthorized!')
@@ -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-1.3.4 → valar-1.3.6}/src/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-1.3.4 → valar-1.3.6}/src/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-1.3.4 → valar-1.3.6}/src/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-1.3.4 → valar-1.3.6}/src/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-1.3.4 → valar-1.3.6}/src/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-1.3.6/src/valar/views/handler.py

@@ -0,0 +1,53 @@
+import traceback
+
+from ..channels.counter import Counter
+from ..channels.sender import ValarChannelSender
+from ..dao import Dao
+from ..dao.engine import ValarEngine
+
+import time
+
+
+def valar_test_handler(sender: ValarChannelSender):
+    data = sender.data
+    length = data.get('length', 100)
+    counter = Counter(length)
+    for i in range(length):
+        time.sleep(0.1)
+        tick = counter.tick()
+        tick.update({'name': 'test1'})
+        sender.load(tick)
+
+
+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}
+
+    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-1.3.4 → valar-1.3.6}/src/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 → valar-1.3.6/src/valar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.3.4
+Version: 1.3.6
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -17,6 +17,7 @@ Requires-Dist: openpyxl==3.1.5
 Requires-Dist: deepmerge~=2.0
 Requires-Dist: minio==7.2.2
 Requires-Dist: PyJWT~=2.10.1
+Requires-Dist: PyMySQL~=1.1.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{valar-1.3.4 → valar-1.3.6}/src/valar.egg-info/requires.txt

@@ -7,3 +7,4 @@ openpyxl==3.1.5
 deepmerge~=2.0
 minio==7.2.2
 PyJWT~=2.10.1
+PyMySQL~=1.1.2

valar-1.3.4/src/valar/views/handler.py

@@ -1,46 +0,0 @@
-from ..channels.counter import Counter
-from ..channels.sender import ValarChannelSender
-from ..dao import Dao
-from ..dao.engine import ValarEngine
-
-import time
-
-
-def valar_test_handler(sender: ValarChannelSender):
-    data = sender.data
-    length = data.get('length', 100)
-    counter = Counter(length)
-    for i in range(length):
-        time.sleep(0.1)
-        tick = counter.tick()
-        tick.update({'name': 'test1'})
-        sender.load(tick)
-
-
-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)