buildz 0.6.35__tar.gz → 0.6.37__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.35
+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
@@ -34,6 +34,8 @@ License-File: LICENSE
 运行python -m buildz查看帮助
 
 持续更新中。。。
+2024/12/22:
+增加pathz模块，方便处理路径，修改ioc和db
 2024/12/18:
 增加数据映射xz，数据库db增加类似orm功能以及表和索引结构查询功能（目前只写了mysql,oracle,sqlite3的查询），配置文件读写xf的输出增加对ListMap的支持(dumpx, dumpxf)
 2024/11/11:

{buildz-0.6.35 → buildz-0.6.37}/README.md

@@ -21,6 +21,8 @@
 运行python -m buildz查看帮助
 
 持续更新中。。。
+2024/12/22:
+增加pathz模块，方便处理路径，修改ioc和db
 2024/12/18:
 增加数据映射xz，数据库db增加类似orm功能以及表和索引结构查询功能（目前只写了mysql,oracle,sqlite3的查询），配置文件读写xf的输出增加对ListMap的支持(dumpx, dumpxf)
 2024/11/11:

buildz-0.6.37/buildz/auto/__init__.py

@@ -0,0 +1,7 @@
+from .run import Run
+
+def imports():
+    from . import deal, deal_type, factory, cache, log, config, dbs
+    from . import verify, save, request, defs, deal_list
+
+pass

buildz-0.6.37/buildz/cachez/__init__.py

@@ -0,0 +1,8 @@
+#
+
+from .cache import *
+
+def imports():
+    pass
+
+pass

buildz-0.6.37/buildz/cachez/cache.py

