buildz 0.6.42__tar.gz → 0.6.44__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.42
+Version: 0.6.44
 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
@@ -38,6 +38,8 @@ 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模块用于命令行参数匹配

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

@@ -25,6 +25,8 @@ 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模块用于命令行参数匹配

{buildz-0.6.42 → buildz-0.6.44}/buildz/auto/config.py

@@ -24,8 +24,8 @@ class Config(Base):
 
 pass
 #wrap.add_datas("[(env, env.buildz.auto.deal), buildz.auto.deal, auto.deal]")
-@wrap.obj_args("[env, buildz.auto.deal, auto.deal]")
 @wrap.obj(id="autoz.deal")
+@wrap.obj_args("[env, buildz.auto.deal, auto.deal]")
 class DfDeal(Base):
     def init(self, id):
         self.id = id

{buildz-0.6.42 → buildz-0.6.44}/buildz/auto/log.py

@@ -7,22 +7,22 @@ from ..base import Base
 from ..ioc import wrap
 from ..tools import *
 import time, sys
-from ..logz import FpLog
+#from ..logz import FpLog
+from .. import logz
 @wrap.obj(id="log")
 @wrap.obj_sets(cache="ref,cache")
-class AutoLog(FpLog):
+class AutoLog(logz.Logs):
     def call(self, maps, fp):
         fp = xf.g(maps, log = None)
         fp = self.cache.rfp(fp)
-        self.fp = fp
         shows = xf.get(maps, "log.shows")
         if shows is None:
             shows = ["info", "warn", "error"]
-        self.shows = shows
         format = xf.get(maps, "log.format")
-        if format is not None:
-            self.format = format
         #print(f"[TETSZ] format: {format}")
+        fplog = logz.FpLog(fp,shows=shows,format=format)
+        stdlog = logz.StdLog(shows=shows,format=format)
+        self.init([fplog, stdlog], shows)
         return True
 
 pass

{buildz-0.6.42 → buildz-0.6.44}/buildz/logz.py

@@ -119,9 +119,9 @@ wrap.ns.add_datas("[logs.list, refs], buildz\.logz\.item,", ns = "buildz.logz")
 @ns.obj(id="logs")
 @ns.obj_args("ref, logs.list, []", "ref, buildz.logz.shows,null", "ref, buildz.logz.tag, null")
 class Logs(Log):
-    def init(self, logs, shows = None, tag= None, lock = False):
+    def init(self, logs=[], shows = None, tag= None, lock = False):
         super().init(shows, tag, lock=lock)
-        self.logs = logs
+        self.logs = list(logs)
     def do_log(self, level, tag, *args):
         for _log in self.logs:
             _log.log(level, tag, *args)

{buildz-0.6.42 → buildz-0.6.44}/buildz/tz/time/timez.py

@@ -4,17 +4,22 @@ from ...logz import FpLog
 class Clock(Base):
     def default(self, cost, fc, rst, *a, **b):
         print(f"cost {cost} sec on {fc}")
-    def init(self, fc=None):
+    def init(self, fc=None, out_sec = False, show = True):
         if fc is None:
             fc = self.default
         self.fc = fc
+        self.show = show
+        self.out_sec = out_sec
     def call(self, fc):
         curr = time.time()
         def tfc(*a,**b):
             curr = time.time()
             rst = fc(*a,**b)
             cost = time.time()-curr
-            self.fc(cost, fc, rst, *a, **b)
+            if self.show:
+                self.fc(cost, fc, rst, *a, **b)
+            if self.out_sec:
+                rst = [rst, cost]
             return rst
         return tfc
 

{buildz-0.6.42 → buildz-0.6.44}/buildz/xf/__init__.py

@@ -1,6 +1,6 @@
 
 from .readz import loads, load, loadf, loads_args, loadx, is_args, loadxf
-from .write import dumps, dump, dumpf, dumpx, dumpxf
+from .writez import dumps, dump, dumpf, dumpx, dumpxf
 from .file import *
 from .mapz import *
 from .xargs import fetch as args

buildz-0.6.44/buildz/xf/base.py

