buildz 0.6.44__tar.gz → 0.6.46__tar.gz

buildz-0.6.46/MANIFEST.in

@@ -0,0 +1,3 @@
+include README.md
+recursive-include buildz *
+recursive-include notes *

{buildz-0.6.44/buildz.egg-info → buildz-0.6.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.44
+Version: 0.6.46
 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
@@ -37,33 +37,6 @@ Codes of this project are not allowed to be used for AI training or any other fo
 
 运行python -m buildz查看帮助
 
-持续更新中。。。
-2025/01/21:
-修改xf的读写，读加上报错字符串位置，写改成递归调用减少时间开销
-2025/01/17:
-加了argz模块和evalz模块
-argz模块用于命令行参数匹配
-evalz模块用于可配置真假判断
-命令行还差一个入参转map的
-2024/12/22:
-增加pathz模块，方便处理路径，修改ioc和db
-2024/12/18:
-增加数据映射xz，数据库db增加类似orm功能以及表和索引结构查询功能（目前只写了mysql,oracle,sqlite3的查询），配置文件读写xf的输出增加对ListMap的支持(dumpx, dumpxf)
-2024/11/11:
-新增buildz.tz.xfind，对json做查询用的，功能类似jsonpath，自己实现的原因是好玩，以及不想为了用jsonpath去学对应的语法
-2024/10/08:
-增强auto配置功能，在auto增加数据库使用的封装，后续考虑出文档。。。如果有时间
-2024/09/25:
-修复bug，增强html的搜索功能，增强auto配置功能
-auto里加了个request的demo，里面用的requests库，可以直接配置来进行http调用
-2024/09/24:
-增加模块html:html页面解析
-增加模块auto:自动化调用
-
-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倍，因为只考虑结构化，没考虑列表增减开销（获得的经验教训是别直接用python的列表list当堆栈做append和pop，特别慢！）
 

{buildz-0.6.44 → buildz-0.6.46}/README.md

@@ -24,33 +24,6 @@ Codes of this project are not allowed to be used for AI training or any other fo
 
 运行python -m buildz查看帮助
 
-持续更新中。。。
-2025/01/21:
-修改xf的读写，读加上报错字符串位置，写改成递归调用减少时间开销
-2025/01/17:
-加了argz模块和evalz模块
-argz模块用于命令行参数匹配
-evalz模块用于可配置真假判断
-命令行还差一个入参转map的
-2024/12/22:
-增加pathz模块，方便处理路径，修改ioc和db
-2024/12/18:
-增加数据映射xz，数据库db增加类似orm功能以及表和索引结构查询功能（目前只写了mysql,oracle,sqlite3的查询），配置文件读写xf的输出增加对ListMap的支持(dumpx, dumpxf)
-2024/11/11:
-新增buildz.tz.xfind，对json做查询用的，功能类似jsonpath，自己实现的原因是好玩，以及不想为了用jsonpath去学对应的语法
-2024/10/08:
-增强auto配置功能，在auto增加数据库使用的封装，后续考虑出文档。。。如果有时间
-2024/09/25:
-修复bug，增强html的搜索功能，增强auto配置功能
-auto里加了个request的demo，里面用的requests库，可以直接配置来进行http调用
-2024/09/24:
-增加模块html:html页面解析
-增加模块auto:自动化调用
-
-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倍，因为只考虑结构化，没考虑列表增减开销（获得的经验教训是别直接用python的列表list当堆栈做append和pop，特别慢！）
 

{buildz-0.6.44 → buildz-0.6.46}/buildz/argz/argz.py

@@ -103,12 +103,18 @@ class ArgItem(Base):
         find = False
         for key, vtype in self.trs:
             if vtype =="dict":
-                if key in maps:
-                    val = maps[key]
+                if xf.dhas(maps, key):
+                    val = xf.dget(maps, key)
                     if self.remove:
-                        del maps[key]
-                    find = True
+                        xf.dremove(maps, key)
+                    find=True
                     break
+                #if key in maps:
+                #    val = maps[key]
+                #    if self.remove:
+                #        del maps[key]
+                #    find = True
+                #    break
             else:
                 if key in set_args:
                     val = args[key]
@@ -123,7 +129,8 @@ class ArgItem(Base):
         if not find and self.need:
             raise ArgExp("need", set(self.trs), self.des)
         if self.vtype == 'dict':
-            rst_maps[self.key] = val
+            xf.dset(rst_maps, self.key, val)
+            #rst_maps[self.key] = val
         else:
             rst_args[self.key] = val
 
@@ -135,9 +142,11 @@ class ArgItemBuild(build.Build):
         value = xf.g(conf, value=None)
         des = xf.g(conf, des=None)
         remove = xf.g(conf, remove=True)
-        src = conf['src']
-        if type(src) not in (list, tuple):
-            src = [src]
+        src = xf.g(conf, src=None)
+        srcs = xf.g(conf, srcs = [])
+        if src is not None:
+            srcs.append(src)
+        src = srcs
         item = ArgItem(key, vtype, need, default, value, des, remove)
         for s in src:
             if type(s) not in (list, tuple):

{buildz-0.6.44 → buildz-0.6.46}/buildz/argz/build.py

@@ -1,5 +1,5 @@
 #
-from buildz import Base, xf
+from buildz import Base, xf,pyz
 class Build(Base):
     def init(self, *binds):
         self.builder = None
@@ -11,10 +11,11 @@ class Build(Base):
     def call(self, conf):
         assert 0, 'not impl'
 class Builder(Base):
-    def init(self, fc = None, key_id = "id"):
+    def init(self, fc = None, key_id = "id", default_key = "main"):
         self.vars = {}
         self.confs = {}
         self.key_id = key_id
+        self.df_key = default_key
         self.set_fc(fc)
     def set_fc(self, fc):
         fc.bind(self)
@@ -34,6 +35,12 @@ class Builder(Base):
             conf = self.confs[key]
         return self.fc(conf)
     def conf(self, data):
+        if type(data) == dict:
+            tp = xf.g(data, type=None)
+            if tp is not None and type(tp) not in (list, tuple, dict):
+                if self.key_id not in data:
+                    data[self.key_id] = self.df_key
+                data = [data]
         if type(data) in (list, tuple):
             rst = {}
             for it in data:
@@ -44,5 +51,6 @@ class Builder(Base):
             data = rst
         self.confs = data
         return self
-    def call(self, data, key="main"):
+    def call(self, data, key=None):
+        key = pyz.nnull(key, self.df_key)
         return self.conf(data).get_conf(key)

{buildz-0.6.44 → buildz-0.6.46}/buildz/argz/callz.py

@@ -14,6 +14,9 @@ class Fc(Base):
         if isinstance(fc, Fc):
             return fc
         return Fc(fc)
+class RetFc(Fc):
+    def call(self, args, maps):
+        return args, maps
 class ArgsCall(Fc):
     def init(self, fc, args=None, name = None):
         fc=self.make(fc)
@@ -88,23 +91,34 @@ class FcBuild(build.Build):
         src = xf.g(conf, src = None)
         fc = self.builder.get_var(src)
         return Fc(fc)
+class RetBuild(build.Build):
+    def call(self, conf):
+        ctype = xf.g(conf, type=None)
+        if ctype != "ret":
+            return None
+        return RetFc()
 class CallBuild(build.Build):
     def init(self):
         self.args = argz.ArrArgsBuild()
         self.eval = evalx.EvalBuild()
         self.fc = FcBuild()
         self.calls = CallsBuild()
+        self.ret = RetBuild()
         super().init(self.args, self.eval, self.fc, self.calls)
     def call(self, conf):
         args = self.args(conf)
         judges = self.eval(conf)
         fc = self.fc(conf)
         calls = self.calls(conf)
+        ret = self.ret(conf)
         bfc = fc is None
         bcls = calls is None
-        assert (bfc+bcls)==1
+        bret = ret is None
+        assert (bfc+bcls+bret)==2
         if fc is None:
             fc = calls
+        if fc is None:
+            fc = ret
         if args is not None:
             fc = ArgsCall(fc, args)
         if judges is not None:

{buildz-0.6.44 → buildz-0.6.46}/buildz/argz/tests/conf.js

@@ -22,10 +22,10 @@
     }
     maps: {
         filepath: {
-            src: [f, fp, filepath]
+            srcs: [f, fp, filepath]
         }
         content: {
-            src: [c, ct, content]
+            srcs: [c, ct, content]
         }
     }