@@ -0,0 +1,201 @@
+#
+
+from .. import xf, fz
+from .. import ioc
+from ..base import Base
+from ..ioc import wrap
+from .. import logz
+ns = wrap.ns("buildz.cache")
+import os,re
+
+
+@ns.obj(id="cache.save")
+@ns.obj_args("ref, cache.file", "ref, log")
+class Save(Base):
+    def init(self, cache, log, fkey = "cache.save", fp = None):
+        self.fkey = fkey
+        self.cache = cache
+        self.log = log.tag("Cache.Save")
+        self.fp = fp
+    def save(self):
+        fp = self.fp
+        if fp is None:
+            self.log.warn(f"cache not save cause 'cache.save' is None")
+            return False
+        fz.makefdir(fp)
+        rst  = self.cache.data
+        rs = xf.dumps(rst, format=True).encode("utf-8")
+        fz.write(rs, fp, 'wb')
+        return True
+    def call(self, maps, fp):
+        fp = xf.get(maps, self.fkey, None)
+        fp = self.cache.rfp(fp)
+        self.fp = fp
+        return self.save()
+
+pass
+class CacheKey(Base):
+    def init(self, cache, key):
+        self.cache = cache
+        self.key = key
+    def has(self):
+        return self.cache.has(self.key)
+    def set(self, val):
+        return self.cache.set(self.key, val)
+    def get(self):
+        return self.cache.get(self.key)
+    def call(self, *args):
+        if len(args)==0:
+            return self.get()
+        elif len(args)==1:
+            return self.set(args[0])
+        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, -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):
+        ks = key.split(self.spt)
+        return xf.has(self.data, ks)
+    def get(self, key):
+        ks = key.split(self.spt)
+        return xf.gets(self.data, ks)
+    def set(self, key, val):
+        xf.sets(self.data, key.split(self.spt), val)
+        if self.auto_save:
+            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 = -1, auto_save = False):
+        if type(fps) not in (tuple, list):
+            fps = [fps]
+        self.fps = fps
+        self.spt = spt
+        self.current_first = current_first
+        self.log = logz.make(log)(self)
+        self.key_currents = key_currents
+        self.key_basedir = key_basedir
+        self.save_index = save_index
+        self.data = {}
+        self.auto_save = auto_save
+    def set_currents(self, dp):
+        if type(dp)!=list:
+            dp = [dp]
+        self.set(self.key_currents, dp)
+    def add_currents(self, dp):
+        dps = self.get_currents()
+        if dps is None:
+            dps = []
+        if dp in dps:
+            return
+        dps.append(dp)
+        self.set_currents(dps)
+    def get_currents(self):
+        dps = self.get(self.key_currents)
+        if dps is None:
+            dps = []
+        if type(dps)!=list:
+            dps = [dps]
+        return dps
+    def set_basedir(self, dp):
+        self.set(self.key_basedir, dp)
+    def get_basedir(self):
+        return self.get(self.key_basedir)
+    def rfp(self, fp):
+        if fz.is_abs(fp):
+            return fp
+        dps = [None,"."]
+        cfps = self.get_currents()
+        if cfps is not None:
+            if self.current_first:
+                dps = cfps+dps
+            else:
+                dps = dps+cfps
+        basedir = self.get_basedir()
+        if basedir is not None:
+            dps = [basedir]+dps
+        for dp in dps:
+            _fp = fp
+            if dp is not None:
+                _fp = os.path.join(dp, fp)
+            if os.path.isfile(_fp):
+                return _fp
+        if basedir is not None:
+            fp = os.path.join(basedir, fp)
+        return fp
+    def save(self, fp = None):
+        if fp is None:
+            fp = self.fps[self.save_index]
+        fp = self.rfp(fp)
+        fz.makefdir(fp)
+        rst  = self.data
+        rs = xf.dumps(rst, format=True).encode("utf-8")
+        fz.write(rs, fp, 'wb')
+    def load(self, fps = None):
+        if fps is None:
+            fps = self.fps
+        data = {}
+        for fp in fps:
+            fp = self.rfp(fp)
+            if os.path.isfile(fp):
+                self.log.info(f"load cache from {fp}")
+                xdata = xf.flush_maps(xf.loadf(fp),visit_list=True)
+                xf.fill(xdata, data, replace=1)
+        xf.fill(data, self.data, replace=0)
+
+pass
+
+@ns.obj(id="cache.mem")
+@ns.obj_args("ref, log, null")
+class Mem(Cache):
+    def init(self, log=None):
+        super().init(None, log)
+
+pass
+@ns.obj(id="cache")
+@ns.obj_args("ref, cache.file", "ref, cache.mem")
+class Caches(Base):
+    def init(self, cache, mem):
+        self.cache = cache
+        self.mem = mem
+        self.caches = [cache, mem]
+        self.set = cache.set
+        self.remove = cache.remove
+        self.call=cache.call
+        self.rfp = cache.rfp
+        self.get_currents = cache.get_currents
+        self.add_currents = cache.add_currents
+        self.set_currents = cache.set_currents
+        self.set_basedir = cache.set_basedir
+        self.get_basedir = cache.get_basedir
+        self.has_file = cache.has
+        self.has_mem = mem.has
+    def get_file(self, key):
+        return self.cache.get(key)
+    def get_mem(self, key):
+        return self.mem.get(key)
+    def set_file(self, key, val):
+        self.cache.set(key,val)
+    def set_mem(self, key, val):
+        self.mem.set(key, val)
+    def remove_file(self, key):
+        self.cache.remove(key)
+    def remove_mem(self, key):
+        self.mem.remove(key)
+    def get(self, key):
+        for cache in self.caches:
+            v = cache.get(key)
+            if v is not None:
+                return v
+        return None
+    def has(self, key):
+        for cache in self.caches:
+            if cache.has(key):
+                return True
+        return False
+
+pass

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

