buildz 0.6.51__tar.gz → 0.6.52__tar.gz

{buildz-0.6.51/buildz.egg-info → buildz-0.6.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.51
+Version: 0.6.52
 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.52/buildz/iocz/__init__.py

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

buildz-0.6.52/buildz/iocz/conf/conf.py

@@ -0,0 +1,70 @@
+
+from .base import *
+from ... import dz
+class Conf(Base):
+    '''
+        list to dict
+    '''
+    def init(self):
+        self.lists = {}
+        self.aliases = {}
+    @staticmethod
+    def default(val):
+        if val is None:
+            val = [0, None]
+        if not dz.islist(val):
+            val = [1, val]
+        return val
+    def key(self, key, aliases, need=False, remove=True, deal = None, default=None):
+        self.aliases[key] = list(aliases), need, remove, deal, self.default(default)
+    def index(self, i, key=None, need=False, deal = None, dict_out = False, default=None):
+        self.lists[i] = key,need,deal, dict_out, self.default(default)
+    def to_dict(self, conf, unit=None):
+        if not dz.islist(conf):
+            return conf, False
+        rst = {}
+        for i,item in self.lists.items():
+            key, need, deal, out_dict, default = item
+            if i>=len(conf):
+                if default[0]:
+                    val = default[1]
+                else:
+                    assert not need, f"require key '{key}' not set in list {conf}"
+                    continue
+            else:
+                val = conf[i]
+            if deal is not None:
+                val,upd = deal(val, unit)
+            if type(val)==dict and out_dict:
+                rst.update(val)
+            else:
+                rst[key] = val
+        return rst, 1
+    def update_dict(self, conf, unit=None):
+        upd = False
+        for key, item in self.aliases.items():
+            aliases, need, remove, deal, default = item
+            if key not in conf:
+                for name in aliases:
+                    if name in conf:
+                        conf[key] = conf[name]
+                        upd = 1
+                        if remove:
+                            del conf[name]
+                        break
+            if key not in conf:
+                if default[0]:
+                    conf[key] = default[1]
+                else:
+                    assert not need, f"require key '{key}' not set in dict {conf}"
+            if key in conf and deal is not None:
+                conf[key], _upd = deal(conf[key], unit)
+                upd = upd or _upd
+        return upd
+    def call(self, conf, unit=None):
+        conf, upd = self.to_dict(conf, unit)
+        upd = upd or self.update_dict(conf, unit)
+        return conf, upd
+
+pass
+

{buildz-0.6.51 → buildz-0.6.52}/buildz/iocz/conf/mg.py

@@ -2,6 +2,7 @@
 #
 from ..ioc.mg import Manager, GetKey, Ids
 from ... import dz,xf
+from ..conf_deal.deal import DealDeal
 from .unit import ConfUnit
 spt = Ids(".")
 class DLKey(GetKey):
@@ -55,6 +56,7 @@ default_conf = None
 s_default_conf = r"""
     {
         id.spt: '.'
+        env.spt: '.'
         conf:{
             dict.key = 'id'
             list.index = [(0,1)]
@@ -76,8 +78,9 @@ def init():
     default_conf = dz.flush_maps(default_conf)
 class ConfManager(Manager):
     def init(self, conf=None):
-        ids, deal_key, conf_key, deal_ids = self.Conf(conf)
-        super().init(ids, deal_key, conf_key, deal_ids)
+        ids, deal_key, conf_key, deal_ids, env_ids = self.Conf(conf)
+        super().init(ids, deal_key, conf_key, deal_ids, env_ids)
+        self.set_deal('deal', DealDeal())
     @staticmethod
     def Conf(conf=None):
         init()
@@ -92,9 +95,10 @@ class ConfManager(Manager):
         ids = Ids(id_spt)
         deal_spt, find = dz.dget(conf, spt("id.spt"), id_spt)
         deal_ids = Ids(deal_spt)
+        env_spt, find = dz.dget(conf, spt("env.spt"), id_spt)
         deal_key = DLKey.Load(conf['deal'])
         conf_key = DLKey.Load(conf['conf'])
-        return ids, deal_key, conf_key, deal_ids
+        return ids, deal_key, conf_key, deal_ids, env_spt
     def add_conf(self, conf):
         unit = ConfUnit(conf, self)
         return unit

buildz-0.6.52/buildz/iocz/conf/test.py

@@ -0,0 +1,87 @@
+#
+
+from buildz import iocz
+
+from buildz import xf, pyz, Base
+
+class Test(Base):
+    def str(self):
+        return f'Test<{id(self)}>(id={self.id})'
+    def init(self, id=0):
+        super().init()
+        self.id = id
+    def call(self):
+        print("Test.show:", self)
+
+pass
+confs = r"""
+confs.pri: {
+    deal_obj:{
+        type=deal
+        src=buildz_bak.iocz.conf_deal.obj.ObjectDeal
+        deals: [obj,object]
+        call=1
+    }
+    deal_val:{
+        type=deal
+        src=buildz_bak.iocz.conf_deal.val.ValDeal
+        deals: [val,value]
+        call=1
+    }
+    deal_ref: {
+        type:deal
+        src:buildz_bak.iocz.conf_deal.ref.RefDeal
+        deals: ref
+        call=1
+    }
+    deal_ioc: {
+        type:deal
+        src:buildz_bak.iocz.conf_deal.ioc.IOCDeal
+        deals: ioc
+        call=1
+    }
+}
+builds: [deal_obj,deal_val,deal_ref,deal_ioc]
+"""
+confs1 = r'''
+ns: xxx
+envs: {
+    a=0
+    b=1
+}
+confs.ns: [
+    [[obj, test1], <buildz>.iocz.conf.test.Test, [],{id=[ioc]}]
+    {
+        id=test
+        type=obj
+        source=<buildz>.iocz.conf.test.Test
+        single=1
+        args=[
+            [ref, test1]
+        ]
+    }
+]
+'''.replace("<buildz>", "buildz")
+def get_env_sys(self, id, sid=None):
+    sysdt = os.getenv(id)
+    return sysdt
+def test():
+    mg = iocz.build()
+    print(mg)
+    #unit = mg.add_conf(confs)
+    unit = mg.add_conf(confs1)
+    with mg.push_vars({"test": 123}):
+        it, find = unit.get("test")
+        print(f"it: {it, id(it)}, find: {find}")
+    it, find = unit.get("test")
+    print(f"it: {it, id(it)}, find: {find}")
+    it, find = mg.get("test", "xxx")
+    print(f"it: {it, id(it)}, find: {find}")
+    print(f"env: {unit.get_env('b')}")
+    print(type(it))
+    it = Test(123)
+    print(type(it))
+    print(it)
+    exit()
+
+pyz.lc(locals(), test)

{buildz-0.6.51 → buildz-0.6.52}/buildz/iocz/conf/unit.py

@@ -6,6 +6,7 @@ from ..ioc.datas import Datas
 '''
 id|namespace|ns:
 deal_id|deal_ns: 
+env_id|env_ns:
 envs.pub|envs.pri|envs.ns|envs: {
     
 }
@@ -28,9 +29,13 @@ or
 class ConfUnit(Unit):
     key_ns = ('id', 'namespace', 'ns')
     key_deal_ns = "deal_id,deal_ns,deal_namespace".split(",")
-    key_pub = "confs.pub,confs".split(",")
-    key_pri = "confs.pri,confs.prv".split(",")
-    key_ns = "confs.ns,confs.namespace".split(",")
+    key_env_ns = "env_id,env_ns,env_namespace".split(",")
+    key_confs_pub = "confs.pub,confs".split(",")
+    key_confs_pri = "confs.pri,confs.prv".split(",")
+    key_confs_ns = "confs.ns,confs.namespace".split(",")
+    key_envs_pub = "envs.pub,envs".split(",")
+    key_envs_pri = "envs.pri,envs.prv".split(",")
+    key_envs_ns = "envs.ns,envs.namespace".split(",")
     key_builds = "builds,build".split(",")
     def init(self, conf, mg):
         if type(conf)==str:
@@ -39,7 +44,8 @@ class ConfUnit(Unit):
             conf = {'confs': conf}
         ns = dz.get_one(conf, self.key_ns)
         deal_ns = dz.get_one(conf, self.key_deal_ns)
-        super().init(ns, deal_ns)
+        env_ns = dz.get_one(conf, self.key_env_ns)
+        super().init(ns, deal_ns, env_ns)
         self.bind(mg)
         self.load(conf)
     def load_confs(self, confs, tag=None):
@@ -53,12 +59,19 @@ class ConfUnit(Unit):
             key,find = self.conf_key(item)
             if find:
                 self.set_conf(key, item, tag)
+    def load_envs(self, envs, tag=None):
+        for key, val in envs.items():
+            self.set_env(key, val, tag)
     def load(self, conf):
-        keys = [self.key_pub, self.key_ns, self.key_pri]
         tags = [Datas.Key.Pub, Datas.Key.Ns, Datas.Key.Pri]
+        keys = [self.key_confs_pub, self.key_confs_ns, self.key_confs_pri]
         for key, tag in zip(keys, tags):
             tag_confs = dz.get_one(conf, key, [])
             self.load_confs(tag_confs, tag)
+        keys = [self.key_envs_pub, self.key_envs_ns, self.key_envs_pri]
+        for key, tag in zip(keys, tags):
+            tag_envs = dz.get_one(conf, key, {})
+            self.load_envs(tag_envs, tag)
         builds = dz.get_one(conf, self.key_builds, [])
         for item in builds:
             self.add_build(item)

buildz-0.6.52/buildz/iocz/conf/up.py

@@ -0,0 +1,29 @@
+#
+from .conf import Conf
+from .base import Base
+from ... import dz
+class Up(Conf):
+    def init(self):
+        super().init()
+        self.key('up', 'parent,parents'.split(","))
+    def call(self, conf, unit):
+        conf, upd = super().call(conf, unit)
+        if 'up' in conf:
+            up = conf['up']
+            up_conf, tag, find = unit.get_conf(up)
+            assert find, f"up '{up}' not found in {conf}"
+            assert dz.isdict(up_conf), f"up '{up}' should be dict, but list found: {up_conf}"
+            dz.fill(up_conf, conf, 0)
+            upd = 1
+        return conf, upd
+
+pass
+
+class BaseConf(Up):
+    def init(self):
+        super().init()
+        conf = Conf()
+        conf.index(0, 'type', need=1)
+        conf.index(1, 'id', need=0)
+        conf.index(2, 'single', need=0)
+        self.index(0, deal=conf, need=1, dict_out=1)

buildz-0.6.52/buildz/iocz/conf_deal/base.py

@@ -0,0 +1,2 @@
+from ..conf.base import *
+from ..conf.up import *

buildz-0.6.52/buildz/iocz/conf_deal/deal.py

@@ -0,0 +1,14 @@
+
+from .base import *
+from ..ioc_deal import deal
+class DealDeal(deal.DealDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.index(1, 'source', need=1)
+        conf.index(2, 'tag')
+        conf.index(3, 'call')
+        conf.key('source', 'src'.split(","), need=1)
+        self.update = conf
+
+pass

buildz-0.6.52/buildz/iocz/conf_deal/ioc.py

@@ -0,0 +1,12 @@
+
+from .base import *
+from ..ioc_deal import ioc
+class IOCDeal(ioc.IOCDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.index(1, 'target')
+        conf.key('target', 'data,key'.split(","))
+        self.update = conf
+
+pass

buildz-0.6.52/buildz/iocz/conf_deal/obj.py

@@ -0,0 +1,20 @@
+#
+
+from .base import *
+from ..ioc_deal import obj
+
+class ObjectDeal(obj.ObjectDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.index(1, 'source', need=1)
+        conf.index(2, 'args')
+        conf.index(3, 'maps')
+        conf.index(4, 'sets')
+        conf.index(5, 'after_set')
+        conf.key('source', 'src'.split(","), need=1)
+        conf.key('before_set', 'before_call'.split(","))
+        conf.key('after_set', 'after_call,call'.split(","))
+        self.update = conf
+
+pass

buildz-0.6.52/buildz/iocz/conf_deal/ref.py

@@ -0,0 +1,13 @@
+
+from .base import *
+from ..ioc_deal import ref
+class RefDeal(ref.RefDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.index(1, 'ref', need=1)
+        conf.index(2, 'default')
+        conf.key('ref', 'key,data'.split(","), need=1)
+        self.update = conf
+
+pass

buildz-0.6.52/buildz/iocz/conf_deal/val.py

@@ -0,0 +1,12 @@
+
+from .base import *
+from ..ioc_deal import val
+class ValDeal(val.ValDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.index(1, 'val', need=1)
+        conf.key('val', 'value,data'.split(","), need=1)
+        self.update = conf
+
+pass

buildz-0.6.52/buildz/iocz/init.py

@@ -0,0 +1,45 @@
+#
+
+from .conf import mg
+from .. import xf
+s_default_conf = r"""
+confs.pri: {
+    deal_obj:{
+        type=deal
+        src=<buildz>.iocz.conf_deal.obj.ObjectDeal
+        deals: [obj,object]
+        call=1
+    }
+    deal_val:{
+        type=deal
+        src=<buildz>.iocz.conf_deal.val.ValDeal
+        deals: [val,value]
+        call=1
+    }
+    deal_ref: {
+        type:deal
+        src:<buildz>.iocz.conf_deal.ref.RefDeal
+        deals: ref
+        call=1
+    }
+    deal_ioc: {
+        type:deal
+        src:<buildz>.iocz.conf_deal.ioc.IOCDeal
+        deals: ioc
+        call=1
+    }
+}
+builds: [deal_obj,deal_val,deal_ref,deal_ioc]
+""".replace("<buildz>", "buildz")
+def build(conf = None, default_conf = True):
+    global s_default_conf
+    if default_conf and type(default_conf) not in (str, list, tuple, dict):
+        default_conf = s_default_conf
+    if type(default_conf) == str:
+        default_conf = xf.loads(default_conf)
+    obj = mg.ConfManager(conf)
+    if default_conf:
+        obj.add_conf(default_conf)
+    return obj
+
+pass

{buildz-0.6.51 → buildz-0.6.52}/buildz/iocz/ioc/base.py

@@ -10,10 +10,13 @@ pass
 class Deal(Base):
     def deal(self, conf, unit):
         return None
+    def update(self, conf, unit):
+        return conf, False
     def call(self, conf, unit):
         'encape, conf, conf_need_udpate'
+        conf, upd = self.update(conf, unit)
         encape = self.deal(conf,unit)
-        return encape,conf,False
+        return encape,conf,upd
 
 pass
 

{buildz-0.6.51 → buildz-0.6.52}/buildz/iocz/ioc/dataset.py

@@ -28,7 +28,8 @@ class Dataset(Base):
             id = id.id
         val = (val,id)
         map = dz.get_set(self.ns, ns, dict())
-        map[key] = val
+        dz.dset(map, self.ids(key),val)
+        #map[key] = val
     def add(self, data):
         ns = data.ns
         self.objs[data.id] = data
@@ -64,15 +65,20 @@ class Dataset(Base):
         obj,find = dz.dget(self.pub, ids)
         if find:
             return obj, ids, find
-        return 0,0,0
+        return None,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
+        return None,0,0,0
     def ns_get(self, key, ns=None, id=None):
         map = dz.get_set(self.ns, ns, dict())
+        obj, find = dz.dget(map, self.ids(key))
+        if not find:
+            return None,0,0
+        obj, id = obj
+        return obj,id,1
         if key not in map:
             return 0, 0, 0
         v,id=map[key]

{buildz-0.6.51 → buildz-0.6.52}/buildz/iocz/ioc/encapes.py

@@ -98,9 +98,9 @@ class Encapeset(Dataset):
         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, tag, id)
+        obj, eid, keys, _tag, find = super().get(key, ns, tag, id)
         if find:
-            return obj, eid, keys, tag, find
+            return obj, eid, keys, _tag, find
         return self.make(key, ns, tag, id)
 
     

buildz-0.6.52/buildz/iocz/ioc/envs.py

@@ -0,0 +1,15 @@
+#
+from .datas import Datas
+from .dataset import Dataset
+from .confs import Confs
+class Envs(Datas):
+    def init(self, ns=None, id=None, dts=None):
+        super().init(ns, id, dts)
+        self.ids = None
+    def bind(self, dts):
+        self.ids = dts.ids
+        super().bind(dts)
+    def set(self, key, val, tag=None):
+        super().set(self.ids(key), val, tag)
+    def get(self, key, tags=None):
+        return super().get(self.ids(key), tags)

{buildz-0.6.51 → buildz-0.6.52}/buildz/iocz/ioc/mg.py

@@ -35,7 +35,7 @@ class Manager(Base):
         if type(ids)==str:
             ids = Ids(ids)
         return ids
-    def init(self, ids, deal_key='type', conf_key='id', deal_ids = None):
+    def init(self, ids, deal_key='type', conf_key='id', deal_ids = None, env_ids = None):
         self._index = 0
         self.units = {}
         self.builds = Buildset(self)
@@ -43,11 +43,17 @@ class Manager(Base):
         self.ids = ids
         self.deal_key = self.make_key(deal_key)
         self.conf_key = self.make_key(conf_key)
-        self.deal_ids = pyz.nnull(deal_ids, ids)
+        self.deal_ids = self.make_ids(pyz.nnull(deal_ids, ids))
+        self.env_ids = self.make_ids(pyz.nnull(env_ids, ids))
         self.confs = Dataset(self.ids)
+        self.envs = Dataset(self.env_ids)
         self.deals = Dataset(self.deal_ids)
         self.encapes = Encapeset(self.ids, self)
         self.vars = Varset(self.ids)
+        #
+        self.set_env = self.envs.set
+        self.get_env = self.envs.tget
+        #
         self.push_var = self.vars.vpush
         self.push_vars = self.vars.vpushs
         self.pop_var = self.vars.vpop
@@ -57,6 +63,7 @@ class Manager(Base):
         self.get_var = self.vars.vget
         self.unset_var = self.vars.vremove
         self.unset_vars = self.vars.vremoves
+        #
         self.default_unit = self.create()
     def add_build(self, conf):
         self.builds.add(conf)
@@ -65,13 +72,13 @@ class Manager(Base):
     def add(self, unit):
         unit.bind(self)
         self.units[unit.id] = unit
-    def create(self, ns=None, deal_ns = None, deal_key=None, conf_key= None):
+    def create(self, ns=None, deal_ns = None, env_ns = None, deal_key=None, conf_key= None):
         id = self.id()
         deal_key = pyz.nnull(deal_key, self.deal_key)
         conf_key = pyz.nnull(conf_key, self.conf_key)
         deal_key = self.make_key(deal_key)
         conf_key = self.make_key(conf_key)
-        unit = Unit(ns, deal_ns, deal_key, conf_key, id)
+        unit = Unit(ns, deal_ns, env_ns, deal_key, conf_key, id)
         unit.bind(self)
         return unit
     def get_unit(self, id):
@@ -95,5 +102,16 @@ class Manager(Base):
         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)
+    def get(self, key, ns=None, id=None,params=None, search_var = True):
+        if search_var:
+            obj, find = self.get_var(key, ns)
+            if find:
+                return obj, 1
+        encape, tag, find = self.get_encape(key, ns, id)
+        if not find:
+            return None, 0
+        return encape(params),1
+
+
 
 pass

{buildz-0.6.51 → buildz-0.6.52}/buildz/iocz/ioc/tdata.py

@@ -1,6 +1,6 @@
 #
 from .tdict import TagDict
-from ... import pyz, dz
+from ... import pyz, dz,Base
 class Key:
     Pub = "pub"
     Pri = "pri"
@@ -9,6 +9,10 @@ class Key:
     tags_pub = [Pub]
     tags_pri = None
 pass
+class UnitBase(Base):
+    def init(self, ns=None, id=None):
+        self.ns = ns
+        self.id = id
 class TagData(TagDict):
     '''
         分成三个域，公共pub，私有pri和同域名ns
@@ -28,7 +32,7 @@ class TagData(TagDict):
         return self.tget(*a,**b)
     @staticmethod
     def nsid(src, id):
-        if isinstance(src, TagData):
+        if isinstance(src, TagData) or isinstance(src, UnitBase):
             ns = src.ns
             id = src.id
         else: