valar 1.0.24__tar.gz → 1.0.26__tar.gz

{valar-1.0.24/src/valar.egg-info → valar-1.0.26}/PKG-INFO

@@ -1,7 +1,8 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.0.24
+Version: 1.0.26
 Summary: valar for morghulis
+Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
 Author-email: liuyinpeng@buaa.edu.cn
 Requires-Python: >=3.9
@@ -19,15 +20,22 @@ Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
+Dynamic: home-page
 Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
 valar for morghulis
+# 1. install
+```shell
+pip install valar
+```
+
 
-# settings
+# 1. settings
 ```python
+
 from pathlib import Path
 
 """ Compulsory settings """
@@ -35,9 +43,8 @@ DEBUG = True
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-
-
-""" DataSource """
+SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^'
+""" Minimized compulsory settings """
 
 DATABASES = {
     'default': {
@@ -46,34 +53,17 @@ DATABASES = {
     }
 }
 
-MONGO_SETTINGS = {
-    'host': '47.98.192.120',
-    'port': 27017,
-    "username": "admin",
-    "password": '19870120'
-}
-
-MINIO_SETTINGS = {
-    'endpoint': '10.134.10.92:9000',
-    'access_key': 'admin',
-    "secret_key": "19870120",
-    'secure': False
-}
-
-""" Minimized compulsory settings """
-
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'valar.data'
+    'valar.data',
 ]
 
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
-    'valar.Middleware'
 ]
 
 CHANNEL_LAYERS = {
@@ -86,8 +76,20 @@ CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
-VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 
+MONGO = {
+    'host': '<IP>',
+    'port': '<PORT>',
+    "username": "<USERNAME>",
+    "password": '<PASSWORD>'
+}
+
+MINIO = {
+    'endpoint': '<IP>:<PORT>',
+    'access_key': '<USERNAME>',
+    "secret_key": "<PASSWORD>",
+    'secure': False
+}
 
 """ Optional settings """
 # ALLOWED_HOSTS = ['*']
@@ -99,49 +101,57 @@ VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 # SESSION_COOKIE_AGE = 60 * 60
 # FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 # DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+
+```
+# 2. asgi
+```python
+from django.core.asgi import get_asgi_application
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.urls import re_path
+from valar.channels.consumer import ValarConsumer
+
+application = ProtocolTypeRouter({
+    'http': get_asgi_application(),
+    'websocket': URLRouter([
+        re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
+    ])
+})
+
 ```
 
-# root urls
+# 3. migrate
+```shell
+python manage.py makemigrations
+python manage.py migrate
+```
+
+
+# 4. root urls
 ```python
 from django.urls import path, include
 
-from valar.channels import ValarSocketSender
-from valar.channels.views import handel_channel
-
 urlpatterns = [
-    path('socket/<str:handler>', handel_channel),
     path('data/', include('valar.data.urls')),
 ]
 
-
-channel_handler_mapping = {
+channel_mapping = {
     # 'test': test_handler
 }
-
-# async def test_handler(data, sender: ValarSocketSender):
-#     # print(data, sender.handler, sender.client, sender.uid)
-#     await sender.to_users({'user': 15}, 15)
-#     for i in range(3):
-#         await sender.to_clients({'h': i},sender.client)
-
 ```
 
-
-# asgi
+# 5. channel_handler
 ```python
-from django.core.asgi import get_asgi_application
-from channels.routing import ProtocolTypeRouter, URLRouter
-from django.urls import re_path
 
-from valar.channels import ValarConsumer
+import time
 
-application = ProtocolTypeRouter({
-    'http': get_asgi_application(),
-     'websocket': URLRouter([
-        re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
-    ])
-})
+from valar.channels.sender import ValarSocketSender
+from valar.core.counter import Counter
 
+def test_handler(sender: ValarSocketSender):
+    data = sender.data
+    length = data.get('length',50)
+    counter = Counter(length)
+    for i in range(length):
+        time.sleep(0.1)
+        sender.to_clients(counter.tick() ,sender.client, wait=True)
 ```
-
-

{valar-1.0.24 → valar-1.0.26}/README.md

@@ -1,7 +1,13 @@
 valar for morghulis
+# 1. install
+```shell
+pip install valar
+```
+
 
