buildz 0.6.39__tar.gz → 0.6.41__tar.gz

{buildz-0.6.39/buildz.egg-info → buildz-0.6.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.39
+Version: 0.6.41
 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.6.41/buildz/argz/args.py

@@ -0,0 +1,19 @@
+#
+
+from buildz import xf, Base
+
+class Args(Base):
+    """
+        order: [0, cal]
+        args: [(1,), []]
+        maps: {
+            
+        }
+    """
+    def init(self, conf):
+        if type(conf)==str:
+            conf = xf.loads(conf)
+        self.conf = conf
+    def call(self, argx):
+        
+        pass

{buildz-0.6.39 → buildz-0.6.41}/buildz/cachez/cache.py

@@ -157,13 +157,13 @@ class Mem(Cache):
 
 pass
 @ns.obj(id="cache")
-@ns.obj_args("ref, cache.file", "ref, cache.mem")
+@ns.obj_args("ref, cache.mem", "ref, cache.file")
 class Caches(Base):
-    def init(self, cache, mem):
+    def init(self, mem, cache):
         self.cache = cache
         self.mem = mem
-        self.caches = [cache, mem]
-        self.set = cache.set
+        self.caches = [mem, cache]
+        self.set = mem.set
         self.remove = cache.remove
         self.call=cache.call
         self.rfp = cache.rfp
@@ -188,9 +188,8 @@ class Caches(Base):
         self.mem.remove(key)
     def get(self, key):
         for cache in self.caches:
-            v = cache.get(key)
-            if v is not None:
-                return v
+            if cache.has(key):
+                return cache.get(key)
         return None
     def has(self, key):
         for cache in self.caches:

{buildz-0.6.39 → buildz-0.6.41}/buildz/ioc/ioc/conf.py

@@ -191,8 +191,12 @@ class Conf(Base):
         if self._default_type is None:
             return self.confs.default_type
         return self._default_type
-    def get_var(self, key, i = -1):
-        return self.confs.get_var(key, i)
+    def get_var(self, key, i = -1, search_confs = True):
+        var, exist = self.confs.get_var(key, i)
+        if not exist and search_confs:
+            gid = self.confs.gid(self.namespace, key)
+            var, exist = self.confs.get_var(gid, i)
+        return var, exist
     def set_var(self, key, val):
         return self.confs.set_var(key, val)
     def unset_var(self, key):

{buildz-0.6.39 → buildz-0.6.41}/buildz/ioc/ioc/confs.py

@@ -1,6 +1,6 @@
 #coding=utf-8
 from buildz import xf, pyz
-from .decorator import decorator
+from .decorator import decorators,IOCDObj,decorator
 from buildz.xf import g as xg
 from buildz import argx
 import json
@@ -374,10 +374,11 @@ class Confs(Base):
             raise
         #return self.add(conf)
     def add_decorator(self):
-        decorator.bind_confs(self)
+        decorators.bind(self)
+        #decorator.bind_confs(self)
         return
-        confs = decorator.all()
-        return self.adds(confs)
+        # confs = decorator.all()
+        # return self.adds(confs)
         # conf = decorator()
         # #print(f"[TESTZ] CONFS add decorator(): {conf}")
         # return self.add(conf)
@@ -525,4 +526,52 @@ class ConfsList(Base):
 
 pass
 
+class PushVar(IOCDObj):
+    def init(self, key, val):
+        super().init()
+        self.key = key
+        self.val = val
+    def bind(self, wrap):
+        super().bind(wrap)
+        self.decorator.add_bind(self)
+    def call(self):
+        conf = self.decorator.obj
+        confs = conf.confs
+        id = confs.gid(self.decorator.namespace, self.key)
+        confs.push_var(id, val)
+
+pass
+class PushVars(IOCDObj):
+    def init(self, maps):
+        super().init()
+        self.maps
+    def bind(self, wrap):
+        super().bind(wrap)
+        self.decorator.add_bind(self)
+    def call(self):
+        conf = self.decorator.obj
+        confs = conf.confs
+        for key, val in self.maps.items():
+            id = confs.gid(self.decorator.namespace, key)
+            confs.push_var(id, val)
+
+pass
+# class PushVar(IOCDObj):
+#     def init(self, id):
+#         super().init()
+#         self.id = id
+#     def call(self, val):
+#         def bind_fc():
+#             conf = self.decorator.obj
+#             confs = conf.confs
+#             id = confs.gid(self.decorator.namespace, self.id)
+#             confs.push_var(id, val)
+#         self.decorator.add_bind(bind_fc)
+#         return val
+
+# pass
+
+
+decorator.regist("push_var", PushVar)
+#ns.push_var("path")(pathz)
 

buildz-0.6.41/buildz/ioc/ioc/decorator.py

@@ -0,0 +1,282 @@
+#coding=utf-8
+from buildz.base import Base
+from buildz import xf
+from threading import Lock
+class Fcs(Base):
+    def init(self, wrap, fcs):
+        self._ioc_args = [wrap, fcs]
+        self._base = wrap
+    @property
+    def conf(self):
+        return self._ioc_args[0].obj
+    def __getattr__(self, key):
+        return self._ioc_args[1][key]
+
+pass
+class IOCDObj(Base):
+    def init(self):
+        self._wrap = None
+    def bind(self, wrap):
+        self._wrap = wrap
+        return self
+    @property
+    def wrap(self):
+        return self._wrap
+    @property
+    def decorator(self):
+        return self._wrap
+
+pass
+class IOCDWrap(Base):
+    def init(self, fc, wrap):
+        self.wrap = wrap
+        while isinstance(fc, IOCDWrap):
+            fc = fc.fc
+        self.fc = fc
+    def call(self, *args, **maps):
+        fc = self.fc(*args, **maps)
+        if isinstance(fc, IOCDObj):
+            fc.bind(self.wrap)
+        return fc
+        #return self.fc(*args, **maps).bind(self.wrap)
+
+pass
+class Decorator(Base):
+    """
+        用@备注的形式自动生成conf文档
+    """
+    @property
+    def namespace(self):
+        return self.ns
+    def init(self, ns=None, lock = False):
+        self.conf = {}
+        self.ns = ns
+        self.fcs = {}
+        self.obj_fcs = Fcs(self, self.fcs)
+        self.obj = None
+        self.id = None
+        self.bind_fcs = []
+        self.do_lock = lock
+        if lock:
+            self.lock = Lock()
+            self.set = self.lk_fc(self.set)
+            self.get = self.lk_fc(self.get)
+            self.add = self.lk_fc(self.add)
+            self.add_bind = self.lk_fc(self.add_bind)
+    def add_bind(self, fc):
+        fc = IOCDWrap(fc, self)
+        self.bind_fcs.append(fc)
+    def lk_fc(self, fc):
+        def _fc(*a, **b):
+            with self.lock:
+                return fc(*a, **b)
+        return _fc
+    def bind(self, confs):
+        self.conf['namespace'] = self.ns
+        #from buildz import xf
+        #print(f"[TESTZ] Decorator conf: {self.conf}")
+        self.id = confs.add(self.conf)
+        self.obj = confs.get_conf(self.id)
+        for fc in self.bind_fcs:
+            fc()
+    def call(self):
+        return self.obj_fcs
+    def regist(self, key, fc):
+        fc = IOCDWrap(fc, self)
+        self.fcs[key]=fc
+    def clone(self, ns=None, lock=None):
+        if lock is None:
+            lock = self.do_lock
+        dc = Decorator(ns, lock)
+        for k,fc in self.fcs.items():
+            dc.regist(k, fc)
+        for fc in self.bind_fcs:
+            dc.add_bind(fc)
+        return dc
+    def get(self, tag, index):
+        conf = self.conf
+        if tag not in conf:
+            conf[tag]=[]
+        return conf[tag][index]
+    def add(self, tag, data):
+        conf = self.conf
+        if tag not in conf:
+            conf[tag]=[]
+        id = len(conf[tag])
+        conf[tag].append(data)
+        return id
+    def set(self, tag, key, val):
+        conf = self.conf
+        if tag not in conf:
+            conf[tag]={}
+        conf[tag][key]=val
+    def add_datas(self, item):
+        if type(item)==str:
+            item = xf.loads(item)
+        return self.add("datas", item)
+    def get_datas(self, id):
+        return self.get("datas", id)
+    def set_datas(self, id, val):
+        return self.set("datas", id, val)
+    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)
+
+pass
+
+class Decorators(Base):
+    decorator_fc_names = "regist,get,add,set,add_datas,get_datas,set_datas,set_envs,add_inits,add_locals".split(",")
+    def init(self, ns=None):
+        self.demo = Decorator(ns)
+        self.ns = ns
+        self.confs = {}
+        self.confs[ns] = self.demo
+        self.obj = None
+        for nfc in Decorators.decorator_fc_names:
+            setattr(self, nfc, self.ns_fc(nfc))
+    def ns_fc(self, nfc):
+        def _fc(*a, ns=None):
+            return getattr(self.decorator(ns), nfc)(*a)
+        return _fc
+    def decorator(self, ns=None):
+        if ns is None:
+            ns = self.ns
+        if ns not in self.confs:
+            self.confs[ns] = self.demo.clone(ns)
+        return self.confs[ns]
+    def call(self, ns=None):
+        return self.decorator(ns)()
+    def bind(self, confs):
+        for ns, conf in self.confs.items():
+            conf.bind(confs)
+        self.obj = confs
+
+pass
+decorators = Decorators()
+decorator = decorators.demo
+ns = decorators
+# class Decorator(Base):
+#     def init(self):
+#         #self.conf = {}
+#         self.confs = {}
+#         self.confs[None] = {}
+#         self.objs = {}
+#         self.ids = {}
+#         self.namespace = None
+#         self.fcs = {}
+#         self._ns = {}
+#         self.regist("add_datas", self.add_datas)
+#     def get_conf_obj(self, ns):
+#         return self.objs[ns]
+#     @property
+#     def conf(self):
+#         return self.get_conf_obj(self.namespace)
+#     def fcns(self, namespace, fc):
+#         self._ns[fc] = namespace
+#     def ns(self, namespace):
+#         self.namespace = namespace
+#     def curr_ns(self):
+#         return self.namespace
+#     def regist(self, key, fc):
+#         self.fcs[key] = fc
+#     def get_conf(self, src, ns = None):
+#         if ns is None:
+#             ns = self.namespace
+#         if src in self._ns:
+#             ns = self._ns[src]
+#         if ns not in self.confs:
+#             conf = {}
+#             conf['namespace'] = ns
+#             self.confs[ns] = conf
+#         return self.confs[ns]
+#     def get(self, tag, index, src=None):
+#         conf = self.get_conf(src)
+#         if tag not in conf:
+#             conf[tag]=[]
+#         return conf[tag][index]
+#     def add(self, tag, data, src = None, ns = None):
+#         conf = self.get_conf(src, ns)
+#         if tag not in conf:
+#             conf[tag]=[]
+#         id = len(conf[tag])
+#         conf[tag].append(data)
+#         return id
+#     def set(self, tag, key, val, src=None):
+#         conf = self.get_conf(src)
+#         if tag not in conf:
+#             conf[tag]={}
+#         conf[tag][key]=val
+#     def add_datas(self, item, key=None, ns = None):
+#         if type(item)==str:
+#             item = xf.loads(item)
+#         return self.add("datas", item, key, ns)
+#     def get_datas(self, id, key=None):
+#         return self.get("datas", id, key)
+#     def set_datas(self, id, val):
+#         return self.set("datas", id, val)
+#     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 bind_confs(self, confs):
+#         for ns, val in self.confs.items():
+#             id = confs.add(val)
+#             obj = confs.get_conf(id)
+#             self.ids[ns] = id
+#             self.objs[ns] = obj
+#     def all(self):
+#         arr = [val for k,val in self.confs.items()]
+#         return arr
+#     # def call(self):
+#     #     return self.conf
+
+# pass
+
+# decorator = Decorator()
+# class Fcs:
+#     def __init__(self, k, ns):
+#         self._ioc_ns = [k, ns]
+#     @property
+#     def conf(self):
+#         return self._ioc_ns[1].get_conf(self._ioc_ns[0])
+
+# pass
+# class NameSpace(Base):
+#     def get_conf(self, ns):
+#         return self.decorator.get_conf_obj(ns)
+#     def init(self, decorator):
+#         self.decorator = decorator
+#         self.lock = Lock()
+#     def fc(self, namespace, rfc):
+#         def wfc(*a, **b):
+#             with self.lock:
+#                 ns = self.decorator.curr_ns()
+#                 self.decorator.ns(namespace)
+#                 rst = rfc(*a,**b)
+#                 self.decorator.fcns(namespace, rst)
+#                 self.decorator.ns(ns)
+#                 return rst
+#         return wfc
+#     def call(self, namespace):
+#         fcs = self.decorator.fcs
+#         obj = Fcs(namespace, self)
+#         for k,f in fcs.items():
+#             setattr(obj, k, self.fc(namespace, f))
+#         def wfc(rfc, *a, **b):
+#             with self.lock:
+#                 ns = self.decorator.curr_ns()
+#                 self.decorator.ns(namespace)
+#                 rst = rfc(*a,**b)
+#                 self.decorator.fcns(namespace, rst)
+#                 self.decorator.ns(ns)
+#                 return rst
+#         setattr(obj, "wrap", wfc)
+#         return obj
+
+# pass
+# ns = NameSpace(decorator)

