valar 0.0.2__tar.gz → 0.0.4__tar.gz

{valar-0.0.2/valar.egg-info → valar-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: valar
-Version: 0.0.2
+Version: 0.0.4
 Summary: Valar Margulis
 Home-page: https://gitee.com/GRIFFIN120/valar
 Author: 刘寅鹏

{valar-0.0.2 → valar-0.0.4}/README.md

@@ -5,3 +5,6 @@ write readme latter.
 python setup.py sdist
 twine upload dist/*
 
+pip install --upgrade pip 
+pip install --upgrade valar
+

{valar-0.0.2 → valar-0.0.4}/setup.py

@@ -1,12 +1,16 @@
 from setuptools import setup
+NAME = 'valar'
+VERSION = '0.0.4'
 
 setup(
-    name='valar',
-    version='0.0.2',
-    packages=['vala'],
+    name=NAME,
+    version=VERSION,
+    packages=['valar_base','valar_common','valar_meta'],
     url='https://gitee.com/GRIFFIN120/valar',
     license='MIT License',
     author='刘寅鹏',
     author_email='liuyinpeng@buaa.edu.cn',
     description='Valar Margulis'
 )
+
+print(f'twine upload dist/{NAME}-{VERSION}.tar.gz ')

{valar-0.0.2 → valar-0.0.4/valar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: valar
-Version: 0.0.2
+Version: 0.0.4
 Summary: Valar Margulis
 Home-page: https://gitee.com/GRIFFIN120/valar
 Author: 刘寅鹏

valar-0.0.4/valar.egg-info/SOURCES.txt

@@ -0,0 +1,14 @@
+LICENSE.txt
+README.md
+setup.py
+valar.egg-info/PKG-INFO
+valar.egg-info/SOURCES.txt
+valar.egg-info/dependency_links.txt
+valar.egg-info/top_level.txt
+valar_base/__init__.py
+valar_base/apps.py
+valar_base/models.py
+valar_base/network.py
+valar_base/urls.py
+valar_common/__init__.py
+valar_meta/__init__.py

valar-0.0.4/valar.egg-info/top_level.txt

@@ -0,0 +1,3 @@
+valar_base
+valar_common
+valar_meta

valar-0.0.4/valar_base/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class BaseConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'valar_base'

valar-0.0.4/valar_base/models.py

@@ -0,0 +1,93 @@
+import uuid
+
+from django.db import models
+from django.db.models.fields.files import FieldFile
+
+'''
+基类，配合Dao使用
+'''
+
+
+class BaseModel(models.Model):
+    uuid = models.UUIDField(default=uuid.uuid4, editable=False, verbose_name='标识')
+    sort = models.IntegerField(null=True, unique=True, verbose_name='序号')
+    name = models.CharField(max_length=255, null=True, verbose_name='名称')
+    description = models.TextField(null=True, verbose_name='描述')
+    date = models.DateField(null=True, verbose_name='日期')
+    enable = models.BooleanField(default=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='修改时间')
+    _enable = models.BooleanField(default=True)
+
+    class Meta:
+        abstract = True
+
+    @property
+    def mapping(self):
+        mapping = {}
+        for field in self._meta.get_fields():
+            prop = field.name
+            domain = type(field).__name__
+            mapping[prop] = {'prop': prop, 'domain': domain, 'field': field}
+        return mapping
+
+    """
+        只序列化基础字段：能用value_from_object直接取出的字段。与values等价
+    """
+
+    @property
+    def json(self, fields={}):
+        mapping = self.mapping
+        excludes = ['ManyToOneRel', 'OneToOneRel', 'ManyToManyRel', 'ManyToManyField', 'UUIDField']
+        mapping = {prop: mapping[prop] for prop in mapping if mapping[prop]['domain'] not in excludes}
+        data = {}
+        for prop in mapping:
+            field = mapping[prop]['field']
+            domain = mapping[prop]['domain']
+            value = field.value_from_object(self)
+            if domain in ['ForeignKey', 'OneToOneField']:
+                prop = prop + '_id'
+            elif domain in ['DateField']:
+                value = value.strftime('%Y-%m-%d') if value else None
+            elif domain in ['DateTimeField']:
+                value = value.strftime('%Y-%m-%d %H:%M:%S') if value else None
+            elif domain in ['FileField']:
+                file: FieldFile = value
+                value = file.name
+            # elif domain in ['BigAutoField']:
+            #     value = str(value)
+            data[prop] = value
+        return data
+
+    @property
+    def full(self):
+        data = self.json
+        mapping = self.mapping
+        excludes = ['ManyToManyField', 'ManyToManyRel', 'ForeignKey', 'ManyToOneRel', 'OneToOneField', 'OneToOneRel']
+        mapping = {prop: mapping[prop] for prop in mapping if mapping[prop]['domain'] in excludes}
+        for prop in mapping:
+            field = mapping[prop]['field']
+            domain = mapping[prop]['domain']
+            if domain in ['ForeignKey', 'OneToOneField', 'OneToOneRel']:
+                if hasattr(self, prop):
+                    bean: BaseModel = getattr(self, prop)
+                    data[prop] = bean.json if bean else None
+            elif domain in ['ManyToManyField', 'ManyToManyRel', 'ManyToOneRel']:
+                accessor = prop if domain == 'ManyToManyField' else field.get_accessor_name()
+                try:
+                    _set = getattr(self, accessor).all()
+                    data[prop] = [item.id for item in _set]
+                    data[f'{prop}_set'] = [item.json for item in _set]
+                except Exception as e:
+                    print(e)
+                    pass
+        return data
+
+
+class BaseTree(BaseModel):
+    pid = models.IntegerField(null=False, default=0, verbose_name='父节点')
+    node_type = models.IntegerField(null=False, default=1, verbose_name='节点类型')  # 0 中间节点 1 末端节点
+    icon = models.CharField(max_length=255, null=True, verbose_name='图标')
+
+    class Meta:
+        abstract = True

valar-0.0.4/valar_base/network.py

@@ -0,0 +1,11 @@
+from django.http import JsonResponse
+
+
+class ValaResponse(JsonResponse):
+    def __init__(self, data, message='', _type='info'):
+        data = {
+            'result': data,
+            'message': message,
+            'type': _type
+        }
+        super(ValaResponse, self).__init__(data, safe=False)

valar-0.0.4/valar_base/urls.py

@@ -0,0 +1,8 @@
+from django.urls import path
+
+from views import search
+
+urlpatterns = [
+
+    path("get/<int:_id>", search.get),
+]

valar-0.0.2/vala/dao.py

@@ -1,2 +0,0 @@
-def exp():
-    print('hello vala!!!!!')

valar-0.0.2/valar.egg-info/SOURCES.txt

@@ -1,9 +0,0 @@
-LICENSE.txt
-README.md
-setup.py
-vala/__init__.py
-vala/dao.py
-valar.egg-info/PKG-INFO
-valar.egg-info/SOURCES.txt
-valar.egg-info/dependency_links.txt
-valar.egg-info/top_level.txt

valar-0.0.2/valar.egg-info/top_level.txt

@@ -1 +0,0 @@
-vala