@@ -117,39 +117,54 @@ 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 = ""
-        if len(keys)>0:
-            need_query = True
-            conds = []
-            for k in keys:
-                if k not in maps:
-                    need_query = False
-                    break
-                v = maps[k]
-                if type(v)==str:
-                    v = f"'{v}'"
-                if v is not None:
-                    cond = f"{k} = {v}"
-                else:
-                    cond = f"{k} is null"
-                conds.append(cond)
-            if need_query:
-                conds = " and ".join(conds)
-                sql_search = f"select count(*) from {table} where {conds}"
-                rst = self.query(sql_search, as_map = False)[1][0]
-                update = rst>0
+        # update = False
+        # conds = ""
+        # if len(keys)>0:
+        #     need_query = True
+        #     conds = []
+        #     for k in keys:
+        #         if k not in maps:
+        #             need_query = False
+        #             break
+        #         v = maps[k]
+        #         if type(v)==str:
+        #             v = f"'{v}'"
+        #         if v is not None:
+        #             cond = f"{k} = {v}"
+        #         else:
+        #             cond = f"{k} is null"
+        #         conds.append(cond)
+        #     if need_query:
+        #         conds = " and ".join(conds)
+        #         sql_search = f"select count(*) from {table} where {conds}"
+        #         rst = self.query(sql_search, as_map = False)[1][0]
+        #         update = rst>0
+        kvs = [[k,tls.py2sql(v)] for k,v in maps.items()]
+        #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 = 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)
             kvs = [[k,tls.py2sql(v)] for k,v in maps.items() if k not in keys]
@@ -157,10 +172,10 @@ class SimpleDv(ItDv):
             sets = ",".join(sets)
             sql = f"update {table} set {sets} where {conds}"
         else:
-            kvs = [[k, tls.py2sql(v)] for k,v in maps.items()]
+            kvs = [[k,tls.py2sql(v)] for k,v in maps.items()]
             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});"
+            sql = f"insert into {table}({ks}) values({vs})"
         return self.execute(sql)
 
 pass

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

@@ -20,8 +20,10 @@ def deal_item(item, conf):
 def deal_key(it, conf):
     data_keys = xf.g(conf, data_keys=[])
     tmp = {}
+    #print(f"[TESTZ] conf: {conf}, it: {it}")
     for i in range(min(len(it), len(data_keys))):
         tmp[data_keys[i]] = it[i]
+    #print(f"[TESTZ] tmp: {tmp}")
     sql_key = tmp['sql_key']
     sql_def = tmp['sql_def']
     py_key = xf.g(tmp, py_key=None)
@@ -31,11 +33,12 @@ def deal_key(it, conf):
     xf.g(conf, vars=[]).append(sql_key+" "+sql_def)
 def makes(datas, data_keys = "sql_key,sql_def,py_key".split(",")):
     if type(datas)==dict:
-        rst = [make(v, k) for k,v in datas.items()]
+        rst = [make(v, k, py_name = k) for k,v in datas.items()]
     else:
         rst = [make(it) for it in datas]
     return rst
