buildz 0.6.49__tar.gz → 0.6.50__tar.gz

{buildz-0.6.49/buildz.egg-info → buildz-0.6.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.49
+Version: 0.6.50
 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.49 → buildz-0.6.50}/buildz/dz/mapz.py

@@ -1,4 +1,10 @@
 from buildz import pyz
+def islist(obj):
+    return type(obj) in (list, tuple)
+def tolist(obj):
+    if not islist(obj):
+        obj = [obj]
+    return obj
 def dict2list(obj):
     if type(obj)!=dict:
         return obj
@@ -180,7 +186,7 @@ def dhas(maps, keys):
 
 pass
 
-def dget(maps, keys):
+def dget(maps, keys, default = None):
     if type(keys) not in (list,tuple):
         keys = [keys]
     for key in keys:
@@ -196,7 +202,7 @@ def dget(maps, keys):
         else:
             find = False
         if not find:
-            return None,0
+            return default,0
         maps = maps[key]
     return maps,1
 
@@ -216,7 +222,7 @@ def dremove(maps, keys):
         if first or len(maps[key])==0:
             del maps[key]
         first=0
-    return None
+    return
 
 pass
 

buildz-0.6.50/buildz/iocz/conf/base.py

@@ -0,0 +1,3 @@
+from ..ioc.base import *
+from ..ioc.confs import Confs
+

buildz-0.6.50/buildz/iocz/conf/mg.py

@@ -0,0 +1,80 @@
+
+#
+from ..ioc.mg import Manager, GetKey, Ids
+from ... import dz,xf
+from .unit import ConfUnit
+spt = Ids(".")
+class DLKey(GetKey):
+    @staticmethod
+    def Load(conf):
+        keys, kfind = dz.dget(conf, spt("dict.key"))
+        lids, lfind = dz.dget(conf, spt("list.index"))
+        default = dz.dget(conf, 'default', None)
+        return DLKey(keys, lids, default)
+    def init(self, keys, indexes, default=None):
+        super().init()
+        self.keys = dz.tolist(keys)
+        self.indexes = dz.tolist(indexes)
+        self.default = default
+    def list_get(self, conf):
+        for indexes in self.indexes:
+            obj, find = dz.dget(conf, indexes)
+            if find:
+                return obj, find
+        return self.default, 0
+    def dict_get(self, conf):
+        for keys in self.keys:
+            obj, find = dz.dget(conf, keys)
+            if find:
+                return obj, find
+        return self.default, 0
+    def call(self, conf):
+        if dz.islist(conf):
+            return self.list_get(conf)
+        return self.dict_get(conf)
+    def fill(self, conf):
+        pass
+default_conf = None
+def init():
+    global default_conf
+    if default_conf not None:
+        return
+    default_conf = xf.loads(r'''
+    {
+        id.spt: '.'
+        conf:{
+            dict.key = 'id'
+            list.index = [(0,1)]
+            default: null
+        }
+        deal: {
+            spt: '.'
+            dict.key = type
+            list.index = ((0,0),0)
+            default: null
+        }
+    }
+    ''')
+    default_conf = dz.flush_maps(default_conf)
+class ConfManager(Manager):
+    def init(self, conf=None):
+        init()
+        spt = Ids(".")
+        if conf is None:
+            conf = {}
+        if type(conf)==str:
+            conf = xf.loads(conf)
+        conf = dz.flush_maps(conf)
+        dz.fill(default_conf, conf, 0)
+        id_spt, find = dz.dget(conf, spt("id.spt"),".")
+        ids = Ids(id_spt)
+        deal_spt, find = dz.dget(conf, spt("id.spt"), id_spt)
+        deal_ids = Ids(deal_spt)
+        deal_key = DLKey(conf['deal'])
+        conf_key = DLKey(conf['conf'])
+        super().init(ids, deal_key, conf_key, deal_ids)
+    def add_conf(self, conf):
+        unit = ConfUnit(conf, self)
+        return unit
+
+pass

buildz-0.6.50/buildz/iocz/conf/unit.py

@@ -0,0 +1,16 @@
+
+#
+from ..ioc.unit import Unit
+'''
+id|namespace|ns:
+deal_id|deal_ns: 
+confs.pub: [
+
+]
+builds: [
+    
+]
+'''
+class ConfUnit(Unit):
+    def init(self, conf, mg):
+        pass

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

