buildz 0.6.55__tar.gz → 0.6.56__tar.gz

{buildz-0.6.55/buildz.egg-info → buildz-0.6.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.55
+Version: 0.6.56
 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.55 → buildz-0.6.56}/buildz/argz/argz.py

@@ -29,6 +29,8 @@ class ArgType:
 
 pass
 class Params(Base):
+    def str(self):
+        return f"Params(args={self.args}, maps={self.maps})"
     def init(self, args=[], maps={}):
         self.args = args
         self.maps = maps

buildz-0.6.56/buildz/argz/callz.py

@@ -0,0 +1,60 @@
+from buildz import Base, xf, dz
+from . import argz
+from . import evalx
+from ..iocz.ioc_deal.base import BaseEncape
+class Fc(Base):
+    def str(self):
+        return str(self.fc)
+    def init(self, fc=None):
+        self.fc = fc
+    def call(self, params):
+        return self.fc(*params.args, **params.maps), 1
+    @staticmethod
+    def make(fc):
+        if isinstance(fc, Fc):
+            return fc
+        return Fc(fc)
+class RetFc(Fc):
+    def call(self, params):
+        return (params.args, params.maps), 1
+def cal_eval(eval, inputs):
+    if eval is None:
+        return 1
+    return eval(inputs)
+def cal_args(args, inputs):
+    if args is None:
+        return inputs
+    return args(inputs)
+def deal_exp(fc, params, args):
+    try:
+        return fc(params)
+    except argz.ArgExp as exp:
+        if args is not None:
+            exp = args.deal_exp(exp)
+        raise exp
+class Call(Fc):
+    def str(self):
+        return str(self.fcs)
+    def init(self, fc, args=None, eval=None):
+        if not dz.islist(fc):
+            fc = [fc]
+        fc = [self.make(k) for k in fc]
+        self.fcs = fc
+        self.args = args
+        self.eval = eval
+    def deal(self, params):
+        rst = None,0
+        for fc in self.fcs:
+            val,mark_call = fc(params)
+            if mark_call:
+                rst = val, mark_call
+        return rst
+    def call(self, params):
+        if not cal_eval(self.eval, params):
+            return None, 0
+        params = cal_args(self.args, params)
+        return deal_exp(self.deal, params, self.args)
+    def add(self, fc):
+        self.fcs.append(self.make(fc))
+
+pass

{buildz-0.6.55 → buildz-0.6.56}/buildz/argz/conf_argz.py

@@ -27,8 +27,8 @@ class ArgItemConf(conf.Conf):
         self.index(1,deal= df, dict_out=1)
         self.key('default', deal=df, dict_out=1)
         des = conf.Conf()
-        des.index(0, 'des')
-        des.index(1,'need')
+        des.index(0,'need')
+        des.index(1, 'des')
         des.index(2, 'remove')
         self.index(2, deal=des, dict_out=1)
 

{buildz-0.6.55 → buildz-0.6.56}/buildz/argz/conf_callz.py

@@ -34,13 +34,45 @@ class ArgsCallEncape(BaseEncape):
             fcs = [self.ref(fc, self.unit) for fc in self.fcs]
             self.call_fc = Call(fcs, self.args, self.eval)
         return self.call_fc
+class IOCZVarCallEncape(BaseEncape):
+    def init(self, fc, args, eval, unit):
+        if not dz.islist(fc):
+            fc = [fc]
+        self.fcs = fc
+        self.args = args
+        self.eval = eval
+        self.unit = unit
+    def call(self, params=None,**maps):
+        if params is None:
+            params = iocz.Params()
+        inputs = params.inputs
+        if inputs is None:
+            inputs = argz.Params()
+        if not cal_eval(self.eval, inputs):
+            return None
+        inputs = cal_args(self.args, inputs)
+        params.inputs = inputs
+        return deal_exp(self.deal, params, self.args)
+    def deal(self, params):
+        with self.unit.push_vars(params.inputs.maps):
+            val = None
+            for fc in self.fcs:
+                if type(fc)==str:
+                    fc, _tag, find = self.unit.get_encape(fc)
+                    assert find, f"fc '{fc}' not found"
+                _val = fc(params)
+                val = pyz.nnull(_val, val)
+            return val
 class ArgsCallDeal(BaseDeal):
-    def init(self, fc=True, update_env = False):
+    def init(self, fc=True, update_env = False, fc_encape=None):
         super().init()
         _conf = BaseConf()
         index=1
         self.fc = fc
         self.update_env = update_env
