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

valar/classes/valar_minio.py

@@ -47,6 +47,14 @@ class ValarMinio:
         )
         return BytesIO(ret.read())
 
+    def read_path(self, path) -> BytesIO:
+        bucket_name, object_name = path.split('/')
+        ret: BaseHTTPResponse = self.client.get_object(
+            bucket_name=bucket_name,
+            object_name=object_name
+        )
+        return BytesIO(ret.read())
+
     def __generate_policy__(self):
         return json.dumps({
             "Version": "2012-10-17",

valar/dao/__init__.py

@@ -18,15 +18,15 @@ class Dao(AbstractDao):
         self.fields = self.dao.fields
         self.manager = self.dao.manager
 
+    def insert_one(self, item):
+        return self.dao.insert_one(item)
+
+    def update_one(self, item):
+        return self.dao.update_one(item)
+
     def save_many(self, array: list):
-        warnings.warn(
-            "save_many 已弃用，请使用 insert_one 或 update_one 替代。",
-            DeprecationWarning,
-            stacklevel=2
-        )
         return self.dao.save_many(array)
 
-
     def save_one(self, item):
         return self.dao.save_one(item)
 

valar/dao/abstract.py

@@ -49,6 +49,14 @@ class AbstractDao(ABC):
     def save_one(self, item):
         pass
 
+    @abstractmethod
+    def insert_one(self, item):
+        pass
+
+    @abstractmethod
+    def update_one(self, item):
+        pass
+
     @abstractmethod
     def save_many(self, array: list):
         pass

valar/dao/mon_dao.py

@@ -19,6 +19,12 @@ domain_mapping = {
 
 class MonDao(AbstractDao):
 
+    def insert_one(self, item):
+        pass
+
+    def update_one(self, item):
+        pass
+
     def __init__(self, entity):
         self.db = 'mon'
         self.entity = entity

valar/dao/orm_dao.py

@@ -50,7 +50,18 @@ class OrmDao(AbstractDao):
             props.append('id')
         return list(query_set.values(*props))
 
-    def save_one(self, item):
+    def insert_one(self, item):
+        print(item)
+        return self.__save__(item)
+
+    def update_one(self, item):
+        pass
+
+    def save_one(self, item: dict):
+        item.update({'saved': True})
+        return self.__save__(item)
+
+    def __save__(self, item: dict):
         oid, simple_item, complex_item = self.__detach_item__(item)
         query_set = self.manager.filter(id=oid) if oid else []
         if len(query_set):

valar/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.24 on 2025-09-19 15:34
+# Generated by Django 4.2.24 on 2025-09-21 19:05
 
 from django.db import migrations, models
 import django.db.models.deletion

valar/migrations/0002_location.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.2.24 on 2025-09-22 11:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Location',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sort', models.BigIntegerField(null=True, verbose_name='序号')),
+                ('create_time', models.DateTimeField(auto_now_add=True, null=True, verbose_name='创建时间')),
+                ('modify_time', models.DateTimeField(auto_now=True, null=True, verbose_name='修改时间')),
+                ('disabled', models.BooleanField(default=False, verbose_name='禁用')),
+                ('saved', models.BooleanField(default=False, verbose_name='已保存')),
+                ('pid', models.IntegerField(default=0, verbose_name='父节点')),
+                ('isLeaf', models.BooleanField(default=False, verbose_name='叶子节点')),
+                ('icon', models.CharField(max_length=255, null=True, verbose_name='图标')),
+                ('scope', models.CharField(max_length=100, null=True)),
+                ('name', models.CharField(max_length=100, null=True)),
+            ],
+            options={
+                'verbose_name': '指标集',
+            },
+        ),
+    ]

valar/migrations/0003_location_code_location_name_cn_location_name_en.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.24 on 2025-09-22 11:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0002_location'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='location',
+            name='code',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='location',
+            name='name_cn',
+            field=models.CharField(max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='location',
+            name='name_en',
+            field=models.CharField(max_length=100, null=True),
+        ),
+    ]

valar/migrations/0004_remove_location_icon_remove_location_isleaf_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.24 on 2025-09-22 11:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valar', '0003_location_code_location_name_cn_location_name_en'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='location',
+            name='icon',
+        ),
+        migrations.RemoveField(
+            model_name='location',
+            name='isLeaf',
+        ),
+        migrations.RemoveField(
+            model_name='location',
+            name='pid',
+        ),
+    ]

valar/models/indicator.py

@@ -22,3 +22,14 @@ class Indicator(VModel):
 
     class Meta:
         verbose_name = '指标项'
