buildz 0.8.9__tar.gz → 0.9.1__tar.gz

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

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

@@ -13,8 +13,12 @@ def dzkeys(key, spt):
 class Conf(Base):
     def val(self):
         return self.get_conf()
-    def top(self):
-        return self.root or self
+    def top(self, domain = None):
+        root = self.root or self
+        if domain is not None:
+            root = root(domain)
+        return root
+        # return self.root or self
     def get_conf(self):
         if self.domain:
             key = self.domain
@@ -42,6 +46,8 @@ class Conf(Base):
         self.dr_bind('_hget', 'hget')
         self.dr_bind('_set', 'set')
         self.dr_bind('_has', 'has')
+        self.dr_bind('_remove', 'remove')
+        self.have_all = self.has_all
     def clean(self):
         obj = self.root or self
         obj.conf = {}
@@ -79,6 +85,9 @@ class Conf(Base):
         return self._hget(key, default)[0]
         keys = dzkeys(key, self.spt)
         return mapz.dget(self.conf, keys, default)[0]
+    def _remove(self, key):
+        keys = dzkeys(key, self.spt)
+        return mapz.dremove(self.conf, keys)
     def _has(self, key):
         keys = dzkeys(key, self.spt)
         return mapz.dhas(self.conf, keys)
@@ -93,6 +102,23 @@ class Conf(Base):
             val = self.get(keys[i], defaults[i] if i<len(defaults) else None)
             rst.append(val)
         return rst
+    def g(self, **maps):
+        return [self.get(k, v) for k,v in maps.items()]
+    def s(self, **maps):
+        [self.set(k,v) for k,v in maps.items()]
     def sets(self, keys, *vals):
         keys = self.spts_ks(keys)
-        rst = [self.set(key, val) for key, val in zip(keys, vals)]
+        rst = [self.set(key, val) for key, val in zip(keys, vals)]
+    def removes(self, keys):
+        keys = self.spts_ks(keys)
+        rst = [self.remove(key) for key in keys]
+    def has_all(self, keys):
+        keys = self.spts_ks(keys)
+        rst = [1-self.has(key) for key in keys]
+        return sum(rst)==0
+    def has_any(self, keys):
+        keys = self.spts_ks(keys)
+        for key in keys:
+            if self.has(key):
+                return True
+        return False

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

@@ -45,14 +45,29 @@ class Fetch:
         for key in maps:
             rst[key] = maps[key]
         keys = list(rst.keys())
-        for key in keys:
-            while key in self.maps:
-                rkey = self.maps[key]
-                if key in rst:
+        while len(keys)>0:
+            key = keys.pop(0)
+            if key in self.maps:
+                rkeys = self.maps[key]
+                if type(rkeys) not in (list, tuple):
+                    rkeys = [rkeys]
+                for rkey in rkeys:
+                    assert rkey!=key, f'error rkey==key: {key}'
                     val = rst[key]
                     rst[rkey] = val
-                    del rst[key]
-                key = rkey
+                    keys.append(rkey)
+                del rst[key]
+        # for key in keys:
+        #     while key in self.maps:
+        #         rkeys = self.maps[key]
+        #         if type(rkeys) not in (list, tuple):
+        #             rkeys = [rkeys]
+        #         for rkey in rkeys:
+        #             if key in rst:
+        #                 val = rst[key]
+        #                 rst[rkey] = val
+        #                 del rst[key]
+        #         key = rkey
         return rst
 
 pass

{buildz-0.8.9 → buildz-0.9.1}/buildz/confz.py

@@ -1,7 +1,9 @@
 from .dz import Conf
-from . import xf, pathz, pyz, argx
+from . import xf, pathz, pyz, argx, dz
 import sys, os
 def load_conf(conf, dp=None, dp_key = 'dp', src_key = 'src.conf'):
+    if type(conf)==dict:
+        conf = Conf().update(conf)
     fps, base = conf.gets('fps, conf', [], {})
     if type(fps)==str:
         fps = [fps]
@@ -24,10 +26,25 @@ def load_conf(conf, dp=None, dp_key = 'dp', src_key = 'src.conf'):
 # using
 def calls(conf):
     calls = conf.get("calls", [])
+    root = conf.top()
+    if type(calls)==dict:
+        target = dz.g(calls, target='run')
+        if target in calls:
+            calls = dz.get(calls, target, [])
+        else:
+            calls = root.get(target, [])
+    if type(calls)==dict:
+        dm, init, calls = dz.g(calls, domain=None, init = {},calls=[])
+        if len(init)>0:
+            init_conf = conf.top("confz.init")
+            if dm is not None:
+                init_conf = init_conf(dm)
+            init_conf.update(init, replace=0)
+            root.update(init_conf.val())
     if type(calls)==str:
         calls = [calls]
     for key in calls:
-        assert conf.has(key)
+        assert conf.has(key), f"not has key: '{key}'"
         simple(conf(key))
 def simple(conf):
     fc = conf.get('fc')
@@ -57,7 +74,9 @@ def run(dp = None, fp = None, init_conf = {}):
     conf = Conf().update(conf)
     init = conf.get(conf.get("key.init", "init"), {})
     conf = load_conf(conf, dp).update(init)
+    conf.set("confz.init", init)
     simple(conf)
+    return conf
 def test():
     run()
 pyz.lc(locals(), test)

{buildz-0.8.9 → buildz-0.9.1}/buildz/pyz.py

@@ -65,20 +65,26 @@ def load(md, fc = None):
     """
     mds = md.split(".")
     arr = mds[1:]
+    tr_exp = ''
     while len(mds)>0:
         try:
             md = __import__(".".join(mds))
             break
         except ModuleNotFoundError as exp:
+            import traceback
+            tr_exp = traceback.format_exc()
             mds = mds[:-1]
     if len(mds)==0:
-        raise Exception("can't import package from "+md)
-    for k in arr:
-        md = getattr(md, k)
-    if fc is not None:
-        fc = getattr(md, fc)
-    else:
-        fc = md
+        raise Exception("can't import package from "+md+":"+tr_exp)
+    try:
+        for k in arr:
+            md = getattr(md, k)
+        if fc is not None:
+            fc = getattr(md, fc)
+        else:
+            fc = md
+    except Exception as exp:
+        raise Exception(f"get exp: {exp}, traceback: {tr_exp}")
     return fc
 
 pass

{buildz-0.8.9 → buildz-0.9.1}/buildz/xf/writerz/mg.py

@@ -7,12 +7,12 @@ class Manager:
     def height_tree(self, obj):
         tobj = type(obj)
         if tobj not in self.deals:
-            raise Exception("undealable type"+str(obj))
+            raise Exception(f"undealable type {tobj}=="+str(obj))
         for fc in self.deals[tobj]:
             rst = fc.height_tree(self, obj)
             if rst is not None:
                 return rst
-        raise Exception("undealable obj in type"+str(obj))
+        raise Exception(f"undealable obj in type: {type(obj)}=="+str(obj))
     def add(self, types, fc):
         if type(types) not in (list, tuple):
             types = [types]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.9
+Version: 0.9.1
 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-0.9.1}/setup.py

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