+        if fc_encape is None:
+            fc_encape = ArgsCallEncape
+        self.fc_encape = fc_encape
         if fc:
             _conf.ikey(1, 'fc', 'fcs,calls,call'.split(','))
             _conf.ikey(2, 'eval', "judges,judge,evals".split(","))
@@ -69,15 +101,17 @@ class ArgsCallDeal(BaseDeal):
                 fcs = [EnvFc(unit)]
             else:
                 fcs = [RetFc()]
-        # if self.update_env and not self.fc:
-        #     return UpdateEnvEncape(_args, _eval, unit)
-        return ArgsCallEncape(fcs, _args, _eval, unit)
+        return self.fc_encape(fcs, _args, _eval, unit)
 class RetArgsDeal(ArgsCallDeal):
     def init(self):
         super().init(False)
 class UpdateEnvDeal(ArgsCallDeal):
     def init(self):
         super().init(False,True)
+
+class IOCZVarCallDeal(ArgsCallDeal):
+    def init(self):
+        super().init(fc_encape=IOCZVarCallEncape)
 confs = xf.loads(r"""
 # confs.pri: {
 #     deal_args: {
@@ -106,8 +140,14 @@ confs.pri: [
         1,
         [argz,argz_call,argz_fc]
     )
+    (
+        (deal, deal_var)
+        buildz.argz.conf_callz.IOCZVarCallDeal
+        1,
+        [vargz, argz_var]
+    )
 ]
-builds: [deal_args, deal_ret, deal_argz_env]
+builds: [deal_args, deal_ret, deal_argz_env, deal_var]
 """)
 class ConfBuilder(Base):
     def init(self, conf=None):
@@ -126,11 +166,17 @@ class ConfBuilder(Base):
             conf = xf.loads(conf)
         conf = {'confs': [conf]}
         self.mg.add_conf(conf)
-    def call(self, key, args, maps):
+    def call(self, key, args=[], maps={}):
         params = argz.Params(args, maps)
         #p = iocz.Params(params=params)
         fc, find = self.mg.get(key)
         #rst, find = self.mg.get(key, params=p)
         assert find, f"key not found: '{key}'"
         return fc(params)[0]
-        return rst[0]
+        return rst[0]
+    def get(self, key, args=[], maps={}, ns=None):
+        inputs = argz.Params(args, maps)
+        params = iocz.Params(inputs=inputs)
+        obj, find = self.mg.get(key, params=params)
+        assert find, f"key not found: '{key}'"
+        return obj

{buildz-0.6.55 → buildz-0.6.56}/buildz/argz/evalx.py

@@ -18,4 +18,19 @@ class VarBuild(evalz.Build):
         return VarEval(data['data'][0], self.stype)
 lb = VarBuild('list')
 db = VarBuild('dict')
-evalBuilder = evalz.EvalBuilder.Make().set(["l","list","args"], lb).set(['d','dict','maps'], db)
+
+class SizeEval(evalz.Eval):
+    def init(self, key):
+        self.key = key
+    def call(self, obj):
+        args, maps = obj.args, obj.maps
+        if self.key in 'l,list,args'.split(","):
+            return len(args)
+        elif self.key in 'd,dict,maps'.split(","):
+            return len(maps)
+        assert 0
+class SizeBuild(evalz.Build):
+    def call(self, data):
+        return SizeEval(data['data'][0])
+sb = SizeBuild()
+evalBuilder = evalz.EvalBuilder.Make().set(["l","list","args"], lb).set(['d','dict','maps'], db).set("size,len".split(","), sb)

{buildz-0.6.55 → buildz-0.6.56}/buildz/argz/test_call.py

@@ -41,19 +41,43 @@ conf = r"""
     (cvar, search_fc)
     buildz.fz.search
 ]
+[
+    (obj, search_obj)
+    buildz.fz.search
+    [(ref, dp)]
+]
+(
+    (vargz, vmain)
+    (vsearch)
+)
+{
+    type: vargz
+    id: vsearch
+    call: search_obj
+    judge: eq(args[0], search)
+    conf={
+        range: 1
+        dict: {
+            dp: ((0, dp), false, (null,1))
+            pt_fp: ((1, pt_fp), (true,null))
+            pt: ((2, pt), (true,null))
+        }
+    }
+}
 """
 def test_fc(*a, **b):
     print(f"test_fc({a}, {b})")
     return a,b
 def test():