@@ -0,0 +1,28 @@
+
+from buildz import Base
+class Args(Base):
+    def str(self):
+        return f"<Args args={self.args}, maps={self.maps}>"
+    @property
+    def lists(self):
+        return self.args
+    @lists.setter
+    def lists(self, val):
+        self.args=val
+    @lists.deleter
+    def lists(self):
+        del self.args
+    @property
+    def dicts(self):
+        return self.maps
+    @dicts.setter
+    def dicts(self, val):
+        self.maps=val
+    @dicts.deleter
+    def dicts(self):
+        del self.maps
+    def init(self, args, maps):
+        self.args = args
+        self.maps = maps
+
+pass

buildz-0.6.44/buildz/xf/loaderz/base.py

@@ -0,0 +1,40 @@
+
+def arr_pos(arr):
+    if len(arr)==0:
+        return (0,0)
+    return (arr[0].pos[0], arr[-1].pos[-1])
+class BaseDeal:
+    def arr_pos(self, arr):
+        return arr_pos(arr)
+    def has_prev(self):
+        return 1
+    def has_deal(self):
+        return 1
+    def labels(self):
+        return []
+    def types(self):
+        return []
+    def prepare(self, msg):
+        pass
+    def regist(self, mgs):
+        if self._id is None:
+            self._id = mgs.regist()
+        self.prepare(mgs)
+    def id(self):
+        return self._id
+    def __str__(self):
+        return "BaseDeal"
+    def __repr__(self):
+        return str(self)
+    def __init__(self, *argv, **maps):
+        self._id = None
+        self.init(*argv, **maps)
+    def init(self, *argv, **maps):
+        pass
+    def deal(self, buffer, rst, mg):
+        pass
+    def build(self):
+        pass
+
+pass
+

buildz-0.6.44/buildz/xf/loaderz/buffer.py

