buildz 0.6.53__tar.gz → 0.6.54__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.53
+Version: 0.6.54
 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.54/buildz/argz/tests/conf.js

@@ -0,0 +1,34 @@
+{
+    id: main
+    type: calls
+    range: 1
+    calls: [
+        search
+    ]
+}
+{
+    id: search
+    type: call
+    src: search
+    judge: ['=', args[0], search]
+    args: [1, [[0,()], [1, ()], {}]]
+    args: {
+        range: 1
+        keep: 1
+        list: {
+            0: {
+                des: path
+                need: 1
+                src: 0
+            }
+        }
+        dict: {
+            filepath: {
+                srcs: [f, fp, filepath]
+            }
+            content: {
+                srcs: [c, ct, content]
+            }
+        }
+    }
+}

buildz-0.6.54/buildz/argzx/argz.py

@@ -0,0 +1,216 @@
+from .. import Base, xf, dz
+class ArgExp(Exception):
+    def __repr__(self):
+        return self.__str__()
+    def __str__(self):
+        return f"stype: {self.stype}, trs: {self.trs}, des: {self.des}"
+    def __init__(self, stype, trs, des=None, prev = None):
+        super().__init__()
+        self.prev = prev
+        self.stype = stype
+        self.trs = trs
+        self.des = des
+
+pass
+class ArgType:
+    list = 'list'
+    dict='dict'
+    @staticmethod
+    def stand(s):
+        if ArgType.islist(s):
+            return ArgType.list
+        return ArgType.dict
+    @staticmethod
+    def islist(s):
+        return s in ('list','l','lst','args')
+    @staticmethod
+    def isdict(s):
+        return s in ('dict', 'd', 'dct', 'maps')
+
+pass
+class Args(Base):
+    '''
+        参数映射基础类
+    '''
+    Type=ArgType
+    def call(self, args, maps):
+        return args, maps
+    def deal_exp(self, exp):
+        return exp
+
+pass
+class ArrArgs(Args):
+    '''
+        参数映射类的队列，顺序处理
+    '''
+    def str(self):
+        return f"ArrArgs(args={self.args})"
+    def init(self, args = None):
+        if args is None:
+            args = []
+        self.args = args
+    def add(self, item):
+        self.args.append(item)
+        return self
+    def call(self, args, maps):
+        i=0
+        try:
+            for i in range(len(self.args)):
+                item = self.args[i]
+                args, maps = item(args,maps)
+        except ArgExp as exp:
+            exp = self.deal_exp(exp, i-1)
+            raise exp
+        return args, maps
+    def deal_exp(self, exp, base=None):
+        if base is None:
+            base = len(self.args)-1
+        for i in range(base, -1, -1):
+            exp = self.args[i].deal_exp(exp)
+        return exp
+class RangeListArgs(Args):
+    '''
+        范围映射
+    '''
+    def str(self):
+        return f"RangeArgs(base={self.base}, last={self.last}, min={self.min})"
+    def init(self, base = 0, last = None, min=0):
+        self.base = base
+        self.last = last
+        self.min = min
+    def deal_exp(self, exp):
+        trs = set()
+        for key, vtype in exp.trs:
+            if ArgType.islist(vtype):
+                trs.add((key+self.base, vtype))
+            else:
+                trs.add((key, vtype))
+        return ArgExp(exp.stype, trs, exp.des, exp)
+    def call(self, args, maps):
+        if self.last is None:
+            args = args[self.base:]
+        else:
+            args = args[self.base:self.last]
+        if len(args)<self.min:
+            raise ArgExp("need", set([(self.base, 'list')]))
+        return args, maps
+
+
+class ArgItem(Base):
+    '''
+        单个字段映射处理
+    '''
+    # vtype = 'dict' | 'list'
+    def init(self, key, vtype=ArgType.dict, need = False, default = False, default_value = None, des = None,remove=True):
+        self.vtype = vtype
+        self.key = key
+        self.need = need
+        self.default = default
+        self.default_value = default_value
+        self.trs = []
+        self.remove = remove
+        if des is None:
+            des = key
+        self.des = des
+    def add(self, key, vtype=ArgType.dict):
+        self.trs.append((key, vtype))
+        return self
+    def deal_exp(self, exp):
+        trs = set()
+        for key, vtype in exp.trs:
+            if key == self.key and vtype==self.vtype:
+                trs.update(self.trs)
+            else:
+                trs.add((key, vtype))
+        return ArgExp(exp.stype, trs, exp.des, exp)
+    def fetch(self, key, vtype, set_args, args, maps):
+        find = False
+        if ArgType.isdict(vtype):
+            val,find = dz.dget(maps, key)
+            if find:
+                if self.remove:
+                    dz.dremove(maps, key)
+        else:
+            if key in set_args:
+                val = args[key]
+                if self.remove:
+                    set_args.remove(key)
+                find = True
+        return val, find
+    def call(self, set_args, args, maps, rst_args, rst_maps):
+        val = None
+        find = False
+        for key, vtype in self.trs:
+            val, find = self.fetch(key, vtype, set_args, args, maps)
+            if find:
+                break
+        if not find and self.default:
+            find = True
+            val = self.default_value
+        if not find and self.need:
+            raise ArgExp("need", set(self.trs), self.des)
+        if not find:
+            return
+        if ArgType.isdict(self.vtype):
+            xf.dset(rst_maps, self.key, val)
+        else:
+            rst_args[self.key] = val
+
+pass
+class ListFill:
+    '''
+        数组映射后，中间缺失位置如何处理
+        exp=报错
+        null=填充None
+    '''
+    exp='exp'
+    null = 'null'
+    default=exp
+class TrsArgs(Args):
+    def str(self):
+        return f"TrsArgs(args={len(self.args)}, keep={self.keep}, fill = {self.list_fill})"
+    '''
+        数据映射
+    '''
+    def deal_exp(self, exp):
+        for item in self.args:
+            exp = item.deal_exp(exp)
+        return exp
+    def init(self, args=None, keep = True, list_fill = ListFill.default):
+        super().init()
+        if args is None:
+            args = []
+        self.args = args
+        self.keep = keep
+        self.list_fill = list_fill
+    def add(self, item):
+        self.args.append(item)
+        return self
+    def call(self, args, maps):
+        rst_args, rst_maps = {}, {}
+        set_args = set(range(len(args)))
+        for item in self.args:
+            item(set_args, args, maps, rst_args, rst_maps)
+        if self.keep and len(set_args)>0:
+            for i in set_args:
+                if i not in rst_args:
+                    rst_args[i] = args[i]
+        l_args = 0
+        if len(rst_args)>0:
+            l_args= max(rst_args.keys())
+        out_args = []
+        for i in range(l_args+1):
+            if i in rst_args:
+                out_args.append(rst_args[i])
+            else:
+                if self.list_fill == ListFill.null:
+                    out_args.append(None)
+                else:
+                    raise ArgExp("need", set([(i, ArgType.list)]))
+        if self.keep:
+            for k in maps:
+                if k not in rst_maps:
+                    rst_maps[k] = maps[k]
+        return out_args, rst_maps
+
+pass