buildz-0.6.41/buildz/ioc/ioc/loads.py

@@ -0,0 +1,35 @@
+#
+from buildz import Base, xf
+from ..ioc.decorator import decorator,IOCDObj
+class Loads(IOCDObj):
+    def init(self, conf, vtype = "envs"):
+        if type(conf)==str:
+            conf = xf.loads(conf)
+        self._type = vtype
+        self.conf = conf
+    def bind(self, wrap):
+        super().bind(wrap)
+        self.decorator.add_bind(self)
+    def call(self):
+        conf = self.decorator.obj
+        confs = conf.confs
+        maps = {}
+        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)
+            xf.deep_fill(maps, conf.envs, 1)
+        else:
+            confs.push_vars(maps)
+
+pass
+
+class Loadf(Loads):
+    def init(self, fp, vtype="env"):
+        conf = xf.loadf(fp)
+        super().init(conf, vtype)
+
+pass
+decorator.regist("load_conf", Loads)
+decorator.regist("loadf_conf", Loadf)

{buildz-0.6.39 → buildz-0.6.41}/buildz/ioc/ioc_deal/base.py

@@ -2,7 +2,7 @@
 
 from ..ioc.base import Base, EncapeData, IdNotFoundError
 from buildz import xf
-from ..ioc.decorator import decorator
+from ..ioc.decorator import decorator, IOCDObj
 import os
 dp = os.path.dirname(__file__)
 join = os.path.join
