valar 1.3.12__tar.gz → 1.3.13__tar.gz

{valar-1.3.12/src/valar.egg-info → valar-1.3.13}/PKG-INFO

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

{valar-1.3.12 → valar-1.3.13}/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.12"
+version = "1.3.13"
 
 requires = [
     'channels==3.0.3',

{valar-1.3.12 → valar-1.3.13}/src/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-1.3.12 → valar-1.3.13}/src/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-1.3.12 → valar-1.3.13}/src/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-1.3.12 → valar-1.3.13}/src/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-1.3.12 → valar-1.3.13}/src/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-1.3.12 → valar-1.3.13}/src/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-1.3.13/src/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-1.3.13/src/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-1.3.13/src/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-1.3.12 → valar-1.3.13}/src/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-1.3.12 → valar-1.3.13}/src/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-1.3.12 → valar-1.3.13}/src/valar/views/rest.py

@@ -15,6 +15,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)
@@ -76,9 +85,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 → valar-1.3.13/src/valar.egg-info}/PKG-INFO

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

{valar-1.3.12 → valar-1.3.13}/src/valar.egg-info/SOURCES.txt

@@ -41,6 +41,9 @@ src/valar/dao/defaults/field_keys_default.py
 src/valar/dao/defaults/field_values_default.py
 src/valar/dao/defaults/view_defaults.py
 src/valar/migrations/0001_initial.py
+src/valar/migrations/0002_location.py
+src/valar/migrations/0003_location_code_location_name_cn_location_name_en.py
+src/valar/migrations/0004_remove_location_icon_remove_location_isleaf_and_more.py
 src/valar/migrations/__init__.py
 src/valar/models/__init__.py
 src/valar/models/auth.py