@@ -0,0 +1,37 @@
+from ..base import *
+basepath = path
+path = pathz.Path()
+path.set("conf", basepath.local("ioc/conf"), curr=0)
+class Encape(Base):
+    def call(self, params=None, **maps):
+        return None
+
+pass
+class Deal(Base):
+    def deal(self, conf, unit):
+        return None
+    def call(self, conf, unit):
+        'encape, conf, conf_need_udpate'
+        encape = self.deal(conf,unit)
+        return encape,conf,False
+
+pass
+
+class Params(Base):
+    def clone(self, **upds):
+        args, maps = list(self.args), dict(self.maps)
+        maps.update(upds)
+        return Params(args, maps)
+    def init(self, *args, **maps):
+        self.args = args
+        self.maps = maps
+    def get(self, key, default=None):
+        if key not in self.maps:
+            return default
+        return self.maps[key]
+    def __getattr__(self, key):
+        if key not in self.maps:
+            return None
+        return self.maps[key]
+
+pass

{buildz-0.6.49 → buildz-0.6.50}/buildz/iocz/ioc/builds.py

@@ -25,17 +25,17 @@ class Builds(Base):
     def build(self):
         if not self.need_build:
             return
+        self.need_build = False
         for conf in self.jobs:
             if Confs.is_conf(conf):
-                encape = self.unit.get_encape(conf, self.unit.ns, self.unit.id)
+                encape,c,u = self.unit.get_encape(conf, self.unit.ns, self.unit.id)
             elif isinstance(conf, Encape):
                 encape = conf
             else:
-                encape = self.unit.get_encape(conf, self.unit.ns, self.unit.id)
+                encape,c,u = self.unit.get_encape(conf, self.unit.ns, self.unit.id)
             encape()
             self.dones.append(conf)
         self.jobs = []
-        self.need_build = False
     def call(self):
         self.build()
 class Buildset(Base):
@@ -52,6 +52,7 @@ class Buildset(Base):
     def build(self):
         if not self.need_build:
             return
+        self.need_build = False
         for builds in self.jobs:
             builds()
             self.dones.append(builds)

{buildz-0.6.49 → buildz-0.6.50}/buildz/iocz/ioc/encapes.py

@@ -29,7 +29,7 @@ class Encapes(Datas):
         self.set(key, encape, ctag)
         return encape, ctag, 1
     def make_conf(self, conf, deal_ns=None, id=None):
-        deal_key = self.deal_key(conf)
+        deal_key, dk_find = self.deal_key(conf)
         deal, dtag, dfind = self.deals.tget(deal_key, deal_ns, id, True)
         assert dfind
         encape, conf, upd = deal(conf, self.unit)
@@ -88,7 +88,7 @@ class Encapeset(Dataset):
             self.set(key, encape, ns, ctag)
         return encape, cid, keys, ctag, 1
     def make_conf(self, conf, deal_ns=None, id=None,cid=None):
-        deal_key = self.deal_key(conf)
+        deal_key, dk_find = self.deal_key(conf)
         deal, dtag, dfind = self.deals.tget(deal_key, deal_ns, id)
         assert dfind
         unit = self.mg.get_unit(cid)

{buildz-0.6.49 → buildz-0.6.50}/buildz/iocz/ioc/mg.py

@@ -7,33 +7,41 @@ from ... import pyz,dz
 from .ids import Ids
 from .unit import Unit
 from .builds import Buildset
-class StrDealKey(Base):
+class GetKey(Base):
+    def call(self, conf):
+        return None, 0
+    def fill(self, conf, key):
+        assert 0,'not callable'
+class SimpleConfKey(Base):
     def init(self, key):
         self.key = key
     def call(self, conf):
         if self.key not in conf:
-            return None
-        return conf[self.key]
+            return None,0
+        return conf[self.key],1
+    def fill(self, conf, key):
+        conf[self.key] = key
 
 pass
 class Manager(Base):
     @staticmethod
-    def make_deal_key(deal_key):
-        if type(deal_key) == str:
-            deal_key = StrDealKey(deal_key)
-        return deal_key
+    def make_key(key):
+        if type(key) == str:
+            key = SimpleConfKey(key)
+        return key
     @staticmethod
     def make_ids(ids):
         if type(ids)==str:
             ids = Ids(ids)
         return ids
-    def init(self, ids, deal_key, deal_ids = None):
+    def init(self, ids, deal_key='type', conf_key='id', deal_ids = None):
         self._index = 0
         self.units = {}
         self.builds = Buildset(self)
         ids = self.make_ids(ids)
         self.ids = ids
-        self.deal_key = self.make_deal_key(deal_key)
+        self.deal_key = self.make_key(deal_key)
+        self.conf_key = self.make_key(conf_key)
         self.deal_ids = pyz.nnull(deal_ids, ids)
         self.confs = Dataset(self.ids)
         self.deals = Dataset(self.deal_ids)