-}
+}

buildz-0.6.46/buildz/argz/testx.py

@@ -0,0 +1,42 @@
+from buildz import argz,xf,Base,evalz,pathz
+import sys,os
+
+path = pathz.Path()
+path.set("res", path(path.dir(__file__), "tests"))
+conf = xf.loadf(path.res("conf.js"))
+conf=xf.loads(r"""
+type=ret
+maps={
+    spt: {
+        src: [(env, spt), d]
+        default: 1
+        value: '.'
+    }
+    eglobal: {
+        src: [(env, global), d]
+        default:1
+        value: true
+    }
+}
+""")
+
+mg = argz.CallBuilder()
+fc = mg(conf)
+
+data = xf.loads(r"""
+args=[]
+maps={
+    env: {
+        spt: x
+    }
+}
+""")
+args = xf.g(data, args=[])
+maps = xf.g(data, maps={})
+
+rst = fc(args, maps)
+print(f"rst: {rst}")
+'''
+python -m buildz.argz.testx
+python -m buildz.argz.test search /d/rootz f=asf c=test
+'''

{buildz-0.6.44 → buildz-0.6.46}/buildz/base.py

@@ -1,5 +1,33 @@
 #coding=utf-8
 from . import pyz
+def fcBase(cls, lst=0, keys = tuple()):
+    class _Base(cls):
+        def str(self):
+            return str(self.__class__)
+        def repr(self):
+            return self.str()
+        def __str__(self):
+            return self.str()
+        def __repr__(self):
+            return self.repr()
+        def __call__(self, *a, **b):
+            return self.call(*a, **b)
+        def call(self, *a, **b):
+            return None
+        def init(self, *a, **b):
+            pass
+        def __init__(self, *a, **b):
+            sa = a[:lst]
+            a = a[lst:]
+            sb = {}
+            for k in keys:
+                if k in b:
+                    sb[k] = b[k]
+                    del b[k]
+            super().__init__(*sa, **sb)
+            self.init(*a, **b)
+    return _Base
+
 class Base:
     def str(self):
         return str(self.__class__)

