valar 1.2.2__tar.gz → 1.2.4__tar.gz

{valar-1.2.2/src/valar.egg-info → valar-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.2.2
+Version: 1.2.4
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -16,7 +16,6 @@ Requires-Dist: pandas==2.2.3
 Requires-Dist: openpyxl==3.1.5
 Requires-Dist: deepmerge~=2.0
 Requires-Dist: minio==7.2.2
-Requires-Dist: valar-auto-mixins~=0.0.1
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -29,7 +28,7 @@ Dynamic: summary
 
 valar for morghulis
 
-# 1. install
+# 1. installation
 
 ```shell
 pip install valar
@@ -38,24 +37,16 @@ pip install valar
 # 1. settings
 
 ```python
-from django.core.management.utils import get_random_secret_key
 from pathlib import Path
 
-"""       Compulsory settings       """
-
+""" Compulsory settings """
 DEBUG = True
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-SECRET_KEY = get_random_secret_key()
-
-"""       Valar Options       """
+SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^'
 
-HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
-MONGO_URI = 'mongodb://root:19870120@121.41.111.175:27017/'
-MINIO_URL = "s3://admin:password@120.27.8.186:9000"
-
-"""       Minimized compulsory settings       """
+""" Minimized compulsory settings """
 
 DATABASES = {
     'default': {
@@ -63,29 +54,32 @@ DATABASES = {
         'NAME': BASE_DIR / 'db.sqlite3',
     }
 }
+
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
     'valar.apps.ValarConfig',
 ]
+
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
 ]
+
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels.layers.InMemoryChannelLayer"
     }
 }
+
 CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
 
-"""       Optional settings       """
-
+""" Optional settings """
 ALLOWED_HOSTS = ['*']
 LANGUAGE_CODE = 'en-us'
 TIME_ZONE = 'Asia/Shanghai'
@@ -96,6 +90,13 @@ SESSION_COOKIE_AGE = 60 * 60
 FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 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"
+
 ```
 
 # 2. asgi
@@ -104,6 +105,7 @@ DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 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({
@@ -113,39 +115,77 @@ application = ProtocolTypeRouter({
     ])
 })
 
+
 ```
 
 # 3. migrate
 
-no need, valar will auto migration
+- no need to makemigrations and migrate for valar, valar will auto migration
 
 # 4. root urls
 
-no need, valar will auto set urlpatterns
+no need to provide urls for val, valar will auto set urlpatterns for Morghulis (
+see https://www.npmjs.com/package/morghulis)
 
-# 5. how to use valar_channel
+# 5. how to register a channel handler for Morghulis async methods
 
-5.1 set HANDLER_MAPPING in settings
+## 5.1 create a handler
 
 ```python
-HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
+import time
+from valar.channels.sender import ValarChannelSender
+from valar.channels.counter import Counter
+
+
+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)
 ```
 
-5.2 create a handler
+### 5.2 create a dict (e.g. using the name 'channel_mapping') to save your handler
+
+- I'd like to put it in the root urls.py, you can put it anywhere
 
 ```python
-from valar.channels.sender import ValarSocketSender
+channel_mapping = {
+    'test': valar_test_handler,
+}
+```
 
+## 5.2 register the channel_mapping in the settings.py
 
-def test_handler(sender: ValarSocketSender):
-    data = sender.data
-    sender.load(data)
+```python
+HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
 ```
 
-5.3 register handler in channel_mapping
+### 5.4 you can copy the following codes to your urls.py
 
 ```python
+import json
+
+from django.urls import path
+
+from valar.classes.valar_response import ValarResponse
+from valar.views.handler import valar_test_handler
+
+
+def test_request(request):
+    body = json.loads(request.body)
+    return ValarResponse(body)
+
+
+urlpatterns = [
+    path('test', test_request),
+]
+
 channel_mapping = {
-    'test': test_handler,
+    'test_handler': valar_test_handler,
 }
+
 ```

{valar-1.2.2 → valar-1.2.4}/README.md

@@ -1,6 +1,6 @@
 valar for morghulis
 
-# 1. install
+# 1. installation
 
 ```shell
 pip install valar
@@ -9,24 +9,16 @@ pip install valar
 # 1. settings
 
 ```python
-from django.core.management.utils import get_random_secret_key
 from pathlib import Path
 
-"""       Compulsory settings       """
-
+""" Compulsory settings """
 DEBUG = True
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-SECRET_KEY = get_random_secret_key()
-
-"""       Valar Options       """
+SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^'
 
-HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
-MONGO_URI = 'mongodb://root:19870120@121.41.111.175:27017/'
-MINIO_URL = "s3://admin:password@120.27.8.186:9000"
-
-"""       Minimized compulsory settings       """
+""" Minimized compulsory settings """
 
 DATABASES = {
     'default': {
@@ -34,29 +26,32 @@ DATABASES = {
         'NAME': BASE_DIR / 'db.sqlite3',
     }
 }
+
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
     'valar.apps.ValarConfig',
 ]
+
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
 ]
