buildz 0.6.54__tar.gz → 0.6.55__tar.gz

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

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

@@ -28,13 +28,20 @@ class ArgType:
         return s in ('dict', 'd', 'dct', 'maps')
 
 pass
+class Params(Base):
+    def init(self, args=[], maps={}):
+        self.args = args
+        self.maps = maps
 class Args(Base):
     '''
         参数映射基础类
     '''
     Type=ArgType
-    def call(self, args, maps):
-        return args, maps
+    def call(self, params):
+        return params
+    def deal(self, args, maps):
+        params = self.call(Params(args,maps))
+        return params.args, params.maps
     def deal_exp(self, exp):
         return exp
 
@@ -52,16 +59,18 @@ class ArrArgs(Args):
     def add(self, item):
         self.args.append(item)
         return self
-    def call(self, args, maps):
+    def call(self, params):
+        args, maps = params.args, params.maps
         i=0
         try:
             for i in range(len(self.args)):
                 item = self.args[i]
-                args, maps = item(args,maps)
+                params = item(params)
         except ArgExp as exp:
             exp = self.deal_exp(exp, i-1)
             raise exp
-        return args, maps
+        #params.args, params.maps = args, maps
+        return params
     def deal_exp(self, exp, base=None):
         if base is None:
             base = len(self.args)-1
@@ -86,14 +95,17 @@ class RangeListArgs(Args):
             else:
                 trs.add((key, vtype))
         return ArgExp(exp.stype, trs, exp.des, exp)
-    def call(self, args, maps):
+    def call(self, params):
+        args, maps = params.args, params.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
+        return Params(args, maps)
+        params.args, params.maps = args, maps
+        return params
 
 
 class ArgItem(Base):
@@ -125,6 +137,7 @@ class ArgItem(Base):
         return ArgExp(exp.stype, trs, exp.des, exp)
     def fetch(self, key, vtype, set_args, args, maps):
         find = False
+        val=None
         if ArgType.isdict(vtype):
             val,find = dz.dget(maps, key)
             if find:
@@ -176,7 +189,7 @@ class TrsArgs(Args):
         for item in self.args:
             exp = item.deal_exp(exp)
         return exp
-    def init(self, args=None, keep = True, list_fill = ListFill.default):
+    def init(self, args=None, keep = False, list_fill = ListFill.default):
         super().init()
         if args is None:
             args = []
@@ -186,7 +199,8 @@ class TrsArgs(Args):
     def add(self, item):
         self.args.append(item)
         return self
-    def call(self, args, maps):
+    def call(self, params):
+        args, maps = params.args, params.maps
         rst_args, rst_maps = {}, {}
         set_args = set(range(len(args)))
         for item in self.args:
@@ -197,9 +211,9 @@ class TrsArgs(Args):
                     rst_args[i] = args[i]
         l_args = 0
         if len(rst_args)>0:
-            l_args= max(rst_args.keys())
+            l_args= max(rst_args.keys())+1
         out_args = []
-        for i in range(l_args+1):
+        for i in range(l_args):
             if i in rst_args:
                 out_args.append(rst_args[i])
             else:
@@ -211,6 +225,8 @@ class TrsArgs(Args):
             for k in maps:
                 if k not in rst_maps:
                     rst_maps[k] = maps[k]
-        return out_args, rst_maps
+        return Params(out_args, rst_maps)
+        params.args, params.maps = out_args, rst_maps
+        return params
 
 pass

buildz-0.6.55/buildz/argz/callz.py

@@ -0,0 +1,47 @@
+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.54/buildz/argzx → buildz-0.6.55/buildz/argz}/conf_argz.py