{buildz-0.6.44 → buildz-0.6.46}/buildz/fz/__init__.py

@@ -2,7 +2,7 @@
 #author:
 from .dirz import dirs, FileDeal
 from .lsf import lists, search, searchd,searchs,_search
-from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir,removes, cover, fcover, sread, swrite, is_abs
+from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir,removes, cover, fcover, sread, swrite, is_abs, xors, fxors, coverx, covers, fcovers
 from .fhs import fhash, fhashs
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

{buildz-0.6.44 → buildz-0.6.46}/buildz/fz/fio.py

@@ -56,23 +56,37 @@ pass
 
 dirname = dirpath
 
-def fcover(filepath, wsize = 1024*10):
-	st = os.stat(filepath)
-	size = st.st_size
-	bs = b'a'*wsize
-	with open(filepath, 'wb') as f:
-		for i in range(0, size, wsize):
-			f.write(bs)
+def coverx(sz, chars=None):
+    if chars is None:
+        chars = b"a"
+    if type(chars)==str:
+        chars = chars.encode("utf-8")
+    l = sz//len(chars)
+    cs = chars*l
+    left = sz%len(chars)
+    cs+=chars[:left]
+    return cs
+def fcover(filepath, wsize = 1024*10, chars=None):
+    st = os.stat(filepath)
+    size = st.st_size
+    #print(f"{filepath}:{size}")
+    #bs = b'a'*wsize
+    with open(filepath, 'wb') as f:
+        for i in range(0, size, wsize):
+            sz = min(size-i, wsize)
+            bs = coverx(sz, chars)
+            #print(f"bs: {len(bs)}, sz: {sz}, i:{i}, wsize:{wsize}")
+            f.write(bs)
 
 pass
 cover = fcover
