valar 1.3.14__tar.gz → 1.3.16__tar.gz

valar-1.3.16/MANIFEST.in

@@ -0,0 +1,5 @@
+# 包含所有 __init__.py
+recursive-include src *migrations/__init__.py
+
+# 排除其他迁移文件
+prune src/*/migrations/*.py

{valar-1.3.14/src/valar.egg-info → valar-1.3.16}/PKG-INFO

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

{valar-1.3.14 → valar-1.3.16}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 with open("README.md", "r", encoding="utf-8") as f:
     long_description = f.read()
 
-version = "1.3.14"
+version = "1.3.16"
 
 requires = [
     'channels==3.0.3',
@@ -31,5 +31,5 @@ setup(
     package_dir={"": "src"},  # 设置src目录为根目录
     python_requires=">=3.9",  # 项目支持的Python版本
     install_requires=requires,  # 项目必须的依赖
-    include_package_data=False  # 是否包含非Python文件（如资源文件）
+    include_package_data=True
 )

{valar-1.3.14 → valar-1.3.16}/src/valar/apps.py

@@ -15,8 +15,8 @@ class ValarConfig(AutoMigrationMixin, AutoUrlPatternsMixin, AppConfig):
         if os.environ.get('RUN_MAIN') == 'true':
             try:
                 from .dao.frame import MetaFrame
-                getattr(super(), 'set_url', None)()
-                getattr(super(), 'auto_migrate', None)()
+                # getattr(super(), 'set_url', None)()
+                # getattr(super(), 'auto_migrate', None)()
                 MetaFrame()
             except Exception as e:
                 traceback.print_exc()

{valar-1.3.14 → valar-1.3.16}/src/valar/channels/consumer.py

@@ -18,7 +18,11 @@ class ValarConsumer(AsyncJsonWebsocketConsumer):
 
     async def disconnect(self, code):
         await self.channel_layer.group_discard(VALAR_CHANNEL_GROUP, self.channel_name)
-        await self.close(code)
+        try:
+            await self.close(code)
+        except Exception as e:
+            print(e)
+            pass
 
     async def receive_json(self, data, *args, **kwargs):
         pass

{valar-1.3.14 → valar-1.3.16}/src/valar/dao/orm_dao.py

@@ -1,6 +1,7 @@
 import datetime
 import json
 
+from django.conf import settings
 from django.core.paginator import Paginator
 from django.db.models.options import Options
 
@@ -331,6 +332,7 @@ def __set_simple_values__(fields, values):
         elif domain == 'JSONField':
             json_props.append(prop)
     for row in values:
+        row['$minio'] = settings.MINIO_ROOT
         for prop, formating in date_props_mapping.items():
             if row.get(prop):
                 row[prop] = row[prop].strftime(formating)

{valar-1.3.14 → valar-1.3.16}/src/valar/models/core.py

@@ -1,6 +1,7 @@
 import json
 
 from django.apps import AppConfig
+from django.conf import settings
 from django.db import models
 from django.db.models import ManyToOneRel, OneToOneRel, ManyToManyRel, ManyToManyField, UUIDField, FileField, \
     ForeignKey, OneToOneField, DateField, TimeField, DateTimeField, BigAutoField, JSONField
@@ -75,7 +76,7 @@ class VModel(models.Model):
                 _set = getattr(self, accessor).all().order_by('-sort')
                 data[prop] = [item.id for item in _set]
                 data[f'{prop}_set'] = [item.json() for item in _set]
-
+        data['$minio'] = settings.MINIO_ROOT
         return data
 
 

{valar-1.3.14 → valar-1.3.16}/src/valar/urls.py

@@ -1,6 +1,6 @@
 from .channels.views import handel_channel
 from .views import rest, meta, file, auth, password
-from django.urls import path
+from django.urls import path, re_path
 
 urlpatterns = [
     path('socket/<str:handler>', handel_channel),

{valar-1.3.14 → valar-1.3.16/src/valar.egg-info}/PKG-INFO

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

{valar-1.3.14 → valar-1.3.16}/src/valar.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 LICENSE
+MANIFEST.in
 README.md
 setup.py
 src/valar/__init__.py