+
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels.layers.InMemoryChannelLayer"
     }
 }
+
 CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
 
-"""       Optional settings       """
-
+""" Optional settings """
 ALLOWED_HOSTS = ['*']
 LANGUAGE_CODE = 'en-us'
 TIME_ZONE = 'Asia/Shanghai'
@@ -67,6 +62,13 @@ SESSION_COOKIE_AGE = 60 * 60
 FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 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"
+
 ```
 
 # 2. asgi
@@ -75,6 +77,7 @@ DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 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({
@@ -84,39 +87,77 @@ application = ProtocolTypeRouter({
     ])
 })
 
+
 ```
 
 # 3. migrate
 
-no need, valar will auto migration
+- no need to makemigrations and migrate for valar, valar will auto migration
 
 # 4. root urls
 
-no need, valar will auto set urlpatterns
+no need to provide urls for val, valar will auto set urlpatterns for Morghulis (
+see https://www.npmjs.com/package/morghulis)
 
-# 5. how to use valar_channel
+# 5. how to register a channel handler for Morghulis async methods
 
-5.1 set HANDLER_MAPPING in settings
+## 5.1 create a handler
 
 ```python
-HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
+import time
+from valar.channels.sender import ValarChannelSender
+from valar.channels.counter import Counter
+
+
+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)
 ```
 
-5.2 create a handler
+### 5.2 create a dict (e.g. using the name 'channel_mapping') to save your handler
+
+- I'd like to put it in the root urls.py, you can put it anywhere
 
 ```python
-from valar.channels.sender import ValarSocketSender
+channel_mapping = {
+    'test': valar_test_handler,
+}
+```
 
+## 5.2 register the channel_mapping in the settings.py
 
-def test_handler(sender: ValarSocketSender):
-    data = sender.data
-    sender.load(data)
+```python
+HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
 ```
 
-5.3 register handler in channel_mapping
+### 5.4 you can copy the following codes to your urls.py
 
 ```python
+import json
+
+from django.urls import path
+
+from valar.classes.valar_response import ValarResponse
+from valar.views.handler import valar_test_handler
+
+
+def test_request(request):
+    body = json.loads(request.body)
+    return ValarResponse(body)
+
+
+urlpatterns = [
+    path('test', test_request),
+]
+
 channel_mapping = {
-    'test': test_handler,
+    'test_handler': valar_test_handler,
 }
+
 ```

{valar-1.2.2 → valar-1.2.4}/setup.py

@@ -12,12 +12,11 @@ requires = [
     'openpyxl==3.1.5',
     'deepmerge~=2.0',
     'minio==7.2.2',
-    'valar-auto-mixins~=0.0.1'
 ]
 
 setup(
     name="valar",  # 包名
-    version="1.2.2",  # 版本号
+    version="1.2.4",  # 版本号
     author="LYP",  # 作者
     author_email="liuyinpeng@buaa.edu.cn",  # 邮箱
     description="valar for morghulis",  # 简短描述

{valar-1.2.2 → valar-1.2.4}/src/valar/apps.py

@@ -1,7 +1,8 @@
 import os
 from django.apps import AppConfig
-from valar_app_mixins.auto_migration_mixin import AutoMigrationMixin
-from valar_app_mixins.auto_urlpatterns_mixin import AutoUrlPatternsMixin
+
+from .classes.app_mixins.auto_migration_mixin import AutoMigrationMixin
+from .classes.app_mixins.auto_urlpatterns_mixin import AutoUrlPatternsMixin
 
 
 class ValarConfig(AutoMigrationMixin, AutoUrlPatternsMixin, AppConfig):

valar-1.2.4/src/valar/classes/app_mixins/auto_migration_mixin.py

@@ -0,0 +1,8 @@
+from django.core.management import call_command
+
+class AutoMigrationMixin:
+    name = None  # 子类必须提供
+    def auto_migrate(self):
+        app = self.name.replace('src.', '')
+        call_command('makemigrations', app, interactive=False, verbosity=0)
+        call_command('migrate', app, interactive=False, verbosity=0)

valar-1.2.4/src/valar/classes/app_mixins/auto_urlpatterns_mixin.py

@@ -0,0 +1,15 @@
+import importlib
+
+from django.conf import settings
+from django.urls import path, include
+
+
+class AutoUrlPatternsMixin:
+    name = None  # 子类必须提供
+
+    def set_url(self):
+        root = settings.ROOT_URLCONF
+        module = importlib.import_module(root)
+        urlpatterns: list = getattr(module, 'urlpatterns')
+        url = f'{self.name}.urls'
+        urlpatterns.append(path('valar/', include(url)))

{valar-1.2.2 → valar-1.2.4}/src/valar/dao/defaults/field_keys_default.py

@@ -39,7 +39,7 @@ meta_field_key_defaults = {
             ]
         ),
     },