@@ -215,7 +215,10 @@ class FormatDeal(BaseDeal):
 
 pass
 
-class Order(Base):
+class Order(IOCDObj):
+    """
+        应该是什么没写完全的功能，已经忘记是做啥用的了
+    """
     def init(self, *fcs, reverse=False):
         self.fcs = fcs
         if reverse:

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

@@ -0,0 +1,5 @@
+
+from . import obj
+from . import base
+from . import var
+from ..ioc import loads

{buildz-0.6.39 → buildz-0.6.41}/buildz/ioc/ioc_deal/obj.py

@@ -1,12 +1,12 @@
 #
 from ..ioc.base import Base, EncapeData,IOCError
 from ..ioc.single import Single
-from ..ioc.decorator import decorator
+from ..ioc.decorator import decorator, IOCDObj
 from .base import FormatData,FormatDeal
 from buildz import xf, pyz
 from buildz import Base as Basez
 import os
-g_obj_cid = '_buildz_ioc_conf_index'
+#g_obj_cid = '_buildz_ioc_conf_index'
 dp = os.path.dirname(__file__)
 join = os.path.join
 class ObjectDeal(FormatDeal):
@@ -241,7 +241,7 @@ class IOCConf(Basez):
 
 pass
 g_ioc_conf = IOCConf()
