valar 1.3.13__py3-none-any.whl → 1.3.15__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of valar might be problematic. Click here for more details.

Files changed (8) hide show
  1. valar/dao/orm_dao.py +2 -0
  2. valar/models/core.py +2 -1
  3. valar/views/rest.py +2 -0
  4. {valar-1.3.13.dist-info → valar-1.3.15.dist-info}/METADATA +1 -1
  5. {valar-1.3.13.dist-info → valar-1.3.15.dist-info}/RECORD +8 -8
  6. {valar-1.3.13.dist-info → valar-1.3.15.dist-info}/WHEEL +0 -0
  7. {valar-1.3.13.dist-info → valar-1.3.15.dist-info}/licenses/LICENSE +0 -0
  8. {valar-1.3.13.dist-info → valar-1.3.15.dist-info}/top_level.txt +0 -0
valar/dao/orm_dao.py CHANGED
@@ -1,6 +1,7 @@
1
1
  import datetime
2
2
  import json
3
3
 
4
+ from django.conf import settings
4
5
  from django.core.paginator import Paginator
5
6
  from django.db.models.options import Options
6
7
 
@@ -331,6 +332,7 @@ def __set_simple_values__(fields, values):
331
332
  elif domain == 'JSONField':
332
333
  json_props.append(prop)
333
334
  for row in values:
335
+ row['$minio'] = settings.MINIO_ROOT
334
336
  for prop, formating in date_props_mapping.items():
335
337
  if row.get(prop):
336
338
  row[prop] = row[prop].strftime(formating)
valar/models/core.py CHANGED
@@ -1,6 +1,7 @@
1
1
  import json
2
2
 
3
3
  from django.apps import AppConfig
4
+ from django.conf import settings
4
5
  from django.db import models
5
6
  from django.db.models import ManyToOneRel, OneToOneRel, ManyToManyRel, ManyToManyField, UUIDField, FileField, \
6
7
  ForeignKey, OneToOneField, DateField, TimeField, DateTimeField, BigAutoField, JSONField
@@ -75,7 +76,7 @@ class VModel(models.Model):
75
76
  _set = getattr(self, accessor).all().order_by('-sort')
76
77
  data[prop] = [item.id for item in _set]
77
78
  data[f'{prop}_set'] = [item.json() for item in _set]
78
-
79
+ data['$minio'] = settings.MINIO_ROOT
79
80
  return data
80
81
 
81
82
 
valar/views/rest.py CHANGED
@@ -1,5 +1,6 @@
1
1
  import json
2
2
 
3
+ from django.conf import settings
3
4
  from django.db.models import QuerySet
4
5
 
5
6
  from .handler import batch_handler
@@ -55,6 +56,7 @@ def find_one(request, db, entity):
55
56
  dao = Dao(entity, db)
56
57
  bean = dao.find_one(_id)
57
58
  item = dao.serialize(bean)
59
+ item['$minio'] = settings.MINIO_ROOT
58
60
  return ValarResponse(item)
59
61
 
60
62
 
{valar-1.3.13.dist-info → valar-1.3.15.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: valar
3
- Version: 1.3.13
3
+ Version: 1.3.15
4
4
  Summary: valar for morghulis
5
5
  Home-page: https://gitee.com/GRIFFIN120/valar_dev
6
6
  Author: LYP
{valar-1.3.13.dist-info → valar-1.3.15.dist-info}/RECORD RENAMED
@@ -25,7 +25,7 @@ valar/dao/frame.py,sha256=cz2SWcRgKww0XVNZpCcPD3ACcW6q6piMba2StshT60M,7462
25
25
  valar/dao/meta.py,sha256=2o720rFqPdDxQ0yXW74zHU0m914PfKkzvLwPINtiRbg,5051
26
26
  valar/dao/mon_dao.py,sha256=OlbbEl8Pl-2ABoYTT9goj2q51mgxmWy9770ZQv3fB_s,3665
27
27
  valar/dao/mon_field.py,sha256=AJp-KS19oRiRHtMidC_1uTv2oCplqO4-bdKNDLMllWU,570
28
- valar/dao/orm_dao.py,sha256=vL68kHEPvGTVknpDv0USl36JrZVhgl4sya8z9ob-LVI,13907
28
+ valar/dao/orm_dao.py,sha256=AwLduycRAN0uUwZtnK-IQ4j-PDV4E8W-YBg4EwTnFlY,13984
29
29
  valar/dao/orm_field.py,sha256=qADDGPM_EUVxP2VEGfnb2m97gYeSFxXt5fOmY2Df11c,4981
30
30
  valar/dao/query.py,sha256=7MqCdwjdhXWBWjEggHVFQfC0zlZH3TrwuVxKE7E0OKA,1049
31
31
  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
39
39
  valar/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
40
40
  valar/models/__init__.py,sha256=GMosgOi_o4kFIyReJg1qFqtbWSob5Mazd5FSGT_zfqI,55
41
41
  valar/models/auth.py,sha256=nxtLgJwBEgvYWXATcN-RN1e5LIzeUzK97jExUSjoIOk,1710
42
- valar/models/core.py,sha256=ghtfs8uFH6SC0xvd-gkARr-FUWDXG0IMGWSuETOvecw,3695
42
+ valar/models/core.py,sha256=Tc1Mx1tIOXBy1PKtqrIu0pY12leSaKqfQFURmprEqYk,3772
43
43
  valar/models/frame.py,sha256=N13Bok7XNJDLoYDCpCIq8tEUktQVNerrLtk_U0KDJAE,851
44
44
  valar/models/indicator.py,sha256=vytY_CFFziUO44oMNB2SXOxs8PKlZQ6NgAiYp2MjK_I,1384
45
45
  valar/models/meta.py,sha256=sNCYJZKzx8JNbRidgRQunwIHYn9WXm89Svoc7-uutd4,4967
@@ -50,9 +50,9 @@ valar/views/file.py,sha256=MdsmuoauyPJTDb89_-mk57IFId5w8HJNpBVozBKAG7s,1538
50
50
  valar/views/handler.py,sha256=KlXWhVU-b_b5uxrUwQBHW7H4shSPy4NnXj6AINM_Joo,1619
51
51
  valar/views/meta.py,sha256=H3_raG-LEcfg1p_CBpluhPXBsLFQB_jtaI5CKGgYOKk,4774
52
52
  valar/views/password.py,sha256=O094qG8Sh4ilT_wpEMw4IZtAlcQjrDVcFD5BHaWKg2Q,2127
53
- valar/views/rest.py,sha256=GUuRDZLljxEwiZJwLfspwz9VYjTDEwYf-iRUsZnTCVQ,2684
54
- valar-1.3.13.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
55
- valar-1.3.13.dist-info/METADATA,sha256=dUYMndu2bZu2BaN-rw0ISzAhEy6tL7wCWCjHmjnBl6A,5173
56
- valar-1.3.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
57
- valar-1.3.13.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
58
- valar-1.3.13.dist-info/RECORD,,
53
+ valar/views/rest.py,sha256=iqBCXU105CyS-lQISqrTTD2LCGzXZNijhQfxM7Fc4_Q,2758
54
+ valar-1.3.15.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
55
+ valar-1.3.15.dist-info/METADATA,sha256=iYGf4wF7dj_FVNI8Cszt4eT3VphlltRMjg4ilstlMUg,5173
56
+ valar-1.3.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
57
+ valar-1.3.15.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
58
+ valar-1.3.15.dist-info/RECORD,,
{valar-1.3.13.dist-info → valar-1.3.15.dist-info}/WHEEL RENAMED
File without changes