valar 1.3.21__tar.gz → 1.3.24__tar.gz

{valar-1.3.21/src/valar.egg-info → valar-1.3.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.3.21
+Version: 1.3.24
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -8,6 +8,7 @@ Author-email: liuyinpeng@buaa.edu.cn
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: autobahn==24.4.2
 Requires-Dist: channels==3.0.3
 Requires-Dist: pymongo~=4.11.2
 Requires-Dist: asgiref~=3.8.1
@@ -45,7 +46,7 @@ pip install valar
     - asgi.py
     - urls.py
 
-## 2.1 settings.py
+## 2.1 settings.py and ___init__.py
 
 ```python
 from pathlib import Path
@@ -61,8 +62,16 @@ SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+        'ENGINE': 'django.db.backends.mysql',  # 使用 MySQL
+        'NAME': 'vm_ets',  # 数据库名
+        'USER': 'root',  # 用户名
+        'PASSWORD': password,  # 密码
+        'HOST': 'localhost',  # 数据库地址，本机用127.0.0.1
+        'PORT': '3306',  # MySQL端口，默认3306
+        'OPTIONS': {
+            'connect_timeout': 5,  # 默认10秒，可以缩短
+            'charset': 'utf8mb4',
+        }
     }
 }
 
@@ -105,44 +114,58 @@ DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 """ Valar Options """
 
 HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
-MONGO_URI = 'mongodb://username:password@host:27017'
-MINIO_URL = "s3://username:password@host:9000"
-MINIO_ROOT = "https://host:9001"
+MONGO_URI = f'mongodb://root:{password}@{host}:27017/'
+MINIO_URL = f"s3://admin:{password}@{host}:9001"
+MINIO_ROOT = f"http://{host}:9001"
 
 """ Email Options """
+
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = 'xxx.xx.xx.xx'
-EMAIL_PORT = 465
-EMAIL_DOMAIN = 'http://xx.xx.xx'
-EMAIL_HOST_USER = "xxx@xx.xx.xx"
-EMAIL_HOST_PASSWORD = '*******'
-EMAIL_USE_TLS = False
-EMAIL_USE_SSL = True
+EMAIL_HOST = 'smtp.126.com'
+EMAIL_PORT = 25
+EMAIL_HOST_USER = "xxxx@126.com"
+EMAIL_HOST_PASSWORD = 'CGiKQh5FyQyupQYA'
+```
+
+```python
+import pymysql
+
+pymysql.install_as_MySQLdb()
+
 ```
 
 ## 2.2 asgi.py
 
 ```python
+import os
+from pathlib import Path
+
 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
 
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', '%s.settings' % Path(__file__).resolve().parent.parent.name)
 application = ProtocolTypeRouter({
     'http': get_asgi_application(),
     'websocket': URLRouter([
         re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
     ])
 })
-
-
 ```
 
 ## 2.3 urls.py
 
-- no need to provide urls for Valar, Valar will auto set urlpatterns for Morghulis (
-  see https://www.npmjs.com/package/morghulis)
+```python
+from django.urls import path, include
+
+urlpatterns = [
+    path('valar/', include('valar.urls')),
+]
+
+```
+
 - go to section 4 to see how to register channel handlers (a Vue - Django async communication tool) in urls.
 
 # 3. migrate

{valar-1.3.21 → valar-1.3.24}/README.md

@@ -15,7 +15,7 @@ pip install valar
     - asgi.py
     - urls.py
 
-## 2.1 settings.py
+## 2.1 settings.py and ___init__.py
 
 ```python
 from pathlib import Path
@@ -31,8 +31,16 @@ SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+        'ENGINE': 'django.db.backends.mysql',  # 使用 MySQL
+        'NAME': 'vm_ets',  # 数据库名
+        'USER': 'root',  # 用户名
+        'PASSWORD': password,  # 密码
+        'HOST': 'localhost',  # 数据库地址，本机用127.0.0.1
+        'PORT': '3306',  # MySQL端口，默认3306
+        'OPTIONS': {
+            'connect_timeout': 5,  # 默认10秒，可以缩短
+            'charset': 'utf8mb4',
+        }
     }
 }
 
@@ -75,44 +83,58 @@ DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 """ Valar Options """
 
 HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
-MONGO_URI = 'mongodb://username:password@host:27017'
-MINIO_URL = "s3://username:password@host:9000"
-MINIO_ROOT = "https://host:9001"
+MONGO_URI = f'mongodb://root:{password}@{host}:27017/'
+MINIO_URL = f"s3://admin:{password}@{host}:9001"
+MINIO_ROOT = f"http://{host}:9001"
 
 """ Email Options """
+
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = 'xxx.xx.xx.xx'
-EMAIL_PORT = 465
-EMAIL_DOMAIN = 'http://xx.xx.xx'
-EMAIL_HOST_USER = "xxx@xx.xx.xx"
-EMAIL_HOST_PASSWORD = '*******'
-EMAIL_USE_TLS = False
-EMAIL_USE_SSL = True
+EMAIL_HOST = 'smtp.126.com'
+EMAIL_PORT = 25
+EMAIL_HOST_USER = "xxxx@126.com"
+EMAIL_HOST_PASSWORD = 'CGiKQh5FyQyupQYA'
+```
+
+```python
+import pymysql
+
+pymysql.install_as_MySQLdb()
+
 ```
 
 ## 2.2 asgi.py
 
 ```python
+import os
+from pathlib import Path
+
 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
 
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', '%s.settings' % Path(__file__).resolve().parent.parent.name)
 application = ProtocolTypeRouter({
     'http': get_asgi_application(),
     'websocket': URLRouter([
         re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
     ])
 })
-
-
 ```
 
 ## 2.3 urls.py
 
-- no need to provide urls for Valar, Valar will auto set urlpatterns for Morghulis (
-  see https://www.npmjs.com/package/morghulis)
+```python
+from django.urls import path, include
+
+urlpatterns = [
+    path('valar/', include('valar.urls')),
+]
+
+```
+
 - go to section 4 to see how to register channel handlers (a Vue - Django async communication tool) in urls.
 
 # 3. migrate

{valar-1.3.21 → valar-1.3.24}/setup.py

@@ -7,9 +7,10 @@ from typing import Dict, Type
 with open("README.md", "r", encoding="utf-8") as f:
     long_description = f.read()
 
-version = "1.3.21"
+version = "1.3.24"
 
 requires = [
+    'autobahn==24.4.2',
     'channels==3.0.3',
     'pymongo~=4.11.2',
     'asgiref~=3.8.1',

{valar-1.3.21 → valar-1.3.24}/src/valar/channels/sender.py

@@ -92,6 +92,9 @@ class ValarChannelSender(Sender):
 
     def error(self, payload):
         self.__emit__('error', payload)
+        if self.__thread__:
+            self.__thread__.join()
+            self.__thread__ = None
 
     def __emit__(self, status='proceed', data=None):
         scope = 'broadcast' if self.__channel__.broadcast else 'client'

{valar-1.3.21 → valar-1.3.24}/src/valar/dao/orm_dao.py

@@ -1,5 +1,6 @@
 import datetime
 import json
+from urllib.parse import quote
 
 from django.core.paginator import Paginator
 from django.db.models.options import Options
@@ -317,6 +318,7 @@ def __get_custom_props__(entity, code='default'):
 def __set_simple_values__(fields, values):
     date_props_mapping = {}
     json_props = []
+    file_props = []
     for field in fields:
         if isinstance(field, OrmField):
             prop = field.prop
@@ -328,12 +330,16 @@ def __set_simple_values__(fields, values):
             date_props_mapping[prop] = __data_props_formatting__[domain]
         elif domain == 'JSONField':
             json_props.append(prop)
+        elif domain == 'FileField':
+            file_props.append(prop)
     for row in values:
         for prop, formating in date_props_mapping.items():
             if row.get(prop):
                 row[prop] = row[prop].strftime(formating)
         for prop in json_props:
             row[prop] = json.loads(row[prop]) if type(row[prop]) is str else row[prop]
+        for prop in file_props:
+            row[prop] = quote(row[prop], safe=":/")
 
     # def fun(field): return type(field).__name__ not in __referred_domains__ and field.name not in __omit_field_props__
     #

{valar-1.3.21 → valar-1.3.24}/src/valar/models/core.py

@@ -1,4 +1,5 @@
 import json
+from urllib.parse import quote
 
 from django.apps import AppConfig
 from django.db import models
@@ -48,7 +49,7 @@ class VModel(models.Model):
                 elif domain in [TimeField]:
                     value = value.strftime('%H:%M:%S')
                 elif domain in [FileField]:
-                    value = value.name
+                    value = quote(value.name, safe=":/")
                 elif domain in [BigAutoField]:
                     value = value
             data[prop] = value

{valar-1.3.21 → valar-1.3.24}/src/valar/views/handler.py

@@ -23,6 +23,7 @@ def valar_test_handler(sender: ValarChannelSender):
 def batch_handler(sender: ValarChannelSender):
     data = sender.data
     entity, db, method = data.get("entity"), data.get("db"), data.get("method")
+    print(entity, db, method)
     dao = Dao(entity, db)
     if method == 'save_many':
         array = data.get("data", [])
@@ -42,6 +43,6 @@ def batch_handler(sender: ValarChannelSender):
         minio = ValarEngine().get_minio_bucket(entity)
         for path in paths:
             minio.remove(path)
-            payload = counter.tick()
-            sender.load(payload)
+            # payload = counter.tick()
+            # sender.load(payload)
     return []

{valar-1.3.21 → valar-1.3.24/src/valar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.3.21
+Version: 1.3.24
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -8,6 +8,7 @@ Author-email: liuyinpeng@buaa.edu.cn
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: autobahn==24.4.2
 Requires-Dist: channels==3.0.3
 Requires-Dist: pymongo~=4.11.2
 Requires-Dist: asgiref~=3.8.1
@@ -45,7 +46,7 @@ pip install valar
     - asgi.py
     - urls.py
 
-## 2.1 settings.py
+## 2.1 settings.py and ___init__.py
 
 ```python
 from pathlib import Path
@@ -61,8 +62,16 @@ SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
+        'ENGINE': 'django.db.backends.mysql',  # 使用 MySQL
+        'NAME': 'vm_ets',  # 数据库名
+        'USER': 'root',  # 用户名
+        'PASSWORD': password,  # 密码
+        'HOST': 'localhost',  # 数据库地址，本机用127.0.0.1
+        'PORT': '3306',  # MySQL端口，默认3306
+        'OPTIONS': {
+            'connect_timeout': 5,  # 默认10秒，可以缩短
+            'charset': 'utf8mb4',
+        }
     }
 }
 
@@ -105,44 +114,58 @@ DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 """ Valar Options """
 
 HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
-MONGO_URI = 'mongodb://username:password@host:27017'
-MINIO_URL = "s3://username:password@host:9000"
-MINIO_ROOT = "https://host:9001"
+MONGO_URI = f'mongodb://root:{password}@{host}:27017/'
+MINIO_URL = f"s3://admin:{password}@{host}:9001"
+MINIO_ROOT = f"http://{host}:9001"
 
 """ Email Options """
+
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = 'xxx.xx.xx.xx'
-EMAIL_PORT = 465
-EMAIL_DOMAIN = 'http://xx.xx.xx'
-EMAIL_HOST_USER = "xxx@xx.xx.xx"
-EMAIL_HOST_PASSWORD = '*******'
-EMAIL_USE_TLS = False
-EMAIL_USE_SSL = True
+EMAIL_HOST = 'smtp.126.com'
+EMAIL_PORT = 25
+EMAIL_HOST_USER = "xxxx@126.com"
+EMAIL_HOST_PASSWORD = 'CGiKQh5FyQyupQYA'
+```
+
+```python
+import pymysql
+
+pymysql.install_as_MySQLdb()
+
 ```
 
 ## 2.2 asgi.py
 
 ```python
+import os
+from pathlib import Path
+
 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
 
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', '%s.settings' % Path(__file__).resolve().parent.parent.name)
 application = ProtocolTypeRouter({
     'http': get_asgi_application(),
     'websocket': URLRouter([
         re_path(r'(?P<client>\w+)/$', ValarConsumer.as_asgi()),
     ])
 })
-
-
 ```
 
 ## 2.3 urls.py
 
-- no need to provide urls for Valar, Valar will auto set urlpatterns for Morghulis (
-  see https://www.npmjs.com/package/morghulis)
+```python
+from django.urls import path, include
+
+urlpatterns = [
+    path('valar/', include('valar.urls')),
+]
+
+```
+
 - go to section 4 to see how to register channel handlers (a Vue - Django async communication tool) in urls.
 
 # 3. migrate

{valar-1.3.21 → valar-1.3.24}/src/valar.egg-info/requires.txt

@@ -1,3 +1,4 @@
+autobahn==24.4.2
 channels==3.0.3
 pymongo~=4.11.2
 asgiref~=3.8.1