-# settings
+# 1. settings
 ```python
+
 from pathlib import Path
 
 """ Compulsory settings """
@@ -9,9 +15,8 @@ DEBUG = True
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-
-
-""" DataSource """
+SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^'
+""" Minimized compulsory settings """
 
 DATABASES = {
     'default': {
@@ -20,34 +25,17 @@ DATABASES = {
     }
 }
 
-MONGO_SETTINGS = {
-    'host': '47.98.192.120',
-    'port': 27017,
-    "username": "admin",
-    "password": '19870120'
-}
-
-MINIO_SETTINGS = {
-    'endpoint': '10.134.10.92:9000',
-    'access_key': 'admin',
-    "secret_key": "19870120",
-    'secure': False
-}
-
-""" Minimized compulsory settings """
-
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'valar.data'
+    'valar.data',
 ]
 
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
-    'valar.Middleware'
 ]
 
 CHANNEL_LAYERS = {
@@ -60,8 +48,20 @@ CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
-VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 
+MONGO = {
+    'host': '<IP>',
+    'port': '<PORT>',
+    "username": "<USERNAME>",
+    "password": '<PASSWORD>'
+}
+
+MINIO = {
+    'endpoint': '<IP>:<PORT>',
+    'access_key': '<USERNAME>',
+    "secret_key": "<PASSWORD>",
+    'secure': False
+}
 
 """ Optional settings """
 # ALLOWED_HOSTS = ['*']
@@ -73,49 +73,57 @@ VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 # SESSION_COOKIE_AGE = 60 * 60
 # FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 # DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+
 ```
+# 2. asgi
+```python
+from django.core.asgi import get_asgi_application
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.urls import re_path
+from valar.channels.consumer import ValarConsumer
 
-# root urls
+application = ProtocolTypeRouter({
+    'http': get_asgi_application(),
+    'websocket': URLRouter([
+        re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
+    ])
+})
+
+```
+
+# 3. migrate
+```shell
+python manage.py makemigrations
+python manage.py migrate
+```
+
+
+# 4. root urls
 ```python
 from django.urls import path, include
 
-from valar.channels import ValarSocketSender
-from valar.channels.views import handel_channel
-
 urlpatterns = [
-    path('socket/<str:handler>', handel_channel),
     path('data/', include('valar.data.urls')),
 ]
 
-
-channel_handler_mapping = {
+channel_mapping = {
     # 'test': test_handler
 }
-
-# async def test_handler(data, sender: ValarSocketSender):
-#     # print(data, sender.handler, sender.client, sender.uid)
-#     await sender.to_users({'user': 15}, 15)
-#     for i in range(3):
-#         await sender.to_clients({'h': i},sender.client)
-
 ```
 
-
-# asgi
+# 5. channel_handler
 ```python
-from django.core.asgi import get_asgi_application
-from channels.routing import ProtocolTypeRouter, URLRouter
-from django.urls import re_path
-
-from valar.channels import ValarConsumer
-
-application = ProtocolTypeRouter({
-    'http': get_asgi_application(),
-     'websocket': URLRouter([
-        re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
-    ])
-})
 
-```
+import time
 
+from valar.channels.sender import ValarSocketSender
+from valar.core.counter import Counter
 
+def test_handler(sender: ValarSocketSender):
+    data = sender.data
+    length = data.get('length',50)
+    counter = Counter(length)
+    for i in range(length):
+        time.sleep(0.1)
+        sender.to_clients(counter.tick() ,sender.client, wait=True)
+```

{valar-1.0.24 → valar-1.0.26}/setup.py

@@ -16,13 +16,13 @@ requires = [
 
 setup(
     name="valar",  # 包名
-    version="1.0.24",  # 版本号
+    version="1.0.26",  # 版本号
     author="LYP",  # 作者
     author_email="liuyinpeng@buaa.edu.cn",  # 邮箱
     description="valar for morghulis",  # 简短描述
     long_description=long_description,  # 详细说明
     long_description_content_type="text/markdown",  # 详细说明使用标记类型
-    # url="https://github.com/",                     # 项目主页
+    url="https://gitee.com/GRIFFIN120/valar_dev",                     # 项目主页
     packages=find_packages(where="src"),  # 需要打包的部分
     package_dir={"": "src"},  # 设置src目录为根目录
     python_requires=">=3.9",  # 项目支持的Python版本

{valar-1.0.24 → valar-1.0.26}/src/valar/data/views/rest.py

@@ -71,11 +71,14 @@ def table(request, db, entity):
 def tree(request, db, entity):
     body = json.loads(request.body)
     conditions = body.get('conditions', [])
-    root = body.get('page')
+    root = body.get('root')
     dao = Dao(entity, db)
     query_set = dao.tree(root, conditions)
     results = dao.transform(query_set)
-    return ValarResponse(results)
+    return ValarResponse({
+        "results": results,
+        "root": root
+    })
 
 
 def meta_view(request, db, entity):

{valar-1.0.24 → valar-1.0.26/src/valar.egg-info}/PKG-INFO

@@ -1,7 +1,8 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.0.24
+Version: 1.0.26
 Summary: valar for morghulis
+Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
 Author-email: liuyinpeng@buaa.edu.cn
 Requires-Python: >=3.9
@@ -19,15 +20,22 @@ Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
+Dynamic: home-page
 Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
 valar for morghulis
+# 1. install
+```shell
+pip install valar
+```
+
 
-# settings
+# 1. settings
 ```python
