buildz 0.6.51__tar.gz → 0.6.53__tar.gz

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

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

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

buildz-0.6.53/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.53}/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):
@@ -9,7 +10,7 @@ class DLKey(GetKey):
     def Load(conf):
         keys, kfind = dz.dget(conf, spt("dict.key"))
         lids, lfind = dz.dget(conf, spt("list.index"))
-        default = dz.dget(conf, 'default', None)
+        default, find = dz.dget(conf, 'default', None)
         return DLKey(keys, lids, default)
     def init(self, keys, indexes, default=None):
         super().init()
@@ -55,6 +56,10 @@ default_conf = None
 s_default_conf = r"""
     {
         id.spt: '.'
+        env: {
+            spt: '.'
+            orders: [local, args, conf, sys]
+        }
         conf:{
             dict.key = 'id'
             list.index = [(0,1)]
@@ -66,6 +71,9 @@ s_default_conf = r"""
             list.index = ((0,0),0)
             default: null
         }
+        tag: {
+            dict.key='tag'
+        }
     }
 """
 def init():
@@ -76,10 +84,6 @@ 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)
-    @staticmethod
-    def Conf(conf=None):
         init()
         spt = Ids(".")
         if conf is None:
@@ -92,9 +96,13 @@ class ConfManager(Manager):
         ids = Ids(id_spt)
         deal_spt, find = dz.dget(conf, spt("id.spt"), id_spt)
         deal_ids = Ids(deal_spt)
+        env_ids, 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
+        tag_key = DLKey.Load(conf['tag'])
+        env_orders, find = dz.dget(conf, spt("env.orders"), None)
+        super().init(ids, deal_key, conf_key, tag_key, deal_ids, env_ids, env_orders)
+        self.set_deal('deal', DealDeal())
     def add_conf(self, conf):
         unit = ConfUnit(conf, self)
         return unit

{buildz-0.6.51 → buildz-0.6.53}/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,9 @@ 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.tag_key = None
         self.bind(mg)
         self.load(conf)
     def load_confs(self, confs, tag=None):
@@ -50,15 +57,23 @@ class ConfUnit(Unit):
                 rst.append(v)
             confs = rst
         for item in confs:
-            key,find = self.conf_key(item)
-            if find:
-                self.set_conf(key, item, tag)
+            self.add_conf(item, tag)
+            # 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.53/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.53/buildz/iocz/conf_deal/base.py

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

buildz-0.6.53/buildz/iocz/conf_deal/call.py

@@ -0,0 +1,34 @@
+
+from .base import *
+from ... import dz,pyz
+class CallEncape(BaseEncape):
+    def init(self, unit, cvar, args, maps):
+        super().init()
+        self.unit = unit
+        self.params = call, args, maps
+    def call(self, params=None, **_):
+        call, args, maps = self.params
+        call = self.obj(call)
+        if type(call)==str:
+            call = self.unit.get(call)
+        args = self.elist2obj(args)
+        maps = self.edict2obj(maps)
+        return call(*args, **maps)
+class CallDeal(BaseDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.index(1, 'call', need=1)
+        conf.index(2, 'args')
+        conf.index(3, 'maps')
+        conf.key('call', need=1)
+        self.update = conf
+    def deal(self, conf, unit):
+        assert 'call' in conf
+        call = conf['call']
+        call = self.get_encape(call, unit)
+        args = self.get_elist(unit, conf, 'args',[])
+        maps = self.get_edict(unit, conf, 'maps', {})
+        return CallEncape(unit, call, args, maps)
+
+pass

buildz-0.6.53/buildz/iocz/conf_deal/cvar.py

@@ -0,0 +1,28 @@
+
+from .base import *
+from ... import dz,pyz
+class CVarEncape(BaseEncape):
+    def init(self, cvar):
+        super().init()
+        self.cvar = cvar
+    def call(self, params=None, **maps):
+        cvar = self.cvar
+        if isinstance(cvar, Encape):
+            cvar = cvar()
+        cvar = self.load(cvar)
+        return cvar
+class CVarDeal(BaseDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.index(1, 'cvar', need=1)
+        conf.key('cvar', 'var,data'.split(","), need=1)
+        self.update = conf
+    def deal(self, conf, unit):
+        assert 'cvar' in conf
+        cvar = conf['cvar']
+        if Confs.is_conf(cvar):
+            cvar = self.get_encape(cvar, unit)
+        return CVarEncape(cvar)
+
+pass

buildz-0.6.53/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.53/buildz/iocz/conf_deal/env.py

@@ -0,0 +1,35 @@
+
+from .base import *
+from ... import dz,pyz
+class EnvEncape(BaseEncape):
+    def init(self, unit, env, default):
+        super().init()
+        self.unit = unit
+        self.params = env, default
+    def call(self, params=None, **_):
+        env, default = self.params
+        env = self.obj(env)
+        obj, _, find = self.unit.get_env(env)
+        if find:
+            return obj
+        assert default[0], f"env '{env}' not found"
+        obj = default[1]
+        obj = self.obj(obj)
+        return obj
+class EnvDeal(BaseDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.index(1, 'env', need=1)
+        conf.index(2, 'default')
+        conf.key('env', "data,key".split(","), need=1)
+        self.update = conf
+    def deal(self, conf, unit):
+        assert 'env' in conf
+        env = self.get_encape(conf['env'], unit)
+        default, dfind = dz.dget(conf, 'default')
+        if dfind:
+            default = self.get_encape(default, unit)
+        return EnvEncape(unit, env, [dfind, default])
+
+pass

buildz-0.6.53/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.53/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.53/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.53/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.53/buildz/iocz/init.py

@@ -0,0 +1,70 @@
+#
+
+from .conf import mg
+from .. import xf
+from .wrap import wraps, default_wraps
+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
+    }
+    deal_cvar: {
+        type=deal
+        src: <buildz>.iocz.conf_deal.cvar.CVarDeal
+        deals: cvar
+        call=1
+    }
+    deal_call: {
+        type=deal
+        src: <buildz>.iocz.conf_deal.call.CallDeal
+        deals: (call, fc)
+        call=1
+    }
+    deal_env: {
+        type=deal
+        src: <buildz>.iocz.conf_deal.env.EnvDeal
+        deals: env
+        call=1
+    }
+}
+builds: [deal_obj,deal_val,deal_ref,deal_ioc,deal_cvar, deal_env,deal_call]
+""".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
+
+def build_wraps(default=True):
+    obj = wraps.WrapUnits()
+    if default:
+        default_wraps.build(obj)
+    return obj

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