-def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(",")):
+def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_name=None):
+    #print(f"[TESTZ] MARK: {data}")
     """
         从配置中生成建表语句，删表语句和orm对象
         输入:
@@ -75,13 +78,16 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(",")):
     elif type(data) == dict:
         data = dict2list(data)
     conf = {}
-    xf.s(conf, sql_before = [], sql_after = [], sql_delete_before=[], sql_delete_after=[],auto_translate=True,table=table,keys=[],py2sqls={},query_keys=None, data_keys = data_keys, vars=[])
+    xf.s(conf, sql_before = [], sql_after = [], sql_delete_before=[], sql_delete_after=[],auto_translate=True,table=table,keys=[],py2sqls={},query_keys=None, data_keys = data_keys, vars=[], py_name = py_name)
     for it in data:
         if len(it)==1 and type(it[0]) in (list, tuple):
             deal_item(it[0], conf)
         else:
             deal_key(it, conf)
     table = xf.g(conf, table=table)
+    py_name = xf.g(conf, py_name = py_name)
+    if py_name is None:
+        py_name = table
     vars =  xf.g(conf, vars = [])
     vars = ",".join(vars)
     assert table is not None
@@ -93,12 +99,17 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(",")):
     sqls_del = sqls[2]+[sql_del]+sqls[3]
     sqls = [sqls_crt, sqls_del]
     sqls = [(";\n".join(k)+";").replace(";;",";") for k in sqls]
-    obj = TableObject(*xf.g(conf, keys=[], table=table, py2sqls = None, query_keys=None,auto_translate=True), sql_create = sqls[0], sql_delete = sqls[1])
+    obj = TableObject(*xf.g(conf, keys=[], table=table, py2sqls = None, query_keys=None,auto_translate=True), sql_create = sqls[0], sql_delete = sqls[1], py_name = py_name)
     return sqls, obj
 
 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: 表字段
@@ -108,10 +119,14 @@ class TableObject(Base):
         auto_translate:
             对于没有在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):
+    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
+        if py_name is None:
+            py_name = table
+        self.py_name = py_name
         if py2sqls is None:
             py2sqls = {}
         if type(py2sqls) in (list, tuple):
@@ -139,10 +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
@@ -153,7 +175,10 @@ class TableObject(Base):
                 if hasattr(obj, k):
                     tmp[k] = getattr(obj, k)
             obj = tmp
-        obj = {self.py2sqls[k]:v for k,v in obj.items()}
+        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:
@@ -178,17 +203,39 @@ class TableObject(Base):
     def queryAll(self, dv=None, sql2py=True):
         sql = f"select * from {self.table};"
         return self.query(sql, dv, sql2py)
-    def save(self, obj, dv=None, py2sql = True, commit=False, check = True):
+    def filterSql(self, obj):
+        if type(obj)!=dict:
+            tmp = {}
+            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, 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;")
+            dv.execute("commit")
         return _
+    def clean(self, dv=None,commit = False):
+        dv = self.rdv(dv)
+        dv.execute(f"delete from {self.table}")
+        if commit:
+            dv.execute("commit")
+        
+
 

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

@@ -4,6 +4,7 @@ import sys,os
 from .basez import SimpleDv, fetch
 from .structz import CMD
 from buildz import xf,fz
+from buildz.db import tls
 class Db(SimpleDv):
     # func to impl:
     def to_list(self, rst):
@@ -89,6 +90,24 @@ class Db(SimpleDv):
             rst = rst[1:]
             rst = [{k:v for k,v in zip(keys, dt)} for dt in rst]
         return rst
+    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:
+            keys = []
+        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 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 CONFLICT DO UPDATE SET {sets}"
+        #print(f"[TESTZ] sql: {sql}")
+        return self.execute(sql)
 
 pass
 def build(argv, conf):

{buildz-0.6.35 → buildz-0.6.37}/buildz/ioc/ioc/base.py

@@ -33,7 +33,7 @@ class EncapeData(Base):
         包含data id对应的配置，配置文件id，配置文件对象
         [object.test, call, ]
     """
-    def __init__(self, data, conf=None, local = False, type = None, src = None, info = None, confs = None):
+    def __init__(self, data, conf=None, local = False, type = None, src = None, info = None, confs = None, force_new = False):
         """
             data: 配置数据
             conf: 配置数据对应的配置文件的管理器
@@ -42,6 +42,7 @@ class EncapeData(Base):
             src: 源对象，配置数据生成的对象调用conf获取对象，会有这个字段，目前只有object会放这个字段，其他要么透传要么不传
             info: 额外的调用信息，目前只有object会用到里面的id字段，作为单例额外输入
         """
+        self.force_new = force_new
         if typez(data)==dict:
             pid = xf.g1(data, parent=None, template=None, temp=None)
             if pid is not None:
@@ -77,8 +78,8 @@ class EncapeData(Base):
         self.info = info
     def deal(self, remove = False):
         if self.conf is None:
-            return self.confs.get(self, src = self.src, info=self.info, remove = remove)
-        return self.conf.get(self, src = self.src, info=self.info, remove = remove)
+            return self.confs.get(self, src = self.src, info=self.info, remove = remove, force_new = self.force_new)
+        return self.conf.get(self, src = self.src, info=self.info, remove = remove, force_new = self.force_new)
 
 
 pass

{buildz-0.6.35 → 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):
@@ -201,7 +205,7 @@ class Conf(Base):
         return self.confs.has_var(key)
     def pop_var(self, key):
         self.confs.pop_var(key)