buildz-0.6.54/buildz/argzx/conf_argz.py

@@ -0,0 +1,118 @@
+from ..iocz.conf import conf
+from .. import Base, xf, dz,pyz
+from .argz import *
+"""
+key:{
+    src: [a,b,c]
+    des: asdf
+    need:1
+    default: True
+    default_value: 123
+    remove: 1
+}
+key: [
+    src, 
+    [des, need, remove]
+    [default, default_value]
+]
+"""
+class ArgItemConf(conf.Conf):
+    def init(self):
+        super().init()
+        self.index(0, 'src', need=1)
+        self.key('src', need=1)
+        df = conf.Conf()
+        df.index(0, 'default')
+        df.index(1, 'default_value')
+        self.index(1, df, dict_out=1)
+        des = conf.Conf()
+        des.index(0, 'des')
+        des.index(1,'need')
+        des.index(2, 'remove')
+        self.index(2, deal=des, dict_out=1)
+
+pass
+class ArgSrcConf(conf.Conf):
+    def init(self):
+        super().init()
+        self.index(0, 'key', need=1)
+        self.key('key', 'val,value,data'.split(','), need=1)
+        self.index(1, 'type')
+        self.key('type', 'vtype'.split(","))
+    def call(self, data, unit=None):
+        data, upd = super().call(data, unit)
+        val = data['key']
+        if 'type' not in data:
+            if type(val)==int:
+                vtype = ArgType.list
+            else:
+                vtype = ArgType.dict
+        else:
+            vtype = data['type']
+        data['type'] = ArgType.stand(vtype)
+        return data, upd
+
+class TrsArgsBuild(Base):
+    def init(self):
+        self.conf = ArgItemConf()
+        self.src_conf = ArgSrcConf()
+    def visits(self, datas, vtype,obj):
+        for key, item in dz.dict2iter(datas):
+            item,_ = self.conf(item)
+            it = ArgItem(key, vtype, *dz.g(item, need=0, default=0, default_value=None,des=None, remove=True))
+            srcs = dz.g(item, src=[])
+            if not dz.islist(srcs):
+                srcs = [srcs]
+            for src in srcs:
+                src, _ = self.src_conf(src)
+                print(f"CONF src: {src}")
+                key, vtype = src['key'], src['type']
+                it.add(key, vtype)
+            obj.add(it)
+    def call(self, conf):
+        lists = xf.g(conf, list={})
+        dicts = xf.g(conf, dict={})
+        if len(lists)+len(dicts)==0:
+            return None
+        keep,list_fill = xf.g(conf, keep=0, fill='exp')
+        obj = TrsArgs([], keep, list_fill)
+        self.visits(lists, ArgType.list, obj)
+        self.visits(dicts, ArgType.dict, obj)
+        return obj
+
+class FullArgsBuild(Base):
+    def init(self):
+        self.trs_build = TrsArgsBuild()
+        cf = conf.Conf()
+        rcf = conf.Conf()
+        rcf.index(0, 'base')
+        rcf.index(1, 'last')
+        rcf.index(2, 'min')
+        cf.index(0, 'range', deal=rcf)
+        cf.key('range', 'ranges'.split(","), deal=rcf)
+        cf.index(1, 'list')
+        cf.index(2, 'dict')
+        cf.key('list', 'args,lists'.split(","))
+        cf.key("dict", 'maps,dicts'.split(","))
+        _cf = conf.Conf()
+        _cf.index(0, 'keep')
+        _cf.index(1, 'fill')
+        _cf.key('fill', 'fill_type'.split(','))
+        cf.index(3, deal=_cf, dict_out=1)
+        self.conf = cf
+    def call(self, conf):
+        arr_args = ArrArgs()
+        conf, upd = self.conf(conf)
+        #print(f"BUILD conf: {conf}")
+        ranges = dz.g(conf, range=None)
+        if ranges is not None:
+            base = ranges['base']
+            if base is not None:
+                last, min = dz.g(ranges, last=None,min=0)
+                min = pyz.nnull(min, 0)
+                range_args = RangeListArgs(base, last, min)
+                arr_args.add(range_args)
+        trs_args = self.trs_build(conf)
+        if trs_args is not None:
+            arr_args.add(trs_args)
+        return arr_args