@@ -0,0 +1,165 @@
+
+class BufferInput:
+    def __init__(self, buf):
+        self.buf = buf
+    def __call__(self, size=1):
+        s = self.buf[:size]
+        self.buf = self.buf[size:]
+        return s
+
+pass
+"""
+Buffer:
+    缓存操作:
+        //add：从数据中获取字符串并直接放入缓存，返回空
+        get: 从缓存获取字符串
+        rget: 从缓存获取字符串，从右往左拿
+        size: 缓存大小
+        clean: 清空缓存
+        full：获取缓存完整字符串
+        read_cache: 从数据中获取字符串并直接放入缓存，返回获取的字符串
+    操作数据
+        read: 从数据中获取字符串
+        clean2read：清空缓存和数据中所有读取过的字符串
+    pos: 返回缓存索引，数据读取索引
+"""
+class BufferBase:
+    def pos2str(self, pos):
+        assert 0
+    def init(self):
+        self.buffer_base =0
+        self.read_base=0
+    def pos(self):
+        return self.buffer_base, self.buffer_base+self.size()
+    def offsets(self):
+        return self.buffer_base, self.read_base
+    def read_cache(self, size=1):
+        assert 0
+    def read(self, size=1):
+        assert 0
+    def clean2read(self, size=1):
+        return self.clean(size)
+    def clean(self, read_size=0):
+        assert 0
+    def size(self):
+        assert 0
+    def full(self):
+        assert 0
+    def rget(self, size=1):
+        assert 0
+    def get(self, size=1):
+        assert 0
+class Buffer(BufferBase):
+    def pos2str(self, pos):
+        return "read from file"
+    def read_cache(self, size = 1):
+        s = self.read(size)
+        self.buffer+=s
+        self.s_read = self.s_read[len(s):]
+        return s
+    def read(self, size = 1):
+        if self.s_read is None:
+            self.s_read = self.input(1)
+            self.read_base+=1
+        l = len(self.s_read)
+        if l<size:
+            self.s_read += self.input(size-l)
+            self.read_base+=size-l
+        rst = self.s_read[:size]
+        if self.buffer is None:
+            self.buffer = self.s_read[:0]
+        return rst
+    def init(self):
+        super().init()
+        self.buffer = None
+        self.s_read = None
+    def __init__(self, input):
+        self.input = input
+        self.init()
+    def add(self, size):
+        if self.buffer is None:
+            self.buffer = self.s_read[:size]
+        else:
+            self.buffer += self.s_read[:size]
+    def size(self):
+        if self.buffer is None:
+            return 0
+        return len(self.buffer)
+    def full(self, size = 0, right = 1):
+        return self.buffer
+    def clean2read(self, read_size=1):
+        if read_size>0:
+            self.s_read = self.s_read[read_size:]
+        self.buffer = self.buffer[:0]
+        self.buffer_base=self.read_base
+    def clean(self, read_size = 0):
+        if read_size>0:
+            self.s_read = self.s_read[read_size:]
+        self.buffer = self.buffer[:0]
+        self.buffer_base=self.read_base
+    def rget(self, size=1):
+        return self.buffer[-size:]
+    def get(self, size=1):
+        return self.buffer[:size]
+
+pass
+
+def decode(s, coding = 'utf-8'):
+    coding = coding.lower()
+    xcoding = 'utf-8'
+    if coding == 'utf-8':
+        xcoding = 'gbk'
+    try:
+        return s.decode(coding)
+    except:
+        return s.decode(xcoding)
+
+pass
+class StrBuffer(BufferBase):
+    def pos2str(self, pos):
+        s = self.str[pos[0]:pos[1]+1]
+        return s
+    def read_cache(self, size = 1):
+        s = self.read(size)
+        l = len(s)
+        self.buffer_size+=l
+        self.read_base+=l
+        return s
+    def read(self, size = 1):
+        s = self.str[self.read_base:self.read_base+size]
+        if type(s)==bytes:
+            s = decode(s)
+        return s
+    def init(self):
+        super().init()
+        self.buffer_size = 0
+    def __init__(self, s):
+        self.str = s
+        self.init()
+    def add(self, size):
+        # x = self.str[self.buffer_base+self.buffer_size:self.buffer_base+self.buffer_size+len(arr)]
+        # if x!=arr:
+        #     print(f"[ERROR] x:({x}), arr:({arr}), bb: {self.buffer_base}, bs:{self.buffer_size}, rb: {self.read_base}")
+        #     print("[["+self.str[self.buffer_base:self.read_base+10]+"]]")
+        #     raise Exception("")
+        self.buffer_size+=size
+    def size(self):
+        return self.buffer_size
+    def full(self):
+        return self.str[self.buffer_base:self.buffer_base+self.buffer_size]
+    def clean2read(self, read_size=1):
+        self.read_base+=read_size
+        self.buffer_base = self.read_base
+        self.buffer_size = 0
+    def clean(self, read_size = 0):
+        self.read_base+=read_size
+        self.buffer_base = self.read_base
+        self.buffer_size = 0
+    def rget(self, size=1):
+        size = min(size, self.buffer_size)
+        return self.str[self.buffer_base+self.buffer_size-size:self.buffer_base+self.buffer_size]
+    def get(self, size=1):
+        size = min(size, self.buffer_size)
+        return self.str[self.buffer_base:self.buffer_base+size]
+
+pass

buildz-0.6.44/buildz/xf/loaderz/deal/listmapz.py

@@ -0,0 +1,58 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+from ...base import Args
+class ListMapDeal(lr.LRDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right, as_map = False, as_args=False):
+        super().init(left, right, "listmap")
+        self.as_map = as_map
+        self.as_args = as_args
+    def types(self):
+        return ['list']
+    def build(self, obj):
+        # if self.check_right(obj):
+        #     return None
+        val = obj.val
+        if len(val)==0:
+            obj.val = []
+            obj.is_val = 1
+            return obj
+        return self.build_arr(val, obj.pos)
+    def build_arr(self, arr, arr_pos):
+        rst = {}
+        lst = []
+        mp = {}
+        i = 0
+        while i<len(arr):
+            obj = arr[i]
+            opt = None
+            if i+1<len(arr):
+                opt = arr[i+1]
+            if opt is not None and opt.type == 'kv':
+                if i+2>=len(arr):
+                    raise exp.Exp(f"u f in listmap: {arr}", arr_pos)
+                val = arr[i+2]
+                mp[obj.val]=val.val
+                i+=3
+            else:
+                lst.append(obj.val)
+                i+=1
+        if self.as_args:
+            return item.Item(Args(lst, mp), arr_pos, type='args', is_val=1)
+        if len(mp)==0:
+            if self.as_map:
+                if len(lst)==0:
+                    return item.Item(mp, arr_pos, type="map", is_val=1)
+                else:
+                    return item.Item(Args(lst, mp), arr_pos, type='args', is_val=1)
+            return item.Item(lst, arr_pos, type="list", is_val=1)
+        elif len(lst)==0:
+            return item.Item(mp, arr_pos, type="map", is_val=1)
+        else:
+            return item.Item(Args(lst, mp), arr_pos, type='args', is_val=1)
+
+pass