@@ -10,21 +10,35 @@ 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
 
 class Params(Base):
-    def clone(self, **upds):
-        args, maps = list(self.args), dict(self.maps)
+    @staticmethod
+    def Clone(params, **upds):
+        if params is None:
+            args,maps = [],{}
+        else:
+            args, maps = list(self.args), dict(self.maps)
         maps.update(upds)
-        return Params(args, maps)
+        obj = Params()
+        obj.args = args
+        obj.maps = maps
+        return obj
+    def clone(self, **upds):
+        return Params.Clone(self, **upds)
     def init(self, *args, **maps):
         self.args = args
         self.maps = maps
+    def set(self, key, val):
+        self.maps[key] = val
     def get(self, key, default=None):
         if key not in self.maps:
             return default

{buildz-0.6.51 → buildz-0.6.53}/buildz/iocz/ioc/confs.py

@@ -10,6 +10,6 @@ class Confs(Datas):
         super().init(ns, id, dts)
         self.deal_ns = deal_ns
     def set(self, key, val, tag=None):
-        val = (val, self.deal_ns)
+        val = (val, self.deal_ns, self.id)
         super().set(key, val, tag)
         

{buildz-0.6.51 → buildz-0.6.53}/buildz/iocz/ioc/datas.py

@@ -13,6 +13,9 @@ class Datas(TagData):
             return
         self.dts = dts
         dts.add(self)
+    def update(self, maps, tag=None):
+        for key, val in maps.items():
+            self.set(key, val, tag)
     def set(self, key, val, tag=None):
         tag = pyz.nnull(tag, self.default)
         super().set(key, val, tag)

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

@@ -7,28 +7,30 @@ class Dataset(Base):
     '''
         所有数据集，只包含pub和ns部分
     '''
+    def str(self):
+        return f"Dataset(pub={self.pub}, ns={self.ns})"
     def init(self, ids):
         self.ids = ids
         self.pub = {}
         self.ns = {}
         self.objs = {}
+    def update(self, maps, ns=None, tag=None, id=None, flush=False):
+        if flush:
+            maps = dz.unflush_maps(maps, self.ids.id)
+        for key, val in maps.items():
+            self.set(key, val, ns, tag, id)
     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
+        dz.dset(map, self.ids(key),val)
+        #map[key] = val
     def add(self, data):
         ns = data.ns
         self.objs[data.id] = data
@@ -39,19 +41,22 @@ class Dataset(Base):
         if data.dts!=self:
             data.bind(self)
     def tget(self, key, ns=None, tag=None, id=None):
-        obj, id, keys,tag, find = self.get(key,ns,tag, id)
+        obj, keys,tag, find = self.get(key,ns,tag, id)
         return obj, tag, find
     def get(self, key, ns=None, tag=None, id = None):
+        keys = self.ids(key)
+        if len(keys)==0:
+            return None,None,None,0
         if tag == TagData.Key.Pub:
             find =False
         else:
-            obj, oid, find = self.ns_get(key,ns,id)
+            obj, 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)
+            obj, keys, find=self.pub_get(key,ns,id)
             tag=TagData.Key.Pub
-        return obj,oid,keys,tag,find
+        return obj,keys,tag,find
     def _pub_get(self, key, ns=None, id=None):
         ids_key = self.ids(key)
         ids = ids_key
@@ -64,16 +69,15 @@ 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 obj,keys,find
+        return None,None,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
+        obj, find = dz.dget(map, self.ids(key))
+        if not find:
+            return None,0
+        return obj,1