buildz 0.6.36__tar.gz → 0.6.37__tar.gz

{buildz-0.6.36/buildz.egg-info → buildz-0.6.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.36
+Version: 0.6.37
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.6.36 → buildz-0.6.37}/buildz/cachez/cache.py

@@ -52,8 +52,10 @@ class CacheKey(Base):
         else:
             assert 0
 @ns.obj(id="cache.file")
-@ns.obj_args("ref, fps, cache.js","ref, log, null", "ref, rfp.current.first, false", "ref, split, .", "ref, key.currents, buildz.cache.path.currents", "ref, key.basedir, buildz.cache.path.basedir", "ref, save.index, 0", "ref, save.auto, false")
+@ns.obj_args("ref, fps, cache.js","ref, log, null", "ref, rfp.current.first, false", "ref, split, .", "ref, key.currents, buildz.cache.path.currents", "ref, key.basedir, buildz.cache.path.basedir", "ref, save.index, -1", "ref, save.auto, false")
 class Cache(Base):
+    def clean(self):
+        self.data = {}
     def bind(self, key):
         return CacheKey(self, key)
     def has(self, key):
@@ -68,7 +70,7 @@ class Cache(Base):
             self.save()
     def remove(self, key):
         xf.removes(self.data, key.split(self.spt))
-    def init(self, fps="cache.js", log=None, current_first=False, spt = ".", key_currents = "buildz.cache.path.currents", key_basedir = "buildz.cache.path.basedir", save_index = 0, auto_save = False):
+    def init(self, fps="cache.js", log=None, current_first=False, spt = ".", key_currents = "buildz.cache.path.currents", key_basedir = "buildz.cache.path.basedir", save_index = -1, auto_save = False):
         if type(fps) not in (tuple, list):
             fps = [fps]
         self.fps = fps

{buildz-0.6.36 → buildz-0.6.37}/buildz/db/dv/basez.py

@@ -117,19 +117,25 @@ class SimpleDv(ItDv):
         if commit:
             self.execute("commit;")
     def execute(self, sql, vals=(), commit=False):
+        #print(f"[TESTZ] sql: {sql}")
         tmp = self.cursor.execute(sql, vals)
         if commit:
             self.cursor.execute("commit;")
         return tmp
-    def insert_or_update(self, maps, table, keys = None):
+    def iou_sql(self, table, ks, vs, sets):
+        sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
+        return sql
+    def insert_or_update(self, maps, table, keys = None, update_keys = None):
+        if type(update_keys)==str:
+            update_keys = [update_keys]
         if type(maps)!=dict:
             maps = maps.__dict__
         if keys is None:
             keys = []
         if type(keys) not in (list, tuple):
             keys = [keys]
-        update = False
-        conds = ""
+        # update = False
+        # conds = ""
         # if len(keys)>0:
         #     need_query = True
         #     conds = []
@@ -151,11 +157,13 @@ class SimpleDv(ItDv):
         #         rst = self.query(sql_search, as_map = False)[1][0]
         #         update = rst>0
         kvs = [[k,tls.py2sql(v)] for k,v in maps.items()]
-        sets = [f"{k}={v}" for k,v in kvs]
+        #print(f"[TESTZ] save kvs: {kvs}, update_keys: {update_keys}")
+        sets = [f"{k}={v}" for k,v in kvs if update_keys is None or k in update_keys]
         sets = ",".join(sets)
         ks = ",".join([kv[0] for kv in kvs])
         vs = ",".join([str(kv[1]) for kv in kvs])
-        sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
+        sql = self.iou_sql(table, ks, vs, sets)
+        #sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
         return self.execute(sql)
         if update:
             keys = set(keys)

{buildz-0.6.36 → buildz-0.6.37}/buildz/db/dv/orm.py

@@ -105,6 +105,11 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
 pass
 
 class TableObject(Base):
+    def clone(self, table_name, py_name = None):
+        sql_create = self.sql_create.replace("<table>", table_name)
+        sql_delete = self.sql_delete.replace("<table>", table_name)
+        obj = TableObject(self.keys, table_name, self.src_py2sqls, self.query_keys, self.auto_translate, self.dv, sql_create, sql_delete, py_name)
+        return obj
     """
         字段映射
         keys: 表字段
@@ -115,6 +120,7 @@ class TableObject(Base):
             对于没有在py2sqls自定义映射的表字段，是否自动转换(py|autoTran<=>auto_tran|sql)
     """
     def init(self, keys, table=None, py2sqls=None, query_keys=None, auto_translate=True, dv = None, sql_create=None, sql_delete=None, py_name = None):
+        self.src_py2sqls = py2sqls
         if table is None:
             table = tls.lower(self.__class__.__name__)
         self.table = table
@@ -148,11 +154,17 @@ class TableObject(Base):
         self.sql_delete = sql_delete
     def create(self, dv=None):
         assert self.sql_create is not None
+        if self.sql_create.find("<table>")>=0:
+            print(f"[WARN] not create template table by {self.sql_create}")
+            return
         #print(f"[TESTZ] sql_create: {self.sql_create}")
         dv = self.rdv(dv)
         dv.executes(self.sql_create)
     def delete(self, dv=None):
         assert self.sql_delete is not None
+        if self.sql_delete.find("<table>")>=0:
+            print(f"[WARN] not delete template table by {self.sql_delete}")
+            return
         self.rdv(dv).execute(self.sql_delete)
     def bind(self, dv):
         self.dv = dv