-    'vtest.Vala': {
+    'valar.Valar': {
         'simple': ('pick', ['id', 'name', 'text_field', 'boolean_field', 'integer_field', 'float_field']),
         'date': ('pick', ['id', 'name', 'date_field', 'datetime_field', 'time_field']),
         'special': ('pick', ['id', 'name', 'text_field', 'json_field', 'file', 'm2m']),

valar-1.2.4/src/valar/models/__init__.py

@@ -0,0 +1 @@
+from . import core, frame, meta, test

valar-1.2.4/src/valar/models/test.py

@@ -0,0 +1,29 @@
+from django.db import models
+from .core import VModel, VTree
+
+
+class Valar(VModel):
+    text_field = models.TextField(null=True, verbose_name='Text Field')
+    boolean_field = models.BooleanField(null=True, verbose_name='Boolean Field')
+    integer_field = models.IntegerField(null=True, verbose_name='Integer Field')
+    float_field = models.FloatField(null=True, verbose_name='Float Field')
+    date_field = models.DateField(null=True, verbose_name='Date Field')
+    datetime_field = models.DateTimeField(null=True, verbose_name='Datetime Field')
+    time_field = models.TimeField(null=True, verbose_name='Time Field')
+    json_field = models.JSONField(null=True, verbose_name='Json Field')
+    file = models.FileField(null=True, verbose_name='File Field')
+
+
+class Vmo(VModel):
+    valar = models.ForeignKey(to=Valar, null=True, on_delete=models.CASCADE, verbose_name='Valar')
+    name = models.CharField(max_length=100, null=True, verbose_name='Name')
+
+
+class Voo(VModel):
+    valar = models.OneToOneField(to=Valar, null=True, on_delete=models.CASCADE, verbose_name='Valar')
+    name = models.CharField(max_length=100, null=True, verbose_name='Name')
+
+
+class Vmm(VTree):
+    valars = models.ManyToManyField(to=Valar, verbose_name='valars')
+    name = models.CharField(max_length=100, null=True, verbose_name='name')

{valar-1.2.2 → valar-1.2.4}/src/valar/views/handler.py

@@ -3,6 +3,19 @@ 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

{valar-1.2.2 → valar-1.2.4/src/valar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.2.2
+Version: 1.2.4
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP
@@ -16,7 +16,6 @@ Requires-Dist: pandas==2.2.3
 Requires-Dist: openpyxl==3.1.5
 Requires-Dist: deepmerge~=2.0
 Requires-Dist: minio==7.2.2
-Requires-Dist: valar-auto-mixins~=0.0.1
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -29,7 +28,7 @@ Dynamic: summary
 
 valar for morghulis
 
-# 1. install
+# 1. installation
 
 ```shell
 pip install valar
@@ -38,24 +37,16 @@ pip install valar
 # 1. settings
 
 ```python
-from django.core.management.utils import get_random_secret_key
 from pathlib import Path
 
-"""       Compulsory settings       """
-
+""" Compulsory settings """
 DEBUG = True
 BASE_DIR = Path(__file__).resolve().parent.parent
 BASE_APP = str(BASE_DIR.name)
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-SECRET_KEY = get_random_secret_key()
-
-"""       Valar Options       """
+SECRET_KEY = 'django-insecure-of@tfouoq^_f$l!yki#m=6j7)@&kjri$1_$!mca-=%7=+@f@5^'
 
-HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
-MONGO_URI = 'mongodb://root:19870120@121.41.111.175:27017/'
-MINIO_URL = "s3://admin:password@120.27.8.186:9000"
-
-"""       Minimized compulsory settings       """
+""" Minimized compulsory settings """
 
 DATABASES = {
     'default': {
@@ -63,29 +54,32 @@ DATABASES = {
         'NAME': BASE_DIR / 'db.sqlite3',
     }
 }
+
 INSTALLED_APPS = [
     'django.contrib.sessions',
     "corsheaders",
     'channels',
     'valar.apps.ValarConfig',
 ]
+
 MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
 ]
+
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels.layers.InMemoryChannelLayer"
     }
 }
+
 CORS_ORIGIN_ALLOW_ALL = True
 CORS_ALLOW_CREDENTIALS = True
 ROOT_URLCONF = "%s.urls" % BASE_APP
 ASGI_APPLICATION = "%s.asgi.application" % BASE_APP
 
-"""       Optional settings       """
-
+""" Optional settings """
 ALLOWED_HOSTS = ['*']
 LANGUAGE_CODE = 'en-us'
 TIME_ZONE = 'Asia/Shanghai'
@@ -96,6 +90,13 @@ SESSION_COOKIE_AGE = 60 * 60
 FILE_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 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"
+
 ```
 
 # 2. asgi
@@ -104,6 +105,7 @@ DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 100
 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({
@@ -113,39 +115,77 @@ application = ProtocolTypeRouter({
     ])
 })
 
+
 ```
 
 # 3. migrate
 
-no need, valar will auto migration
+- no need to makemigrations and migrate for valar, valar will auto migration
 
 # 4. root urls
 
-no need, valar will auto set urlpatterns
+no need to provide urls for val, valar will auto set urlpatterns for Morghulis (
+see https://www.npmjs.com/package/morghulis)
 
-# 5. how to use valar_channel
+# 5. how to register a channel handler for Morghulis async methods
 
-5.1 set HANDLER_MAPPING in settings
+## 5.1 create a handler
 
 ```python
-HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
+import time
+from valar.channels.sender import ValarChannelSender
+from valar.channels.counter import Counter
+
+
+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)
 ```
 
-5.2 create a handler
+### 5.2 create a dict (e.g. using the name 'channel_mapping') to save your handler
+
+- I'd like to put it in the root urls.py, you can put it anywhere
 
 ```python
-from valar.channels.sender import ValarSocketSender
+channel_mapping = {
+    'test': valar_test_handler,
+}
+```
 
+## 5.2 register the channel_mapping in the settings.py
 
-def test_handler(sender: ValarSocketSender):
-    data = sender.data
-    sender.load(data)
+```python
+HANDLER_MAPPING = "%s.urls.channel_mapping" % BASE_APP
 ```
 
-5.3 register handler in channel_mapping
+### 5.4 you can copy the following codes to your urls.py
 
 ```python
+import json
+
+from django.urls import path
+
+from valar.classes.valar_response import ValarResponse
+from valar.views.handler import valar_test_handler
+
+
+def test_request(request):
+    body = json.loads(request.body)
+    return ValarResponse(body)
+
+
+urlpatterns = [
+    path('test', test_request),
+]
+
 channel_mapping = {
-    'test': test_handler,
+    'test_handler': valar_test_handler,
 }
+
 ```