buildz 0.6.56__tar.gz → 0.6.58__tar.gz

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

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

@@ -87,7 +87,7 @@ class ArgsCallDeal(BaseDeal):
         conf_args = dz.g(conf, conf=None)
         _eval = None
         if conf_eval is not None:
-            _eval = evalBuilder(conf_eval)
+            _eval = evalBuilder.default_build(UnitBuild(unit))(conf_eval)
         _args = None
         if conf_args is not None:
             _args = self.args_builder(conf_args)

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

@@ -32,5 +32,20 @@ class SizeEval(evalz.Eval):
 class SizeBuild(evalz.Build):
     def call(self, data):
         return SizeEval(data['data'][0])
+class UnitEval(evalz.Eval):
+    def init(self, encape):
+        self.encape = encape
+    def call(self, obj):
+        return self.encape()
+class UnitBuild(evalz.Build):
+    def init(self, unit):
+        super().init()
+        self.unit = unit
+    def call(self, data):
+        conf = [data['type']]+data['data']
+        encape, _, find = self.unit.get_encape(conf)
+        assert find
+        return UnitEval(encape)
+
 sb = SizeBuild()
 evalBuilder = evalz.EvalBuilder.Make().set(["l","list","args"], lb).set(['d','dict','maps'], db).set("size,len".split(","), sb)

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

