buildz 0.6.2__tar.gz → 0.6.3__tar.gz

{buildz-0.6.2/buildz.egg-info → buildz-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.2
+Version: 0.6.3
 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.2 → buildz-0.6.3}/buildz/ioc/ioc/base.py

@@ -19,6 +19,7 @@ class Base:
     def __call__(self, *args, **maps):
         return self.deal(*args, **maps)
     def deal(self, *args, **maps):
+        raise Exception("unexcept touch")
         return None
 
 pass

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc/conf.py

@@ -8,7 +8,7 @@ class Conf(Base):
     """
         配置文件格式：
             {
-                id: 配置文件id，默认null
+                _id: 配置文件id，默认null
                 //在配置文件配置的环境变量
                 envs: {
                     id: val
@@ -23,7 +23,7 @@ class Conf(Base):
                         maps: {} // 字典入参
                     }
                 }
-                namespace: 命名空间，默认null
+                id|namespace: 命名空间，默认null
                 //本地数据配置项
                 locals: [
                     item_conf,
@@ -57,13 +57,17 @@ class Conf(Base):
         return id
     def map(self, arr, fc_key):
         return {fc_key(obj): obj for obj in arr}
+    def __str__(self):
+        return f"conf<id={self.namespace}, _id={self.id}>"
+    def __repr__(self):
+        return self.__str__()
     def init(self, conf, confs):
         """
             {
                 deals:[{build: fc_path,args: [],maps: {}}]
                 envs: {id: val}
-                id: default null
-                namespace: default null
+                _id: default null
+                id|namespace: default null
                 datas: [{id:val, type: val, ...}]
                 locals: [like datas]
                 default_type: default null
@@ -71,11 +75,11 @@ class Conf(Base):
         """
         if type(conf)!=dict:
             conf = {'datas':conf}
-        id = xf.g(conf, id=None)
+        id = xf.g(conf, _id=None)
         if id is None:
             id = confs.conf_id()
         self.id = id
-        self.namespace = xf.g(conf, namespace=None)
+        self.namespace = xf.g1(conf, namespace=None, id=None)
         self.conf = conf
         self.confs = confs
         self.locals = self.map(xf.g(conf, locals=[]), self.confs.get_data_id)
@@ -164,13 +168,26 @@ class Conf(Base):
             return edata
         if not search_confs:
             return None
-        return self.confs.get_data(id, self.id, src=src, info = info)
+        gid = self.confs.gid(self.namespace, id)
+        obj = self.confs.get_data(gid, self.id, src=src, info = info)
+        if obj is not None:
+            return obj
+        obj = self.confs.get_data(id, self.id, src=src, info = info)
+        return obj
     def get(self, *args, **maps):
         return self.get_obj(*args, **maps)
     def default_type(self):
         if self._default_type is None:
             return self.confs.default_type
         return self._default_type
+    def get_var(self, key, i = -1):
+        return self.confs.get_var(key, i)
+    def push_var(self, key, val):
+        return self.confs.push_var(key,val)
+    def has_var(self, key):
+        return self.confs.has_var(key)
+    def pop_var(self, key):
+        self.confs.pop_var(key)
     def get_obj(self, id, src = None, info=None, remove = False):
         """
             根据data id获取data对象，处理逻辑：根据data id查配置，根据配置的type查deal，返回deal处理过的配置

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc/confs.py

@@ -58,11 +58,12 @@ class Confs(Base):
         self.flush_env(self.envs_args)
     def build_env_args_buildz(self):
         args, maps = argx.fetch()
-        e = xf.get(maps, e = [])
-        env = xf.get(maps, env=[])
-        env += e
-        env = [k.split("=") for k in env]
-        env = {k[0]:"=".join(k[1:]) for k in env}
+        env = maps
+        # e = xf.get(maps, e = [])
+        # env = xf.get(maps, env=[])
+        # env += e
+        # env = [k.split("=") for k in env]
+        # env = {k[0]:"=".join(k[1:]) for k in env}
         self.envs_args = env
         self.flush_env(self.envs_args)
     def build_env_args(self):
@@ -184,10 +185,10 @@ class Confs(Base):
             data_key_type: type
             // 数据配置参数是数组的时候，数据id的位置
             // default=[0,0]
-            data_index_id: [0,0]
+            data_index_id: [0,1]
             // 数据配置参数是数组的时候，数据type的位置
             // default=[0,1]
-            data_index_type: [0,1]
+            data_index_type: [0,0]
             // 处理deal的type字段名
             // default = 'type'
             deal_key_type: type
@@ -209,8 +210,8 @@ class Confs(Base):
         self.global_deal = xf.g(conf, global_deal = True)
         self.data_key_id = xf.g(conf, data_key_id = 'id')
         self.data_key_type = xf.g(conf, data_key_type = 'type')
-        self.data_index_id = xf.g(conf, data_index_id = [0,0])
-        self.data_index_type = xf.g(conf, data_index_type = [0,1])
+        self.data_index_id = xf.g(conf, data_index_id = [0,1])
+        self.data_index_type = xf.g(conf, data_index_type = [0,0])
         self.deal_key_type = xf.g(conf, deal_key_type = 'type')
         self.deal_index_type = xf.g(conf, deal_index_type = 0)
         self.env_orders = xf.g(conf, env_orders = ['sys', 'local', 'conf'])
@@ -229,8 +230,25 @@ class Confs(Base):
         self.envs = {}
         self.envs_args = None
         self.mark_init = False
+        self.vars = {}
         if 'args' in self.env_orders:
             self.build_env_args()
+    def get_var(self, key, i=-1):
+        if not self.has_var(key):
+            return None, False
+        return self.vars[key][i], True
+    def push_var(self, key, val):
+        if key not in self.vars:
+            self.vars[key] =  []
+        self.vars[key].append(val)
+    def has_var(self, key):
+        if key not in self.vars:
+            return False
+        return len(self.vars[key])>0
+    def pop_var(self, key):
+        if not self.has_var(key):
+            return
+        self.vars[key].pop(-1)
     def do_init(self):
         if self.mark_init:
             return
@@ -267,6 +285,10 @@ class Confs(Base):
         id = self._conf_id
         self._conf_id+=1
         return id
+    def gid(self, cid, id):
+        cids = self.ids(cid)
+        ids = self.ids(id)
+        return self.id(cids+ids)
     def ids(self, id):
         if id is None:
             return []
@@ -308,7 +330,7 @@ class Confs(Base):
         if type(conf) in [bytes, str]:
             conf = self.loads(conf)
         obj = Conf(conf, self)
-        id = xf.g(conf, namespace=None)
+        id = xf.g1(conf, id=None, namespace=None)
         ids = self.ids(id)
         node = self.node
         for id in ids:
@@ -383,9 +405,11 @@ class Confs(Base):
         for confs,i in arr:
             id = self.id(ids[i:])
             for conf in confs:
-                conf = conf.get_data(id, sid==conf.id, False, src = src, info = info)
-                if conf is not None:
-                    return conf
+                if sid == conf.id:
+                    continue
+                _conf = conf.get_data(id, sid==conf.id, False, src = src, info = info)
+                if _conf is not None:
+                    return _conf
         return None
 
 pass

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/base.py

@@ -118,6 +118,12 @@ class FormatData(Base):
 pass
 
 class BaseDeal(Base):
+    def push_vars(self, conf, vars):
+        if vars is not None:
+            [conf.push_var(key,val) for key,val in vars.items()]
+    def pop_vars(self, conf, vars):
+        if vars is not None:
+            [conf.pop_var(key) for key in vars]
     """
         基础处理类，加了一些方便处理的方法，自己写的处理可以不用继承这个
         自己实现的处理类，要实现两个方法：__call__(self, edata:EncapeData)和remove(self, edata:EncapeData)
@@ -148,6 +154,15 @@ class BaseDeal(Base):
             return None
         return deal(edata)
     def deal(self, edata:EncapeData):
+        """
+        """
+        try:
+            return self._deal(edata)
+        except:
+            print(f"except in {self.__class__}.deal: {edata.data}")
+            raise
+        return None
+    def _deal(self, edata:EncapeData):
         """
         """
         return None

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/call.py

@@ -11,7 +11,8 @@ class CallDeal(FormatDeal):
         {
             id:id
             type:call
-            method: import路径+"."+方法名
+            call|method: import路径+"."+方法名
+            vars: [...]
             args: [item_conf, ...]
             maps: {
                 key1:item_conf,
@@ -36,14 +37,23 @@ class CallDeal(FormatDeal):
         conf = edata.conf
         data = self.format(data)
         src = edata.src
-        method = xf.g(data, method=0)
-        method = pyz.load(method)
+        method = xf.g1(data, call=0, method=0)
+        #method = xf.g(data, method=0)
+        method = self.get_obj(method, conf, src)
+        if type(method) in [str, bytes]:
+            method = pyz.load(method)
         info = edata.info
         iargs, imaps = None, None
+        ivars = None
         if type(info) == dict:
-            iargs, imaps = xf.g(info, args = None, maps = None)
+            iargs, imaps,ivars = xf.g(info, args = None, maps = None, vars=None)
         args = xf.g(data, args=[])
         maps = xf.g(data, maps ={})
+        vars = xf.g(data, vars={})
+        vars = {k:self.get_obj(v, conf, src) for k,v in vars.items()}
+        if ivars is not None:
+            xf.fill(ivars, vars, 1)
+        ivars = vars
         if iargs is not None:
             args = iargs
         if imaps is not None:
@@ -52,6 +62,9 @@ class CallDeal(FormatDeal):
         # maps = {k:self.get_obj(maps[k], conf, src, info = edata.info) for k in maps}
         args = [self.get_obj(v, conf, src) for v in args]
         maps = {k:self.get_obj(maps[k], conf, src) for k in maps}
-        return method(*args, **maps)
+        self.push_vars(conf, ivars)
+        rst = method(*args, **maps)
+        self.pop_vars(conf, ivars)
+        return rst
 
 pass

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/calls.py

@@ -35,10 +35,11 @@ class CallsDeal(FormatDeal):
         conf = edata.conf
         data = self.format(data)
         src = edata.src
+        info = edata.info
         calls = xf.g1(data, calls=[], data = [])
         rst = None
         for call in calls:
-            rst = self.get_obj(call, conf, src)
+            rst = self.get_obj(call, conf, src, info=info)
         return rst
 
 pass

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/call_lists.js

@@ -4,10 +4,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null}
+                {key: id, default: null},
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/calls_lists.js

@@ -4,10 +4,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null}
+                {key: id, default: null},
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/deal_lists.js

@@ -4,10 +4,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null}
+                {key: id, default: null},
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/env_lists.js

@@ -4,10 +4,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort:-1,
+            //sort:-1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null }
+                {key: id, default: null},
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/ioc_lists.js

@@ -7,10 +7,10 @@
             nullable: 0,
             out: 1,
             conf: {
-                sort: -1,
+                //sort: -1,
                 data:[
-                    {key: id, default: null},
                     {key: type, default: null}
+                    {key: id, default: null},
                 ]
             }
         },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/iocf_lists.js

@@ -7,10 +7,10 @@
             nullable: 0,
             out: 1,
             conf: {
-                sort: -1,
+                //sort: -1,
                 data:[
-                    {key: id, default: null},
                     {key: type, default: null}
+                    {key: id, default: null},
                 ]
             }
         },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/join_lists.js

@@ -3,10 +3,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null}
+                {key: id, default: null},
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/list_lists.js

@@ -3,10 +3,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null}
+                {key: id, default: null}
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/map_lists.js

@@ -3,10 +3,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null}
+                {key: id, default: null},
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/mcall_lists.js

@@ -4,10 +4,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null}
+                {key: id, default: null},
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/obj_lists.js

@@ -4,8 +4,8 @@
         nullable: 0,
         out: 1,
         conf: [
-            {key: id, default: null},
             {key: type, default: null},
+            {key: id, default: null},
             {key: single, default: 1}
         ]
     },
@@ -13,14 +13,16 @@
         nullable: 0,
         key: source
     },
-    {
-        key: construct,
-        default: {args: [], maps: {}},
-        conf: [
-            {key: args, default: []},
-            {key: maps, default: {}}
-        ]
-    },
+    {key: args, default: []},
+    {key: maps, default: {}},
+    // {
+    //     key: construct,
+    //     default: {args: [], maps: {}},
+    //     conf: [
+    //         {key: args, default: []},
+    //         {key: maps, default: {}}
+    //     ]
+    // },
     {
         key: sets,
         default: []

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/ovar_lists.js

@@ -4,10 +4,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null}
+                {key: id, default: null},
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/ref_lists.js

@@ -7,10 +7,10 @@
             nullable: 0,
             out: 1,
             conf: {
-                sort: -1,
+                //sort: -1,
                 data:[
-                    {key: id, default: null},
                     {key: type, default: null}
+                    {key: id, default: null},
                 ]
             }
         },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/var_lists.js

@@ -4,7 +4,7 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
                 {key: id, default: null},
                 {key: type, default: null}

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/conf/xfile_lists.js

@@ -4,10 +4,10 @@
         nullable: 0,
         out: 1,
         conf: {
-            sort: -1,
+            //sort: -1,
             data:[
-                {key: id, default: null},
                 {key: type, default: null}
+                {key: id, default: null},
             ]
         }
     },

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/env.py

@@ -11,11 +11,12 @@ class EnvDeal(FormatDeal):
             {
                 id: id
                 type: env
-                key: 环境变量key
+                env|key: 环境变量key
                 default: item_conf //可选
             }
         简写：
-            [[id, env], key]
+            [[id, env], key, default]
+            [env, key, default]
             [env, key]
         例:
             [env, path] //读取环境变量path

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/map.py

@@ -11,7 +11,7 @@ class MapDeal(FormatDeal):
         {
             id:id
             type:map
-            data: {
+            map|data: {
                 key1: item_conf,
                 ...
             }

{buildz-0.6.2 → buildz-0.6.3}/buildz/ioc/ioc_deal/mcall.py

@@ -12,7 +12,8 @@ class MethodCallDeal(FormatDeal):
             id: id
             type: mcall
             source: 对象id
-            method: 调用方法
+            mcall|method: 调用方法
+            vars: [...]
             args: [...]
             maps: {key:...}
             info: item_conf，额外引用信息，默认null
@@ -30,14 +31,15 @@ class MethodCallDeal(FormatDeal):
         super().init("MethodCallDeal", fp_lists, fp_defaults, 
             join(dp, "conf", "mcall_lists.js"),
             join(dp, "conf", "mcall_defaults.js"))
-    def deal(self, edata:EncapeData):
+    def _deal(self, edata:EncapeData):
         sid = edata.sid
         data = edata.data
         conf = edata.conf
         data = self.format(data)
         src = edata.src
-        source = xf.g(data, source=None)
-        method = xf.g(data, method=0)
+        source = xf.g1(data, source=None, src=None)
+        method = xf.g1(data, mcall=0, method=0)
+        #method = xf.g(data, method=0)
         info = xf.g(data, info=None)
         if info is not None:
             info = self.get_obj(info, src = edata.src, info = edata.info)
@@ -54,12 +56,20 @@ class MethodCallDeal(FormatDeal):
             raise Exception(f"not object for method {method}")
         if src is None:
             src = source
-        method = getattr(source, method)
+        method = self.get_obj(method, conf, src)
+        if type(method) in [str, bytes]:
+            method = getattr(source, method)
         iargs, imaps = None, None
+        ivars = None
         if type(info) == dict:
-            iargs, imaps = xf.g(info, m_args = None, m_maps = None)
+            iargs, imaps = xf.g(info, m_args = None, m_maps = None, vars=None)
         args = xf.g(data, args=[])
         maps = xf.g(data, maps ={})
+        vars = xf.g(data, vars={})
+        vars = {k:self.get_obj(v, conf, src) for k,v in vars.items()}
+        if ivars is not None:
+            xf.fill(ivars, vars, 1)
+        ivars = vars
         if iargs is not None:
             args = iargs
         if imaps is not None:
@@ -68,6 +78,9 @@ class MethodCallDeal(FormatDeal):
         # maps = {k:self.get_obj(maps[k], conf, src, edata.info) for k in maps}
         args = [self.get_obj(v, conf, src) for v in args]
         maps = {k:self.get_obj(maps[k], conf, src) for k in maps}
-        return method(*args, **maps)
+        self.push_vars(conf, ivars)
+        rst = method(*args, **maps)
+        self.pop_vars(conf, ivars)
+        return rst
 
 pass