-def removes(fp, cover = False):
+def removes(fp, cover = False,wsize = 1024*10,chars=None):
     if not os.path.exists(fp):
         return
     if os.path.isfile(fp):
         #print(f"remove file '{fp}'")
         if cover:
-            fcover(fp)
+            fcover(fp,wsize=wsize, chars=chars)
         os.remove(fp)
         return
     fps = os.listdir(fp)
@@ -123,4 +137,36 @@ def is_abs(fp):
     return False
 
 pass
-    
+    
+def xors(bs, codes):
+    if type(codes)==str:
+        codes = codes.encode("utf-8")
+    rst = b''
+    codes= list(codes)
+    for i in range(0, len(bs), len(codes)):
+        _bs = bs[i:i+len(codes)]
+        rs = bytes([a^b for a,b in zip(_bs, codes)])
+        rst+=rs
+        codes = codes[1:]+codes[:1]
+    return rst
+
+def fxors(fp, codes, ofp=None):
+    bs = read(fp, 'rb')
+    bs = xors(bs, codes)
+    if ofp is not None:
+        write(bs, ofp, 'wb')
+    else:
+        return bs
+
+pass
+def covers(dp, chars=None,wsize = 1024*10,):
+    if not os.path.exists(dp):
+        return
+    from . import lsf
+    fs = lsf.search(dp)
+    #print(f"fs: {fs}")
+    for fp in fs:
+        fcover(fp,wsize=wsize, chars=chars)
+
+pass
+fcovers = covers

{buildz-0.6.44 → buildz-0.6.46}/buildz/ioc/ioc/confs.py

@@ -270,38 +270,44 @@ class Confs(Base):
         return self.fcs[key]
     def var_keys(self):
         return self.vars.keys()
-    def get_var(self, key, i=-1):
+    def get_var(self, key, i=-1, ns = None):
+        key = self.gid(ns, key)
         if not self.has_var(key):
             return None, False
         return self.vars[key][i], True
-    def set_vars(self, vars):
-        [self.set_var(key,val) for key,val in vars.items()]
-    def unset_vars(self, vars):
-        [self.unset_var(key) for key in vars]
-    def push_vars(self, vars):
+    def set_vars(self, vars, ns = None):
+        [self.set_var(key,val,ns) for key,val in vars.items()]
+    def unset_vars(self, vars, ns = None):
+        [self.unset_var(key,ns) for key in vars]
+    def push_vars(self, vars, ns = None):
         if vars is not None:
-            [self.push_var(key,val) for key,val in vars.items()]
+            [self.push_var(key,val,ns) for key,val in vars.items()]
         return pyz.with_out(lambda :self.pop_vars(vars))
-    def pop_vars(self, vars):
+    def pop_vars(self, vars, ns = None):
         if vars is not None:
-            [self.pop_var(key) for key in vars]
-    def set_var(self, key, val):
+            [self.pop_var(key,ns) for key in vars]
+    def set_var(self, key, val, ns = None):
         """
             will remove push datas
         """
+        key = self.gid(ns, key)
         self.vars[key] = [val]
-    def unset_var(self, key):
+    def unset_var(self, key, ns = None):
+        key = self.gid(ns, key)
         if key in self.vars:
             del self.vars[key]