-class IOCObjectAdd_(Basez):
+class IOCObjectAdd_(IOCDObj):
     def init(self, key, *arr):
         _arr = update_list(arr)
         self.key = key
@@ -286,7 +286,7 @@ class IOCObjectMCall(IOCObjectAdd_):
         super().init("mcalls", *_arr)
 
 pass
-class IOCObjectSet_(Basez):
+class IOCObjectSet_(IOCDObj):
     def init(self, key, **maps):
         _maps = update_set(maps)
         self._maps = {key:_maps}
@@ -308,10 +308,11 @@ class IOCObjectMap(IOCObjectSet_):
         super().init("maps", **maps)
 
 pass
-class IOCObject(Basez):
+class IOCObject(IOCDObj):
     KEYS = "id,args,maps,call,prev_call,single,remove,sets,after_remove,template,parent,temp".split(",")
     SET_KEYS = "maps,sets".split(",")
     def init(self, **maps):
+        super().init()
         rst = update_set(maps)
         for key in self.SET_KEYS:
             if key not in maps:
@@ -347,7 +348,8 @@ class IOCObject(Basez):
         conf['type'] = 'object'
         if 'mcalls' in conf and 'call' not in conf:
             conf['call'] = {'type': "calls", 'calls': conf['mcalls']}