-    def get_obj(self, id, src = None, info=None, remove = False):
+    def get_obj(self, id, src = None, info=None, remove = False, force_new = False):
         """
             根据data id获取data对象，处理逻辑：根据data id查配置，根据配置的type查deal，返回deal处理过的配置
         """
@@ -213,9 +217,12 @@ class Conf(Base):
         if conf is None:
             raise IdNotFoundError(f"can't find conf of {id}")
             return None
+        conf.force_new = force_new
         if conf.conf is None:
             if remove:
                 return None
+            # 不太记得了，应该是错误代码
+            print(f"[TESTZ] error code: {conf.conf}")
             return conf.data()
         deal = self.get_deal(conf.type)
         if deal is None:

{buildz-0.6.35 → 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] =  []
@@ -405,7 +413,7 @@ class Confs(Base):
         return self.get_obj(*args, **maps)
     def remove(self, *a,**b):
         return self.get_obj(*a, **b, remove=True)
-    def get_obj(self, id, sid = None, src = None, info = None, remove = False):
+    def get_obj(self, id, sid = None, src = None, info = None, remove = False, force_new = False):
         """
             根据data id获取data对象，处理逻辑：根据data id查配置，根据配置的type查deal，返回deal处理过的配置
         """
@@ -429,6 +437,7 @@ class Confs(Base):
             raise IOCError(f"confs: can't find deal of {id}, type = {conf.type}")
             return None
         #print(f"get_obj: {id}({sid}), conf: {conf}, deal: {deal}, type: {conf.type}")
+        conf.force_new = force_new
         if not remove:
             obj = deal(conf)
         else:

{buildz-0.6.35 → buildz-0.6.37}/buildz/ioc/ioc/decorator.py

@@ -19,8 +19,9 @@ class Decorator(Base):
         return self.namespace
     def regist(self, key, fc):
         self.fcs[key] = fc
-    def get_conf(self, src):
-        ns = self.namespace
+    def get_conf(self, src, ns = None):
+        if ns is None:
+            ns = self.namespace
         if src in self._ns:
             ns = self._ns[src]
         if ns not in self.confs:
@@ -33,8 +34,8 @@ class Decorator(Base):
         if tag not in conf:
             conf[tag]=[]
         return conf[tag][index]
-    def add(self, tag, data, src = None):
-        conf = self.get_conf(src)
+    def add(self, tag, data, src = None, ns = None):
+        conf = self.get_conf(src, ns)
         if tag not in conf:
             conf[tag]=[]
         id = len(conf[tag])
@@ -45,12 +46,12 @@ class Decorator(Base):
         if tag not in conf:
             conf[tag]={}
         conf[tag][key]=val
-    def add_datas(self, item, key):
+    def add_datas(self, item, key=None, ns = None):
         if type(item)==str:
             item = xf.loads(item)
-        return self.add("datas", item, key)
-    def get_datas(self, id):
-        return self.get("datas", id)
+        return self.add("datas", item, key, ns)
+    def get_datas(self, id, key=None):
+        return self.get("datas", id, key)
     def set_datas(self, id, val):
         return self.set("datas", id, val)
     def set_envs(self, key, val):
@@ -91,6 +92,15 @@ class NameSpace(Base):
         obj = Fcs()
         for k,f in fcs.items():
             setattr(obj, k, self.fc(namespace, f))
+        def wfc(rfc, *a, **b):
+            with self.lock:
+                ns = self.decorator.curr_ns()
+                self.decorator.ns(namespace)
+                rst = rfc(*a,**b)
+                self.decorator.fcns(namespace, rst)
+                self.decorator.ns(ns)
+                return rst
+        setattr(obj, "wrap", wfc)
         return obj
 
 pass

{buildz-0.6.35 → buildz-0.6.37}/buildz/ioc/ioc/single.py

@@ -21,6 +21,8 @@ class Single(Base):
         self.default = default
         self.singles = {}
     def get_ids(self, edata: EncapeData):
+        if edata.force_new:
+            return None
         sid = edata.sid
         data = edata.data
         info = edata.info