-    def push_var(self, key, val):
+    def push_var(self, key, val, ns = None):
+        key = self.gid(ns, key)
         if key not in self.vars:
             self.vars[key] =  []
         self.vars[key].append(val)
-    def has_var(self, key):
+    def has_var(self, key, ns=None):
+        key = self.gid(ns, key)
         if key not in self.vars:
             return False
         return len(self.vars[key])>0
-    def pop_var(self, key):
+    def pop_var(self, key, ns=None):
+        key = self.gid(ns, key)
         if not self.has_var(key):
             return
         self.vars[key].pop(-1)

{buildz-0.6.44 → buildz-0.6.46}/buildz/ioc/ioc/loads.py

@@ -2,11 +2,12 @@
 from buildz import Base, xf
 from ..ioc.decorator import decorator,IOCDObj
 class Loads(IOCDObj):
-    def init(self, conf, vtype = "envs"):
+    def init(self, conf, vtype = "envs", flush=False):
         if type(conf)==str:
             conf = xf.loads(conf)
         self._type = vtype
         self.conf = conf
+        self.flush = flush
     def bind(self, wrap):
         super().bind(wrap)
         self.decorator.add_bind(self)
@@ -17,10 +18,13 @@ class Loads(IOCDObj):
         for key, val in self.conf.items():
             key = confs.gid(self.decorator.namespace, key)
             maps[key] = val
-        if self._type == 'env':
-            confs.flush_env(maps)
+        if self._type in ('env', 'envs'):
+            if self.flush:
+                confs.flush_env(maps)
             xf.deep_fill(maps, conf.envs, 1)
         else:
+            if self.flush:
+                maps = xf.unflush_maps(maps, confs.id)
             confs.push_vars(maps)
 
 pass
@@ -32,4 +36,5 @@ class Loadf(Loads):
 
 pass
 decorator.regist("load_conf", Loads)
+decorator.regist("loads_conf", Loads)
 decorator.regist("loadf_conf", Loadf)

{buildz-0.6.44 → buildz-0.6.46}/buildz/ioc/ioc_deal/ref.py

@@ -47,6 +47,7 @@ class RefDeal(FormatDeal):
         try:
             return edata.conf.get_obj(key, info = info, src = edata.src)
         except IdNotFoundError as exp:
+            #print(f"[testz] ref data: {data} in {edata.conf}")
             if "default" in data:
                 key = data['default']
                 return self.get_obj(key, edata.conf, src=edata.src)

buildz-0.6.46/buildz/iocz/base.py

@@ -0,0 +1,6 @@
+from ..base import Base, fcBase
+from .. import pathz
+path = pathz.Path()
+path.set('local', path.dir(__file__))
+path.set('conf', path.local('conf'),curr=0)
+

buildz-0.6.46/buildz/iocz/ioc/base.py

@@ -0,0 +1,5 @@
+from ..base import *
+basepath = path
+path = pathz.Path()
+path.set("conf", basepath.local("ioc/conf"), curr=0)
+

buildz-0.6.46/buildz/iocz/ioc/confs.py

@@ -0,0 +1,5 @@
+from .ids import Ids
+from .base import Base
+class Confs(Base):
+    '''
+    '''

buildz-0.6.46/buildz/iocz/ioc/env.py