-    args = ['env','.']
+    args = ['search','.']
     maps = {
         'pt_fp': r".*\.py$"
     }
     bd = argz.build()
     bd.adds(conf)
     bd.push_var("test_fc",test_fc)
-    rst = bd("main", args, maps)
+    #rst = bd("main", args, maps)
+    rst = bd.get("vmain", args, maps)
     print(f"rst: {rst}")
     print(bd.mg.envs)
     pass

buildz-0.6.56/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, env=-1):
+        super().init(env)
+        conf = BaseConf()
+        conf.ikey(1, 'ref', 'key,data'.split(","), need=1)
+        conf.index(2, 'default')
+        conf.ikey(3, 'env', 'profile'.split(','))
+        self.update = conf
+
+pass

{buildz-0.6.55 → buildz-0.6.56}/buildz/iocz/init.py

@@ -48,8 +48,30 @@ confs.pri: {
         deals: (env, profile,conf)
         call=1
     }
+    eref: {
+        type=obj
+        src: <buildz>.iocz.conf_deal.ref.RefDeal
+        args: (0)
+    }
+    deal_eref: {
+        type=deal
+        src: [ref, eref]
+        deals: (eref)
+        call=0
+    }
+    refe: {
+        type=obj
+        src: <buildz>.iocz.conf_deal.ref.RefDeal
+        args: (1)
+    }
+    deal_refe: {
+        type=deal
+        src: [ref, refe]
+        deals: (refe)
+        call=0
+    }
 }
-builds: [deal_obj,deal_val,deal_ref,deal_ioc,deal_cvar, deal_env,deal_call]
+builds: [deal_obj,deal_val,deal_ref,deal_ioc,deal_cvar, deal_env,deal_call, deal_eref, deal_refe]
 """.replace("<buildz>", "buildz")
 def build(conf = None, default_conf = True):
     global s_default_conf

{buildz-0.6.55 → buildz-0.6.56}/buildz/iocz/ioc/base.py

@@ -26,7 +26,7 @@ class Params(Base):
         if params is None:
             args,maps = [],{}
         else:
-            args, maps = list(self.args), dict(self.maps)
+            args, maps = list(params.args), dict(params.maps)
         maps.update(upds)
         obj = Params()
         obj.args = args

{buildz-0.6.55 → buildz-0.6.56}/buildz/iocz/ioc/sys_envs.py

@@ -8,7 +8,7 @@ class SysEnvs(Base):
     def tget(self, key, ns=None, tag=None, id=None):
         rst = os.getenv(key)
         if rst is None and ns is not None:
-            gkey = self.ids.id(self.ids(key), self.ids(ns))
+            gkey = self.ids.id(self.ids(ns)+self.ids(key))
             rst = os.getenv(gkey)
         if rst is None:
             return None, TagData.Key.Pub, 0

{buildz-0.6.55 → buildz-0.6.56}/buildz/iocz/ioc/unit.py

@@ -97,6 +97,9 @@ class Unit(UnitBase):
     def get_var(self, key, src=-1, tag=None):
         src, id = self.nsid(src, None)
         return self.mg.get_var(key, src, tag)
+    def push_vars(self, kvs, src=-1, tag=None):
+        src, id = self.nsid(src, None)
+        return self.mg.push_vars(kvs, src, tag)
     def get(self, key, params=None, src=-1, id=None, gfind=True, search_var=True):
         src, id = self.nsid(src, id)
         if search_var:

{buildz-0.6.55 → buildz-0.6.56}/buildz/iocz/ioc_deal/deal.py

@@ -7,7 +7,8 @@ class DealEncape(BaseEncape):
         super().init()
         self.src, self.targets, self.tag, self.prev_call, self.unit = src, targets, tag, prev_call, unit
     def call(self, params=None, **maps):
-        src = self.src
+        #src = self.src
+        src = self.obj(self.src)
         if self.prev_call:
             src = src()
         for target in self.targets:
@@ -20,7 +21,7 @@ class DealDeal(BaseDeal):
         if type(targets) not in (list, tuple):
             targets = [targets]
         if Confs.is_conf(src):
-            src = unit.get_encape(src, unit)
+            src = self.get_encape(src, unit)
         elif type(src)==str:
             src = self.load(src)
         return DealEncape(src, targets, tag, prev_call, unit,)

{buildz-0.6.55 → buildz-0.6.56}/buildz/iocz/ioc_deal/ref.py

@@ -5,16 +5,25 @@ from ..ioc.single import Single
 class RefEncape(BaseEncape):
     '''
     '''
-    def init(self, ref, default, unit):
+    def init(self, ref, default, unit, env=-1):
         super().init()
         self.unit = unit
         self.ref, self.default = ref, default
+        self.env = env
     def call(self, params=None, **maps):
         ref = self.ref
         if isinstance(ref, Encape):
             ref = ref(params)
+        if self.env==0:
+            obj, _, find = self.unit.get_env(ref)
+            if find:
+                return obj
         obj, find = self.unit.get(ref)
         if not find:
+            if self.env==1:
+                obj, _, find = self.unit.get_env(ref)
+                if find:
+                    return obj
             assert self.default[0], f"ref '{ref}' not found"
             val = self.default[1]
             if isinstance(val, Encape):
@@ -22,17 +31,25 @@ class RefEncape(BaseEncape):
             obj = val
         return obj
 class RefDeal(BaseDeal):
+    def init(self, env = -1):
+        super().init()
+        self.env = env
     def deal(self, conf, unit):
         assert 'ref' in conf, f"[REF] key 'ref' not found in {conf}"
         ref = dz.g(conf, ref=None)
         if 'default' in conf:
-            default = 1,conf['default']
+            default = [1,conf['default']]
         else:
-            default = 0,None
+            default = [0,None]
         ref = self.get_encape(ref, unit)
         if default[0]:
             default[1] = self.get_encape(default[1], unit)
-        encape = RefEncape(ref, default, unit)
+        env = None
+        if 'env' in conf:
+            env = conf['env']
+        if env is None:
+            env = self.env
+        encape = RefEncape(ref, default, unit, env)
         return encape
 
 pass

{buildz-0.6.55 → buildz-0.6.56}/buildz/iocz/test/test.py

@@ -2,12 +2,12 @@
 
 from buildz import iocz,xf, pyz, Base
 profiles = xf.loads(r"""