buildz-0.6.44/buildz/xf/loaderz/deal/listz.py

@@ -0,0 +1,33 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+class ListDeal(lr.LRDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right):
+        super().init(left, right, 'list')
+    def types(self):
+        return ['list']
+    def build(self, obj):
+        val = obj.val
+        if len(val)==0:
+            obj.val = []
+            obj.is_val = 1
+            return obj
+        if len(val)>1:
+            opt = val[1]
+            if opt.type=='kv':
+                return None
+        return self.build_arr(val, obj.pos)
+    def build_arr(self, arr, arr_pos):
+        rst = []
+        #pos = self.arr_pos(arr)#(arr[0].pos[0],arr[-1].pos[-1])
+        for _item in arr:
+            if not _item.is_val:
+                raise exp.Exp(f"error in list: item is not val: {_item}", _item.pos)
+            rst.append(_item.val)
+        return item.Item(rst, arr_pos, type='list', is_val = 1)
+
+pass

buildz-0.6.44/buildz/xf/loaderz/deal/lr.py

@@ -0,0 +1,70 @@
+from .. import base
+from .. import item
+from .. import exp
+class LRDeal(base.BaseDeal):
+    def labels(self):
+        return [self.left]
+    def types(self):
+        return []
+    def deal(self, buffer, rst, mg):
+        cl = buffer.read(self.ll)
+        if self.left!=cl:
+            return False
+        _arr = []
+        rm = buffer.full().strip()
+        rm_pos = buffer.pos()
+        buffer.clean2read(self.ll)
+        if len(rm)>0:
+            _arr.append(item.Item(rm, rm_pos, type="str", is_val=False))
+        arr_pos = list(rm_pos)
+        while True:
+            cr = buffer.read(self.lr)
+            if cr == self.right:
+                rm = buffer.full().strip()
+                rm_pos = buffer.pos()
+                buffer.clean2read(self.lr)
+                break
+            if not mg.deal(buffer, _arr):
+                e_pos = buffer.pos()
+                raise exp.Exp("Error lr", e_pos)
+        buffer.clean()
+        arr_pos[1] = rm_pos[1]
+        arr_pos = tuple(arr_pos)
+        if len(rm)>0:
+            _arr.append(item.Item(rm , rm_pos, type = 'str', is_val=False))
+        if self.mg_build:
+            dts = mg.build_arr(_arr)
+        else:
+            dts = _arr
+        obj = self.build_arr(dts, arr_pos)
+        rst.append(obj)
+        return True
+    def to_vals(self, _arr, mg):
+        dts = []
+        for k in _arr:
+            _k = mg.build(k)
+            if item.is_null(_k):
+                continue
+            dts.append(_k)
+        return dts
+    def build_arr(self, obj, arr_pos):
+        return item.Item(obj, arr_pos, type = self.type, is_val=True)
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def prepare(self, mg):
+        self.left = mg.like(self.left)
+        self.right = mg.like(self.right)
+        self.ll = len(self.left)
+        self.lr = len(self.right)
+    def init(self, left, right, name= "lr", mg_build = True):
+        self.left = left
+        self.right = right
+        self.ll = len(left)
+        self.lr = len(right)
+        self.name = name
+        self.mg_build = mg_build
+    def err(self, s):
+        return s.replace("<lr>", self.name)
+
+pass

buildz-0.6.44/buildz/xf/loaderz/deal/lrval.py

