buildz 0.6.11__tar.gz → 0.6.13__tar.gz

{buildz-0.6.11/buildz.egg-info → buildz-0.6.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.11
+Version: 0.6.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
@@ -31,6 +31,11 @@ License-File: LICENSE
 运行python -m buildz查看帮助
 
 持续更新中。。。
+2024/09/25:
+修复bug，增强html的搜索功能，增强auto配置功能
+2024/09/24:
+增加模块html:html页面解析
+增加模块auto:自动化调用
 
 2024/09/09
 ioc:

{buildz-0.6.11 → buildz-0.6.13}/README.md

@@ -18,6 +18,11 @@
 运行python -m buildz查看帮助
 
 持续更新中。。。
+2024/09/25:
+修复bug，增强html的搜索功能，增强auto配置功能
+2024/09/24:
+增加模块html:html页面解析
+增加模块auto:自动化调用
 
 2024/09/09
 ioc:

buildz-0.6.13/buildz/auto/__init__.py

@@ -0,0 +1 @@
+from .run import Run

buildz-0.6.13/buildz/auto/cache.py

@@ -0,0 +1,91 @@
+#
+
+from .. import xf, fz
+from .. import ioc
+from ..base import Base
+from ..ioc import wrap
+import os,re
+
+@wrap.obj(id="cache.modify")
+@wrap.obj_args("ref, cache", "ref, log")
+class Update(Base):
+    """
+    #{}
+    """
+    def init(self, cache, log, pt = "(#\{([^\{\}]*)\})"):
+        self.cache = cache
+        self.log = log
+        self.pt = pt
+    def call(self, s):
+        if type(s)==dict:
+            rst = {}
+            for k,v in s.items():
+                k,v = self(k), self(v)
+                rst[k] = v
+            return rst
+        elif type(s)==list:
+            rst = []
+            for v in s:
+                v = self(v)
+                rst.append(v)
+            return rst
+        elif type(s)!=str:
+            return s
+        rst = re.findall(self.pt, s)
+        for match, key in rst:
+            val = self.cache.get(key)
+            if val is None:
+                err = f"'{key}' not found in cache"
+                self.log.error(err)
+                raise Exception(err)
+            if s == match:
+                s = val
+            else:
+                s = s.replace(match, str(val))
+        return s
+
+pass
+
+
+
+@wrap.obj(id="cache.save")
+@wrap.obj_args("ref, cache", "ref, log")
+class Save(Base):
+    def init(self, cache, log):
+        self.cache = cache
+        self.log = log
+    def call(self, maps, fp):
+        fp = xf.get(maps, "cache.save", None)
+        self.log.debug(f"try save cache to '{fp}'")
+        if fp is None:
+            return
+        fz.makefdir(fp)
+        rst  = self.cache.data
+        rs = xf.dumps(rst, format=True)
+        fz.write(rs, fp, 'w')
+        return True
+
+pass
+@wrap.obj(id="cache")
+@wrap.obj_args("ref, log")
+class Cache(Base):
+    def get(self, key):
+        ks = key.split(".")
+        return xf.gets(self.data, ks)
+    def set(self, key, val):
+        xf.sets(self.data, key.split("."), val)
+    def remove(self, key):
+        xf.removes(self.data, key.split("."))
+    def init(self, log):
+        self.log = log
+        self.data = {}
+    def call(self, maps, fp):
+        fp = xf.g(maps, cache="cache.js")
+        data = {}
+        if os.path.isfile(fp):
+            self.log.info(f"load cache from {fp}")
+            data = xf.flush_maps(xf.loadf(fp),visit_list=False)
+        self.data.update(data)
+        return True
+
+pass

buildz-0.6.13/buildz/auto/config.py

@@ -0,0 +1,34 @@
+#
+from .. import xf
+from .. import ioc
+from ..base import Base
+from ..ioc import wrap
+import os
+@wrap.obj(id="buildz.auto.config.load")
+class Config(Base):
+    def call(self, maps, fp):
+        configs = xf.g(maps, configs=[])
+        if type(configs)!=list:
+            configs = [configs]
+        for cfp in configs:
+            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)
+        return True
+
+pass
+#wrap.add_datas("[(env, env.buildz.auto.deal), buildz.auto.deal, auto.deal]")
+@wrap.obj_args("[env, buildz.auto.deal, auto.deal]")
+@wrap.obj(id="autoz.deal")
+class DfDeal(Base):
+    def init(self, id):
+        self.id = id
+    def call(self, data):
+        print(f"[ERROR] implement obj with id '{self.id}' by yourself")
+
+pass
+
+
+