@@ -46,11 +54,13 @@ class Manager(Base):
     def add(self, unit):
         unit.bind(self)
         self.units[unit.id] = unit
-    def create(self, ns=None, deal_ns = None, deal_key=None):
+    def create(self, ns=None, deal_ns = None, deal_key=None, conf_key= None):
         id = self.id()
         deal_key = pyz.nnull(deal_key, self.deal_key)
-        deal_key = self.make_deal_key(deal_key)
-        unit = Unit(ns, deal_ns, deal_key, id)
+        conf_key = pyz.nnull(conf_key, self.conf_key)
+        deal_key = self.make_key(deal_key)
+        conf_key = self.make_key(conf_key)
+        unit = Unit(ns, deal_ns, deal_key, conf_key, id)
         unit.bind(self)
         return unit
     def get_unit(self, id):

buildz-0.6.50/buildz/iocz/ioc/test.py

@@ -0,0 +1,45 @@
+
+from buildz.iocz.ioc import *
+from buildz.iocz.ioc_deal import obj, deal
+from buildz import xf, pyz, Base
+class Test(Base):
+    def init(self, id=0):
+        self.id = id
+
+pass
+conf_obj = xf.loads(r"""
+type=obj
+source=buildz.iocz.ioc.test.Test
+args=[
+    {
+        type=obj
+        source = buildz.iocz.ioc.test.Test
+        maps={id=123}
+    }
+]
+""")
+conf_init = xf.loads(r"""
+type=deal
+source=buildz.iocz.ioc_deal.obj.ObjectDeal
+deals: obj
+call=1
+""")
+def test():
+    mg = Manager('.', 'type')
+    mg.set_deal("deal", deal.DealDeal())
+    print(mg)
+    unit = mg.create()
+    print(unit)
+    #deal_obj = obj.ObjectDeal()
+    #mg.set_deal('obj', deal_obj)
+    unit.set_conf("test",conf_obj)
+    unit.set_conf("deal_obj",conf_init)
+    unit.add_build("deal_obj")
+    encape, tag, find = mg.get_encape("test")
+    print(f"encape: {encape}")
+    it = encape()
+    print(f"obj: {id(it), id(it.id),it.id.id}")
+    it = encape()
+    print(f"obj: {id(it), id(it.id),it.id.id}")
+
+pyz.lc(locals(), test)

{buildz-0.6.49 → buildz-0.6.50}/buildz/iocz/ioc/unit.py

@@ -6,10 +6,11 @@ from .encapes import Encapes
 from ... import pyz
 from .builds import Builds
 class Unit(Base):
-    def init(self, ns=None, deal_ns=None, deal_key = None, id=None):
+    def init(self, ns=None, deal_ns=None, deal_key = None, conf_key = None, id=None):
         self.ns = ns
         self.deal_ns = deal_ns
         self.deal_key = deal_key
+        self.conf_key = conf_key
         self.id = id
         self.confs = Confs(ns, deal_ns, id)
         self.deals = Datas(deal_ns, id)
@@ -32,6 +33,7 @@ class Unit(Base):
             return
         self.mg = mg
         self.deal_key = pyz.nnull(self.deal_key, mg.deal_key)
+        self.conf_key = pyz.nnull(self.conf_key, mg.conf_key)
         if self.id is None:
             self.id = mg.id()
             self.confs.set_id(self.id)
@@ -49,6 +51,7 @@ class Unit(Base):
     def get_conf(self, key, src=None, id=None, gfind=True):
         return self.confs.tget(key, src, id, gfind)
     def set_conf(self, key, conf, tag=None):
+        self.conf_key.fill(conf, key)
         self.confs.set(key, conf, tag)
     def get_encape(self, key, src=None, id=None, gfind=True):
         self.build()

{buildz-0.6.49 → buildz-0.6.50}/buildz/iocz/ioc_deal/base.py

@@ -1,5 +1,6 @@
 from ..ioc.base import *
 from ..ioc.confs import Confs
+from ... import dz
 class BaseEncape(Encape):
     @staticmethod
     def obj(val,*a,**b):
@@ -28,24 +29,21 @@ class BaseDeal(Deal):
             assert find
             return ep
         return key