@@ -0,0 +1,43 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+from . import reval
+class Fcs:
+    def __init__(self):
+        self.maps = {}
+    def set(self, _type, fc):
+        self.maps[_type] = fc
+    def __call__(self, val, _type):
+        if _type not in self.maps:
+            raise Exception("unreginize type:"+_type)
+        return self.maps[_type](val)
+
+pass
+
+
+class LRValDeal(lr.LRDeal):
+    """
+    """
+    def init(self, left, right, fc):
+        super().init(left, right, 'lrval', False)
+        self.fc = fc
+    def build_arr(self, arr, arr_pos):
+        rst = []
+        #pos = self.arr_pos(arr)#(arr[0].pos[0], arr[-1].pos[-1])
+        if len(arr)!=3:
+            raise exp.Exp(f"error in lrval:{arr}", arr_pos)
+        for _item in arr[::2]:
+            if type(_item.val)!=str:
+                raise exp.Exp(f"error in list:{_item}", _item.pos)
+            rst.append(_item.val)
+        try:
+            val = self.fc(rst[0], rst[1])
+        except Exception as exp1:
+            print("exp:", exp1)
+            raise exp.Exp(f"error in lrval fc: {self.fc}({rst}): {exp1} ", pos)
+        return item.Item(val, arr_pos, type='val', is_val = 1)
+    def build_arrx(self, arr, arr_pos):
+        return self.build(obj)
+
+pass

buildz-0.6.44/buildz/xf/loaderz/deal/mapz.py

@@ -0,0 +1,43 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+class MapDeal(lr.LRDeal):
+    """
+        分隔符，有分隔符后将缓存的数据当作字符串
+    """
+    def init(self, left, right):
+        super().init(left, right, "map")
+    def types(self):
+        return ['list']
+    def build(self, obj):
+        #if self.check_right(obj):
+        #    return None
+        val = obj.val
+        if len(val)==0:
+            obj.val = {}
+            obj.is_val = 1
+            return obj
+        if len(val)%3!=0:
+            return None
+        opt = val[1]
+        if opt.type!='kv':
+            return None
+        return self.build_arr(val, obj.pos)
+    def build_arr(self, arr, arr_pos):
+        rst = {}
+        #pos = self.arr_pos(arr)#(arr[0].pos[0], arr[-1].pos[-1])
+        if len(arr)%3!=0:
+            raise exp.Exp(f"u f in map: {arr}", arr_pos)
+        for i in range(0, len(arr), 3):
+            k = arr[i]
+            v = arr[i+2]
+            opt = arr[i+1]
+            if opt.type != "kv":
+                raise exp.Exp(f"u f opt in map: {opt}", opt.pos)
+            if type(k.val)==list:
+                k.val = tuple(k.val)
+            rst[k.val] = v.val
+        return item.Item(rst, arr_pos, type='map', is_val = 1)
+
+pass

buildz-0.6.44/buildz/xf/loaderz/deal/nextz.py

@@ -0,0 +1,26 @@
+from .. import base
+from .. import item
+
+class PrevNextDeal(base.BaseDeal):
+    def labels(self):
+        return ['']
+    #def types(self):
+    #    return [""]
+    """
+        读取下一个字符放缓存里，应放最低优先级
+    """
+    def deal(self, buffer, arr, mg):
+        c = buffer.read_cache(1)
+        if len(c)==0:
+            rm = buffer.full().strip()
+            pos = buffer.pos()
+            buffer.clean()
+            if len(rm)==0:
+                return False
+            obj = item.Item(rm, pos, type = 'str', is_val = 0)
+            arr.append(obj)
+            # TODO return True?
+            return False
+        return True
+
+pass

buildz-0.6.44/buildz/xf/loaderz/deal/reval.py

@@ -0,0 +1,33 @@
+from .. import base
+from .. import item
+from .. import exp
+from . import lr
+import re
+class ValDeal(base.BaseDeal):
+    def prepare(self,mg):
+        self.pt = mg.like(self.pt)
+        self.type = mg.type
+    def types(self):
+        return ["str"]
+    """
+        正则表达式匹配
+    """
+    def init(self, pt, fc):
+        st = "^"
+        ed = "$"
+        if pt[0]!=st:
+            pt = st+pt
+        if pt[-1]!=ed:
+            pt = pt+ed
+        self.pt = pt
+        self.fc = fc
+    def build(self, obj):
+        val = obj.val
+        if type(val) != self.type:
+            return None
+        if re.match(self.pt, val) is None:
+            return None
+        val = self.fc(val)
+        return item.Item(val, obj.pos, type = "val", is_val = 1)
+
+pass