buildz 0.6.48__tar.gz → 0.6.49__tar.gz

{buildz-0.6.48/buildz.egg-info → buildz-0.6.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.48
+Version: 0.6.49
 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.48 → buildz-0.6.49}/buildz/dz/mapz.py

@@ -1,4 +1,12 @@
 from buildz import pyz
+def dict2list(obj):
+    if type(obj)!=dict:
+        return obj
+    return list(obj.items())
+def dict2iter(obj):
+    if type(obj)!=dict:
+        return obj
+    return obj.items()
 def get(obj, key, default=None, set = False):
     if type(obj)==list:
         key = int(key)

{buildz-0.6.48 → buildz-0.6.49}/buildz/ioc/wrap.py

@@ -19,6 +19,7 @@ def pkg(fp):
 pass
 def imports(dp=".", pts=".*\.py$", pfx=""):
     """
+    not include test: r"^(?!.*(?:test|bak)).*\.py$"
     find filepath by dirpath(dp) and pattern(pts), 
     import:
     filepath = ".".join(filepath.split(".")[:-1])

{buildz-0.6.48 → buildz-0.6.49}/buildz/iocz/base.py

@@ -2,5 +2,5 @@ from ..base import Base, fcBase
 from .. import pathz
 path = pathz.Path()
 path.set('local', path.dir(__file__))
-path.set('conf', path.local('conf'),curr=0)
+path.set('conf', path.local('conf'), curr=0)
 

buildz-0.6.49/buildz/iocz/ioc/__init__.py

@@ -0,0 +1,2 @@
+#
+from .init import *

buildz-0.6.49/buildz/iocz/ioc/base.py

@@ -0,0 +1,18 @@
+from ..base import *
+basepath = path
+path = pathz.Path()
+path.set("conf", basepath.local("ioc/conf"), curr=0)
+class Encape(Base):
+    def call(self, params=None, **maps):
+        return None
+
+pass
+class Deal(Base):
+    def deal(self, conf, unit):
+        return None
+    def call(self, conf, unit):
+        'encape, conf, conf_need_udpate'
+        encape = self.deal(conf,unit)
+        return encape,conf,False
+
+pass

{buildz-0.6.48 → buildz-0.6.49}/buildz/iocz/ioc/bind.py

@@ -1,5 +1,5 @@
 #
-from buildz import Base
+from ... import Base
 
 class Bind(Base):
     def init(self):

buildz-0.6.49/buildz/iocz/ioc/builds.py

@@ -0,0 +1,63 @@
+#
+from .base import *
+from .datas import Datas
+from .confs import Confs
+from .encapes import Encapes
+from ... import pyz
+
+class Builds(Base):
+    def init(self, unit):
+        self.need_build = False
+        self.jobs = []
+        self.dones = []
+        self.unit = unit
+        self.builds = None
+    def bind(self, builds):
+        if self.builds == builds:
+            return
+        self.builds = builds
+        self.builds.add(self)
+    def add(self, conf):
+        self.jobs.append(conf)
+        self.need_build = True
+        if self.builds is not None:
+            self.builds.add(self)
+    def build(self):
+        if not self.need_build:
+            return
+        for conf in self.jobs:
+            if Confs.is_conf(conf):
+                encape = self.unit.get_encape(conf, self.unit.ns, self.unit.id)
+            elif isinstance(conf, Encape):
+                encape = conf
+            else:
+                encape = self.unit.get_encape(conf, self.unit.ns, self.unit.id)
+            encape()
+            self.dones.append(conf)
+        self.jobs = []
+        self.need_build = False
+    def call(self):
+        self.build()
+class Buildset(Base):
+    def init(self, mg):
+        self.mg = mg
+        self.need_build = False
+        self.jobs = []
+        self.dones = []
+    def add(self, builds):
+        if builds.need_build:
+            self.jobs.append(builds)
+            self.need_build = True
+        builds.bind(self)
+    def build(self):
+        if not self.need_build:
+            return
+        for builds in self.jobs:
+            builds()
+            self.dones.append(builds)
+        self.jobs = []
+        self.need_build = False
+    def call(self):
+        self.build()
+
+pass

buildz-0.6.49/buildz/iocz/ioc/confs.py

@@ -0,0 +1,15 @@
+#
+from .tdata import TagData
+from .datas import Datas
+from .dataset import Dataset
+class Confs(Datas):
+    @staticmethod
+    def is_conf(obj):
+        return type(obj) in (list, tuple, dict)
+    def init(self, ns=None, id=None, deal_ns = None, dts=None):
+        super().init(ns, id, dts)
+        self.deal_ns = deal_ns
+    def set(self, key, val, tag=None):
+        val = (val, self.deal_ns)
+        super().set(key, val, tag)
+        

buildz-0.6.49/buildz/iocz/ioc/datas.py

@@ -0,0 +1,26 @@
+
+from ... import pyz, dz
+from .tdata import TagData
+class Datas(TagData):
+    '''
+        一个单元下的数据集
+    '''
+    def init(self, ns=None, id=None, dts=None):
+        super().init(ns, id)
+        self.dts = dts
+    def bind(self, dts):
+        if self.dts==dts:
+            return
+        self.dts = dts
+        dts.add(self)
+    def set(self, key, val, tag=None):
+        tag = pyz.nnull(tag, self.default)
+        super().set(key, val, tag)
+        if self.dts is not None and tag in (TagData.Key.Pub, TagData.Key.Ns):
+                self.dts.set(key, val, self.ns, tag, self)
+    def tget(self, key, src=None,id=None, gfind=True):
+        ns, id = self.nsid(src, id)
+        obj, tag, find=super().tget(key, ns, id)
+        if not find and gfind:
+            obj, tag, find = self.dts.tget(key, ns, id)
+        return obj, tag, find

buildz-0.6.49/buildz/iocz/ioc/dataset.py

@@ -0,0 +1,76 @@
+#
+
+from .tdata import TagData
+from .base import *
+from ... import dz
+class Dataset(Base):
+    '''
+        所有数据集，只包含pub和ns部分
+    '''
+    def init(self, ids):
+        self.ids = ids
+        self.pub = {}
+        self.ns = {}
+        self.objs = {}
+    def set(self, key, val, ns=None, tag=None, id=None):
+        if tag == TagData.Key.Ns:
+            self.ns_set(key,val,ns,id)
+        else:
+            self.pub_set(key,val,ns,id)
+    def pub_set(self, key, val, ns=None, id=None):
+        if isinstance(id, TagData):
+            id = id.id
+        val = (val,id)
+        keys = self.ids(ns)+self.ids(key)
+        dz.dset(self.pub, keys, val)
+    def ns_set(self, key, val, ns=None, id=None):
+        if isinstance(id, TagData):
+            id = id.id
+        val = (val,id)
+        map = dz.get_set(self.ns, ns, dict())
+        map[key] = val
+    def add(self, data):
+        ns = data.ns
+        self.objs[data.id] = data
+        for key, val in data.tag(data.Key.Pub).items():
+            self.pub_set(key, val, ns, data)
+        for key, val in data.tag(data.Key.Ns).items():
+            self.ns_set(key, val, ns, data)
+        if data.dts!=self:
+            data.bind(self)
+    def tget(self, key, ns=None, id=None):
+        obj, id, keys,tag, find = self.get(key,ns,id)
+        return obj, tag, find
+    def get(self, key, ns=None, id = None):
+        obj, oid, find = self.ns_get(key,ns,id)
+        tag = TagData.Key.Ns
+        keys = key
+        if not find:
+            obj, oid, keys, find=self.pub_get(key,ns,id)
+            tag=TagData.Key.Pub
+        return obj,oid,keys,tag,find
+    def _pub_get(self, key, ns=None, id=None):
+        ids_key = self.ids(key)
+        ids = ids_key
+        obj,find = dz.dget(self.pub, ids)
+        if find:
+            return obj, ids, find
+        if ns is None:
+            return 0,0, 0
+        ids = self.ids(ns) + ids_key
+        obj,find = dz.dget(self.pub, ids)
+        if find:
+            return obj, ids, find
+        return 0,0,0
+    def pub_get(self, key, ns=None, id=None):
+        obj,keys,find = self._pub_get(key, ns, id)
+        if find:
+            v,id=obj
+            return v,id,keys,find
+        return 0,0,0,0
+    def ns_get(self, key, ns=None, id=None):
+        map = dz.get_set(self.ns, ns, dict())
+        if key not in map:
+            return 0, 0, 0
+        v,id=map[key]
+        return v,id, 1

buildz-0.6.49/buildz/iocz/ioc/encapes.py

@@ -0,0 +1,106 @@
+#
+from .datas import Datas
+from .dataset import Dataset
+from .confs import Confs
+class Encapes(Datas):
+    def init(self, ns=None, id=None, dts=None, unit=None):
+        super().init(ns, id, dts)
+        self.confs = None
+        self.deals = None
+        self.deal_key = None
+        self.unit = unit
+        self.build()
+    def build(self):
+        if self.unit is None or self.confs is not None:
+            return
+        self.confs = self.unit.confs
+        self.deals = self.unit.deals
+        self.deal_key = self.unit.deal_key
+    def make(self, key, ns=None, id=None):
+        if self.confs is None or self.deals is None or self.deal_key is None:
+            return 0,0,0
+        conf, ctag, cfind = self.confs.tget(key, ns, id, False)
+        if not cfind:
+            return 0,0,0
+        conf, deal_ns = conf
+        encape, conf, upd = self.make_conf(conf, deal_ns, id)
+        if upd:
+            self.confs.set(key, conf, ctag)
+        self.set(key, encape, ctag)
+        return encape, ctag, 1
+    def make_conf(self, conf, deal_ns=None, id=None):
+        deal_key = self.deal_key(conf)
+        deal, dtag, dfind = self.deals.tget(deal_key, deal_ns, id, True)
+        assert dfind
+        encape, conf, upd = deal(conf, self.unit)
+        return encape, conf, upd
+    def tget(self, key, src=None,id=None, gfind=True):
+        if Confs.is_conf(key):
+            encape, conf, upd = self.make_conf(key, self.deals.ns, id)
+            return encape, Datas.Key.Pub, 1
+        ns, id = self.nsid(src, id)
+        obj, tag, find=super().tget(key, ns, id, False)
+        if find:
+            return obj, tag, find
+        obj, tag, find = self.make(key, ns, id)
+        if find:
+            return obj, tag, find
+        if not gfind:
+            return 0,0,0
+        return self.dts.tget(key, ns, id)
+class Encapeset(Dataset):
+    '''
+        生成对象前的中间层
+    '''
+    def init(self, ids, mg=None):
+        super().init(ids)
+        self.confs = None
+        self.deals = None
+        self.deal_key = None
+        self.mg = None
+        self.bind(mg)
+    def bind(self, mg):
+        if self.mg==mg:
+            return self
+        self.mg = mg
+        self.confs = mg.confs
+        self.deals = mg.deals
+        self.deal_key = mg.deal_key
+        return self
+    def make(self, key, ns=None, id = None):
+        conf, cid, keys, ctag, cfind = self.confs.get(key, ns, id)
+        if not cfind:
+            return 0,0,0,0,0
+        conf, deal_ns = conf
+        encape, conf, upd  = self.make_conf(conf, deal_ns, id, cid)
+        if cid in self.objs:
+            obj = self.objs[id]
+            if ns != obj.ns:
+                ids_ns = self.ids(obj.ns)
+                keys_ns = keys[:len(ids_ns)]
+                assert ids_ns == keys_ns, f"{ids_ns}!={keys_ns}"
+                keys = keys[len(ids_ns):]
+                key = self.ids.id(keys)
+            self.objs[cid].set(key, encape, ctag)
+            if upd:
+                self.confs.objs[cid].set(key, conf, ctag)
+        else:
+            self.set(key, encape, ns, ctag)
+        return encape, cid, keys, ctag, 1
+    def make_conf(self, conf, deal_ns=None, id=None,cid=None):
+        deal_key = self.deal_key(conf)
+        deal, dtag, dfind = self.deals.tget(deal_key, deal_ns, id)
+        assert dfind
+        unit = self.mg.get_unit(cid)
+        encape, conf, upd = deal(conf, unit)
+        return encape, conf, upd 
+    def get(self, key, ns=None, id=None):
+        if Confs.is_conf(key):
+            encape, conf, upd = self.make_conf(key, None, id)
+            return encape, None, None, Datas.Key.Pub, 1
+        obj, eid, keys, tag, find = super().get(key, ns, id)
+        if find:
+            return obj, eid, keys, tag, find
+        return self.make(key, ns, id)
+
+    

{buildz-0.6.48 → buildz-0.6.49}/buildz/iocz/ioc/env.py

@@ -1,5 +1,5 @@
 from .base import Base, fcBase
-from buildz import xf,pyz
+from ... import xf,pyz
 class EnvExp(Exception):
     def __init__(self, id):
         super().__init__(f"EnvExp id not found: '{id}'")

{buildz-0.6.48 → buildz-0.6.49}/buildz/iocz/ioc/ids.py

@@ -12,13 +12,12 @@ class Ids(Base):
                 ids = ids[0]
         return self.spt.join(ids)
     def ids(self, id):
+        if id is None:
+            return []
         if type(id) in (list, tuple):
             return id
         return id.split(self.spt)
     def call(self, id):
         return self.ids(id)
-        a = self.ids(a)
-        b = self.ids(b)
-        return self.id(a,b)
 pass
 

buildz-0.6.49/buildz/iocz/ioc/init.py

@@ -0,0 +1,4 @@
+#
+from .mg import Manager
+from .unit import Unit
+from .ids import Ids

buildz-0.6.49/buildz/iocz/ioc/mg.py

@@ -0,0 +1,78 @@
+#
+
+from .base import *
+from .encapes import Encapeset
+from .dataset import Dataset
+from ... import pyz,dz
+from .ids import Ids
+from .unit import Unit
+from .builds import Buildset
+class StrDealKey(Base):
+    def init(self, key):
+        self.key = key
+    def call(self, conf):
+        if self.key not in conf:
+            return None
+        return conf[self.key]
+
+pass
+class Manager(Base):
+    @staticmethod
+    def make_deal_key(deal_key):
+        if type(deal_key) == str:
+            deal_key = StrDealKey(deal_key)
+        return deal_key
+    @staticmethod
+    def make_ids(ids):
+        if type(ids)==str:
+            ids = Ids(ids)
+        return ids
+    def init(self, ids, deal_key, deal_ids = None):
+        self._index = 0
+        self.units = {}
+        self.builds = Buildset(self)
+        ids = self.make_ids(ids)
+        self.ids = ids
+        self.deal_key = self.make_deal_key(deal_key)
+        self.deal_ids = pyz.nnull(deal_ids, ids)
+        self.confs = Dataset(self.ids)
+        self.deals = Dataset(self.deal_ids)
+        self.encapes = Encapeset(self.ids, self)
+        self.default_unit = self.create()
+    def add_build(self, conf):
+        self.builds.add(conf)
+    def build(self):
+        self.builds.build()
+    def add(self, unit):
+        unit.bind(self)
+        self.units[unit.id] = unit
+    def create(self, ns=None, deal_ns = None, deal_key=None):
+        id = self.id()
+        deal_key = pyz.nnull(deal_key, self.deal_key)
+        deal_key = self.make_deal_key(deal_key)
+        unit = Unit(ns, deal_ns, deal_key, id)
+        unit.bind(self)
+        return unit
+    def get_unit(self, id):
+        if id not in self.units:
+            return self.default_unit
+        return self.units[id]
+    def id(self):
+        index = self._index
+        self._index+=1
+        return index
+    def get_deal(self, key, ns=None, id=None):
+        return self.deals.tget(key, ns, id)
+    def set_deal(self, key, deal, ns=None, tag=None, id=None):
+        self.deals.set(key, deal, ns, tag, id)
+    def get_conf(self, key, ns=None, id=None):
+        return self.confs.tget(key, ns, id)
+    def set_conf(self, key, conf, ns=None, tag=None, id=None):
+        self.confs.set(key, conf, ns, tag, id)
+    def get_encape(self, key, ns=None, id=None):
+        self.build()
+        return self.encapes.tget(key, ns, id)
+    def set_encape(self, key, encape, ns=None, tag=None, id=None):
+        self.encapes.set(key, encape, ns, tag, id)
+
+pass

buildz-0.6.49/buildz/iocz/ioc/single.py

@@ -0,0 +1,56 @@
+#
+from ... import pyz,dz,Base
+
+class Key:
+    default_param_key = 'single_id'
+    i_multi = 0
+    i_single = 1
+    i_param = 2
+    multi='multi'
+    single='single'
+    param='param'
+    str2int = {
+        multi:i_multi,
+        single: i_single,
+        param: i_param
+    }
+    @staticmethod
+    def s2i(key=None):
+        if key is None:
+            key = Key.i_single
+        if key in Key.str2int:
+            key = Key.str2int[key]
+        return key
+class Single(Base):
+    Key = Key
+    def init(self, single=None, param_key = None):
+        if param_key is None:
+            param_key = Key.default_param_key
+        self.single = Key.s2i(single)
+        self.objs = {}
+        self.param_key = param_key
+    def get_key(self, params):
+        if self.single == Key.i_multi:
+            return 0,0
+        elif self.single == Key.i_single:
+            key = None
+        elif self.single == Key.i_param:
+            if params is None:
+                key = None
+            else:
+                key = params.get(self.param_key)
+        else:
+            assert 0
+        return key,1
+    def set(self, params, obj):
+        key, find = self.get_key(params)
+        if not find:
+            return
+        self.objs[key] = obj
+    def get(self, params):
+        key, find = self.get_key(params)
+        if not find:
+            return 0,0
+        if key not in self.objs:
+            return 0,0
+        return self.objs[key],1

{buildz-0.6.48 → buildz-0.6.49}/buildz/iocz/ioc/tdata.py

@@ -1,29 +1,34 @@
 #
-from .tdict import TDict
-from buildz import pyz, dz
+from .tdict import TagDict
+from ... import pyz, dz
 class Key:
     Pub = "pub"
     Pri = "pri"
     Ns = "ns"
-    tags_ns = "ns,pub".split(",")
-    tags_pub = ['pub']
+    tags_ns = [Ns,Pub]
+    tags_pub = [Pub]
     tags_pri = None
 pass
-class TData(TDict):
+class TagData(TagDict):
     '''
         分成三个域，公共pub，私有pri和同域名ns
+        设置访问规则
         不同域名只能访问pub数据
         同域名访问pub和ns
         同一个配置文件内（同一个id）访问pub，ns和pri
     '''
-    def init(self, id=None, ns=None):
+    Key = Key
+    def init(self, ns=None, id=None):
         self.ns = ns
         self.id = id
         super().init(Key.Pub)
+    def set_id(self, id):
+        self.id = id
     def call(self, *a,**b):
         return self.tget(*a,**b)
-    def nsid(self, src, id):
-        if isinstance(src, TData):
+    @staticmethod
+    def nsid(src, id):
+        if isinstance(src, TagData):
             ns = src.ns
             id = src.id
         else:

{buildz-0.6.48 → buildz-0.6.49}/buildz/iocz/ioc/tdict.py

@@ -1,6 +1,6 @@
 #
-from buildz import pyz,dz,Base
-class TDict(Base):
+from ... import pyz,dz,Base
+class TagDict(Base):
     def remove(self, key, tag=None):
         tag = pyz.nnull(tag, self.default)
         rst = dz.get_set(self.maps, tag, dict())
@@ -20,11 +20,13 @@ class TDict(Base):
             rst = self.maps[tag]
             val, has = dz.dget(rst, key)
             if has:
-                return val, 1
-        return None,0
-    def __getattr__(self, tag):
+                return val, tag, 1
+        return None, None, 0
+    def tag(self, tag):
         rst = dz.get_set(self.maps, tag, dict())
         return rst
+    def __getattr__(self, tag):
+        return self.tag(tag)
     def init(self, default=""):
         self.maps = {}
         self.default=default

buildz-0.6.49/buildz/iocz/ioc/test.py

@@ -0,0 +1,37 @@
+
+from buildz.iocz.ioc import *
+from buildz.iocz.ioc_deal import obj
+from buildz import xf, pyz, Base
+class Test(Base):
+    def init(self, id=0):
+        self.id = id
+
+pass
+def test():
+    conf = xf.loads(r"""
+    type=obj
+    source=buildz.iocz.ioc.test.Test
+    single=0
+    args=[
+        {
+            type=obj
+            source = buildz.iocz.ioc.test.Test
+            maps={id=123}
+        }
+    ]
+    """)
+    mg = Manager('.', 'type')
+    print(mg)
+    unit = mg.create()
+    print(unit)
+    deal_obj = obj.ObjectDeal()
+    mg.set_deal('obj', deal_obj)
+    unit.set_conf("test",conf)
+    encape, tag, find = mg.get_encape("test")
+    print(f"encape: {encape}")
+    it = encape()
+    print(f"obj: {id(it), id(it.id),it.id.id}")
+    it = encape()
+    print(f"obj: {id(it), id(it.id),it.id.id}")
+
+pyz.lc(locals(), test)

buildz-0.6.49/buildz/iocz/ioc/test1.py

@@ -0,0 +1,36 @@
+
+from buildz import ioc
+
+from buildz import xf, pyz, Base
+class Test(Base):
+    def init(self, id=0):
+        self.id = id
+
+pass
+def test():
+    conf = xf.loads(r"""
+    [
+        {
+            id=test
+            type=obj
+            source=buildz.iocz.ioc.test.Test
+            single=0
+            args=[
+                {
+                    type=obj
+                    source = buildz.iocz.ioc.test.Test
+                    maps={id=123}
+                }
+            ]
+        }
+    ]
+    """)
+    mg = ioc.build()
+    mg.add(conf)
+    print(mg)
+    it = mg.get("test")
+    print(f"obj: {id(it), id(it.id),it.id.id}")
+    it = mg.get("test")
+    print(f"obj: {id(it), id(it.id),it.id.id}")
+
+pyz.lc(locals(), test)