buildz-0.6.54/buildz/argzx/test.py

@@ -0,0 +1,29 @@
+#
+
+from buildz.argzx import conf_argz as argzx
+from buildz.tls import *
+conf = xf.loads(r"""
+#range=(0,12,3)
+range=(0,12,3)
+args: {
+    0:[0,0]
+}
+maps: {
+    a={
+        src: [(1,list)]
+    }
+}
+""")
+def test():
+    args = [0,1,2]
+    maps = {'a':'b','c':'d'}
+    bd = argzx.FullArgsBuild()
+    obj = bd(conf)
+    args, maps = obj(args, maps)
+    print(f"obj: {obj}")
+    print(f"args: {args}, maps: {maps}")
+    pass
+
+pass
+
+pyz.lc(locals(),test)

{buildz-0.6.53 → buildz-0.6.54}/buildz/evalz/evalz.py

@@ -132,6 +132,7 @@ class EvalBuilder(Base):
                 {type: val, data: 'test'}
             ]
         }
+        eq(var(name),val(test))
     """
     def init(self, default_type = None):
         self._default_type = default_type

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/conf/conf.py

@@ -5,9 +5,11 @@ class Conf(Base):
     '''
         list to dict
     '''
-    def init(self):
+    def init(self, v2l=True):
         self.lists = {}
         self.aliases = {}
+        self.ranges = {}
+        self.v2l = v2l
     @staticmethod
     def default(val):
         if val is None:
@@ -15,13 +17,33 @@ class Conf(Base):
         if not dz.islist(val):
             val = [1, val]
         return val
+    def range(self, key, base, last=None, min = 0, default=None):
+        self.ranges[key] = base,last,min,self.default(default)
     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 range_to_dict(self, rst, conf, unit=None):
+        for key, item in self.ranges.items():
+            base,last,min,default = item
+            if last is None:
+                tmp = conf[base:]
+            else:
+                tmp = conf[base:last]
+            if len(tmp)<min:
+                if default[0]:
+                    val = default[1]
+                else:
+                    assert 0,f"require key '{key}' not set in list {conf}"
+            else:
+                val = tmp
+            rst[key] = val
     def to_dict(self, conf, unit=None):
         if not dz.islist(conf):
-            return conf, False
+            if not dz.isdict(conf) and self.v2l:
+                conf = [conf]
+            else:
+                return conf, False
         rst = {}
         for i,item in self.lists.items():
             key, need, deal, out_dict, default = item
@@ -39,6 +61,7 @@ class Conf(Base):
                 rst.update(val)
             else:
                 rst[key] = val
+        self.range_to_dict(rst, conf, unit)
         return rst, 1
     def update_dict(self, conf, unit=None):
         upd = False

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/conf/unit.py

@@ -26,17 +26,47 @@ or
     ...
 ]
 '''
+def split2list(s, by=','):
+    if s is None:
+        return [s]
+    if not dz.islist(s):
+        s = s.split(by)
+    return s
+def join_nnull(by, *args):
+    args = [k for k in args if k is not None and k!=""]
+    return by.join(args)
+    
+def joins(prefix, suffix=None, by='.', split=","):
+    prefix = split2list(prefix,split)
+    suffix = split2list(suffix,split)
+    rst = []
+    for pfx in prefix:
+        for sfx in suffix:
+            rst.append(join_nnull(by, pfx, sfx))
+    return rst
+
+
 class ConfUnit(Unit):
-    key_ns = ('id', 'namespace', 'ns')
-    key_deal_ns = "deal_id,deal_ns,deal_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(",")
+    #key_ns = ('id', 'namespace', 'ns')
+    key_ns = joins("id,namespace,ns")
+    #key_deal_ns = "deal_id,deal_ns,deal_namespace".split(",")
+    key_deal_ns = joins("deal", "id,ns,namespace", "_")
+    #key_env_ns = "env_id,env_ns,env_namespace,profile_id,profile_ns,profile_namespace".split(",")
+    key_env_ns = joins("env,profile", "id,ns,namespace", "_")
+    #key_confs_pub = "confs.pub,confs".split(",")
+    key_confs_pub = joins("confs,conf", "pub,")
+    #key_confs_pri = "confs.pri,confs.prv".split(",")
+    key_confs_pri = joins("confs,conf", "pri,prv")
+    #key_confs_ns = "confs.ns,confs.namespace".split(",")
+    key_confs_ns = joins("confs,conf", "ns,namespace")
+    #key_envs_pub = "envs.pub,envs,profiles,profiles.pub".split(",")
+    key_envs_pub = joins("envs,env,profiles,profile", "pub,Pub,P,")
+    #key_envs_pri = "envs.pri,envs.prv,profiles.pri,profiles.prv".split(",")
+    key_envs_pri = joins("envs,env,profiles,profile", "pri,prv,local,p,l")
+    #key_envs_ns = "envs.ns,envs.namespace,profiles.ns,profiles.namespace".split(",")
+    key_envs_ns = joins("envs,env,profiles,profile", "ns,namespace,n")
+    #key_builds = "builds,build".split(",")
+    key_builds = joins("builds,build")
     def init(self, conf, mg):
         if type(conf)==str:
             conf = xf.loads(conf)

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/conf_deal/deal.py

@@ -6,8 +6,8 @@ class DealDeal(deal.DealDeal):
         super().init()
         conf = BaseConf()
         conf.index(1, 'source', need=1)
-        conf.index(2, 'tag')
-        conf.index(3, 'call')
+        conf.index(2, 'call')
+        conf.index(3, 'tag')
         conf.key('source', 'src'.split(","), need=1)
         self.update = conf
 

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/conf_deal/env.py

@@ -22,7 +22,7 @@ class EnvDeal(BaseDeal):
         conf = BaseConf()
         conf.index(1, 'env', need=1)
         conf.index(2, 'default')
-        conf.key('env', "data,key".split(","), need=1)
+        conf.key('env', "data,key,profile,conf".split(","), need=1)
         self.update = conf
     def deal(self, conf, unit):
         assert 'env' in conf

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/init.py

@@ -44,7 +44,7 @@ confs.pri: {
     deal_env: {
         type=deal
         src: <buildz>.iocz.conf_deal.env.EnvDeal
-        deals: env
+        deals: (env, profile,conf)
         call=1
     }
 }

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

@@ -18,6 +18,7 @@ class Datas(TagData):
             self.set(key, val, tag)
     def set(self, key, val, tag=None):
         tag = pyz.nnull(tag, self.default)
+        tag = TagData.Key.stand(tag)
         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)

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/ioc/envs.py

@@ -6,6 +6,7 @@ class Envs(Datas):
     def init(self, ns=None, id=None, dts=None):
         super().init(ns, id, dts)
         self.ids = None
+        self.caches = {}
     def update(self, maps, tag=None, flush=False):
         if flush:
             maps = dz.unflush_maps(maps, self.ids.id)
@@ -14,7 +15,14 @@ class Envs(Datas):
     def bind(self, dts):
         self.ids = dts.ids
         super().bind(dts)
+        for k,v in self.caches.items():
+            val,tag=v
+            self.set(k,val,tag)
+        self.caches = {}
     def set(self, key, val, tag=None):
-        super().set(self.ids(key), val, tag)
+        if self.ids is not None:
+            super().set(self.ids(key), val, tag)
+        else:
+            self.caches[key] = val,tag
     def get(self, key, tags=None):
         return super().get(self.ids(key), tags)

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/ioc/tdata.py

@@ -8,6 +8,24 @@ class Key:
     tags_ns = [Ns,Pub]
     tags_pub = [Pub]
     tags_pri = None
+    @staticmethod
+    def is_pub(s):
+        return s in ("pub", "public")
+    @staticmethod
+    def is_pri(s):
+        return s in ("pri", "prv", "private")
+    @staticmethod
+    def is_ns(s):
+        return s in ("ns", "namespace")
+    @staticmethod
+    def stand(s):
+        if Key.is_pub(s):
+            return Key.Pub
+        elif Key.is_ns(s):
+            return Key.Ns
+        elif Key.is_pri(s):
+            return Key.Pri
+        return None
 pass
 class UnitBase(Base):
     def init(self, ns=None, id=None):

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/ioc/vars.py

@@ -15,6 +15,7 @@ class Varset(Dataset):
     def tag(self, _tag):
         if _tag is None:
             _tag = TagData.Key.Pub
+        _tag = TagData.Key.stand(_tag)
         return _tag
     def init(self, ids):
         super().init(ids)

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/test/test.py

@@ -1,10 +1,13 @@
 #
 
 from buildz import iocz,xf, pyz, Base
+profiles = xf.loads(r"""
+PYTHON_PATH=test
+""")
 wraps = iocz.build_wraps()
 ns = wraps('test').wrap
 @ns.obj(id='test')
-@ns.obj.args("env,PATH")
+@ns.obj.args("env,PYTHON_PATH")
 class Test(Base):
     def str(self):
         return f'Test(<{id(self)}>|id={self.id})'
@@ -15,6 +18,7 @@ class Test(Base):
         print("Test.show:", self)
 
 pass
+ns.load_profiles(profiles)
 #ns.obj.args("env,PATH")(Test)
 #ns.obj(id='test')(Test)
 var = 'test_var'

{buildz-0.6.53 → buildz-0.6.54}/buildz/iocz/wrap/base.py

@@ -32,7 +32,8 @@ class WrapBase(Base):
     def init(self, unit=None):
         self.wrap_conf = {}
         self.confs = []
-        self.unit = unit
+        self.unit = None
+        self.bind(unit)
     def clone(self, unit):
         return self.__class__(unit)
     def bind(self, unit):

buildz-0.6.54/buildz/iocz/wrap/default_wraps.py

@@ -0,0 +1,14 @@
+#
+
+from . import obj
+from . import env
+def build(wraps):
+    wraps.set_fc("obj", obj.ObjectWrap())
+    fc = env.EnvWrap()
+    wraps.set_fc("env", fc)
+    wraps.set_fc("load_envs", fc)
+    wraps.set_fc("profile", fc)
+    wraps.set_fc("load_profiles", fc)
+    return wraps
+
+pass