@@ -50,11 +50,14 @@ conf = r"""
     (vargz, vmain)
     (vsearch)
 )
+(
+    (val, test_var),123
+)
 {
     type: vargz
     id: vsearch
     call: search_obj
-    judge: eq(args[0], search)
+    judge: and(eq(args[0], search),eq(ref(test_var),123))
     conf={
         range: 1
         dict: {

{buildz-0.6.56 → buildz-0.6.58}/buildz/evalz/evalz.py

@@ -137,8 +137,12 @@ class EvalBuilder(Base):
     def init(self, default_type = None):
         self._default_type = default_type
         self.builds = {}
+        self._default_build = None
     def default_type(self, dtype):
         self._default_type = dtype
+    def default_build(self, fc):
+        self._default_build = fc
+        return self
     def set(self, key, fc):
         if type(key) not in (list, tuple):
             key = [key]
@@ -154,6 +158,8 @@ class EvalBuilder(Base):
         if type(data['data']) not in (list, tuple, set):
             data['data'] = [data['data']]
         tp = data['type']
+        if tp not in self.builds and self._default_build is not None:
+            return self._default_build(data)
         assert tp in self.builds
         return self.builds[tp](data)
     @staticmethod

buildz-0.6.58/buildz/iocz/conf_deal/attr.py

@@ -0,0 +1,38 @@
+
+from .base import *
+from ... import dz,pyz,xf
+class AttrEncape(BaseEncape):
+    def init(self, unit, attr, obj):
+        super().init()
+        self.unit = unit
+        self.params = attr, obj
+    def call(self, params=None, **maps):
+        attr, obj = self.params
+        attr = self.obj(attr)
+        if isinstance(obj, Encape):
+            obj = self.obj(obj)
+        elif type(obj)==str:
+            obj, find = self.unit.get(obj)
+        if obj is None and params is not None:
+            obj = params.obj
+        assert obj is not None and hasattr(obj, attr), f"attr get failed for "
+        return getattr(obj, attr)
+class AttrDeal(BaseDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.ikey(1, 'attr', 'var,data,key'.split(","), need=1)
+        conf.ikey(2, 'obj', 'object,src,source'.split(','))
+        self.update = conf
+    def deal(self, conf, unit):
+        assert 'attr' in conf
+        attr = conf['attr']
+        attr = self.get_encape(attr, unit)
+        # obj = dz.g(conf, obj=None)
+        # print(f"obj: {obj}")
+        # exit()
+        obj = dz.get(conf, 'obj')
+        obj = self.get_encape(obj, unit)
+        return AttrEncape(unit, attr, obj)
+
+pass

{buildz-0.6.56 → buildz-0.6.58}/buildz/iocz/conf_deal/call.py

@@ -2,7 +2,7 @@
 from .base import *
 from ... import dz,pyz
 class CallEncape(BaseEncape):
-    def init(self, unit, cvar, args, maps):
+    def init(self, unit, call, args, maps):
         super().init()
         self.unit = unit
         self.params = call, args, maps
@@ -10,7 +10,8 @@ class CallEncape(BaseEncape):
         call, args, maps = self.params
         call = self.obj(call)
         if type(call)==str:
-            call = self.unit.get(call)
+            call,find = self.unit.get(call)
+        assert call is not None
         args = self.elist2obj(args)
         maps = self.edict2obj(maps)
         return call(*args, **maps)

buildz-0.6.58/buildz/iocz/conf_deal/method.py

@@ -0,0 +1,43 @@
+
+from .base import *
+from ... import dz,pyz
+class MethodEncape(BaseEncape):
+    def init(self, unit, method, obj, args, maps):
+        super().init()
+        self.unit = unit
+        self.params = method, obj, args, maps
+    def call(self, params=None, **_):
+        method, obj, args, maps = self.params
+        method = self.obj(method)
+        if isinstance(obj, Encape):
+            obj = self.obj(obj)
+        elif type(obj)==str:
+            obj, find = self.unit.get(obj)
+        if obj is None and params is not None:
+            obj = params.obj
+        if type(method)==str:
+            assert obj is not None and hasattr(obj, method)
+            method = getattr(obj, method)
+        args = self.elist2obj(args)
+        maps = self.edict2obj(maps)
+        return method(*args, **maps)
+class MethodDeal(BaseDeal):
+    def init(self):
+        super().init()
+        conf = BaseConf()
+        conf.ikey(1, 'method','call,fc,data,key'.split(","), need=1)
+        conf.ikey(2, 'obj', 'source,obj,object,src'.split(","))
+        conf.ikey(3, 'args')
+        conf.ikey(4, 'maps')
+        self.update = conf
+    def deal(self, conf, unit):
+        assert 'method' in conf
+        method = conf['method']
+        method = self.get_encape(method, unit)
+        obj = dz.get(conf, "obj")
+        obj = self.get_encape(obj, unit)
+        args = self.get_elist(unit, conf, 'args',[])
+        maps = self.get_edict(unit, conf, 'maps', {})
+        return MethodEncape(unit, method, obj, args, maps)
+
+pass

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

@@ -70,10 +70,22 @@ confs.pri: {
         deals: (refe)
         call=0
     }
+    deal_method: {
+        type=deal
+        src=<buildz>.iocz.conf_deal.method.MethodDeal
+        deals=(method,obj_fc,o_fc)
+        call=1
+    }
+    deal_attr: {
+        type=deal
+        src=<buildz>.iocz.conf_deal.attr.AttrDeal
+        deals=(attr, obj_var, o_var)
+        call=1
+    }
 }
-builds: [deal_obj,deal_val,deal_ref,deal_ioc,deal_cvar, deal_env,deal_call, deal_eref, deal_refe]
+builds: [deal_obj,deal_val,deal_ref,deal_ioc,deal_cvar, deal_env,deal_call, deal_eref, deal_refe,deal_method,deal_attr]
 """.replace("<buildz>", "buildz")
-def build(conf = None, default_conf = True):
+def build(conf = None, default_conf = True, default_wrap = True):
     global s_default_conf
     if default_conf and type(default_conf) not in (str, list, tuple, dict):
         default_conf = s_default_conf
@@ -82,6 +94,8 @@ def build(conf = None, default_conf = True):
     obj = mg.ConfManager(conf)
     if default_conf:
         obj.add_conf(default_conf)
+    if default_wrap:
+        get_wraps().bind(obj)
     return obj
 
 pass
@@ -90,4 +104,14 @@ def build_wraps(default=True):
     obj = wraps.WrapUnits()
     if default:
         default_wraps.build(obj)
-    return obj
+    return obj
+
+global_wraps = None
+def get_wraps():
+    global global_wraps
+    if global_wraps is None:
+        global_wraps = build_wraps()
+    return global_wraps
+
+def get_wrap(ns=None):
+    return get_wraps()(ns)

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

@@ -21,6 +21,8 @@ class Deal(Base):
 pass
 
 class Params(Base):
+    def str(self):
+        return f"iocz.Params(args={self.args}, maps={self.maps})"
     @staticmethod
     def Clone(params, **upds):
         if params is None:

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

