buildz 0.6.50__tar.gz → 0.6.51__tar.gz

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

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

@@ -1,4 +1,6 @@
 from buildz import pyz
+def isdict(obj):
+    return type(obj)==dict
 def islist(obj):
     return type(obj) in (list, tuple)
 def tolist(obj):
@@ -59,20 +61,15 @@ def gf(obj, **maps):
     return rst
 
 pass
-def get_first(obj, *keys):
+def get_first(obj, keys, default = None):
     for k in keys:
         if k in obj:
-            return obj[k]
-    raise KeyError(keys[0])
-
-pass
-def get_one(obj, keys, default = None):
-    for k in keys:
-        if k in obj:
-            return obj[k]
-    return default
+            return obj[k],1
+    return default,0
 
 pass
+def get_one(obj, keys, default=None):
+    return get_first(obj, keys, default)[0]
 def g1(obj, **maps):
     v = None
     for k in maps:
@@ -317,7 +314,7 @@ def flush_maps(maps, fc_key = lambda x:x.split(".") if type(x)==str else [x], vi
     for k,v in maps.items():
         ks = fc_key(k)
         v = flush_maps(v, fc_key, visit_list)
-        sets(rst, ks, v)
+        dset(rst, ks, v)
     return rst
 
 pass

{buildz-0.6.50 → buildz-0.6.51}/buildz/iocz/conf/mg.py

@@ -32,14 +32,27 @@ class DLKey(GetKey):
         if dz.islist(conf):
             return self.list_get(conf)
         return self.dict_get(conf)
-    def fill(self, conf):
-        pass
+    def list_fill(self, conf, key):
+        for indexes in self.indexes:
+            obj, find = dz.dget(conf, indexes)
+            if find:
+                dz.dset(conf, indexes, key)
+                return
+        assert 0
+    def dict_fill(self, conf, key):
+        for keys in self.keys:
+            obj, find = dz.dget(conf, keys)
+            if find:
+                dz.dset(conf, keys, key)
+                return
+        dz.dset(conf, self.keys[0], key)
+    def fill(self, conf, key):
+        if dz.islist(conf):
+            self.list_fill(conf, key)
+        else:
+            self.dict_fill(conf, key)
 default_conf = None
-def init():
-    global default_conf
-    if default_conf not None:
-        return
-    default_conf = xf.loads(r'''
+s_default_conf = r"""
     {
         id.spt: '.'
         conf:{
@@ -54,10 +67,19 @@ def init():
             default: null
         }
     }
-    ''')
+"""
+def init():
+    global default_conf
+    if default_conf is not None:
+        return
+    default_conf = xf.loads(s_default_conf)
     default_conf = dz.flush_maps(default_conf)
 class ConfManager(Manager):
     def init(self, conf=None):
+        ids, deal_key, conf_key, deal_ids = self.Conf(conf)
+        super().init(ids, deal_key, conf_key, deal_ids)
+    @staticmethod
+    def Conf(conf=None):
         init()
         spt = Ids(".")
         if conf is None:
@@ -70,9 +92,9 @@ class ConfManager(Manager):
         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)
+        deal_key = DLKey.Load(conf['deal'])
+        conf_key = DLKey.Load(conf['conf'])
+        return ids, deal_key, conf_key, deal_ids
     def add_conf(self, conf):
         unit = ConfUnit(conf, self)
         return unit

buildz-0.6.51/buildz/iocz/conf/test.py

@@ -0,0 +1,51 @@
+#
+
+from buildz.iocz.conf.mg import ConfManager
+
+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
+confs = r"""
+confs.pri: {
+    deal_obj:{
+        type=deal
+        source=buildz.iocz.ioc_deal.obj.ObjectDeal
+        deals: obj
+        call=1
+    }
+}
+confs: [
+    {
+        id=test
+        type=obj
+        source=buildz.iocz.ioc.test.Test
+        args=[
+            {
+                type=obj
+                source = buildz.iocz.ioc.test.Test
+                maps={id=123}
+            }
+        ]
+    }
+]
+builds: [deal_obj]
+"""
+def test():
+    mg = ConfManager()
+    mg.set_deal("deal", deal.DealDeal())
+    print(mg)
+    unit = mg.add_conf(confs)
+    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.51/buildz/iocz/conf/unit.py

@@ -0,0 +1,66 @@
+
+#
+from ..ioc.unit import Unit
+from ... import dz,xf
+from ..ioc.datas import Datas
+'''
+id|namespace|ns:
+deal_id|deal_ns: 
+envs.pub|envs.pri|envs.ns|envs: {
+    
+}
+confs.pub|confs.pri|confs.ns|confs: [
+
+]
+confs.pub|confs.pri|confs.ns|confs: {
+
+}
+builds: [
+    
+]
+
+or
+
+[
+    ...
+]
+'''
+class ConfUnit(Unit):
+    key_ns = ('id', 'namespace', 'ns')
+    key_deal_ns = "deal_id,deal_ns,deal_namespace".split(",")
+    key_pub = "confs.pub,confs".split(",")
+    key_pri = "confs.pri,confs.prv".split(",")
+    key_ns = "confs.ns,confs.namespace".split(",")
+    key_builds = "builds,build".split(",")
+    def init(self, conf, mg):
+        if type(conf)==str:
+            conf = xf.loads(conf)
+        if dz.islist(conf):
+            conf = {'confs': conf}
+        ns = dz.get_one(conf, self.key_ns)
+        deal_ns = dz.get_one(conf, self.key_deal_ns)
+        super().init(ns, deal_ns)
+        self.bind(mg)
+        self.load(conf)
+    def load_confs(self, confs, tag=None):
+        rst = []
+        if dz.isdict(confs):
+            for k,v in confs.items():
+                self.conf_key.fill(v, k)
+                rst.append(v)
+            confs = rst
+        for item in confs:
+            key,find = self.conf_key(item)
+            if find:
+                self.set_conf(key, item, tag)
+    def load(self, conf):
+        keys = [self.key_pub, self.key_ns, self.key_pri]
+        tags = [Datas.Key.Pub, Datas.Key.Ns, Datas.Key.Pri]
+        for key, tag in zip(keys, tags):
+            tag_confs = dz.get_one(conf, key, [])
+            self.load_confs(tag_confs, tag)
+        builds = dz.get_one(conf, self.key_builds, [])
+        for item in builds:
+            self.add_build(item)
+
+pass

{buildz-0.6.50 → buildz-0.6.51}/buildz/iocz/ioc/dataset.py

@@ -38,13 +38,16 @@ class Dataset(Base):
             self.ns_set(key, val, ns, data)
         if data.dts!=self:
             data.bind(self)
-    def tget(self, key, ns=None, id=None):
-        obj, id, keys,tag, find = self.get(key,ns,id)
+    def tget(self, key, ns=None, tag=None, id=None):
+        obj, id, keys,tag, find = self.get(key,ns,tag, id)
         return obj, tag, find
-    def get(self, key, ns=None, id = None):
-        obj, oid, find = self.ns_get(key,ns,id)
-        tag = TagData.Key.Ns
-        keys = key
+    def get(self, key, ns=None, tag=None, id = None):
+        if tag == TagData.Key.Pub:
+            find =False
+        else:
+            obj, oid, find = self.ns_get(key,ns,id)
+            tag = TagData.Key.Ns
+            keys = key
         if not find:
             obj, oid, keys, find=self.pub_get(key,ns,id)
             tag=TagData.Key.Pub

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

@@ -67,14 +67,14 @@ class Encapeset(Dataset):
         self.deals = mg.deals
         self.deal_key = mg.deal_key
         return self
-    def make(self, key, ns=None, id = None):
-        conf, cid, keys, ctag, cfind = self.confs.get(key, ns, id)
+    def make(self, key, ns=None, tag=None, id = None):
+        conf, cid, keys, ctag, cfind = self.confs.get(key, ns, tag, id)
         if not cfind:
-            return 0,0,0,0,0
+            return None,None,None,None,0
         conf, deal_ns = conf
         encape, conf, upd  = self.make_conf(conf, deal_ns, id, cid)
         if cid in self.objs:
-            obj = self.objs[id]
+            obj = self.objs[cid]
             if ns != obj.ns:
                 ids_ns = self.ids(obj.ns)
                 keys_ns = keys[:len(ids_ns)]
@@ -94,13 +94,13 @@ class Encapeset(Dataset):
         unit = self.mg.get_unit(cid)
         encape, conf, upd = deal(conf, unit)
         return encape, conf, upd 
-    def get(self, key, ns=None, id=None):
+    def get(self, key, ns=None, tag=None, id=None):
         if Confs.is_conf(key):
             encape, conf, upd = self.make_conf(key, None, id)
             return encape, None, None, Datas.Key.Pub, 1
-        obj, eid, keys, tag, find = super().get(key, ns, id)
+        obj, eid, keys, tag, find = super().get(key, ns, tag, id)
         if find:
             return obj, eid, keys, tag, find
-        return self.make(key, ns, id)
+        return self.make(key, ns, tag, id)
 
     

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

@@ -3,6 +3,7 @@
 from .base import *
 from .encapes import Encapeset
 from .dataset import Dataset
+from .vars import Varset
 from ... import pyz,dz
 from .ids import Ids
 from .unit import Unit
@@ -46,6 +47,16 @@ class Manager(Base):
         self.confs = Dataset(self.ids)
         self.deals = Dataset(self.deal_ids)
         self.encapes = Encapeset(self.ids, self)
+        self.vars = Varset(self.ids)
+        self.push_var = self.vars.vpush
+        self.push_vars = self.vars.vpushs
+        self.pop_var = self.vars.vpop
+        self.pop_vars = self.vars.vpops
+        self.set_var = self.vars.vset
+        self.set_vars = self.vars.vsets
+        self.get_var = self.vars.vget
+        self.unset_var = self.vars.vremove
+        self.unset_vars = self.vars.vremoves
         self.default_unit = self.create()
     def add_build(self, conf):
         self.builds.add(conf)

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

@@ -17,6 +17,14 @@ class Unit(Base):
         self.builds = Builds(self)
         self.mg = None
         self.build_encapes()
+    def update_ns(self, ns):
+        self.ns = ns
+        self.confs.ns = ns
+        if self.encapes is not None:
+            self.encapes.ns = ns
+    def update_deal_ns(self, deal_ns):
+        self.deal_ns = deal_ns
+        self.deals.ns = deal_ns
     def add_build(self, conf):
         self.builds.add(conf)
     def build(self):

buildz-0.6.51/buildz/iocz/ioc/vars.py

@@ -0,0 +1,65 @@
+#
+from .tdata import TagData
+from .datas import Datas
+from .dataset import Dataset
+from ... import dz,pyz
+class Varset(Dataset):
+    @staticmethod
+    def fcs(fc, need_val = True):
+        def _fc(kvs, ns=None, tag=None):
+            if need_val:
+                [fc(key, val, ns, tag) for key,val in kvs.items()]
+            else:
+                [fc(key, ns, tag) for key in kvs]
+        return _fc
+    def tag(self, _tag):
+        if _tag is None:
+            _tag = TagData.Key.Pub
+        return _tag
+    def init(self, ids):
+        super().init(ids)
+        self.vpops = self.fcs(self.vpop, 0)
+        self.vremoves = self.fcs(self.vremove, 0)
+        self.vsets = self.fcs(self.vset)
+    def vpushs(self, kvs, ns=None,tag=None):
+        [self.vpush(key, val, ns, tag) for key, val in kvs.items()]
+        return pyz.with_out(lambda :self.vpops(kvs))
+    def vset(self, key, val, ns=None, tag=None):
+        tag = self.tag(tag)
+        self.set(key, [val], ns, tag)
+    def vget(self, key, ns=None, tag=None):
+        tag = self.tag(tag)
+        obj, find_tag, find = self.tget(key, ns, tag)
+        if not find or len(obj)==0:
+            return None, 0
+        return obj[-1], 1
+    def vhas(self, key, ns=None, tag=None):
+        return self.vget(key, ns, tag)[1]
+    def vpush(self, key, val, ns = None, tag = None):
+        tag = self.tag(tag)
+        obj, find_tag, find = self.tget(key, ns, tag)
+        if not find or find_tag != tag:
+            obj = []
+        obj.append(val)
+        self.set(key, obj, ns, tag)
+    def vpop(self, key, ns=None, tag=None):
+        tag = self.tag(tag)
+        obj, find_tag, find = self.tget(key, ns, tag)
+        if not find or find_tag != tag:
+            return 0
+        if len(obj)>0:
+            obj.pop(-1)
+        return 1
+    def vremove(self, key, ns=None, tag=None):
+        tag = self.tag(tag)
+        obj, find_tag, find = self.tget(key, ns, tag)
+        if not find or find_tag != tag:
+            return 0
+        if tag == TagData.Key.Pub:
+            keys = self.ids(ns)+self.ids(key)
+            dz.dremove(self.pub, keys)
+        else:
+            map = self.ns[ns]
+            del map[key]
+        return 1
+        

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

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

@@ -162,6 +162,7 @@ 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/test.py
 buildz/iocz/conf/unit.py
 buildz/iocz/ioc/__init__.py
 buildz/iocz/ioc/base.py
@@ -183,6 +184,7 @@ buildz/iocz/ioc/tdict.py
 buildz/iocz/ioc/test.py
 buildz/iocz/ioc/test1.py
 buildz/iocz/ioc/unit.py
+buildz/iocz/ioc/vars.py
 buildz/iocz/ioc_deal/base.py
 buildz/iocz/ioc_deal/deal.py
 buildz/iocz/ioc_deal/obj.py

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

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

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

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