@@ -0,0 +1,117 @@
+from .base import Base, fcBase
+from buildz import xf,pyz
+class EnvExp(Exception):
+    def __init__(self, id):
+        super().__init__(f"EnvExp id not found: '{id}'")
+class BuildEnv(Base):
+    """
+        3种从环境获取参数的方式:
+            从系统环境获取
+            从命令行输入参数获取
+            从本对象环境数据获取
+        2种设置环境参数方式：
+            设置到系统环境
+            设置到本对象环境数据
+    """
+    def init(self, conf):
+        self.conf = conf
+        self.builds = {
+        }
+    def build_args(self):
+        pass
+    def build_conf(self, ids, flush, flush_list, exp, default):
+        return Env(ids, None, flush, flush_list, exp, default)
+    def deal(self, mg, args, spt, eglobal, orders, from_args, flush, flush_list, exp, default):
+        envs = []
+        env = None
+        ids = ids.Ids(spt)
+        if 'conf' not in orders:
+            orders.append('conf')
+        for order in orders:
+            _env = self.builds[order](ids, flush, flush_list, exp, default)
+            if order == 'conf':
+                env = _env
+            envs.append(_env)
+        env = Envs(envs, env)
+        return env
+    def call(self, mg, conf, args):
+        args, maps = self.conf([], conf)
+        return self.deal(mg, args, **maps)
+
+pass
+class Env(Base):
+    def _get(self, id):
+        return xf.dhget(self.maps, id)
+    def _set(self, id, val):
+        return xf.dset(self.maps, id, val)
+    def _has(self, id):
+        return xf.dhas(self.maps, id)
+    def _del(self, id):
+        return xf.dremove(self.maps, id)
+    def _fill(self, maps):
+        return xf.fill(maps, self.maps)
+    def init(self, ids=None, maps=None, flush=True, flush_list = False):
+        self.flush_list = flush_list
+        self.ids = ids
+        self.flush = flush
+        if maps is None:
+            maps = {}
+        if flush:
+            maps=xf.flush_maps(maps, self.ids.ids, flush_list)
+        self.maps = maps
+    def update(self, maps, flush=None, flush_list=None):
+        flush = pyz.nnull(flush, self.flush)
+        flush_list = pyz.nnull(flush_list, self.flush_list)
+        if flush:
+            maps = xf.flush_maps(maps, self.ids.ids, flush_list)
+        self._fill(maps)
+    def has(self, id, flush=None):
+        flush = pyz.not_null(flush, self.flush)
+        full_id = id
+        if flush:
+            ids = self.ids.ids(id)
+        else:
+            ids = id
+        return self._has(ids)
+    def get(self, id, flush=None):
+        flush = pyz.not_null(flush, self.flush)
+        full_id = id
+        if flush:
+            ids = self.ids.ids(id)
+        else:
+            ids = id
+        return self._get(ids)
+    def set(self, id, val, flush=None):
+        flush = pyz.not_null(flush, self.flush)
+        if flush:
+            id = self.ids.ids(id)
+        self._set(self.maps, id, val)
+ 
+class SysEnv(Env):
+    def _get(self, id, exp_def=None):
+        sysdt = os.getenv(id)
+        return sysdt
+    def _has(self, id):
+        dt = self._get(id)
+        return dt is not None
+    def init(self, ids):
+        super().init(ids, flush=False)
+
+class Envs(Env):
+    def init(self, envs, env):
+        self.envs = envs
+        self.env = env
+    def get(self, id):
+        for env in self.envs:
+            if env.has(id):
+                return env.get(id)
+        return self.env.get(id)
+    def set(self, id, val, *a,**b):
+        return self.env.set(id, val, *a,**b)
+    def has(self, id):
+        for env in self.envs:
+            if env.has(id):
+                return True
+        return self.env.has(id)
+    def update(self, maps, *a,**b):
+        return self.env.update(maps,*a,**b)

buildz-0.6.46/buildz/iocz/ioc/ids.py

@@ -0,0 +1,23 @@
+from .base import Base
+class Ids(Base):
+    '''
+    '''
+    def init(self, spt):
+        self.spt = spt
+    def id(self, *ids):
+        if len(ids)==0:
+            return None
+        elif len(ids)==1:
+            if type(ids[0]) in (list, tuple):
+                ids = ids[0]
+        return self.spt.join(ids)
+    def ids(self, id):
+        if type(id) in (list, tuple):
+            return id
+        return id.split(self.spt)
+    def call(self, a,b):
+        a = self.ids(a)
+        b = self.ids(b)
+        return self.id(a,b)
+pass
+