@@ -165,6 +177,9 @@ class TableObject(Base):
             obj = tmp
         obj = {self.py2sqls[k]:v for k,v in obj.items() if k in self.py2sqls}
         return obj
+    def toSqlKeys(self, keys):
+        obj = [k for k in keys if k in self.py2sqls]
+        return obj
     def toPy(self, obj):
         if type(obj)!=dict:
             tmp = {}
@@ -191,24 +206,28 @@ class TableObject(Base):
     def filterSql(self, obj):
         if type(obj)!=dict:
             tmp = {}
-            for k in self.py2sqls:
+            for k in self.sql2py:
                 if hasattr(obj, k):
                     tmp[k] = getattr(obj, k)
             obj = tmp
         obj = {k:v for k,v in obj.items() if k in self.keys}
         return obj
-    def save(self, obj, dv=None, py2sql = True, commit=False, check = True):
+    def save(self, obj, dv=None, py2sql = True, commit=False, check = True, update_keys = None):
         dv = self.rdv(dv)
+        if type(update_keys)==str:
+            update_keys = [update_keys]
         if type(obj) not in [list, tuple]:
             obj = [obj]
         if py2sql:
             obj = [self.toSql(k) for k in obj]
+            if update_keys is not None:
+                update_keys = self.toSqlKeys(update_keys)#[self.toSqlKeys(k) for k in update_keys]
         else:
             obj = [self.filterSql(k) for k in obj]
         query_keys = self.query_keys
         if not check:
             query_keys = None
-        _ = [dv.insert_or_update(k, self.table, query_keys) for k in obj]
+        _ = [dv.insert_or_update(k, self.table, query_keys, update_keys) for k in obj]
         if commit:
             dv.execute("commit")
         return _

{buildz-0.6.36 → buildz-0.6.37}/buildz/db/dv/sqlite3z.py

@@ -90,7 +90,10 @@ class Db(SimpleDv):
             rst = rst[1:]
             rst = [{k:v for k,v in zip(keys, dt)} for dt in rst]
         return rst
-    def insert_or_update(self, maps, table, keys = None):
+    def iou_sql(self, table, ks, vs, sets):
+        sql = f"insert into {table}({ks}) values({vs}) ON CONFLICT DO UPDATE SET {sets}"
+        return sql
+    def insert_or_updatexxx(self, maps, table, keys = None, update_keys = None):
         if type(maps)!=dict:
             maps = maps.__dict__
         if keys is None:
@@ -98,7 +101,7 @@ class Db(SimpleDv):
         if type(keys) not in (list, tuple):
             keys = [keys]
         kvs = [[k,tls.py2sql(v)] for k,v in maps.items()]
-        sets = [f"{k}={v}" for k,v in kvs]
+        sets = [f"{k}={v}" for k,v in kvs if update_keys is None or k in update_keys]
         sets = ",".join(sets)
         ks = ",".join([kv[0] for kv in kvs])
         vs = ",".join([str(kv[1]) for kv in kvs])

{buildz-0.6.36 → buildz-0.6.37}/buildz/ioc/ioc/conf.py

@@ -193,6 +193,10 @@ class Conf(Base):
         return self._default_type
     def get_var(self, key, i = -1):
         return self.confs.get_var(key, i)
+    def set_var(self, key, val):
+        return self.confs.set_var(key, val)
+    def unset_var(self, key):
+        return self.confs.unset_var(key)
     def var_keys(self):
         return self.confs.var_keys()
     def push_var(self, key, val):

{buildz-0.6.36 → buildz-0.6.37}/buildz/ioc/ioc/confs.py

@@ -281,6 +281,14 @@ class Confs(Base):
     def pop_vars(self, vars):
         if vars is not None:
             [self.pop_var(key) for key in vars]
+    def set_var(self, key, val):
+        """
+            will remove push datas
+        """
+        self.vars[key] = [val]
+    def unset_var(self, key):
+        if key in self.vars:
+            del self.vars[key]
     def push_var(self, key, val):
         if key not in self.vars:
             self.vars[key] =  []

{buildz-0.6.36 → buildz-0.6.37}/buildz/ioc/ioc_deal/obj.py

@@ -228,6 +228,10 @@ class IOCConf(Basez):
         if hasattr(cls, self.key):
             return getattr(cls, self.key)
         return default
+    def unset(self, cls):
+        if hasattr(cls, self.ckey):
+            delattr(cls, self.ckey)
+            delattr(cls, self.key)
     def set(self, cls, dt):
         setattr(cls, self.key, dt)
         setattr(cls, self.ckey, cls)
@@ -341,7 +345,7 @@ class IOCObject(Basez):
         if 'mcalls' in conf and 'call' not in conf:
             conf['call'] = {'type': "calls", 'calls': conf['mcalls']}
         conf[g_obj_cid] = decorator.add_datas(conf, self)
-        g_ioc_conf.set(cls, conf)
+        g_ioc_conf.unset(cls)
         return cls
 
 pass

{buildz-0.6.36 → buildz-0.6.37}/buildz/xf/loaderz/deal/mapz.py

@@ -34,6 +34,8 @@ class MapDeal(lr.LRDeal):
             opt = arr[i+1]
             if opt.type != "kv":
                 raise Exception(f"u f opt in map: {opt}")
+            if type(k.val)==list:
+                k.val = tuple(k.val)
             rst[k.val] = v.val
         return item.Item(rst, type='map', is_val = 1)
 

{buildz-0.6.36 → buildz-0.6.37/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.36
+Version: 0.6.37
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.6.36 → buildz-0.6.37}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.6.36',
+    version = '0.6.37',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',