buildz 0.6.22__tar.gz → 0.6.24__tar.gz

{buildz-0.6.22/buildz.egg-info → buildz-0.6.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.22
+Version: 0.6.24
 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.22 → buildz-0.6.24}/buildz/auto/cache.py

@@ -14,7 +14,7 @@ class Update(Base):
     """
     def init(self, cache, log, pt = "(#\{([^\{\}]*)\})"):
         self.cache = cache
-        self.log = log
+        self.log = log.tag("Cache.Update")
         self.pt = pt
     def call(self, s):
         if type(s)==dict:
@@ -33,8 +33,9 @@ class Update(Base):
             return s
         rst = re.findall(self.pt, s)
         for match, key in rst:
+            has = self.cache.has(key)
             val = self.cache.get(key)
-            if val is None:
+            if not has:
                 err = f"'{key}' not found in cache"
                 self.log.error(err)
                 raise Exception(err)
@@ -51,25 +52,34 @@ pass
 @wrap.obj(id="cache.save")
 @wrap.obj_args("ref, cache.file", "ref, log")
 class Save(Base):
-    def init(self, cache, log, fkey = "cache.save"):
+    def init(self, cache, log, fkey = "cache.save", fp = None):
         self.fkey = fkey
         self.cache = cache
-        self.log = log
-    def call(self, maps, fp):
-        fp = xf.get(maps, self.fkey, None)
+        self.log = log.tag("Cache.Save")
+        self.fp = fp
+    def save(self):
+        fp = self.fp
         if fp is None:
             self.log.warn(f"cache not save cause 'cache.save' is None")
-            return
+            return False
         fz.makefdir(fp)
         rst  = self.cache.data
         rs = xf.dumps(rst, format=True).encode("utf-8")
         fz.write(rs, fp, 'wb')
         return True
+    def call(self, maps, fp):
+        fp = xf.get(maps, self.fkey, None)
+        fp = self.cache.rfp(fp)
+        self.fp = fp
+        return self.save()
 
 pass
 @wrap.obj(id="cache.file")
-@wrap.obj_args("ref, log", "env, cache.rfp.current.first, false")
+@wrap.obj_args("mcall, log, tag, [Cache.File]", "env, cache.rfp.current.first, false")
 class Cache(Base):
+    def has(self, key):
+        ks = key.split(".")
+        return xf.has(self.data, ks)
     def get(self, key):
         ks = key.split(".")
         return xf.gets(self.data, ks)
@@ -96,10 +106,18 @@ class Cache(Base):
         self.set_current(dps)
     def get_current(self):
         dps = self.get("cache.path.current")
+        if dps is None:
+            dps = []
         if type(dps)!=list:
             dps = [dps]
         return dps
+    def set_basedir(self, dp):
+        self.set("cache.path.base", dp)
+    def get_basedir(self):
+        return self.get("cache.path.base")
     def rfp(self, fp):
+        if fz.is_abs(fp):
+            return fp
         dps = [None,"."]
         cfps = self.get_current()
         if cfps is not None:
@@ -107,12 +125,18 @@ class Cache(Base):
                 dps = cfps+dps
             else:
                 dps = dps+cfps
+        basedir = self.get_basedir()
+        if basedir is not None:
+            dps = [basedir]+dps
         for dp in dps:
             _fp = fp
             if dp is not None:
                 _fp = os.path.join(dp, fp)
             if os.path.isfile(_fp):
                 return _fp
+        basedir = self.get_basedir()
+        if basedir is not None:
+            fp = os.path.join(basedir, fp)
         return fp
     def call(self, maps, fp):
         fp = xf.get(maps, self.fkey, "cache.js")
@@ -132,7 +156,7 @@ class Cache(Base):
 pass
 
 @wrap.obj(id="cache.mem")
-@wrap.obj_args("ref, log")
+@wrap.obj_args("mcall, log, tag, [Cache.Mem]")
 class Mem(Cache):
     def init(self, log, current_first=False, fkey = "mem"):
         super().init(log)
@@ -152,6 +176,10 @@ class Caches(Base):
         self.get_current = cache.get_current
         self.add_current = cache.add_current
         self.set_current = cache.set_current
+        self.set_basedir = cache.set_basedir
+        self.get_basedir = cache.get_basedir
+        self.has_file = cache.has
+        self.has_mem = mem.has
     def get_file(self, key):
         return self.cache.get(key)
     def get_mem(self, key):
@@ -170,5 +198,10 @@ class Caches(Base):
             if v is not None:
                 return v
         return None
+    def has(self, key):
+        for cache in self.caches:
+            if cache.has(key):
+                return True
+        return False
 
 pass

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/config.py

@@ -11,13 +11,15 @@ class Config(Base):
         configs = xf.g(maps, configs=[])
         if type(configs)!=list:
             configs = [configs]
+        dts = {}
         for cfp in configs:
             cfp = self.cache.rfp(cfp)
             if not os.path.isfile(cfp):
                 self.log.error(f"config file not exist: {cfp}")
                 return False
             dt = xf.loadf(cfp)
-            xf.fill(dt, maps, replace=0)
+            xf.fill(dt, dts, replace=1)
+        xf.fill(dts, maps, replace=0)
         return True
 
 pass

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/dbs.py

@@ -8,17 +8,30 @@ from buildz.db.dv import build
 class Dbs(Base):
     def init(self, cache, log):
         self.cache = cache
-        self.log = log
+        self.log = log.tag("Dbs")
         self.dbs = {}
     def call(self, maps, fp):
         confs = xf.g(maps, dbs={})
         for key,conf in confs.items():
             url,user,pwd,dv = xf.g(conf, url=None, user=None, pwd=None, device=key)
-            dv = build(dv, [url, user, pwd], val)
+            dv = build(dv, [url, user, pwd], conf)
+            dv.begin()
             self.dbs[key] = dv
         self.cache.set_mem("dbs", self.dbs)
         return True
 
 pass
 
+@wrap.obj(id="dbs.close")
+@wrap.obj_sets(cache="ref, cache", log="ref, log")
+class DbsClose(Base):
+    def call(self, maps, fp):
+        dbs = self.cache.get_mem("dbs")
+        if dbs is None:
+            return True
+        for k,dv in dbs:
+            dv.close()
+        return True
+
+pass
 

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/deal_list.py

@@ -7,7 +7,7 @@ import os
 class List(Base):
     def init(self, cache, log, upd, lst):
         self.cache = cache
-        self.log = log
+        self.log = log.tag("List")
         self.upd = upd
         self.lst = lst
     def call(self, data, fc):
@@ -21,9 +21,10 @@ class List(Base):
         if type(datas)==dict:
             datas = xf.g(datas, datas=[])
         deal = self.lst.curr()
-        print(f"List.datas: {xf.dumps(datas,format=1,deep=1)}")
+        #print(f"List.datas: {xf.dumps(datas,format=1,deep=1)}")
         for data in datas:
             if not deal(data):
+                self.log.error(f"failed in data: {data}")
                 return False
         return True
 

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/defs.py

@@ -6,7 +6,7 @@ from buildz.ioc import wrap
 class Defs(Base):
     def init(self, cache, log, upd):
         self.cache = cache
-        self.log = log
+        self.log = log.tag("Defs")
         self.upd = upd
     def update(self, s, defs, ignore=None):
         if type(s)==dict:

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/factory.py

@@ -25,6 +25,10 @@ class Fill(Base):
     def init(self, mg):
         self.mg = mg
     def call(self, orders, default=None):
+        if type(orders)==str:
+            orders = xf.loads(orders)
+        if type(orders)==str:
+            orders = [orders]
         fcs = [self.mg.get(id) for id in orders]
         return DeepFc(fcs,default)
 

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/log.py

@@ -9,14 +9,20 @@ from ..tools import *
 import time, sys
 from ..tz.log import FpLog
 @wrap.obj(id="log")
+@wrap.obj_sets(cache="ref,cache")
 class AutoLog(FpLog):
     def call(self, maps, fp):
         fp = xf.g(maps, log = None)
+        fp = self.cache.rfp(fp)
         self.fp = fp
         shows = xf.get(maps, "log.shows")
         if shows is None:
             shows = ["info", "warn", "error"]
         self.shows = shows
+        format = xf.get(maps, "log.format")
+        if format is not None:
+            self.format = format
+        #print(f"[TETSZ] format: {format}")
         return True
 
 pass

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/request.py

@@ -17,7 +17,7 @@ class Request(Base):
         self.type = http_type
         self.cache = cache
         self.use_session = use_session
-        self.log = log
+        self.log = log.tag("Request")
         self.upd = upd
         self.fc = None
         self.fcs = None

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/run.py

@@ -4,20 +4,28 @@ from ..base import Base
 from . import init
 import os
 class Run(Base):
-    def init(self, fps=None, init=None):
+    def init(self, fps=None, init=None, basedir=None):
         mg = ioc.build(init)
         if fps is not None:
             mg.add_fps(fps)
         self.mg = mg
+        if basedir is not None:
+            self.basedir(basedir)
+    def basedir(self, dp):
+        self._base = dp
+        self.mg.get("cache").set_basedir(dp)
     def add_current(self, dp):
         self.mg.get("cache").add_current(dp)
     def call(self, fp):
-        self.log = self.mg.get("log")
+        self.log = self.mg.get("log").tag("Run")
+        basedir = self.mg.get("cache").get_basedir()
+        if basedir is not None and not fz.is_abs(fp):
+            fp = os.path.join(basedir, fp)
         if not os.path.isfile(fp):
             dp = os.path.dirname(fp)
             fn = os.path.basename(fp)
             fps = fz.search(dp, fn)
-            print(f"search dp:{dp}, fn: {fn}, rst: {fps}")
+            self.log.info(f"search dp:{dp}, fn: {fn}, rst: {fps}")
             if len(fps)!=1:
                 self.log.error(f"can't find filepath: {fp}")
                 return False

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/save.py

@@ -1,14 +1,17 @@
 #
 from ..tools import *
 from buildz.ioc import wrap
+#print(f"warp.obj_sets: {wrap.obj_sets}")
+#raise Exception("test")
 @wrap.obj(id="save")
 @wrap.obj_args("ref, cache", "ref, log", "ref, cache.modify")
+@wrap.obj_sets(cache_save = "ref, cache.save")
 class Save(Base):
     def init(self, cache, log, upd):
         self.cache = cache
-        self.log = log
+        self.log = log.tag("Save")
         self.upd = upd
-    def call(self, data, fc=None):
+    def call(self, data, next_fc=None):
         data = self.upd(data)
         save = xf.g(data, save={})
         fsave = xf.get(data, "save.file", {})
@@ -31,7 +34,11 @@ class Save(Base):
                 else:
                     val = xf.gets(data, v)
                 fc(k, val)
-        return True
+        save = saves[0]
+        if len(save)+len(fsave)>0:
+            sv = self.cache_save.save()
+            self.log.debug(f"cache_save in save: {sv}")
+        return next_fc(data)
 
 pass
 

buildz-0.6.24/buildz/auto/test/res/config/base.js

@@ -0,0 +1,13 @@
+calls: [log, cache, cache.save, dbs, def.deal.type, list, cache.save, dbs.close]
+log.shows: [info, warn, debug, error]
+//默认格式是 "[{LEVEL}] %Y-%m-%d %H:%M:%S {tag} {msg}\n" (注意LEVEL是大写，有三种：level,Level, LEVEL)
+//变量: {level}, {Level}, {LEVEL}, {tag}, {msg}, %Y, %m, %d, %H, %M, %S
+log.format: "[{Level}] %Y-%m-%d %H:%M:%S [{tag}] {msg}\n"
+def.deal: {
+    types: {
+        http.get: [defs, request, verify, save]
+        get: [defs, request.get, verify, save]
+        list: [defs, deal.list]
+        test: [defs, save]
+    }
+}

buildz-0.6.24/buildz/auto/test/res/config/config.js

@@ -0,0 +1,4 @@
+
+cache: [cache/cache.js,cache/save.js]
+cache.save: cache/save.js
+log: log/%Y%m%d_log_test.txt

{buildz-0.6.22/buildz/auto/test → buildz-0.6.24/buildz/auto/test/res}/data/test.js

@@ -1,5 +1,15 @@
-configs: config/config.js
+configs: [config/base.js, config/config.js]
 datas: [
+    {
+        note: empty
+        type: test
+        data: {
+            a:b
+        }
+        save: {
+            curr1010: data.a
+        }
+    }
     //写一个配置
     {
         note: test

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/test/test.py

@@ -6,7 +6,7 @@ from buildz.ioc import wrap
 class Req(Base):
     def init(self, log, upd):
         self.upd = upd
-        self.log = log
+        self.log = log.tag("Test.Req")
     def call(self, data, fc=None):
         data = self.upd(data)
         self.log.debug(f"test data: {data}")
@@ -19,8 +19,8 @@ from buildz.auto import Run
 from buildz.ioc.wrap import decorator
 import sys
 def test():
-    print(f"wrap: {xf.dumps(decorator(),format=1,deep=1)}")
-    rst = Run()("data/test")
+    #print(f"wrap: {xf.dumps(decorator(),format=1,deep=1)}")
+    rst = Run(basedir="res")("data/test")
     print(f"rst: {rst}")
 
 pass

buildz-0.6.24/buildz/auto/test/xtest.py

@@ -0,0 +1,20 @@
+
+from buildz.ioc import wrap
+x = wrap.ns("test")
+@wrap.obj(id='x')
+class A:
+    pass
+
+pass
+@x.obj(id='y')
+class B:
+    pass
+
+pass
+from buildz import ioc
+mg= ioc.build()
+x = mg.get('x')
+y = mg.get('test.y')
+print(x)
+print(y)
+

{buildz-0.6.22 → buildz-0.6.24}/buildz/auto/verify.py

@@ -6,7 +6,7 @@ from buildz.ioc import wrap
 @wrap.obj_args("ref, log", "ref, cache.modify")
 class Verify(Base):
     def init(self, log, upd):
-        self.log = log
+        self.log = log.tag("Verify")
         self.upd = upd
         self.opts = {}
         self.opts[">"] = self.make_val_cmp(lambda val,v:val>v)

{buildz-0.6.22 → buildz-0.6.24}/buildz/db/runz.py

@@ -15,7 +15,7 @@ def test(fp):
     obj = xf.loads(xf.fread(fp))
     dv = obj['dv']
     if __name__ == "__main__":
-        from db.basez import CMD
+        from dv.structz import CMD
         if dv == 'mysql':
             from dv.mysqlz import build
         elif dv == 'oracle':
@@ -23,7 +23,7 @@ def test(fp):
         elif dv == 'clickhouse':
             from dv.clickhousez import build
     else:
-        from .db.basez import CMD
+        from .dv.structz import CMD
         if dv == 'mysql':
             from .dv.mysqlz import build
         elif dv == 'oracle':

{buildz-0.6.22 → buildz-0.6.24}/buildz/fz/__init__.py

@@ -2,7 +2,7 @@
 #author:
 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
+from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir,removes, cover, fcover, sread, swrite, is_abs
 from .fhs import fhash, fhashs
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

{buildz-0.6.22 → buildz-0.6.24}/buildz/fz/fio.py

@@ -107,4 +107,20 @@ def swrite(dt, fp, code="utf-8", mode = "w"):
         dt = dt.encode(code)
     write(dt, fp, mode)
 
-pass
+pass
+
+def is_abs(fp):
+    if fp is None:
+        return False
+    if fp.strip()=="":
+        return False
+    fp = fp.strip().replace("\\", "/")
+    if fp[0]=="/":
+        return True
+    arr = fp.split("/")
+    if arr[0].find(":")>=0:
+        return True
+    return False
+
+pass
+    

{buildz-0.6.22 → buildz-0.6.24}/buildz/ioc/ioc/confs.py

@@ -362,6 +362,8 @@ class Confs(Base):
             raise
         #return self.add(conf)
     def add_decorator(self):
+        confs = decorator.all()
+        return self.adds(confs)
         conf = decorator()
         #print(f"[TESTZ] CONFS add decorator(): {conf}")
         return self.add(conf)

buildz-0.6.24/buildz/ioc/ioc/decorator.py

@@ -0,0 +1,97 @@
+#coding=utf-8
+from buildz.base import Base
+from buildz import xf
+from threading import Lock
+class Decorator(Base):
+    def init(self):
+        self.conf = {}
+        self.confs = {}
+        self.confs[None] = self.conf
+        self.namespace = None
+        self.fcs = {}
+        self._ns = {}
+        self.regist("add_datas", self.add_datas)
+    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 = 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):
+        conf = self.get_conf(src)
+        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):
+        if type(item)==str:
+            item = xf.loads(item)
+        return self.add("datas", item, key)
+    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)
+    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:
+    pass
+
+pass
+class NameSpace(Base):
+    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()
+        for k,f in fcs.items():
+            setattr(obj, k, self.fc(namespace, f))
+        return obj
+
+pass
+ns = NameSpace(decorator)

{buildz-0.6.22 → buildz-0.6.24}/buildz/ioc/ioc_deal/obj.py

@@ -340,7 +340,7 @@ 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)
+        conf[g_obj_cid] = decorator.add_datas(conf, self)
         g_ioc_conf.set(cls, conf)
         return cls
 

{buildz-0.6.22 → buildz-0.6.24}/buildz/ioc/wrap.py

@@ -1,5 +1,5 @@
 #
-from .ioc.decorator import decorator
+from .ioc.decorator import decorator, ns
 from .ioc_deal import init
 #print(f"decorator.fcs: {decorator.fcs}")
 locals().update(decorator.fcs)