@@ -12,19 +12,20 @@ key:{
 }
 key: [
     src, 
-    [des, need, remove]
     [default, default_value]
+    [des, need, remove]
 ]
 """
 class ArgItemConf(conf.Conf):
     def init(self):
         super().init()
-        self.index(0, 'src', need=1)
-        self.key('src', need=1)
+        self.index(0, 'src')
+        self.key('src')
         df = conf.Conf()
         df.index(0, 'default')
         df.index(1, 'default_value')
-        self.index(1, df, dict_out=1)
+        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')
@@ -52,7 +53,7 @@ class ArgSrcConf(conf.Conf):
         data['type'] = ArgType.stand(vtype)
         return data, upd
 
-class TrsArgsBuild(Base):
+class TrsArgsBuilder(Base):
     def init(self):
         self.conf = ArgItemConf()
         self.src_conf = ArgSrcConf()
@@ -65,7 +66,6 @@ class TrsArgsBuild(Base):
                 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)
@@ -80,9 +80,9 @@ class TrsArgsBuild(Base):
         self.visits(dicts, ArgType.dict, obj)
         return obj
 
-class FullArgsBuild(Base):
+class FullArgsBuilder(Base):
     def init(self):
-        self.trs_build = TrsArgsBuild()
+        self.trs_build = TrsArgsBuilder()
         cf = conf.Conf()
         rcf = conf.Conf()
         rcf.index(0, 'base')

buildz-0.6.55/buildz/argz/conf_callz.py

@@ -0,0 +1,136 @@
+from ..iocz.conf import conf
+from .. import Base, xf, dz,pyz
+from .callz import *
+from ..iocz.ioc_deal.base import BaseEncape,BaseDeal
+from ..iocz.conf.up import BaseConf
+from .conf_argz import *
+from .evalx import *
+from .. import iocz
+from . import argz
+class EnvFc(Fc):
+    def init(self, unit):
+        super().init()
+        self.unit = unit
+    def call(self, params):
+        self.unit.update_env(params.maps)
+        return True,1
+class ArgsCallEncape(BaseEncape):
+    def init(self, fcs, args, eval, unit):
+        super().init()
+        self.fcs = fcs
+        self.args = args
+        self.eval = eval
+        self.call_fc = None
+        self.unit = unit
+    def ref(self, key, unit):
+        key = self.obj(key)
+        if type(key)==str:
+            rst, find = unit.get(key)
+            assert find, f"fc not found: '{key}'"
+            key=rst
+        return key
+    def call(self, params=None):
+        if self.call_fc is None:
+            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 ArgsCallDeal(BaseDeal):
+    def init(self, fc=True, update_env = False):
+        super().init()
+        _conf = BaseConf()
+        index=1
+        self.fc = fc
+        self.update_env = update_env
+        if fc:
+            _conf.ikey(1, 'fc', 'fcs,calls,call'.split(','))
+            _conf.ikey(2, 'eval', "judges,judge,evals".split(","))
+            _conf.ikey(3, 'conf')
+        else:
+            _conf.ikey(2, 'eval', "judges,judge,evals".split(","))
+            _conf.ikey(1, 'conf')
+        self.update=_conf
+        self.args_builder = FullArgsBuilder()
+    def deal(self, conf, unit):
+        conf_eval = dz.g(conf, eval=None)
+        conf_args = dz.g(conf, conf=None)
+        _eval = None
+        if conf_eval is not None:
+            _eval = evalBuilder(conf_eval)
+        _args = None
+        if conf_args is not None:
+            _args = self.args_builder(conf_args)
+        if self.fc:
+            fcs = dz.g(conf, fc=[])
+            if type(fcs)==str:
+                fcs = [fcs]
+            fcs = [self.get_encape(fc, unit) for fc in fcs]
+        else:
+            if self.update_env:
+                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)
+class RetArgsDeal(ArgsCallDeal):
+    def init(self):
+        super().init(False)
+class UpdateEnvDeal(ArgsCallDeal):
+    def init(self):
+        super().init(False,True)
+confs = xf.loads(r"""
+# confs.pri: {
+#     deal_args: {
+#         type=deal
+#         src=buildz.argzx.conf_callz.ArgsCallDeal
+#         call=1
+#         deals=[call,fc]
+#     }
+# }
+confs.pri: [
+    (
+        (deal, deal_ret)
+        buildz.argz.conf_callz.RetArgsDeal
+        1,
+        [argz_ret,ret]
+    )
+    (
+        (deal, deal_argz_env)
+        buildz.argz.conf_callz.UpdateEnvDeal
+        1,
+        [argz_env,argz_envs]
+    )
+    (
+        (deal, deal_args)
+        buildz.argz.conf_callz.ArgsCallDeal
+        1,
+        [argz,argz_call,argz_fc]
+    )
+]
+builds: [deal_args, deal_ret, deal_argz_env]
+""")
+class ConfBuilder(Base):
+    def init(self, conf=None):
+        mg = iocz.build(conf)
+        mg.add_conf(confs)
+        self.mg = mg
+        for key in 'push_var,push_vars,pop_var,pop_vars,set_var,set_vars,get_var,unset_var,unset_vars'.split(","):
+            setattr(self, key, getattr(mg,key))
+    def adds(self, conf):
+        if type(conf)==str:
+            conf = xf.loads(conf)
+        conf = {'confs': conf}
+        self.mg.add_conf(conf)
+    def add(self, conf):
+        if type(conf)==str:
+            conf = xf.loads(conf)
+        conf = {'confs': [conf]}
+        self.mg.add_conf(conf)
+    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]

buildz-0.6.55/buildz/argz/evalx.py

@@ -0,0 +1,21 @@
+#
+from .. import evalz,xf,Base
+
+class VarEval(evalz.Eval):
+    def init(self, key, stype = 'list'):
+        self.key = key
+        self.stype = stype
+    def call(self, obj):
+        args, maps = obj.args, obj.maps
+        if self.stype=='list':
+            return args[self.key]
+        return maps[self.key]
+class VarBuild(evalz.Build):
+    def init(self, stype="list"):
+        super().init()
+        self.stype = stype
+    def call(self, data):
+        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)

buildz-0.6.55/buildz/argz/init.py

@@ -0,0 +1,7 @@
+#
+
+from .conf_callz import *
+def build(conf=None):
+    return ConfBuilder(conf)
+
+pass

{buildz-0.6.54/buildz/argzx → buildz-0.6.55/buildz/argz}/test.py

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

buildz-0.6.55/buildz/argz/test_call.py

@@ -0,0 +1,63 @@
+#
+
+#from buildz.argz import conf_argz as argz
+from buildz.argz import conf_callz as callz
+from buildz.tls import *
+conf = r"""
+(
+    (argz, main)
+    (search, test_ret,test_var,test_env)
+)
+{
+    type: argz
+    id: search
+    call: search_fc
+    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))
+        }
+    }
+}
+[
+    (argz_ret, test_ret)
+    [1]
+    eq(args[0], test)
+]
+[
+    (argz_env, test_env)
+    [1]
+    eq(args[0], env)
+]
+[
+    (argz, test_var)
+    test_fc
+    eq(args(0), var)
+]
+[
+    (cvar, search_fc)
+    buildz.fz.search
+]
+"""
+def test_fc(*a, **b):
+    print(f"test_fc({a}, {b})")
+    return a,b
+def test():
+    args = ['env','.']
+    maps = {
+        'pt_fp': r".*\.py$"
+    }
+    bd = argz.build()
+    bd.adds(conf)
+    bd.push_var("test_fc",test_fc)
+    rst = bd("main", args, maps)
+    print(f"rst: {rst}")
+    print(bd.mg.envs)
+    pass
+
+pass
+
+pyz.lc(locals(),test)

{buildz-0.6.54 → buildz-0.6.55}/buildz/evalz/res/default.js

@@ -1,7 +1,7 @@
 AndBuild: [&&,&,and]
 OrBuild: [||,|, or]
 XorBuild: [^, xor]
-EqualBuild: ['=','==',equal]
+EqualBuild: ['=','==',equal, eq]
 BiggerBuild: ['>', bigger,bg]
 BiggerEqualBuild: ['>=', be]
 LittlerBuild: ['<', littler,lt]

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

@@ -19,10 +19,19 @@ class Conf(Base):
         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)
+        return self
+    def ikey(self, index=None, key=None, aliases=[], need=False, remove=True, deal = None, dict_out = False, default=None):
+        if index is not None:
+            self.index(index, key, need, deal, dict_out, default)
+        if key is not None:
+            self.key(key, aliases, need, remove, deal, dict_out, default)
+        return self
+    def key(self, key, aliases=[], need=False, remove=True, deal = None, dict_out = False, default=None):
+        self.aliases[key] = list(aliases), need, remove, deal, dict_out, self.default(default)
+        return self
     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)
+        return self
     def range_to_dict(self, rst, conf, unit=None):
         for key, item in self.ranges.items():
             base,last,min,default = item
@@ -66,7 +75,7 @@ class Conf(Base):
     def update_dict(self, conf, unit=None):
         upd = False
         for key, item in self.aliases.items():
-            aliases, need, remove, deal, default = item
+            aliases, need, remove, deal, dict_out, default = item
             if key not in conf:
                 for name in aliases:
                     if name in conf:
@@ -83,6 +92,10 @@ class Conf(Base):
             if key in conf and deal is not None:
                 conf[key], _upd = deal(conf[key], unit)
                 upd = upd or _upd
+            if key in conf:
+                val = conf[key]
+                if dz.isdict(val) and dict_out:
+                    dz.fill(val, conf, 1)
         return upd
     def call(self, conf, unit=None):
         conf, upd = self.to_dict(conf, unit)

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

@@ -5,10 +5,10 @@ class DealDeal(deal.DealDeal):
     def init(self):
         super().init()
         conf = BaseConf()
-        conf.index(1, 'source', need=1)
+        conf.ikey(1, 'source', 'src'.split(","), need=1)
         conf.index(2, 'call')
-        conf.index(3, 'tag')
-        conf.key('source', 'src'.split(","), need=1)
+        conf.ikey(3, 'deals', 'deal'.split(","))
+        conf.index(4, 'tag')
         self.update = conf
 
 pass

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

@@ -2,6 +2,7 @@
 
 from .conf import mg
 from .. import xf
+from .ioc.base import Params
 from .wrap import wraps, default_wraps
 s_default_conf = r"""
 confs.pri: {

buildz-0.6.55/buildz/iocz/ioc/__init__.py

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

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

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

@@ -19,16 +19,22 @@ buildz.egg-info/dependency_links.txt
 buildz.egg-info/top_level.txt
 buildz/argz/__init__.py
 buildz/argz/argz.py
-buildz/argz/build.py
 buildz/argz/callz.py
+buildz/argz/conf_argz.py
+buildz/argz/conf_callz.py
 buildz/argz/evalx.py
+buildz/argz/init.py
 buildz/argz/test.py
-buildz/argz/test_obj.py
-buildz/argz/testx.py
-buildz/argz/tests/conf.js
-buildz/argzx/argz.py
-buildz/argzx/conf_argz.py
-buildz/argzx/test.py
+buildz/argz/test_call.py
+buildz/argz_bk/__init__.py
+buildz/argz_bk/argz.py
+buildz/argz_bk/build.py
+buildz/argz_bk/callz.py
+buildz/argz_bk/evalx.py
+buildz/argz_bk/test.py
+buildz/argz_bk/test_obj.py
+buildz/argz_bk/testx.py
+buildz/argz_bk/tests/conf.js
 buildz/auto/__init__.py
 buildz/auto/cache.py
 buildz/auto/config.py

{buildz-0.6.54 → buildz-0.6.55}/setup.py

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