+
 from pathlib import Path
 
 """ Compulsory settings """
@@ -35,9 +43,8 @@ DEBUG = True
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-
-
-""" DataSource """
+SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^'
+""" Minimized compulsory settings """
 
 DATABASES = {
     'default': {
@@ -46,34 +53,17 @@ DATABASES = {
     }
 }
 
-MONGO_SETTINGS = {
-    'host': '47.98.192.120',
-    'port': 27017,
-    "username": "admin",
-    "password": '19870120'
-}
-
-MINIO_SETTINGS = {
-    'endpoint': '10.134.10.92:9000',
-    'access_key': 'admin',
-    "secret_key": "19870120",
-    'secure': False
-}
-
-""" Minimized compulsory settings """
-
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
-    'valar.data'
+    'valar.data',
 ]
 
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
-    'valar.Middleware'
 ]
 
 CHANNEL_LAYERS = {
@@ -86,8 +76,20 @@ CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
-VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 
+MONGO = {
+    'host': '<IP>',
+    'port': '<PORT>',
+    "username": "<USERNAME>",
+    "password": '<PASSWORD>'
+}
+
+MINIO = {
+    'endpoint': '<IP>:<PORT>',
+    'access_key': '<USERNAME>',
+    "secret_key": "<PASSWORD>",
+    'secure': False
+}
 
 """ Optional settings """
 # ALLOWED_HOSTS = ['*']
@@ -99,49 +101,57 @@ VALAR_CHANNEL_HANDLER_MAPPING = "%s.urls.channel_handler_mapping" % BASE_APP
 # SESSION_COOKIE_AGE = 60 * 60
 # FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 # DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
+
+```
+# 2. asgi
+```python
+from django.core.asgi import get_asgi_application
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.urls import re_path
+from valar.channels.consumer import ValarConsumer
+
+application = ProtocolTypeRouter({
+    'http': get_asgi_application(),
+    'websocket': URLRouter([
+        re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
+    ])
+})
+
 ```
 
-# root urls
+# 3. migrate
+```shell
+python manage.py makemigrations
+python manage.py migrate
+```
+
+
+# 4. root urls
 ```python
 from django.urls import path, include
 
-from valar.channels import ValarSocketSender
-from valar.channels.views import handel_channel
-
 urlpatterns = [
-    path('socket/<str:handler>', handel_channel),
     path('data/', include('valar.data.urls')),
 ]
 
-
-channel_handler_mapping = {
+channel_mapping = {
     # 'test': test_handler
 }
-
-# async def test_handler(data, sender: ValarSocketSender):
-#     # print(data, sender.handler, sender.client, sender.uid)
-#     await sender.to_users({'user': 15}, 15)
-#     for i in range(3):
-#         await sender.to_clients({'h': i},sender.client)
-
 ```
 
-
-# asgi
+# 5. channel_handler
 ```python
-from django.core.asgi import get_asgi_application
-from channels.routing import ProtocolTypeRouter, URLRouter
-from django.urls import re_path
 
-from valar.channels import ValarConsumer
+import time
 
-application = ProtocolTypeRouter({
-    'http': get_asgi_application(),
-     'websocket': URLRouter([
-        re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
-    ])
-})
+from valar.channels.sender import ValarSocketSender
+from valar.core.counter import Counter
 
+def test_handler(sender: ValarSocketSender):
+    data = sender.data
+    length = data.get('length',50)
+    counter = Counter(length)
+    for i in range(length):
+        time.sleep(0.1)
+        sender.to_clients(counter.tick() ,sender.client, wait=True)
 ```
-
-