valar 1.3.14__py3-none-any.whl → 1.3.16__py3-none-any.whl

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/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/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/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/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.dist-info → valar-1.3.16.dist-info}/METADATA

@@ -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.dist-info → valar-1.3.16.dist-info}/RECORD

@@ -1,11 +1,11 @@
 valar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar/apps.py,sha256=_FYAPq33FTimVOeSpdp6eQ8bWZBtT-tfG9lgZqGC3O8,746
-valar/urls.py,sha256=iFBIFy9cvS4vR0rigbiuqeVMV8yAn2tUA798w2NUV8A,1412
+valar/apps.py,sha256=g7ayvb8tKf4hA5sdTi4kyMs9g_gfbemezZVVhF3qMGw,750
+valar/urls.py,sha256=jUx2-mRa10H-ip7Qa2jlunQfDB3HNhilMBeYysPDmYw,1421
 valar/auth/Authentication.py,sha256=8HCQ7U0SWMyIKgi5ZMXhVAkduaixJEF-RvNYM5IJpRA,1513
 valar/auth/Middleware.py,sha256=axg1UnA9NRY4Ug1WaR7i8uoq19OLEPnbtpRo1TSUllQ,1197
 valar/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/channels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valar/channels/consumer.py,sha256=fEP52wBHWccturn2QAkqOt9-_Fr8akiw95AoVc6dEMM,1395
+valar/channels/consumer.py,sha256=_013IDOzx4_VU55jo4wgZEunTJkWt22S9gbFMyYhm8Q,1481
 valar/channels/counter.py,sha256=K8aQUI1RiIrSOg3280tV102soC-ZC1qSRZvBXuwNYQ0,377
 valar/channels/executer.py,sha256=_Ap859nvxRl8Ln0BWMqhnL6cQNl-1NQSmMR4Akh-afY,333
 valar/channels/mapping.py,sha256=1SBqxEYO4epbRkSOUw5zm6gau15imz1gokrRTQcy94A,755
@@ -25,7 +25,7 @@ valar/dao/frame.py,sha256=cz2SWcRgKww0XVNZpCcPD3ACcW6q6piMba2StshT60M,7462
 valar/dao/meta.py,sha256=2o720rFqPdDxQ0yXW74zHU0m914PfKkzvLwPINtiRbg,5051
 valar/dao/mon_dao.py,sha256=OlbbEl8Pl-2ABoYTT9goj2q51mgxmWy9770ZQv3fB_s,3665
 valar/dao/mon_field.py,sha256=AJp-KS19oRiRHtMidC_1uTv2oCplqO4-bdKNDLMllWU,570
-valar/dao/orm_dao.py,sha256=vL68kHEPvGTVknpDv0USl36JrZVhgl4sya8z9ob-LVI,13907
+valar/dao/orm_dao.py,sha256=AwLduycRAN0uUwZtnK-IQ4j-PDV4E8W-YBg4EwTnFlY,13984
 valar/dao/orm_field.py,sha256=qADDGPM_EUVxP2VEGfnb2m97gYeSFxXt5fOmY2Df11c,4981
 valar/dao/query.py,sha256=7MqCdwjdhXWBWjEggHVFQfC0zlZH3TrwuVxKE7E0OKA,1049
 valar/dao/defaults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -39,7 +39,7 @@ valar/migrations/0004_remove_location_icon_remove_location_isleaf_and_more.py,sh
 valar/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/models/__init__.py,sha256=GMosgOi_o4kFIyReJg1qFqtbWSob5Mazd5FSGT_zfqI,55
 valar/models/auth.py,sha256=nxtLgJwBEgvYWXATcN-RN1e5LIzeUzK97jExUSjoIOk,1710
-valar/models/core.py,sha256=ghtfs8uFH6SC0xvd-gkARr-FUWDXG0IMGWSuETOvecw,3695
+valar/models/core.py,sha256=Tc1Mx1tIOXBy1PKtqrIu0pY12leSaKqfQFURmprEqYk,3772
 valar/models/frame.py,sha256=N13Bok7XNJDLoYDCpCIq8tEUktQVNerrLtk_U0KDJAE,851
 valar/models/indicator.py,sha256=vytY_CFFziUO44oMNB2SXOxs8PKlZQ6NgAiYp2MjK_I,1384
 valar/models/meta.py,sha256=sNCYJZKzx8JNbRidgRQunwIHYn9WXm89Svoc7-uutd4,4967
@@ -51,8 +51,8 @@ valar/views/handler.py,sha256=KlXWhVU-b_b5uxrUwQBHW7H4shSPy4NnXj6AINM_Joo,1619
 valar/views/meta.py,sha256=H3_raG-LEcfg1p_CBpluhPXBsLFQB_jtaI5CKGgYOKk,4774
 valar/views/password.py,sha256=O094qG8Sh4ilT_wpEMw4IZtAlcQjrDVcFD5BHaWKg2Q,2127
 valar/views/rest.py,sha256=iqBCXU105CyS-lQISqrTTD2LCGzXZNijhQfxM7Fc4_Q,2758
-valar-1.3.14.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-1.3.14.dist-info/METADATA,sha256=PlAwz-c2cy4TGH17oYPyprjLClaczG7Me_fauWJajJE,5173
-valar-1.3.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-valar-1.3.14.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-1.3.14.dist-info/RECORD,,
+valar-1.3.16.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+valar-1.3.16.dist-info/METADATA,sha256=Z0ohLpY4Pp87L2iCwvsxIR2rVmFws1lG6eCKVXRaVIc,5173
+valar-1.3.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+valar-1.3.16.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
+valar-1.3.16.dist-info/RECORD,,