-PYTHON_PATH=test
+xxx.test_var=profile_var_test
 """)
 wraps = iocz.build_wraps()
-ns = wraps('test').wrap
-@ns.obj(id='test')
-@ns.obj.args("env,PYTHON_PATH")
+ns = wraps().wrap
+@ns.obj(id='test_warp')
+@ns.obj.args("ref,xxx.test_var")
 class Test(Base):
     def str(self):
         return f'Test(<{id(self)}>|id={self.id})'
@@ -28,6 +28,9 @@ envs: {
     a=0
     b=1
 }
+confs: [
+    [(val,test_var), conf_var_test]
+]
 confs.ns: [
     [[obj, test1], <buildz>.iocz.test.test.Test, null,{id=[cvar, <buildz>.iocz.test.test.var]}]
     {
@@ -38,7 +41,7 @@ confs.ns: [
         args=[
             #[ref, test1]
             #[env, PATH]
-            [ref, test.test]
+            [ref, test_warp]
             
         ]
     }

{buildz-0.6.55 → buildz-0.6.56/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.55
+Version: 0.6.56
 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.55 → buildz-0.6.56}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.6.55',
+    version = '0.6.56',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',

buildz-0.6.55/buildz/argz/callz.py

@@ -1,47 +0,0 @@
-from buildz import Base, xf, dz
-from . import argz
-from . import evalx
-class Fc(Base):
-    def str(self):
-        return str(self.fc)
-    def init(self, fc=None):
-        self.fc = fc
-    def call(self, params):
-        return self.fc(*params.args, **params.maps), 1
-    @staticmethod
-    def make(fc):
-        if isinstance(fc, Fc):
-            return fc
-        return Fc(fc)
-class RetFc(Fc):
-    def call(self, params):
-        return (params.args, params.maps), 1
-class Call(Fc):
-    def str(self):
-        return str(self.fcs)
-    def init(self, fc, args=None, eval=None):
-        if not dz.islist(fc):
-            fc = [fc]
-        fc = [self.make(k) for k in fc]
-        self.fcs = fc
-        self.args = args
-        self.eval = eval
-    def call(self, params):
-        if self.eval is not None:
-            if not self.eval(params):
-                return None,0
-        if self.args is not None:
-            params = self.args(params)
-        try:
-            rst = None,0
-            for fc in self.fcs:
-                val,mark_call = fc(params)
-                if mark_call:
-                    rst = val, mark_call
-            return rst
-        except argz.ArgExp as exp:
-            if self.args is not None:
-                exp = self.args.deal_exp(exp)
-            raise exp
-    def add(self, fc):
-        self.fcs.append(self.make(fc))

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

@@ -1,13 +0,0 @@
-
-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