@@ -27,6 +27,13 @@ class Unit(UnitBase):
         self.builds = Builds(self)
         self.mg = None
         self.build_encapes()
+        self.vars = []
+    def deal_vars(self):
+        if self.mg is None or len(self.vars)==0:
+            return
+        for kvs, src, tag in self.vars:
+            self.push_vars(kvs, src, tag)
+        self.vars = []
     def add_build(self, conf):
         self.builds.add(conf)
     def build(self):
@@ -57,6 +64,7 @@ class Unit(UnitBase):
         self.envs.bind(mg.envs)
         self.build_encapes()
         self.encapes.bind(mg.encapes)
+        self.deal_vars()
     def lc_get_env(self, key, ns=None, tag=None, id=None):
         return self.envs.tget(key, ns, id, False)
     def get_env(self, key, src=-1, id=None, gfind=True):
@@ -98,6 +106,9 @@ class Unit(UnitBase):
         src, id = self.nsid(src, None)
         return self.mg.get_var(key, src, tag)
     def push_vars(self, kvs, src=-1, tag=None):
+        if self.mg is None:
+            self.vars.append([kvs, src, tag])
+            return
         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):

{buildz-0.6.56 → buildz-0.6.58}/buildz/iocz/ioc_deal/obj.py

@@ -29,7 +29,7 @@ class ObjectEncape(BaseEncape):
         args = self.elist2obj(self.args,params)
         _maps = self.edict2obj(self.maps,params)
         obj = src(*args, **_maps)
-        obj_conf = Params.Clone(params, target=obj)
+        obj_conf = Params.Clone(params, obj=obj)
         self.obj(self.before_set, obj_conf)
         sets = self.edict2obj(self.sets, params, False)
         for k,v in sets:

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

@@ -6,7 +6,7 @@ xxx.test_var=profile_var_test
 """)
 wraps = iocz.build_wraps()
 ns = wraps().wrap
-@ns.obj(id='test_warp')
+@ns.obj(id='test_wrap')
 @ns.obj.args("ref,xxx.test_var")
 class Test(Base):
     def str(self):
@@ -14,8 +14,11 @@ class Test(Base):
     def init(self, id=0):
         super().init()
         self.id = id
-    def call(self):
-        print("Test.show:", self)
+    def call(self, val=None):
+        if val is None:
+            val = self
+        print("Test.show:", val)
+        return self
 
 pass
 ns.load_profiles(profiles)
@@ -41,10 +44,11 @@ confs.ns: [
         args=[
             #[ref, test1]
             #[env, PATH]
-            [ref, test_warp]
-            
+            [method, call,test_wrap]
         ]
+        call: [method, call]
     }
+    [[call,test_call], test, (0)]
 ]
 '''.replace("<buildz>", "buildz")
 def get_env_sys(self, id, sid=None):
@@ -56,6 +60,9 @@ def test():
     print(mg)
     #unit = mg.add_conf(confs)
     unit = mg.add_conf(confs1)
+    val,find=unit.get("test_call")
+    print(f"test_call: {val,find}")
+    exit()
     with mg.push_vars({"test": 123}):
         it, find = unit.get("test")
         print(f"it: {it, id(it)}, find: {find}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.56
+Version: 0.6.58
 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.56 → buildz-0.6.58}/buildz.egg-info/SOURCES.txt

@@ -176,12 +176,14 @@ buildz/iocz/conf/conf.py
 buildz/iocz/conf/mg.py
 buildz/iocz/conf/unit.py
 buildz/iocz/conf/up.py
+buildz/iocz/conf_deal/attr.py
 buildz/iocz/conf_deal/base.py
 buildz/iocz/conf_deal/call.py
 buildz/iocz/conf_deal/cvar.py
 buildz/iocz/conf_deal/deal.py
 buildz/iocz/conf_deal/env.py
 buildz/iocz/conf_deal/ioc.py
+buildz/iocz/conf_deal/method.py
 buildz/iocz/conf_deal/obj.py
 buildz/iocz/conf_deal/ref.py
 buildz/iocz/conf_deal/val.py

{buildz-0.6.56 → buildz-0.6.58}/setup.py

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