buildz 0.9.11__tar.gz → 0.9.13__tar.gz

{buildz-0.9.11/buildz.egg-info → buildz-0.9.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.9.11
+Version: 0.9.13
 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.9.11 → buildz-0.9.13}/buildz/_dz/confx.py

@@ -186,6 +186,7 @@ class Conf(Base):
         '''
         if self.get_type()!=dict:
             return
+        self.history = {}
         for key in self.conf:
             del self.conf[key]
         return self
@@ -200,10 +201,35 @@ class Conf(Base):
         xf.fill(conf, self.conf, replace=replace)
         return self
     def push(self, key, value, flush = 1, update=0, clean_history = 0):
-        assert 0
+        if self.get_type()!=dict:
+            return None
+        keys = dzkeys(key, self.spt)
+        val, find = mapz.dget(self.conf, keys)
+        val = mapz.deep_clone(val)
+        if clean_history or key not in self.history:
+            self.history[key] = []
+        self.history[key].append([val, find, update])
+        if flush and type(value)==dict:
+            value = xf.flush_maps(value, lambda x:x.split(self.spt) if type(x)==str else [x], 0)
+        if find and type(value)==dict and type(val)==dict and update:
+            self(key).update(value,flush=0)
+        else:
+            self.set(key, value)
         return key
     def pop(self, key, clean_history = 0):
-        assert 0
+        if key not in self.history:
+            return False
+        lst = self.history[key]
+        if len(lst)==0:
+            return False
+        rst = lst.pop(-1)
+        if clean_history:
+            self.history[key] = []
+        if not rst[1]:
+            self.remove(key)
+            return True
+        self.set(key, rst[0])
+        return True
     def pops(self, keys, *a, **b):
         keys = self.spts_ks(keys)
         keys.reverse()
@@ -271,4 +297,4 @@ for item in maps:
     item = item[:1]+[ks]+item[1:]
     Conf.fcs_bind(*item)
 
-pass
+pass

{buildz-0.9.11 → buildz-0.9.13}/buildz/base.py

@@ -60,7 +60,19 @@ class Base:
         return None
 
 pass
-
+class BaseX(Base):
+    def __iter__(self):
+        return self.iter()
+    def iter(self):
+        assert False
+    def __getattr__(self, key):
+        return self.get(key)
+    def get(self, key):
+        assert False
+    def set(self, key,val):
+        assert False
+    def __setattr__(self, key, val):
+        return self.set(key, val)
 class WBase(Base):
     def _open(self):
         pass

buildz-0.9.13/buildz/confx.py

@@ -0,0 +1,102 @@
+#
+from .base import Base
+class Confz(Base):
+    def init(self, fc_key = "fc", fn_key = "fn", objs="__confz.objs", fns = "__confz.fns", caches = "__confz.caches", fcs = "__confz.fcs", default_fn = "calls", obj_prefix = "", save_key = "save", default_save = True):
+        self.fc_key = fc_key
+        self.fn_key = fn_key
+        self.objs = objs
+        self.fns = fns
+        self.fcs = fcs
+        self.caches = caches
+        self.default_fn = default_fn
+        self.obj_prefix=  obj_prefix
+        self.default_save = default_save
+        self.save_key = save_key
+    def set(self, conf, id, obj, prefix=True):
+        '''
+            存放创建好的对象
+        '''
+        if prefix:
+            id = self.obj_prefix+id
+        conf(self.objs).set(id, obj)
+    def get(self, conf, id):
+        id = self.obj_prefix+id
+        objs = conf(self.objs)
+        obj = objs.get(id)
+        if obj is None:
+            obj = self.simple(conf, id)
+        return obj
+    def regist(self, curr, conf):
+        '''
+            fn: regist/reg
+            name: fn_name
+            path: fc_path
+            call: false
+        '''
+        name, path, call = curr.gets("name, path, call")
+        if not call:
+            fns = conf(self.fns)
+            fns.set(name, path)
+            return
+        fc = pyz.load(path)
+        fc = fc(curr, conf)
+        conf(self.fcs).set(name, fc)
+    def calls(self, curr, conf):
+        """
+            fn: calls
+            calls: [key1, key2, key3]
+        """
+        calls = curr.get("calls", [])
+        rst = [self.simple(conf, k) for k in calls]
+        return rst
+    def init(self, conf):
+        fcs = conf(self.fcs)
+        fcs.set("regist", self.regist)
+        fcs.set("reg", self.regist)
+        fcs.set("calls", self.calls)
+    def get_fc(self, curr, conf, default_fc):
+        s_fc = curr.get(self.fc_key, None)
+        if s_fc is not None:
+            return pyz.load(s_fc)
+        if default_fc is not None:
+            return default_fc
+        fn = curr.get(self,fn_key, self.default_fn)
+        fcs = conf(self.fcs)
+        fc = fcs.get(fn)
+        if fc is not None:
+            return fc
+        fns = conf(self.fns)
+        s_fc = fns.get(fn)
+        if s_fc is None:
+            return None
+        fc = pyz.load(s_fc)
+        fcs.set(fn, fc)
+        return fc
+    def simple(self, conf, key, default_fc = None):
+        curr = conf(key)
+        fc = self.get_fc(curr, conf, default_fc)
+        obj = fc(curr, conf)
+        if curr.get(self.save_key, self.default_save):
+            self.set(key, obj,False)
+        return obj
+    def call(self, conf, key, default_fc=None):
+        return self.simple(conf, key, default_fc)
+
+pass
+                
+def wrap(fc, to_dict=0, unwrap=0, put_conf=1):
+    if unwrap:
+        assert to_dict==1
+        assert put_conf==0
+    def wfc(curr, conf):
+        if to_dict:
+            curr = curr.dict()
+        if unwrap:
+            return fc(**curr)
+        elif not put_conf:
+            return fc(curr)
+        else:
+            return fc(curr, conf)
+    return wfc
+
+pass

{buildz-0.9.11 → buildz-0.9.13}/buildz/fz/__init__.py

@@ -4,6 +4,6 @@ from .dirz import dirs, FileDeal
 from .lsf import lists, search, searchd,searchs,_search
 from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir,removes, cover, fcover, sread, swrite, is_abs, xors, fxors, coverx, covers, fcovers
 from .fhs import fhash, fhashs
-from .csv import to_csv, from_csv
+from .csv import to_csv, from_csv, merge_in
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

buildz-0.9.13/buildz/fz/csv.py

@@ -0,0 +1,159 @@
+#
+from . import fio
+"""
+col=1,as_map = 1
+{
+    a: [a1,a2,a3,...]
+    b: [b1,b2,b3,...]
+    ...
+}
+
+col=1, as_map=0
+[
+    [a1,a2,a3,...]
+    [b1,b2,b3,...]
+    ...
+]
+
+col=0,as_map = 1
+[
+    {a:a1,b:b1,...},
+    {a:a2,b:b2,...},
+    ...
+]
+
+col=0,as_map=0
+[
+    [a1,b1,...],
+    [a2,b2,...],
+    ...
+]
+"""
+def to_csv(keys, datas, fp, col = True, as_map = False,coding="utf-8"):
+    fio.makefdir(fp)
+    rst = []
+    if col:
+        if as_map:
+            datas = [datas[k] for k in keys]
+        datas = list(zip(*datas))
+    else:
+        if as_map:
+            datas = [[dt[k] for k in keys] for dt in datas]
+    datas = [", ".join([str(v) for v in dt]) for dt in datas]
+    rst = [", ".join(keys)]+datas
+    rs = "\n".join(rst)
+    fio.write(rs.encode(coding), fp)
+
+pass
+
+def from_csv(fp, col=True, as_map = False,coding="utf-8"):
+    s = fio.read(fp).decode(coding)
+    arr = s.split("\n")
+    arr = [[v.strip() for v in k.split(",")] for k in arr if k.strip()!=""]
+    keys = arr[0]
+    datas = arr[1:]
+    if col:
+        outs = []
+        for i in range(len(keys)):
+            tmp = [k[i] for k in datas]
+            outs.append(tmp)
+        if as_map:
+            outs = {k:arr for k,arr in zip(keys, datas)}
+        datas = outs
+    elif as_map:
+        datas = [{k:v for k,v in zip(keys, dt)} for dt in datas]
+    return keys, datas
+
+pass
+def wrap_cols(keys, cols):
+    rst = {}
+    for key, col in zip(keys, cols):
+        rst[key] = col
+    return rst
+
+def init_merge_keys(keys_a, keys_b):
+    rst = {}
+    keys_b = {k:k for k in keys_b}
+    for k in keys_a:
+        rst[k] = []
+    keys_b_ = {}
+    for k,v in keys_b.items():
+        while v in rst:
+            v = v+"_"
+        rst[v] = []
+        keys_b_[k] = v
+    keys_b = keys_b_
+    return rst, keys_b
+def merge_col_in(datas_a, datas_b, keys, keys_a = None, keys_b = None):
+    if type(keys)==str:
+        keys = [keys]
+    if keys_a is None:
+        keys_a = list(datas_a.keys())
+    bak_a = keys_a
+    keys_a = set(keys_a)
+    if keys_b is None:
+        keys_b = list(datas_b.keys())
+    bak_b = keys_b
+    keys_b = set(keys_b)
+    l = len(datas_b[keys[0]])
+    indexes = {}
+    for i in range(l):
+        vs = tuple([datas_b[k][i] for k in keys])
+        indexes[vs] = i
+    rst, keys_b = init_merge_keys(keys_a, keys_b)
+    l = len(datas_a[keys[0]])
+    for i in range(l):
+        vs = tuple([datas_a[k][i] for k in keys])
+        if vs not in indexes:
+            continue
+        j = indexes[vs]
+        for k in keys_a:
+            rst[k].append(datas_a[k][i])
+        for k, k_ in keys_b.items():
+            rst[k_].apepnd(datas_b[k][j])
+    return rst, [keys_a, keys_b]
+
+def merge_row_in(datas_a, datas_b, keys, keys_a = None, keys_b = None):
+    if type(keys)==str:
+        keys = [keys]
+    if len(datas_a)*len(datas_b)==0:
+        return []
+    if keys_a is None:
+        keys_a = list(datas_a[0].keys())
+    bak_a = keys_a
+    keys_a = set(keys_a)
+    if keys_b is None:
+        keys_b = list(datas_b[0].keys())
+    bak_b = keys_b
+    keys_b = set(keys_b)
+    rst, keys_b = init_merge_keys(keys_a, keys_b)
+    rst = []
+    l = len(datas_b)
+    indexes = {}
+    for i in range(l):
+        dt = datas_b[i]
+        vs = tuple([dt[k] for k in keys])
+        indexes[vs] = i
+    l = len(datas_a)
+    for i in range(l):
+        dt = datas_a[i]
+        vs = tuple([dt[k] for k in keys])
+        if vs not in indexes:
+            continue
+        j = indexes[vs]
+        tmp = {}
+        for k in keys_a:
+            tmp[k] = dt[k]
+        dt = datas_b[j]
+        for k, k_ in keys_b.items():
+            tmp[k_] = dt[k]
+        rst.append(tmp)
+    keys_b = [v for k,v in keys_b.items()]
+    return rst, [keys_a, keys_b]
+
+    
+def merge_in(datas_a, datas_b, keys, col = True, keys_a = None, keys_b = None):
+    if col:
+        return merge_col_in(datas_a, datas_b, keys, keys_a, keys_b)
+    return merge_row_in(datas_a, datas_b, keys, keys_a, keys_b)
+    

buildz-0.9.13/buildz/netz/nodes/codes/deal.py

@@ -0,0 +1,24 @@
+#
+'''
+quest
+verify
+
+skt.wrap()
+
+skt.input.add()
+skt.ouput.add()
+
+Pub(密码1，密码2，数据)
+
+密码(数据)
+
+
+'''
+class Deal(Base):
+    def init(self):
+        self.deals = {}
+    def call(self, skt, server):
+        order = skt.get()
+        self.deals[order](skt, server)
+
+pass

buildz-0.9.13/buildz/netz/nodes/codes/node.py

@@ -0,0 +1,35 @@
+from buildz.tls import *
+
+class Server(Base):
+    def init(self, conf, inst):
+        addr = tuple(conf.gets("ip,port", "127.0.0.1", 8080))
+        self.addr = addr
+        self.make_deal = confz.get(inst,"server.deal")
+        skt = socket.socket()
+        skt.listen(addr)
+        self.skt = skt
+        self.running = True
+        self.thread = None
+    def stop(self):
+        self.running = False
+    def start(self):
+        t = th.Thread(target=self.listen, daemon=True)
+        t.start()
+        self.thread = t
+    def join(self):
+        self.thread.join()
+    def listen(self):
+        self.running = True
+        while self.running:
+            skt = self.skt.accept()
+            if not skt:
+                continue
+            t = th.Thread(target=self.make_deal(skt, self),daemon=True)
+            t.start()
+            self.tds.append(t)
+        for t in self.tds:
+            t.join()
+    def call(self):
+        self.listen()
+pass
+

buildz-0.9.13/buildz/netz/nodes/node.py

@@ -0,0 +1,12 @@
+'''
+'''
+from ...base import *
+class Node(Base):
+    def init(self):
+        self.running=1
+        pass
+    def call(self):
+        while self.running:
+            self.deal()
+
+pass

{buildz-0.9.11 → buildz-0.9.13}/buildz/pyz.py

@@ -94,16 +94,17 @@ def pyexe():
 pass
 exe=pyexe
 is_windows = sys.platform.lower()=='win32'
-def pypkg():
+def pypkg(easy=True):
     """
         return python package path, test on linux and windows
     """
-    try:
-        import buildz
-        import os
-        return os.path.dirname(buildz.__path__[0])
-    except:
-        pass
+    if easy:
+        try:
+            import buildz
+            import os
+            return os.path.dirname(buildz.__path__[0])
+        except:
+            pass
     import site
     sites = site.getsitepackages()
     if is_windows:
@@ -118,7 +119,7 @@ pth = pypkg
 
 class Pth:
     def __init__(self, fp = "build.pth"):
-        self.fp = os.path.join(pth(), fp)
+        self.fp = os.path.join(pth(0), fp)
     def read(self):
         fp = self.fp
         if not os.path.isfile(fp):
@@ -233,4 +234,4 @@ def th_input(s, fc_done):
     t = th.Thread(target=fc_input, args=(s, fc_done), daemon=True)
     t.start()
 
-pass
+pass

{buildz-0.9.11 → buildz-0.9.13}/buildz/tools.py

@@ -1,6 +1,6 @@
 #coding=utf-8
 # from buildz.tools import *
-from . import pyz,xf,fz,Base, ioc, logz,xz, pathz, cachez, argz, evalz,dz,confz, path as pathx,argx, log as logx
+from . import pyz,xf,fz,Base, ioc, logz,xz, pathz, cachez, argz, evalz,dz,confz, path as pathx,argx, log as logx, confx
 from .tz.time import timecost,showcost
 from .ioc import wrap
 from .base import fcBase

{buildz-0.9.11 → buildz-0.9.13/buildz.egg-info}/PKG-INFO

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

@@ -7,6 +7,7 @@ buildz/__main__.py
 buildz/argx.py
 buildz/base.py
 buildz/cmd.py
+buildz/confx.py
 buildz/confz.py
 buildz/dz.py
 buildz/log.py
@@ -286,6 +287,9 @@ buildz/netz/mhttp/mhttp.py
 buildz/netz/mhttp/mhttps.py
 buildz/netz/mhttp/proxy.py
 buildz/netz/mhttp/record.py
+buildz/netz/nodes/node.py
+buildz/netz/nodes/codes/deal.py
+buildz/netz/nodes/codes/node.py
 buildz/netz/sslz/__init__.py
 buildz/netz/sslz/gen.py
 buildz/netz/sslz/gen.pyi

{buildz-0.9.11 → buildz-0.9.13}/setup.py

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

buildz-0.9.11/buildz/fz/csv.py

@@ -1,36 +0,0 @@
-#
-from . import fio
-def to_csv(keys, cols, fp):
-    assert len(keys)==len(cols)
-    fio.makefdir(fp)
-    keys = ", ".join(keys)
-    rst = [keys]
-    for tmp in zip(*cols):
-        tmp = [str(k) for k in tmp]
-        tmp = ", ".join(tmp)
-        rst.append(tmp)
-    rs = "\n".join(rst)
-    fio.write(rs.encode("utf-8"), fp)
-
-pass
-
-def from_csv(fp, col=True, as_map = False):
-    # 好像还没测试
-    s = fio.read(fp).decode("utf-8")
-    arr = s.split("\n")
-    arr = [[v.strip() for v in k.split(",")] for k in arr if k.strip()!=""]
-    keys = arr[0]
-    datas = arr[1:]
-    if col:
-        datas = []
-        for i in range(len(keys)):
-            tmp = [k[i] for k in datas]
-            datas.append(tmp)
-        if as_map:
-            datas = {k:arr for k,arr in zip(keys, datas)}
-    elif as_map:
-        datas = [{k:v for k,v in zip(keys, dt)} for dt in datas]
-    return keys, datas
-
-pass
-