buildz 0.6.10__tar.gz → 0.6.11__tar.gz

{buildz-0.6.10/buildz.egg-info → buildz-0.6.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.10
+Version: 0.6.11
 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
@@ -32,6 +32,11 @@ License-File: LICENSE
 
 持续更新中。。。
 
+2024/09/09
+ioc:
+    加修饰器
+    加配置refs
+
 PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
 
 1, a profile file format base on json, make it easy to write profile file, module is in buildz.xf

{buildz-0.6.10 → buildz-0.6.11}/README.md

@@ -19,6 +19,11 @@
 
 持续更新中。。。
 
+2024/09/09
+ioc:
+    加修饰器
+    加配置refs
+
 PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
 
 1, a profile file format base on json, make it easy to write profile file, module is in buildz.xf

{buildz-0.6.10 → buildz-0.6.11}/buildz/ioc/__init__.py

@@ -1,5 +1,5 @@
 #coding=utf-8
 
-from .init import build,default_deals
+from .init import *
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

{buildz-0.6.10 → buildz-0.6.11}/buildz/ioc/init.py

@@ -2,7 +2,7 @@
 
 from .ioc import confs
 from .ioc_deal.base import default_deals
-
+from . import wrap
 def build(fp_init = None, add_default_deals = True):
     obj = confs.Confs()
     if (fp_init is not None):

{buildz-0.6.10 → buildz-0.6.11}/buildz/ioc/ioc/base.py

@@ -64,6 +64,8 @@ class EncapeData(Base):
                 type = conf.confs.get_data_type(data, 0, conf.default_type())
             if confs is None:
                 confs = conf.confs
+        else:
+            self.sid = None
         self.src = src
         self.conf = conf
         self.confs = confs

{buildz-0.6.10 → buildz-0.6.11}/buildz/ioc/ioc/conf.py

@@ -174,6 +174,17 @@ class Conf(Base):
             return obj
         obj = self.confs.get_data(id, self.id, src=src, info = info)
         return obj
+    def full_ids(self, local = True):
+        rst = []
+        arr = [self.datas]
+        if local:
+            arr.append(self.locals)
+        for datas in arr:
+            for id in datas:
+                gid = self.confs.gid(self.namespace, id)
+                item = [gid, id, self]
+                rst.append(item)
+        return rst
     def get(self, *args, **maps):
         return self.get_obj(*args, **maps)
     def default_type(self):
@@ -182,6 +193,8 @@ class Conf(Base):
         return self._default_type
     def get_var(self, key, i = -1):
         return self.confs.get_var(key, i)
+    def var_keys(self):
+        return self.confs.var_keys()
     def push_var(self, key, val):
         return self.confs.push_var(key,val)
     def has_var(self, key):

{buildz-0.6.10 → buildz-0.6.11}/buildz/ioc/ioc/confs.py

@@ -1,5 +1,6 @@
 #coding=utf-8
 from buildz import xf, pyz
+from .decorator import decorator
 from buildz.xf import g as xg
 from buildz import argx
 import json
@@ -253,12 +254,16 @@ class Confs(Base):
         self.fcs = {}
         if 'args' in self.env_orders:
             self.build_env_args()
+        _id = self.add({})
+        self.empty = self.confs[_id]
     def set_fc(self, key, fc):
         self.fcs[key] = fc
     def get_fc(self, key):
         if key not in self.fcs:
             return None
         return self.fcs[key]
+    def var_keys(self):
+        return self.vars.keys()
     def get_var(self, key, i=-1):
         if not self.has_var(key):
             return None, False
@@ -282,6 +287,8 @@ class Confs(Base):
         if not self.has_var(key):
             return
         self.vars[key].pop(-1)
+        if len(self.vars[key])==0:
+            del self.vars[key]
     def do_init(self):
         if self.mark_init:
             return
@@ -347,6 +354,12 @@ class Confs(Base):
             print(f'error in loads: {fp}')
             raise
         #return self.add(conf)
+    def add_decorator(self):
+        conf = decorator()
+        #print(f"[TESTZ] CONFS add decorator(): {conf}")
+        return self.add(conf)
+    def add_wrap(self):
+        return self.add_decorator()
     def adds(self, confs):
         for conf in confs:
             self.add(conf)
@@ -378,6 +391,7 @@ class Confs(Base):
             self.deals[k] = obj.deals[k]
         self.update_maps(self.envs, obj.envs)
         self.mark_init = False
+        return obj.id
     def get(self, *args, **maps):
         return self.get_obj(*args, **maps)
     def remove(self, *a,**b):
@@ -389,15 +403,18 @@ class Confs(Base):
         self.do_init()
         if type(id) == EncapeData:
             conf = id
+        elif type(id) in [list, dict]:
+            conf = EncapeData(id, conf=self.empty, confs=self, info=info, src=src, type= self.get_data_type(id))
         else:
             conf = self.get_data(id, sid, src=src, info = info)
         if conf is None:
             raise IdNotFoundError(f"confs: can't find conf of {id}")
             return None
-        if conf.conf is None:
-            if remove:
-                return None
-            return conf.data()
+        #print(f"[TESTZ] confs.get: {conf.data}, conf: {conf.conf}, type: {conf.type}")
+        # if conf.conf is None:
+        #     if remove:
+        #         return None
+        #     return conf()
         deal = self.get_deal(conf.type, sid)
         if deal is None:
             raise IOCError(f"confs: can't find deal of {id}, type = {conf.type}")
@@ -420,6 +437,14 @@ class Confs(Base):
         if type in self.deals:
             return self.deals[type]
         return None
+    def full_ids(self, src=None):
+        sid = None
+        if src is not None:
+            sid = src.id
+        rst = []
+        for _id, conf in self.confs.items():
+            rst+=conf.full_ids(sid==conf.id)
+        return rst
     def get_confs(self, ids):
         """
             根据ids查所有对应的配置文件列表

buildz-0.6.11/buildz/ioc/ioc/decorator.py

@@ -0,0 +1,30 @@
+#coding=utf-8
+from buildz.base import Base
+class Decorator(Base):
+    def init(self):
+        self.conf = {}
+        self.fcs = {}
+    def regist(self, key, fc):
+        self.fcs[key] = fc
+    def add(self, tag, data):
+        if tag not in self.conf:
+            self.conf[tag]=[]
+        self.conf[tag].append(data)
+    def set(self, tag, key, val):
+        if tag not in self.conf:
+            self.conf[tag]={}
+        self.conf[tag][key]=val
+    def add_datas(self, item):
+        return self.add("datas", item)
+    def set_envs(self, key, val):
+        return self.set("env", key, val)
+    def add_inits(self, val):
+        return self.add("inits", val)
+    def add_locals(self, item):
+        return self.add("locals", item)
+    def call(self):
+        return self.conf
+
+pass
+
+decorator = Decorator()

{buildz-0.6.10 → buildz-0.6.11}/buildz/ioc/ioc_deal/base.py

@@ -2,6 +2,7 @@
 
 from ..ioc.base import Base, EncapeData
 from buildz import xf
+from ..ioc.decorator import decorator
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
@@ -211,4 +212,18 @@ class FormatDeal(BaseDeal):
     #         return None
     #     return deal(edata)
 
-pass
+pass
+
+class Order(Base):
+    def init(self, *fcs, reverse=False):
+        self.fcs = fcs
+        if reverse:
+            self.fcs.reverse()
+        self.reverse = reverse
+    def deal(self, cls):
+        for fc in self.fcs:
+            cls = fc(cls)
+        return cls
+
+pass
+decorator.regist("orders", Order)

{buildz-0.6.10 → buildz-0.6.11}/buildz/ioc/ioc_deal/conf/deals.js

@@ -22,6 +22,11 @@
             note: 引用,
             build: buildz.ioc.ioc_deal.ref.RefDeal
         },
+        {
+            type: refs,
+            note: 正则匹配查引用列表,
+            build: buildz.ioc.ioc_deal.refs.RefsDeal
+        },
         {
             type: mcall,
             note: 对象方法调用,

buildz-0.6.11/buildz/ioc/ioc_deal/conf/refs_lists.js

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

buildz-0.6.11/buildz/ioc/ioc_deal/init.py

@@ -0,0 +1,3 @@
+
+from . import obj
+from . import base

{buildz-0.6.10 → buildz-0.6.11}/buildz/ioc/ioc_deal/obj.py

@@ -1,8 +1,10 @@
 #
 from ..ioc.base import Base, EncapeData,IOCError
 from ..ioc.single import Single
+from ..ioc.decorator import decorator
 from .base import FormatData,FormatDeal
 from buildz import xf, pyz
+from buildz import Base as Basez
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
@@ -193,3 +195,147 @@ class ObjectDeal(FormatDeal):
         return None
 
 pass
+def update_set(maps):
+    rst = {}
+    for k,v in maps.items():
+        if type(v)==str:
+            v = xf.loads(v)
+        rst[k] = v
+    return rst
+
+pass
+def update_list(arr):
+    rst = []
+    for v in arr:
+        if type(v)==str:
+            v = xf.loads(v)
+        rst.append(v)
+    return rst
+
+pass
+
+class IOCObjectAdd_(Basez):
+    def init(self, key, *arr):
+        _arr = update_list(arr)
+        self.key = key
+        self._arr = _arr
+    def call(self, cls):
+        rst = {}
+        if hasattr(cls, "_buildz_ioc_conf"):
+            rst = cls._buildz_ioc_conf
+        _arr = []
+        if self.key in rst:
+            _arr = rst[self.key]
+        _arr+=self._arr
+        rst[self.key] = _arr
+        cls._buildz_ioc_conf = rst
+        return cls
+
+pass
+class IOCObjectArgs(IOCObjectAdd_):
+    def init(self, *arr):
+        super().init("args", *arr)
+
+pass
+class IOCObjectMCall(IOCObjectAdd_):
+    def init(self, *arr):
+        # function, args, maps
+        ks = "mcall,args,maps".split(",")
+        _arr = []
+        for item in arr:
+            if type(item)==str:
+                item = xf.loads(item)
+            if type(item)==list:
+                item = update_list(item)
+                l = min(len(ks), len(item))
+                _tmp = {}
+                for i in range(l):
+                    _tmp[ks[i]] = item[i]
+                item = _tmp
+            else:
+                item = update_set(item)
+            item['source'] = None
+            item['type'] = "mcall"
+            _arr.append(item)
+        super().init("mcalls", *_arr)
+
+pass
+class IOCObjectSet_(Basez):
+    def init(self, key, **maps):
+        _maps = update_set(maps)
+        self._maps = {key:_maps}
+    def call(self, cls):
+        rst = {}
+        if hasattr(cls, "_buildz_ioc_conf"):
+            rst = cls._buildz_ioc_conf
+        xf.fill(self._maps, rst)
+        cls._buildz_ioc_conf = rst
+        return cls
+
+pass
+class IOCObjectSet(IOCObjectSet_):
+    def init(self, **maps):
+        super().init("sets", **maps)
+
+pass
+class IOCObjectMap(IOCObjectSet_):
+    def init(self, **maps):
+        super().init("maps", **maps)
+
+pass
+class IOCObject(Basez):
+    KEYS = "id,args,maps,call,prev_call,single,remove,sets,after_remove".split(",")
+    SET_KEYS = "maps,sets".split(",")
+    def init(self, **maps):
+        rst = update_set(maps)
+        for key in self.SET_KEYS:
+            if key not in maps:
+                continue
+            val = maps[key]
+            for _k, _v in val.items():
+                if type(_v)==str:
+                    _v = xf.loads(_v)
+                val[_k] = _v
+        self._maps = rst
+    def _set(self, key, **maps):
+        sets = {}
+        if key in self._maps:
+            sets = self._maps[key]
+        rst = update_set(maps)
+        xf.fill(sets, rst)
+        self._maps[key] = rst
+        return self
+    def map(self, **maps):
+        return self._set("maps", **maps)
+    def maps(self, **maps):
+        return self.map(**maps)
+    def set(self, **maps):
+        return self._set("sets", **maps)
+    def sets(self, **maps):
+        return self.set(**maps)
+    def call(self, cls):
+        src = cls.__module__+"."+cls.__name__
+        conf = {}
+        if hasattr(cls, "_buildz_ioc_conf"):
+            conf = cls._buildz_ioc_conf
+        xf.fill(self._maps, conf)
+        conf['source'] = src
+        conf['type'] = 'object'
+        if 'mcalls' in conf and 'call' not in conf:
+            conf['call'] = {'type': "calls", 'calls': conf['mcalls']}
+        cls._buildz_ioc_conf = conf
+        decorator.add_datas(conf)
+        return cls
+
+pass
+
+#decorator.regist("IOCObject", IOCObject)
+decorator.regist("obj", IOCObject)
+decorator.regist("object", IOCObject)
+decorator.regist("obj_set", IOCObjectSet)
+decorator.regist("obj_map", IOCObjectMap)
+decorator.regist("obj_arg", IOCObjectArgs)
+decorator.regist("obj_mcall", IOCObjectMCall)
+decorator.regist("obj_sets", IOCObjectSet)
+decorator.regist("obj_maps", IOCObjectMap)
+decorator.regist("obj_args", IOCObjectArgs)

{buildz-0.6.10 → buildz-0.6.11}/buildz/ioc/ioc_deal/ref.py

@@ -12,10 +12,11 @@ class RefDeal(FormatDeal):
                 id: id
                 type: ref
                 ref|key: 引导数据id
+                default: 默认值
                 info: item_conf, 额外的引用信息, 默认null
             }
         简写:
-            [[id, ref], key, info]
+            [[id, ref], key, default, info]
         极简:
             [ref, key]
         例:

buildz-0.6.11/buildz/ioc/ioc_deal/refs.py

@@ -0,0 +1,62 @@
+#coding=utf-8
+from ..ioc.base import Base, EncapeData, IdNotFoundError
+from .base import FormatData,FormatDeal
+from buildz import xf, pyz
+import os
+dp = os.path.dirname(__file__)
+join = os.path.join
+import re
+class RefsDeal(FormatDeal):
+    """
+        引用refs，返回的是一个列表，长度可能为0:
+            {
+                id: id
+                type: refs
+                refs|key: 引导数据id正则匹配表达式
+                info: item_conf, 额外的引用信息, 默认null
+            }
+        简写:
+            [[id, refs], key, info]
+        极简:
+            [refs, key]
+        例:
+            [refs, obj.test] // 数据项"obj.test"的引用
+    """
+    def init(self, fp_lists=None, fp_defaults=None):
+        super().init("RefsDeal", fp_lists, fp_defaults, join(dp, "conf", "refs_lists.js"), None)
+    def match(self, key, pt):
+        rst = len(re.findall(pt, key))>0
+        # if rst:
+        #     print(f"[TESTZ] refs match: {key} in {pt}")
+        # else:
+        #     print(f"[TESTZ] refs NOT match: {key} in {pt}")
+        return rst
+    def deal(self, edata:EncapeData):
+        data = edata.data
+        data = self.fill(data)
+        pt = xf.get_first(data, 'refs', 'key')
+        info = xf.g(data, info=None)
+        if info is not None and type(info)==dict:
+            #info = {k:self.get_obj(info, edata.conf, src = edata.src) for k in info}
+            info = {'type':'map', 'data':info}
+            info = self.get_obj(info, edata.conf, src = edata.src)
+        else:
+            info = {}
+        _info = edata.info
+        if type(_info)==dict:
+            xf.deep_update(info, _info, 1)
+        vars = edata.conf.var_keys()
+        vars = [key for key in vars if self.match(key, pt)]
+        rst = [edata.conf.get_var(key)[0] for key in vars]
+        ids = edata.confs.full_ids(edata.conf)
+        ids = [obj for obj in ids if self.match(obj[0], pt) or self.match(obj[1], pt)]
+        objs = []
+        for obj in ids:
+            #print(f"[TESTZ] REFS get: {obj[2]}.get({obj[1]}, src={edata.src})")
+            _obj = obj[2].get(obj[1], info = info, src = edata.src)
+            objs.append(_obj)
+        #objs = [obj[2].get(obj[1], info = info, src = edata.src) for obj in ids]
+        rst+=objs
+        return rst
+
+pass

buildz-0.6.11/buildz/ioc/wrap.py

@@ -0,0 +1,26 @@
+#
+from .ioc.decorator import decorator
+from .ioc_deal import init
+locals().update(decorator.fcs)
+from buildz import fz
+import os
+def pkg(fp):
+    r = fp.rfind(".")
+    if r>0:
+        fp = fp[:r]
+    fp = fp.replace("\\", "/")
+    fp = fp.replace("//", "/")
+    fp = fp.replace("/", ".")
+    while len(fp)>0 and fp[0]==".":
+        fp = fp[1:]
+    __import__(fp)
+
+pass
+def imports(dp, pts, pfx=""):
+    dp = os.path.abspath(dp)
+    fps = fz.search(dp, pts)
+    fps = [pfx+"/"+fp[len(dp):] for fp in fps]
+    for fp in fps:
+        pkg(fp)
+
+pass

{buildz-0.6.10 → buildz-0.6.11}/buildz/pyz.py

@@ -138,7 +138,8 @@ def bylocals(mlocals, fc, *args, **maps):
         fc(*args, **maps)
 
 pass
-
+#lcmain=bylocals
+lc_main=bylocals
 def mainerr(fc, *args, **maps):
     st = inspect.stack()[1]
     if st.filename == '<stdin>':

{buildz-0.6.10 → buildz-0.6.11}/buildz/tools.py

@@ -1,3 +1,3 @@
 #coding=utf-8
 # from buildz.tools import *
-from . import pyz,xf,fz,Base
+from . import pyz,xf,fz,Base, ioc

{buildz-0.6.10 → buildz-0.6.11/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.10
+Version: 0.6.11
 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
@@ -32,6 +32,11 @@ License-File: LICENSE
 
 持续更新中。。。
 
+2024/09/09
+ioc:
+    加修饰器
+    加配置refs
+
 PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
 
 1, a profile file format base on json, make it easy to write profile file, module is in buildz.xf

{buildz-0.6.10 → buildz-0.6.11}/buildz.egg-info/SOURCES.txt

@@ -51,9 +51,11 @@ buildz/fz/lsf.py
 buildz/ioc/__init__.py
 buildz/ioc/base.py
 buildz/ioc/init.py
+buildz/ioc/wrap.py
 buildz/ioc/ioc/base.py
 buildz/ioc/ioc/conf.py
 buildz/ioc/ioc/confs.py
+buildz/ioc/ioc/decorator.py
 buildz/ioc/ioc/single.py
 buildz/ioc/ioc_deal/base.py
 buildz/ioc/ioc_deal/branch.py
@@ -62,6 +64,7 @@ buildz/ioc/ioc_deal/calls.py
 buildz/ioc/ioc_deal/deal.py
 buildz/ioc/ioc_deal/demo.py
 buildz/ioc/ioc_deal/env.py
+buildz/ioc/ioc_deal/init.py
 buildz/ioc/ioc_deal/ioc.py
 buildz/ioc/ioc_deal/iocf.py
 buildz/ioc/ioc_deal/join.py
@@ -71,6 +74,7 @@ buildz/ioc/ioc_deal/mcall.py
 buildz/ioc/ioc_deal/obj.py
 buildz/ioc/ioc_deal/ovar.py
 buildz/ioc/ioc_deal/ref.py
+buildz/ioc/ioc_deal/refs.py
 buildz/ioc/ioc_deal/val.py
 buildz/ioc/ioc_deal/var.py
 buildz/ioc/ioc_deal/xfile.py
@@ -95,6 +99,7 @@ buildz/ioc/ioc_deal/conf/obj_lists.js
 buildz/ioc/ioc_deal/conf/obj_set_lists.js
 buildz/ioc/ioc_deal/conf/ovar_lists.js
 buildz/ioc/ioc_deal/conf/ref_lists.js
+buildz/ioc/ioc_deal/conf/refs_lists.js
 buildz/ioc/ioc_deal/conf/var_lists.js
 buildz/ioc/ioc_deal/conf/xfile_defaults.js
 buildz/ioc/ioc_deal/conf/xfile_lists.js

{buildz-0.6.10 → buildz-0.6.11}/setup.py

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