+
+
+class Location(VModel):
+    scope = models.CharField(max_length=100, null=True)
+    code = models.CharField(max_length=100, null=True)
+    name = models.CharField(max_length=100, null=True)
+    name_cn = models.CharField(max_length=100, null=True)
+    name_en = models.CharField(max_length=100, null=True)
+
+    class Meta:
+        verbose_name = '指标集'

valar/urls.py

@@ -6,6 +6,7 @@ urlpatterns = [
     path('socket/<str:handler>', handel_channel),
     path('batch', rest.batch),
     path('<str:db>/<str:entity>/save_one', rest.save_one),
+    path('<str:db>/<str:entity>/insert_one', rest.insert_one),
     path('<str:db>/<str:entity>/delete_one', rest.delete_one),
     path('<str:db>/<str:entity>/find_one', rest.find_one),
     path('<str:db>/<str:entity>/find', rest.find),

valar/views/rest.py

@@ -1,5 +1,6 @@
 import json
 
+from django.conf import settings
 from django.db.models import QuerySet
 
 from .handler import batch_handler
@@ -15,6 +16,15 @@ async def batch(request):
     return ValarResponse(True)
 
 
+def insert_one(request, db, entity):
+    item = json.loads(request.body)
+    dao = Dao(entity, db)
+    print(item)
+    bean = dao.insert_one(item)
+    item = dao.serialize(bean)
+    return ValarResponse(item)
+
+
 def save_one(request, db, entity):
     item = json.loads(request.body)
     dao = Dao(entity, db)
@@ -46,6 +56,7 @@ def find_one(request, db, entity):
     dao = Dao(entity, db)
     bean = dao.find_one(_id)
     item = dao.serialize(bean)
+    item['$minio'] = settings.MINIO_ROOT
     return ValarResponse(item)
 
 
@@ -76,9 +87,8 @@ def search(request, db, entity):
     code = body.get('code', 'default')
     conditions = body.get('conditions')
     dao = Dao(entity, db)
-    dao.save_one({})
     qs, _ = dao.find(conditions)
-    # if db == 'orm': qs.filter(saved=False).delete()
+    if db == 'orm': qs.filter(saved=False).delete()
 
     if _type == 'tree':
         query_set = dao.tree(root, conditions)

{valar-1.3.12.dist-info → valar-1.3.14.dist-info}/METADATA

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

{valar-1.3.12.dist-info → valar-1.3.14.dist-info}/RECORD

@@ -1,6 +1,6 @@
 valar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/apps.py,sha256=_FYAPq33FTimVOeSpdp6eQ8bWZBtT-tfG9lgZqGC3O8,746
-valar/urls.py,sha256=cKmlVu8TttqM8mVGmwE442DQHUs3zsubtUadyur_ofU,1349
+valar/urls.py,sha256=iFBIFy9cvS4vR0rigbiuqeVMV8yAn2tUA798w2NUV8A,1412
 valar/auth/Authentication.py,sha256=8HCQ7U0SWMyIKgi5ZMXhVAkduaixJEF-RvNYM5IJpRA,1513
 valar/auth/Middleware.py,sha256=axg1UnA9NRY4Ug1WaR7i8uoq19OLEPnbtpRo1TSUllQ,1197
 valar/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,32 +13,35 @@ valar/channels/sender.py,sha256=6TJR5RlG9K44chhSUC34gvl1G2MgjRxnRpz9lGrs0rU,3852
 valar/channels/views.py,sha256=4J_f-Bn3VR0o0spOa9D52aRcxMRZ0YYgo-dMzJqFrd4,375
 valar/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/classes/singleton_meta.py,sha256=aa9DZKG4Q9Cr67ZWrQ0yaFLrEjwFoTMQbDrpoIqgJZs,245
-valar/classes/valar_minio.py,sha256=acQQbSCBPu1YiAVxU2k-l8BJ_b7JBox3hyt7j7s9MR4,2758
+valar/classes/valar_minio.py,sha256=JkY2f_1U8oqOkBVq7NYCSGhZT5ZoLH1X92RxRm2RYxY,3026
 valar/classes/valar_response.py,sha256=C7jfWZFy5jPWioIHbq7XprzoCfNy1slmhcaQw7KBIp4,310
 valar/classes/app_mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 valar/classes/app_mixins/auto_migration_mixin.py,sha256=lHKY5UnWyDVuEntmiJxF2AcoHFGwa4IRTygGW3zfO7w,330
 valar/classes/app_mixins/auto_urlpatterns_mixin.py,sha256=FX-t-TJWawXyS2r6jbj_IrJBpzwMbWzIjyK6PsHL6XE,415
-valar/dao/__init__.py,sha256=FeUpYTU61jaPhTF2isZVs3Xs3Bw0e4P2NllM4H2PnAI,1551
-valar/dao/abstract.py,sha256=3_9lS4bShAlrp_nv0wbBGrLVDnkvaeH2FxJTcJT-orA,2434
+valar/dao/__init__.py,sha256=HRpBnsBSNgh2IHGg6zjOnNOkKETbSiuo1Qi6BG7wR2c,1525
+valar/dao/abstract.py,sha256=6GurHbMmNTjLVVRHtv3zvZqxDS7lBjGW68RuszneS8c,2566
 valar/dao/engine.py,sha256=wiMOGr_RQYAzLr91C0WkxCQMMlJ-qsZf3IV-NlEwf04,3058
 valar/dao/frame.py,sha256=cz2SWcRgKww0XVNZpCcPD3ACcW6q6piMba2StshT60M,7462
 valar/dao/meta.py,sha256=2o720rFqPdDxQ0yXW74zHU0m914PfKkzvLwPINtiRbg,5051
-valar/dao/mon_dao.py,sha256=dyBM3B8qbcJrbtnTA6SabrtMKQnWkdK56N4u7uYdN7Y,3573
+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=cspQs3Qis5ZuVQ13537l5-9wo3c9uRpAiXVf1Jw6-jM,13658
+valar/dao/orm_dao.py,sha256=vL68kHEPvGTVknpDv0USl36JrZVhgl4sya8z9ob-LVI,13907
 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
 valar/dao/defaults/field_keys_default.py,sha256=SegJzDXn7aHyIyIGyFIHbOltSWA1-JWwkQiaOva4WUY,2262
 valar/dao/defaults/field_values_default.py,sha256=ZyiN0f2nCqewEMfXWjwv6Yeq7gK16EBggTMU6s0pF40,3915
 valar/dao/defaults/view_defaults.py,sha256=v2wEgiaXqEcM4lcjM2uV83cLA5EJZf6qHfLZ7YJikIg,572
-valar/migrations/0001_initial.py,sha256=TYfWv9uH2y-uC5EwzbzEhZeex5cDhwCC94jLi2mkGjk,23345
+valar/migrations/0001_initial.py,sha256=eAW7jCXafKG-uWwsQVb_8JWGBytj75Yl2grs4_nlVmY,23345
+valar/migrations/0002_location.py,sha256=gfqmwADFFLyXL20EYWNxYtXAF7ZdTfOAQtd4gz3hrKw,1428
+valar/migrations/0003_location_code_location_name_cn_location_name_en.py,sha256=TQgGFF5t5Ykncs7J5N9Bq0MEg5plkJ83wss2Cos0Tug,717
+valar/migrations/0004_remove_location_icon_remove_location_isleaf_and_more.py,sha256=ELpOV-LdiOq6ATcx36-U_ji-ioDnY0tWv8zl1jWsZaQ,563
 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/frame.py,sha256=N13Bok7XNJDLoYDCpCIq8tEUktQVNerrLtk_U0KDJAE,851
-valar/models/indicator.py,sha256=hkit14T6P5GnnKJq75QijvCaab82VFRyAS4-Sto-rU0,1024
+valar/models/indicator.py,sha256=vytY_CFFziUO44oMNB2SXOxs8PKlZQ6NgAiYp2MjK_I,1384
 valar/models/meta.py,sha256=sNCYJZKzx8JNbRidgRQunwIHYn9WXm89Svoc7-uutd4,4967
 valar/models/test.py,sha256=3yfyZHJgviEybV1NyN4Qs1BGKE3DvAtb_e4oFI2MVos,1319
 valar/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -47,9 +50,9 @@ valar/views/file.py,sha256=MdsmuoauyPJTDb89_-mk57IFId5w8HJNpBVozBKAG7s,1538
 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=4ZUnroVbOebuFXH5f_Tarnc0QFtsQv31D3id1roHSec,2496
-valar-1.3.12.dist-info/licenses/LICENSE,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-valar-1.3.12.dist-info/METADATA,sha256=ECyqmiFTgMYElBu4F69ogWnWWynyuyzdyNq28jsLFxo,5173
-valar-1.3.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-valar-1.3.12.dist-info/top_level.txt,sha256=TVi6VcvvYfVYZ_WnUVwT4psI8p6inaP3KfmQEWrrvYg,6
-valar-1.3.12.dist-info/RECORD,,
+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,,