-        conf[g_obj_cid] = decorator.add_datas(conf, self)
+        self.decorator.add_datas(conf)
+        #conf[g_obj_cid] = self.decorator.add_datas(conf, self)
         g_ioc_conf.unset(cls)
         return cls
 

{buildz-0.6.39 → buildz-0.6.41}/buildz/ioc/ioc_deal/var.py

@@ -1,7 +1,7 @@
 #
 from ..ioc.base import Base, EncapeData
 from .base import FormatData,FormatDeal
-from ..ioc.decorator import decorator
+from ..ioc.decorator import decorator,IOCDObj
 from buildz import xf, pyz
 from buildz import Base as Basez
 import os
@@ -38,8 +38,9 @@ class VarDeal(FormatDeal):
 
 pass
 
-class IOCVar(Basez):
+class IOCVar(IOCDObj):
     def init(self, id):
+        super().init()
         self.id = id
     def call(self, cls):
         src = cls.__module__+"."+cls.__name__
@@ -47,7 +48,7 @@ class IOCVar(Basez):
         conf['id'] = self.id
         conf['type'] = 'var'
         conf['var'] = src
-        decorator.add_datas(conf)
+        self.decorator.add_datas(conf)
         return cls
 
 pass

{buildz-0.6.39 → buildz-0.6.41}/buildz/ioc/wrap.py

@@ -17,7 +17,7 @@ def pkg(fp):
     __import__(fp)
 
 pass
-def imports(dp, pts=".*\.py$", pfx=""):
+def imports(dp=".", pts=".*\.py$", pfx=""):
     """
     find filepath by dirpath(dp) and pattern(pts), 
     import:

{buildz-0.6.39 → buildz-0.6.41}/buildz/logz.py

@@ -115,7 +115,7 @@ class StdLog(FormatLog):
 
 pass
 #wrap.decorator.add_datas()
-wrap.decorator.add_datas("[logs.list, refs], buildz\.logz\.item,", ns = "buildz.logz")
+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):

{buildz-0.6.39 → buildz-0.6.41}/buildz/pathz.py

@@ -24,6 +24,8 @@ class Path(Base):
             if os.path.exists(_fp):
                 return _fp
         return Path.rjoin(paths[last], *a)
+    def add(self, name, path, index=0):
+        self.paths[name].insert(index, path)
     def set(self, name, paths, last = -1, curr = None):
         if type(paths) not in (list, tuple):
             paths = [paths]

{buildz-0.6.39 → buildz-0.6.41/buildz.egg-info}/PKG-INFO

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

@@ -16,6 +16,8 @@ buildz.egg-info/PKG-INFO
 buildz.egg-info/SOURCES.txt
 buildz.egg-info/dependency_links.txt
 buildz.egg-info/top_level.txt
+buildz/argz/__init__.py
+buildz/argz/args.py
 buildz/auto/__init__.py
 buildz/auto/cache.py
 buildz/auto/config.py
@@ -95,6 +97,7 @@ buildz/ioc/ioc/base.py
 buildz/ioc/ioc/conf.py
 buildz/ioc/ioc/confs.py
 buildz/ioc/ioc/decorator.py
+buildz/ioc/ioc/loads.py
 buildz/ioc/ioc/single.py
 buildz/ioc/ioc_deal/base.py
 buildz/ioc/ioc_deal/branch.py

{buildz-0.6.39 → buildz-0.6.41}/setup.py

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