buildz-0.6.13/buildz/auto/deal.py

@@ -0,0 +1,40 @@
+#
+from .. import xf
+from .. import ioc
+from ..base import Base
+from ..ioc import wrap
+
+@wrap.obj(id="list")
+@wrap.obj_args("[ref, [env, buildz.auto.deal, auto.deal], [ref, autoz.deal]]", "[ioc, confs]")
+class List(Base):
+    def init(self, deal, mg):
+        self.deal = deal
+        self.mg = mg
+    def call(self, maps, fp):
+        datas = xf.g(maps, datas = [])
+        sdeal = xf.g(maps, deal = None)
+        deal_obj = xf.g(maps, deal_obj = None)
+        deal = self.deal
+        if deal_obj is not None:
+            deal = deal_obj
+        elif sdeal is not None:
+            deal = self.mg.get(sdeal)
+        for data in datas:
+            if not deal(data):
+                return False
+        return True
+
+pass
+#wrap.add_datas("[(env, env.buildz.auto.deal), buildz.auto.deal, auto.deal]")
+@wrap.obj_args("[env, buildz.auto.deal, auto.deal]")
+@wrap.obj(id="autoz.deal")
+class DfDeal(Base):
+    def init(self, id):
+        self.id = id
+    def call(self, data):
+        print(f"[ERROR] implement obj with id '{self.id}' by yourself")
+
+pass
+
+
+

buildz-0.6.13/buildz/auto/deal_type.py

@@ -0,0 +1,34 @@
+
+from .. import xf
+from .. import ioc
+from ..base import Base
+from ..ioc import wrap
+class DealType(Base):
+    def init(self, deals = {}):
+        self.deals = deals
+    def call(self, data):
+        if type(data)==str:
+            data = xf.loadf(data)
+        _type = xf.g(data, type = None)
+        return self.deals[_type](data)
+
+pass
+
+@wrap.obj(id = "def.deal.type")
+@wrap.obj_args("ioc, confs")
+class DefDeal(Base):
+    def init(self, mg):
+        self.mg = mg
+    def call(self, maps, fp):
+        conf = xf.get(maps, "def.deal", None)
+        factory_id = xf.g(conf, factory="buildz.auto.deal.fill")
+        factory = self.mg.get(factory_id)
+        data = xf.g(conf, types={})
+        rst = {}
+        for _type, calls in data.items():
+            rst[_type] = factory(calls)
+        obj = DealType(rst)
+        maps['deal_obj'] = obj
+        return True
+
+pass

buildz-0.6.13/buildz/auto/factory.py

@@ -0,0 +1,28 @@
+#
+
+from .. import xf
+from .. import ioc
+from ..base import Base
+from ..ioc import wrap
+
+class DeepFc(Base):
+    def init(self, fcs):
+        self.fc = fcs[0]
+        if len(fcs)>1:
+            self.next = DeepFc(fcs[1:])
+        else:
+            self.next = None
+    def call(self, data):
+        return self.fc(data, self.next)
+
+pass
+@wrap.obj(id = "buildz.auto.deal.fill")
+@wrap.obj_args("ioc, confs")
+class Fill(Base):
+    def init(self, mg):
+        self.mg = mg
+    def call(self, orders):
+        fcs = [self.mg.get(id) for id in orders]
+        return DeepFc(fcs)
+
+pass

buildz-0.6.13/buildz/auto/init.py

@@ -0,0 +1,12 @@
+#
+
+
+
+
+
+
+
+
+
+
+from . import deal, deal_type, factory, cache, verify, log, save, config

buildz-0.6.13/buildz/auto/log.py

@@ -0,0 +1,37 @@
+#
+
+
+from .. import xf
+from .. import ioc
+from ..base import Base
+from ..ioc import wrap
+from ..tools import *
+import time, sys
+@wrap.obj(id="log")
+class Log(Base):
+    def init(self):
+        self.fp = None
+    def log(self, level, *args):
+        args = [str(k) for k in args]
+        msg = " ".join(args)
+        date = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time()))
+        msg = f"[{level}] {date} {msg}\n"
+        sys.stdout.write(msg)
+        if self.fp is not None:
+            fp = time.strftime(self.fp)
+            fz.makefdir(fp)
+            fz.write(msg.encode("utf-8"), fp, 'ab')
+    def info(self, *args):
+        self.log("INFO", *args)
+    def warn(self, *args):
+        self.log("WARN", *args)
+    def debug(self, *args):
+        self.log("DEBUG", *args)
+    def error(self, *args):
+        self.log("ERROR", *args)
+    def call(self, maps, fp):
+        fp = xf.g(maps, log = None)
+        self.fp = fp
+        return True
+
+pass

buildz-0.6.13/buildz/auto/run.py

@@ -0,0 +1,24 @@
+from .. import xf
+from .. import ioc
+from ..base import Base
+from . import init
+import os
+class Run(Base):
+    def init(self, fps=None):
+        mg = ioc.build()
+        if fps is not None:
+            mg.add_fps(fps)
+        self.mg = mg
+    def call(self, fp):
+        maps = xf.loadf(fp)
+        config = self.mg.get("buildz.auto.config.load")
+        if not config(maps, fp):
+            return
+        calls = xf.g(maps, calls = [])
+        for deal in calls:
+            fc = self.mg.get(deal)
+            if not fc(maps, fp):
+                break
+
+pass
+

buildz-0.6.13/buildz/auto/save.py

@@ -0,0 +1,33 @@
+#
+from ..tools import *
+from buildz.ioc import wrap
+@wrap.obj(id="save")
+@wrap.obj_args("ref, cache", "ref, log", "ref, cache.modify")
+class Save(Base):
+    def init(self, cache, log, upd):
+        self.cache = cache
+        self.log = log
+        self.upd = upd
+    def call(self, data, fc=None):
+        data = self.upd(data)
+        save = xf.g(data, save={})
+        for k, v in save.items():
+            if type(v)==str:
+                v = ["key"]+v.split(".")
+            if type(v)!=list:
+                v = ["key", v]
+            tp = v[0]
+            v = v[1:]
+            if tp=="eval":
+                val = eval(v[0])
+            elif tp == "exec":
+                exec(v[0])
+                val = self.val
+            else:
+                val = xf.gets(data, v)
+            self.cache.set(k, val)
+        return True
+
+pass
+
+

buildz-0.6.13/buildz/auto/test/cache.js

@@ -0,0 +1,10 @@
+{
+    test: {
+        url: tmpurl,
+        val: 1,
+        code: 1.99
+    },
+    result: {
+        code: 1.99
+    }
+}

buildz-0.6.13/buildz/auto/test/config.js

@@ -0,0 +1,9 @@
+calls: [log, cache, def.deal.type, list, cache.save]
+cache: cache.js
+cache.save: cache.js
+log: %Y%m%d_log.txt
+def.deal: {
+    types: {
+        http.get: [request, verify, save]
+    }
+}

buildz-0.6.13/buildz/auto/test/item1.js

@@ -0,0 +1,16 @@
+note: test1
+url: test
+type: http.get
+data: {
+    url: "#{test.url}"
+    val: "#{test.val}"
+}
+save: {
+    test.url: data.url
+}
+result: {
+    code: 1.99
+}
+verify: [
+    "result.code, [>, 1]"
+]

buildz-0.6.13/buildz/auto/test/test.js

@@ -0,0 +1,26 @@
+configs: config.js
+datas: [
+    //写一个配置
+    {
+        note: test
+        url: test
+        type: http.get
+        data: {
+            url: "#{test.url}"
+        }
+        save: {
+            test.url: data.url
+        }
+        result: {
+            code: 1.99
+        }
+        verify: [
+            "result.code, [>, 1]"
+        ]
+        save: {
+            result.code: result.code
+        }
+    }
+    // 或者配置所在的文件
+    item1.js
+]

buildz-0.6.13/buildz/auto/test/test.py

@@ -0,0 +1,24 @@
+#coding=utf-8
+from buildz.tools import *
+from buildz.ioc import wrap
+@wrap.obj(id="request")
+@wrap.obj_args("ref, log", "ref, cache.modify")
+class Req(Base):
+    def init(self, log, upd):
+        self.upd = upd
+        self.log = log
+    def call(self, data, fc=None):
+        data = self.upd(data)
+        self.log.debug(f"test data: {data}")
+        if fc is not None:
+            return fc(data)
+        return True
+
+pass
+from buildz.auto import Run
+def test():
+    Run()("test.js")
+
+pass
+pyz.lc(locals(), test)
+

buildz-0.6.13/buildz/auto/verify.py

@@ -0,0 +1,78 @@
+#
+
+from ..tools import *
+from buildz.ioc import wrap
+@wrap.obj(id="verify")
+@wrap.obj_args("ref, log", "ref, cache.modify")
+class Verify(Base):
+    def init(self, log, upd):
+        self.log = log
+        self.upd = upd
+        self.opts = {}
+        self.opts[">"] = self.make_val_cmp(lambda val,v:val>v)
+        self.opts["<"] = self.make_val_cmp(lambda val,v:val<v)
+        self.opts[">="] = self.make_val_cmp(lambda val,v:val>=v)
+        self.opts["<="] = self.make_val_cmp(lambda val,v:val<=v)
+        self.opts["="] = self.eq
+        self.opts["!="] = self.neq
+    def eq(self, val, v):
+        if type(val)!=type(v):
+            if type(val)==str or type(v)==str:
+                return str(val)==str(v)
+        return val==v
+    def neq(self, val, v):
+        if type(val)!=type(v):
+            if type(val)==str or type(v)==str:
+                return str(val)!=str(v)
+        return val!=v
+    def make_val_cmp(self, opt):
+        def fc(val, v):
+            if val is None:
+                return False
+            if type(val)==str:
+                val = float(val)
+            if type(v)==str:
+                v = float(v)
+            return opt(val, v)
+        return fc
+    def match(self, v, val, result, data):
+        tp,v = v
+        if tp in self.opts:
+            return self.opts[tp](val,v)
+        if tp=="eval":
+            return eval(v)
+        elif tp == "exec":
+            exec(v)
+            return self.val
+        else:
+            err = f"not impl match type: {tp}"
+            self.log.error(err)
+            raise Exception(err)
+    def call(self, data, fc=None):
+        data = self.upd(data)
+        note = xf.g(data, note=data)
+        result = xf.g(data, result = {})
+        vs = xf.g(data, verify=[])
+        for it in vs:
+            if type(it)==str:
+                it = xf.loads(it)
+            k,v=it
+            bak = v
+            if k == "$":
+                if type(v)!=list:
+                    v = ["eval", v]
+                val = None
+            else:
+                val = xf.gets(data, k.split("."))
+            if type(v)!=list:
+                v = ["=", v]
+            jg = self.match(v, val, result, data)
+            if not jg:
+                self.log.error(f"verify failed in {note}, key: '{k}', match: {bak}, val: {val}")
+                return False
+        if fc is None:
+            return True
+        return fc(data)
+
+pass
+            

buildz-0.6.13/buildz/html/__init__.py

@@ -0,0 +1 @@
+from .xml import parse

buildz-0.6.13/buildz/html/test/test.py

@@ -0,0 +1,15 @@
+
+from buildz.html import parse
+from buildz.tools import *
+#demo.html太大，已经删除
+fp = "demo.html"
+s = fz.read(fp, "rb").decode("utf-8")
+
+obj = parse(s)
+
+# 可以进行多次查询调用，后一次查询在前一次的结果集里做查询
+rst = obj.finds("(class,toplist1-tr_1MWDu)").finds("tag=a,target=_blank").data()
+rst = obj.searchs("class,toplist1-tr_1MWDu").finds("(tag,a),(tag,a),(target,_blank)").data()
+rst = obj.searchs("class,toplist1-tr_1MWDu").searchs("tag,a", "tag, a", "target, _blank").data()
+
+print(f"search rst: {rst}")