+    def build(self, conf, unit):
+        return None
+    def deal(self, conf, unit):
+        'encape, conf, conf_need_udpate'
+        encape = self.build(conf,unit)
+        return encape,conf,False
+    def call(self, conf, unit):
+        'encape, conf, conf_need_udpate'
+        id,find=unit.conf_key(conf)
+        ns = unit.ns
+        encape = self.cache_get(id, ns)
+        if encape is not None:
+            return encape, conf, False
+        encape,conf,upd = self.deal(conf,unit)
+        self.cache_set(id, ns, encape)
+        return encape,conf,upd
 
 pass
-
-class Params(Base):
-    def clone(self, **upds):
-        args, maps = list(self.args), dict(self.maps)
-        maps.update(upds)
-        return Params(args, maps)
-    def init(self, *args, **maps):
-        self.args = args
-        self.maps = maps
-    def get(self, key, default=None):
-        if key not in self.maps:
-            return default
-        return self.maps[key]
-    def __getattr__(self, key):
-        if key not in self.maps:
-            return None
-        return self.maps[key]
-
-pass

buildz-0.6.50/buildz/iocz/ioc_deal/deal.py

@@ -0,0 +1,33 @@
+
+from .base import *
+from ... import dz,pyz
+from ..ioc.single import Single
+class DealEncape(BaseEncape):
+    def init(self, src, targets, tag, prev_call, unit):
+        super().init()
+        self.src, self.targets, self.tag, self.prev_call, self.unit = src, targets, tag, prev_call, unit
+    def call(self, params=None, **maps):
+        src = self.src
+        if self.prev_call:
+            src = src()
+        for target in self.targets:
+            self.unit.set_deal(target, src, self.tag)
+class DealDeal(BaseDeal):
+    def init(self):
+        super().init()
+        self.load_srcs = {}
+    def build(self, conf, unit):
+        id,id_find = unit.conf_key(conf)
+        src, tag, prev_call = dz.g(conf, source=None, tag=None, call=False)
+        targets = dz.g(conf, deals=[])
+        if type(targets) not in (list, tuple):
+            targets = [targets]
+        if Confs.is_conf(src):
+            src = unit.get_encape(src, unit)
+        elif type(src)==str:
+            if src not in self.load_srcs:
+                self.load_srcs[src] = pyz.load(src)
+            src = self.load_srcs[src]
+        return DealEncape(src, targets, tag, prev_call, unit,)
+
+pass

{buildz-0.6.49 → buildz-0.6.50}/buildz/iocz/ioc_deal/obj.py

@@ -38,13 +38,10 @@ class ObjectDeal(BaseDeal):
     def init(self):
         super().init()
         self.load_srcs = {}
-    def deal(self, conf, unit):
-        id = dz.g(conf, id=None)
-        encape = self.cache_get(id, unit.ns)
-        if encape is not None:
-            return encape
+    def build(self, conf, unit):
+        id,id_find = unit.conf_key(conf)
         single = dz.g(conf, single=None)
-        if single is None and id is None:
+        if single is None and not id_find:
             single = Single.Key.multi
         src, args, maps, sets = dz.g(conf, source=None, args=[], maps={},sets=[])
         before_set, after_set = dz.g(conf, before_set=None, after_set=None)
@@ -64,7 +61,6 @@ class ObjectDeal(BaseDeal):
         for k,v in dz.dict2iter(sets):
             lsets.append((self.get_encape(k, unit),self.get_encape(v, unit)))
         encape = ObjectEncape(single, src, args, lmaps, lsets,before_set,after_set)
-        self.cache_set(id, unit.ns, encape)
         return encape
 
 pass

buildz-0.6.50/buildz/tls.py

@@ -0,0 +1,2 @@
+#
+from .tools import *

{buildz-0.6.49 → buildz-0.6.50/buildz.egg-info}/PKG-INFO

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

@@ -11,6 +11,7 @@ buildz/confz.py
 buildz/logz.py
 buildz/pathz.py
 buildz/pyz.py
+buildz/tls.py
 buildz/tools.py
 buildz.egg-info/PKG-INFO
 buildz.egg-info/SOURCES.txt
@@ -159,6 +160,9 @@ buildz/ioc/ioc_deal/conf/var_lists.js
 buildz/ioc/ioc_deal/conf/xfile_defaults.js
 buildz/ioc/ioc_deal/conf/xfile_lists.js
 buildz/iocz/base.py
+buildz/iocz/conf/base.py
+buildz/iocz/conf/mg.py
+buildz/iocz/conf/unit.py
 buildz/iocz/ioc/__init__.py
 buildz/iocz/ioc/base.py
 buildz/iocz/ioc/bind.py

{buildz-0.6.49 → buildz-0.6.50}/setup.py

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

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

