buildz 0.8.7__tar.gz → 0.8.9__tar.gz

{buildz-0.8.7/buildz.egg-info → buildz-0.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.7
+Version: 0.8.9
 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.8.9/buildz/_dz/conf.py

@@ -0,0 +1,98 @@
+
+from . import mapz
+from buildz import xf
+from ..base import Base
+import os
+def dzkeys(key, spt):
+    # return mapz.keys(key, spt)
+    if type(key)==str:
+        key = key.split(spt)
+    if type(key) not in (list, tuple):
+        key = [key]
+    return key
+class Conf(Base):
+    def val(self):
+        return self.get_conf()
+    def top(self):
+        return self.root or self
+    def get_conf(self):
+        if self.domain:
+            key = self.domain
+        obj = self.root or self
+        if self.domain:
+            return obj._get(self.domain)
+        return obj.conf
+    def str(self):
+        return str(self.get_conf())
+    def call(self, domain=None):
+        if domain is None:
+            return self.top()
+        if self.domain:
+            domain = self.domain+self.spt+domain
+        obj = self.root or self
+        return Conf(self.spt, self.spts, domain, obj)
+    def init(self, spt='.', spts=',', domain=None, root = None):
+        self.spt = spt
+        self.spts = spts
+        self.domain = domain
+        self.root = root
+        if root is None:
+            self.conf = {}
+        self.dr_bind('_get', 'get')
+        self.dr_bind('_hget', 'hget')
+        self.dr_bind('_set', 'set')
+        self.dr_bind('_has', 'has')
+    def clean(self):
+        obj = self.root or self
+        obj.conf = {}
+        return self
+    def dkey(self, key):
+        if self.domain:
+            key = self.domain+self.spt+key
+        return key
+    def update(self, conf, flush = 1, replace=1, visit_list=0):
+        if self.domain:
+            ks = dzkeys(self.domain, self.spt)
+            tmp = {}
+            mapz.dset(tmp, ks, conf)
+            conf = tmp
+        if self.root:
+            return self.root.update(conf, flush, replace, visit_list)
+        if flush:
+            conf = xf.flush_maps(conf, lambda x:x.split(self.spt) if type(x)==str else [x], visit_list)
+        xf.fill(conf, self.conf, replace=replace)
+        return self
+    def dr_bind(self, fn, wfn):
+        def wfc(key,*a,**b):
+            key = self.dkey(key)
+            obj = self.root or self
+            fc = getattr(obj, fn)
+            return fc(key, *a, **b)
+        setattr(self, wfn, wfc)
+    def _set(self, key, val):
+        keys = dzkeys(key, self.spt)
+        mapz.dset(self.conf, keys, val)
+    def _hget(self, key, default=None):
+        keys = dzkeys(key, self.spt)
+        return mapz.dget(self.conf, keys, default)
+    def _get(self, key, default=None):
+        return self._hget(key, default)[0]
+        keys = dzkeys(key, self.spt)
+        return mapz.dget(self.conf, keys, default)[0]
+    def _has(self, key):
+        keys = dzkeys(key, self.spt)
+        return mapz.dhas(self.conf, keys)
+    def spts_ks(self, keys):
+        keys = dzkeys(keys, self.spts)
+        keys = [k.strip() if type(k) == str else k for k in keys]
+        return keys
+    def gets(self, keys, *defaults):
+        keys = self.spts_ks(keys)
+        rst = []
+        for i in range(len(keys)):
+            val = self.get(keys[i], defaults[i] if i<len(defaults) else None)
+            rst.append(val)
+        return rst
+    def sets(self, keys, *vals):
+        keys = self.spts_ks(keys)
+        rst = [self.set(key, val) for key, val in zip(keys, vals)]

{buildz-0.8.7 → buildz-0.8.9}/buildz/_dz/mapz.py

@@ -184,6 +184,14 @@ def dhas(maps, keys):
 
 pass
 
+def keys(key, spt='.', code='utf-8'):
+    if type(key) not in (list, tuple):
+        if type(key)==bytes:
+            key = key.decode(code)
+        if type(key)!=str:
+            key = str(key)
+        key = key.split(spt)
+    return key
 def dget(maps, keys, default = None):
     if type(keys) not in (list,tuple):
         keys = [keys]

{buildz-0.8.7 → buildz-0.8.9}/buildz/argx.py

@@ -1,5 +1,6 @@
 #coding=utf-8
-import sys
+import sys,re
+from .base import Base
 class Fetch:
     """
     命令行参数读取
@@ -60,6 +61,45 @@ class FetchX(Fetch):
         super().__init__(a,b)
 
 pass
+
+def build_pt(pt, fc):
+    st = "^"
+    ed = "$"
+    if pt[0]!=st:
+        pt = st+pt
+    if pt[-1]!=ed:
+        pt = pt+ed
+    def wfc(val):
+        if re.match(pt, val) is None:
+            return None, 0
+        val = fc(val)
+        return val, 1
+    return wfc
+
+pass
+class ValDeals(Base):
+    def init(self):
+        self.deals = []
+    def add(self, fc):
+        self.deals.append(fc)
+    def call(self, val):
+        if type(val)!=str:
+            return val
+        for deal in self.deals:
+            rst, done = deal(val)
+            if done:
+                return rst
+        return val
+
+pass
+to_val = ValDeals()
+to_val.add(build_pt("[\+\-]?\d+", int))
+to_val.add(build_pt("[\+\-]?\d*\.\d+", float))
+to_val.add(build_pt("[\+\-]?\d*(?:\.\d+)?e[\+\-]?\d+", float))
+to_val.add(build_pt("null", lambda x:None))
+to_val.add(build_pt("true", lambda x:True))
+to_val.add(build_pt("false", lambda x:False))
+
 def fetch(argv = None):
     r"""
     format: a b c -a 123 -b456 --c=789 +d  -x"??? ???" y z
@@ -107,6 +147,7 @@ def fetch(argv = None):
         for key in keys:
             if key not in maps:
                 maps[key] = []
+            val = to_val(val)
             maps[key].append(val)
         i+=1
     for k in maps:

{buildz-0.8.7 → buildz-0.8.9}/buildz/base.py

@@ -170,5 +170,13 @@ class Args(Base):
     def init(self, args, maps):
         self.args = args
         self.maps = maps
+    def full(self, list_key = "list", dict_key = "dict"):
+        rst = {}
+        rst[list_key] = self.args
+        rst[dict_key] = self.maps
+        return rst
+    def call(self, *a,**b):
+        return self.full(*a,**b)
+
 
 pass

{buildz-0.8.7 → buildz-0.8.9}/buildz/cachez/cache.py

@@ -153,6 +153,9 @@ class Cache(Base):
                 xdata = xf.flush_maps(xf.loadf(fp),visit_list=True)
                 xf.fill(xdata, data, replace=self.load_replace)
         xf.fill(data, self.data, replace=0)
+    def update(self, conf):
+        conf = xf.flush_maps(conf,visit_list=True)
+        xf.fill(conf, self.data, replace=1)
 
 pass
 
@@ -171,6 +174,7 @@ class Caches(Base):
         self.mem = mem
         self.caches = [mem, cache]
         self.set = mem.set
+        self.update = mem.update
         self.remove = cache.remove
         self.call=cache.call
         self.rfp = cache.rfp

buildz-0.8.9/buildz/confz.py

@@ -0,0 +1,63 @@
+from .dz import Conf
+from . import xf, pathz, pyz, argx
+import sys, os
+def load_conf(conf, dp=None, dp_key = 'dp', src_key = 'src.conf'):
+    fps, base = conf.gets('fps, conf', [], {})
+    if type(fps)==str:
+        fps = [fps]
+    conf_first,replace,flush,visit_list = conf.gets('conf_first,replace,flush,visit_list',1, 1,1,0)
+    spt, spts = conf.gets('spt, spts','.',',')
+    dp = conf.get(dp_key, dp)
+    path = pathz.Path()
+    path.set("dp", dp)
+    rst = Conf(spt, spts)
+    if src_key is not None:
+        rst.set(src_key, conf)
+    if conf_first:
+        rst.update(base, flush, replace, visit_list)
+    for fp in fps:
+        tmp = xf.loadf(path.dp(fp))
+        rst.update(tmp, flush, replace, visit_list)
+    if not conf_first:
+        rst.update(base, flush, replace, visit_list)
+    return rst
+# using
+def calls(conf):
+    calls = conf.get("calls", [])
+    if type(calls)==str:
+        calls = [calls]
+    for key in calls:
+        assert conf.has(key)
+        simple(conf(key))
+def simple(conf):
+    fc = conf.get('fc')
+    if fc is None:
+        fc = calls
+    else:
+        #assert fc is not None
+        fc = pyz.load(fc)
+    return fc(conf)
+def get_sys_conf(conf = []):
+    if type(conf) == str:
+        conf = xf.loadf(conf)
+    if conf is None:
+        conf = []
+    fetch = argx.Fetch(*conf)
+    return fetch()
+def run(dp = None, fp = None, init_conf = {}):
+    if dp is None:
+        dp = os.path.dirname(__file__)
+    path = pathz.Path()
+    path.set('dp', dp)
+    conf = {}
+    if fp is not None:
+        conf = xf.loadf(path.dp(fp))
+    #sys_conf = get_sys_conf()
+    xf.fill(init_conf, conf, 1)
+    conf = Conf().update(conf)
+    init = conf.get(conf.get("key.init", "init"), {})
+    conf = load_conf(conf, dp).update(init)
+    simple(conf)
+def test():
+    run()
+pyz.lc(locals(), test)

buildz-0.8.9/buildz/confz_test/argx.js

@@ -0,0 +1,2 @@
+[]
+{v:init.test.xtest.val}

buildz-0.8.9/buildz/confz_test/conf.js

@@ -0,0 +1,6 @@
+calls: [test.xtest]
+test: {
+    xtest: {
+        fc: buildz.confz_test.test.xtest
+    }
+}

buildz-0.8.9/buildz/confz_test/test.js

@@ -0,0 +1,4 @@
+{
+    fps: [conf.js]
+    conf:{}
+}

buildz-0.8.9/buildz/confz_test/test.py

@@ -0,0 +1,26 @@
+
+from buildz import confz, pathz, pyz
+import os,sys
+
+dp = os.path.dirname(__file__)
+
+path = pathz.Path()
+path.set(None, dp)
+def test():
+    sys_conf = confz.get_sys_conf(path("argx.js"))
+    confz.run(dp, "test.js", sys_conf)
+
+pass
+
+def xtest(conf):
+    print(f"[DEBUG] xtest:", conf)
+
+pass
+
+pyz.lc(locals(), test)
+
+'''
+python -m buildz.confz_test.test
+
+python -m buildz.confz_test.test -v0
+'''

buildz-0.8.9/buildz/dz.py

@@ -0,0 +1,4 @@
+
+from ._dz.mapz import *
+from ._dz.omapz import Mapz
+from ._dz.conf import Conf

{buildz-0.8.7 → buildz-0.8.9}/buildz/logz.py

@@ -72,6 +72,8 @@ class Log(Base):
         if "error" not in self.shows:
             return
         self.log("error", self._tag, *args)
+    def clean(self):
+        pass
 
 pass
 def replaces(s, *args):
@@ -110,6 +112,8 @@ class FpLog(FormatLog):
     def init(self, fp = None,shows =None, tag=None, format=None, base=None, lock = False):
         super().init(shows, tag, format, base, lock)
         self.fp = fp
+    def clean(self):
+        fz.removes(self.fp)
     def output(self, msg):
         #sys.stdout.write(msg)
         if self.fp is not None:
@@ -134,6 +138,9 @@ class Logs(Log):
     def do_log(self, level, tag, *args):
         for _log in self.logs:
             _log.log(level, tag, *args)
+    def clean(self):
+        for log in self.logs:
+            log.clean()
 
 pass
 def simple(fp=None,std=True, shows=None, tag=None, format=None,lock=False):

buildz-0.8.9/buildz/unittest/__init__.py

@@ -0,0 +1,66 @@
+
+'''
+单元测试注解
+'''
+from ..base import Base,fcBase
+from .. import logz
+import traceback
+class UnitTest(Base):
+    def init(self, log=None):
+        self.tests = []
+        self.log = logz.make(log)
+        self.bind_log('info')
+        self.bind_log('debug')
+        self.bind_log('warn')
+        self.bind_log('error')
+    def bind_log(self, key):
+        def call(*a,**b):
+            return getattr(self.log, key)(*a,**b)
+        setattr(self, key, call)
+    def case(self, key):
+        key = str(key)
+        def f(fc):
+            self.tests.append([key, fc])
+            return fc
+        return f
+    def wrap_call(self, _key, fc, args=[], maps={}):
+        bk_log = self.log
+        log = self.log(_key)
+        self.log = log
+        log.info("    unit test case: ", _key)
+        rst = None
+        done = True
+        try:
+            rst = fc(*args, **maps)
+        except Exception as exp:
+            done = False
+            import traceback
+            log.error("    unit test exp: ", exp)
+            log.error(traceback.format_exc())
+        log.info("    done unit test case: ", _key)
+        self.log = bk_log
+        return rst, done
+    def single(self, key, args=[], maps={}):
+        for _key, fc in self.tests:
+            if _key==key:
+                return self.wrap_call(_key, fc, args, maps)[0]
+    def call(self, key = None, args=[], maps={}):
+        if key is None:
+            key = ''
+        rst = []
+        self.log.info(f"start unit test on key: {key}")
+        for _key, fc in self.tests:
+            if _key.find(key)==0:
+                rst, done = self.wrap_call(_key, fc, args, maps)
+                if not done:
+                    break
+
+pass
+def make_loop_check(fc):
+    def call(dts, args=[]):
+        for i in range(len(dts)):
+            dt = dts[i]
+            fc(dt, args+[i])
+    return call
+def build(*a,**b):
+    return UnitTest(*a,**b)

{buildz-0.8.7 → buildz-0.8.9/buildz.egg-info}/PKG-INFO

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

@@ -18,6 +18,7 @@ buildz.egg-info/PKG-INFO
 buildz.egg-info/SOURCES.txt
 buildz.egg-info/dependency_links.txt
 buildz.egg-info/top_level.txt
+buildz/_dz/conf.py
 buildz/_dz/mapz.py
 buildz/_dz/omapz.py
 buildz/argz/__init__.py
@@ -64,6 +65,10 @@ buildz/auto/test/res/data/item2.js
 buildz/auto/test/res/data/test.js
 buildz/cachez/__init__.py
 buildz/cachez/cache.py
+buildz/confz_test/argx.js
+buildz/confz_test/conf.js
+buildz/confz_test/test.js
+buildz/confz_test/test.py
 buildz/db/__init__.py
 buildz/db/__main__.py
 buildz/db/install.txt

{buildz-0.8.7 → buildz-0.8.9}/setup.py

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

buildz-0.8.7/buildz/dz.py

@@ -1,3 +0,0 @@
-
-from ._dz.mapz import *
-from ._dz.omapz import Mapz

buildz-0.8.7/buildz/unittest/__init__.py

@@ -1,35 +0,0 @@
-
-'''
-单元测试注解
-'''
-from ..base import Base,fcBase
-from .. import logz
-import traceback
-class UnitTest(Base):
-    def init(self, log=None):
-        self.tests = []
-        self.log = logz.make(log)
-    def case(self, key):
-        key = str(key)
-        def f(fc):
-            self.tests.append([key, fc])
-        return f
-    def call(self, key = None, args=[], maps={}):
-        if key is None:
-            key = ''
-        rst = []
-        self.log.info(f"start unit test on key: {key}")
-        for _key, fc in self.tests:
-            if _key.find(key)==0:
-                self.log.info("    unit test case: ", _key)
-                try:
-                    fc(*args, **maps)
-                except exp:
-                    import traceback
-                    self.log.error("    unit test exp: ", exp)
-                    self.log.error(traceback.format_exc())
-                self.log.info("    done unit test case: ", _key)
-
-pass
-def build(*a,**b):
-    return UnitTest(*a,**b)