@@ -1,18 +0,0 @@
-from ..base import *
-basepath = path
-path = pathz.Path()
-path.set("conf", basepath.local("ioc/conf"), curr=0)
-class Encape(Base):
-    def call(self, params=None, **maps):
-        return None
-
-pass
-class Deal(Base):
-    def deal(self, conf, unit):
-        return None
-    def call(self, conf, unit):
-        'encape, conf, conf_need_udpate'
-        encape = self.deal(conf,unit)
-        return encape,conf,False
-
-pass

buildz-0.6.49/buildz/iocz/ioc/test.py

@@ -1,37 +0,0 @@
-
-from buildz.iocz.ioc import *
-from buildz.iocz.ioc_deal import obj
-from buildz import xf, pyz, Base
-class Test(Base):
-    def init(self, id=0):
-        self.id = id
-
-pass
-def test():
-    conf = xf.loads(r"""
-    type=obj
-    source=buildz.iocz.ioc.test.Test
-    single=0
-    args=[
-        {
-            type=obj
-            source = buildz.iocz.ioc.test.Test
-            maps={id=123}
-        }
-    ]
-    """)
-    mg = Manager('.', 'type')
-    print(mg)
-    unit = mg.create()
-    print(unit)
-    deal_obj = obj.ObjectDeal()
-    mg.set_deal('obj', deal_obj)
-    unit.set_conf("test",conf)
-    encape, tag, find = mg.get_encape("test")
-    print(f"encape: {encape}")
-    it = encape()
-    print(f"obj: {id(it), id(it.id),it.id.id}")
-    it = encape()
-    print(f"obj: {id(it), id(it.id),it.id.id}")
-
-pyz.lc(locals(), test)

buildz-0.6.49/buildz/iocz/ioc_deal/deal.py

@@ -1,69 +0,0 @@
-
-from .base import *
-from ... import dz,pyz
-from ..ioc.single import Single
-class DealEncape(BaseEncape):
-    '''
-        id=?
-        
-    '''
-    def init(self, single, src, args, maps, sets, before_set=None, after_set=None):
-        self.single = Single(single)
-        self.src, self.args, self.maps, self.sets = src, args, maps, sets
-        self.before_set = before_set
-        self.after_set = after_set
-        self.objs = {}
-    def call(self, params=None, **maps):
-        obj, find = self.single.get(params)
-        if find:
-            return obj
-        src = self.src
-        if params is None:
-            obj_conf = Params(obj = self)
-        else:
-            obj_conf = params.clone(obj=self)
-        if isinstance(src, Encape):
-            src = src(obj_conf)
-        args = [self.obj(k,obj_conf) for k in self.args]
-        _maps = {self.obj(k,obj_conf):self.obj(v,obj_conf) for k,v in self.maps}
-        obj = src(*args, **_maps)
-        self.obj(self.before_set, obj_conf)
-        for k,v in self.sets:
-            setattr(obj, self.obj(k,obj_conf), self.obj(v,obj_conf))
-        self.obj(self.after_set, obj_conf)
-        self.single.set(params, obj)
-        return obj
-class DealDeal(BaseDeal):
-    def init(self):
-        super().init()
-    def deal(self, conf, unit):
-        id = dz.g(conf, id=None)
-        k_ch = (ns, id)
-        single = dz.g(conf, single=None)
-        if single is None and id is None:
-            single = Single.Key.multi
-        if id is not None and k_ch in self.cache_encapes:
-            return self.cache_encapes[k_ch]
-        src, args, maps, sets = dz.g(conf, source=None, args=[], maps={},sets=[])
-        before_set, after_set = dz.g(conf, before_set=None, after_set=None)
-        before_set = self.get_encape(before_set, unit)
-        after_set = self.get_encape(after_set, unit)
-        if Confs.is_conf(src):
-            src = unit.get_encape(src, unit)
-        elif type(src)==str:
-            if src not in self.load_srcs:
-                self.load_srcs[src] = pyz.load(src)
-            src = self.load_srcs[src]
-        args = [self.get_encape(k, unit) for k in args]
-        lmaps = []
-        for k,v in dz.dict2iter(maps):
-            lmaps.append((self.get_encape(k, unit),self.get_encape(v, unit)))
-        lsets = []
-        for k,v in dz.dict2iter(sets):
-            lsets.append((self.get_encape(k, unit),self.get_encape(v, unit)))
-        encape = ObjectEncape(single, src, args, lmaps, lsets,before_set,after_set)
-        if id is not None:
-            self.cache_encapes[k_ch] = encape
-        return encape
-
-pass