buildz 0.6.10__tar.gz → 0.6.12__tar.gz

{buildz-0.6.10/buildz.egg-info → buildz-0.6.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.10
+Version: 0.6.12
 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,14 @@ License-File: LICENSE
 运行python -m buildz查看帮助
 
 持续更新中。。。
+2024/09/24:
+增加模块html:html页面解析
+增加模块auto:自动化调用
+
+2024/09/09
+ioc:
+    加修饰器
+    加配置refs
 
 PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
 

{buildz-0.6.10 → buildz-0.6.12}/README.md

@@ -18,6 +18,14 @@
 运行python -m buildz查看帮助
 
 持续更新中。。。
+2024/09/24:
+增加模块html:html页面解析
+增加模块auto:自动化调用
+
+2024/09/09
+ioc:
+    加修饰器
+    加配置refs
 
 PS: 对比了下json.loads（修改了下json的scanner.py，让它在纯python下运行，不然json.loads会更快）和目前的xf.loads(buildz.xf.readz.loads)的速度，xf.loads比json.loads慢7倍，可能是读字符串更频繁，方法调用更多（为了代码更结构化和容易修改），其实有一版更慢(buildz.xf.read.loads，废弃代码，后面看情况删掉)，慢100倍，因为只考虑结构化，没考虑列表增减开销
 

buildz-0.6.12/buildz/auto/__init__.py

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

buildz-0.6.12/buildz/auto/cache.py

@@ -0,0 +1,88 @@
+#
+
+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)
+            s = s.replace(match, 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.loadf(fp)
+        self.data.update(data)
+        return True
+
+pass

buildz-0.6.12/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.12/buildz/auto/deal_type.py

@@ -0,0 +1,33 @@
+
+from .. import xf
+from .. import ioc
+from ..base import Base
+from ..ioc import wrap
+class DealType(Base):
+    def init(self, deals = {}):
+        print(f"deals: {deals}")
+        self.deals = deals
+    def call(self, 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.12/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.12/buildz/auto/init.py

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

buildz-0.6.12/buildz/auto/log.py

@@ -0,0 +1,35 @@
+#
+
+
+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 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.12/buildz/auto/run.py

@@ -0,0 +1,20 @@
+from .. import xf
+from .. import ioc
+from ..base import Base
+from . import init
+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)
+        calls = xf.g(maps, calls = [])
+        for deal in calls:
+            fc = self.mg.get(deal)
+            if not fc(maps, fp):
+                break
+
+pass
+

buildz-0.6.12/buildz/auto/save.py

@@ -0,0 +1,21 @@
+#
+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():
+            val = xf.gets(data, v.split("."))
+            self.cache.set(k, val)
+        return True
+
+pass
+
+

buildz-0.6.12/buildz/auto/test/test.js

@@ -0,0 +1,27 @@
+calls: [log, cache, def.deal.type, list, cache.save]
+cache: tmp.js
+cache.save: tmp.js
+log: log.txt
+def.deal: {
+    types: {
+        http.get: [request, verify, save]
+    }
+}
+datas: [
+    {
+        url: test
+        type: http.get
+        data: {
+            url: "#{test.url}"
+        }
+        save: {
+            test.url: data.url
+        }
+        result: {
+            code: 0.99
+        }
+        verify: [
+            [code, [">", 1]]
+        ]
+    }
+]

buildz-0.6.12/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.12/buildz/auto/test/tmp.js

@@ -0,0 +1,5 @@
+{
+    test: {
+        url: tmpurl
+    }
+}

buildz-0.6.12/buildz/auto/verify.py

@@ -0,0 +1,72 @@
+#
+
+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
+    def match(self, v, val, result, data):
+        tp,v = v
+        if tp=="=":
+            if type(val)!=type(v):
+                if type(v)==str:
+                    val = str(val)
+                elif type(val)==str:
+                    v = str(v)
+            return val==v
+        elif tp == ">":
+            if val is None:
+                return False
+            if type(val)==str:
+                val = float(val)
+            return val>v
+        elif tp=="<":
+            if val is None:
+                return False
+            if type(val)==str:
+                val = float(val)
+            return val<v
+        elif tp==">=":
+            if val is None:
+                return False
+            if type(val)==str:
+                val = float(val)
+            return val>=v
+        elif tp=="<=":
+            if val is None:
+                return False
+            if type(val)==str:
+                val = float(val)
+            return val<=v
+        elif tp=="sh":
+            return eval(v)
+        else:
+            err = f"not impl match type: {tp}"
+            self.log.error(err)
+            raise Exception(err)
+    def call(self, data, fc=None):
+        result = self.upd(xf.g(data, result = {}))
+        vs = self.upd(xf.g(data, verify=[]))
+        for k,v in vs:
+            bak = v
+            if k == "$":
+                if type(v)!=list:
+                    v = ["sh", v]
+                val = None
+            else:
+                val = xf.gets(result, 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 {data}, key: '{k}', match: {bak}, val: {val}")
+                return False
+        if fc is None:
+            return True
+        return fc(data)
+
+pass
+            

buildz-0.6.12/buildz/html/__init__.py

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

buildz-0.6.12/buildz/html/test.py

@@ -0,0 +1,8 @@
+#coding=utf-8
+from ..base import Base
+class Test(Base):
+    def call(self, map):
+        result = map
+    def init(self):
+        pass
+    pass

buildz-0.6.12/buildz/html/xml.py

@@ -0,0 +1,119 @@
+from html.parser import HTMLParser
+from .. import xf
+import re
+class HtmlTag:
+    def to_maps(self):
+        nodes = [n.to_maps() for n in self.nodes]
+        rst = {'tag': self.tag, 'attrs': self.attrs, 'texts': self.texts, 'text': self.text, 'childs': nodes}
+        return rst
+    def __str__(self):
+        return xf.dumps(self.to_maps())
+    def __repr__(self):
+        return self.__str__()
+    def match(self, val, pt):
+        if type(pt)==list:
+            tp = pt[0]
+            v = pt[1]
+        else:
+            tp = "="
+            v = pt
+        if tp == '>':
+            return val>v
+        elif tp == "<":
+            return val<v
+        elif tp == "=":
+            return val == v
+        elif tp == ">=":
+            return val>=v
+        elif tp=="<=":
+            return val<=v
+        elif tp == "re":
+            return (re.findall(v, val))>0
+        elif tp == 'sh':
+            #v.replace("${it}", val)
+            return eval(v)
+        else:
+            raise Exception(f"not impl match type: '{tp}'")
+    def check(self, maps):
+        #print(f"[TESTZ] check: {maps}, attrs: {self.attrs}")
+        for k,v in maps.items():
+            if k == 'tag':
+                if not self.match(self.tag, v):
+                    return False
+            elif k == "$":
+                return self.match(None, ["sh", v])
+            else:
+                if k not in self.attrs or not self.match(self.attrs[k], v):
+                    return False
+        return True
+    def __init__(self, tag, attrs=None):
+        self.tag = tag
+        if attrs is None:
+            attrs = {}
+        self.attrs = attrs
+        self.nodes = []
+        self.text = None
+        self.texts = []
+    def _search(self, rst, maps):
+        if self.check(maps):
+            rst.append(self)
+        for n in self.nodes:
+            n._search(rst, maps)
+    def searchs(self, **maps):
+        rst = []
+        self._search(rst, maps)
+        return rst
+    def tags(self, _tag):
+        return self.searchs(tag = _tag)
+    def finds(self, s):
+        rst = []
+        maps = xf.loads(s)
+        self._search(rst, maps)
+        return rst
+    def add_node(self, node):
+        self.nodes.append(node)
+    def add_text(self, text):
+        self.text = text
+        self.texts.append(text)
+
+pass
+
+class MyHTMLParser(HTMLParser):
+    def __init__(self):
+        super().__init__()
+        self.data = HtmlTag("document")
+        self.stacks = [self.data]
+    def handle_comment(self, data):
+        "处理注释，< !-- -->之间的文本"
+        pass
+    def handle_startendtag(self, tag, attrs):
+        "处理自己结束的标签，如< img />"
+        self.handle_starttag(tag, attrs)
+        self.handle_endtag(tag)
+        pass
+    def handle_starttag(self, tag, attrs):
+        "处理开始标签，比如< div>；这里的attrs获取到的是属性列表，属性以元组的方式展示"
+        attrs = {k:v for k,v in attrs}
+        tag = HtmlTag(tag, attrs)
+        self.stacks[-1].add_node(tag)
+        self.stacks.append(tag)
+        #print(f"Encountered a {tag} start tag")
+        #for attr, value in attrs:
+        #    print(f"   {attr} = {value}")
+    def handle_data(self, data):
+        self.stacks[-1].add_text(data)
+        "处理数据，标签之间的文本"
+        #print(f"----handle data in tags: {data}")
+    def handle_endtag(self, tag):
+        self.stacks.pop(-1)
+        "处理结束标签,比如< /div>"
+        #print(f"Encountered a {tag} end tag")
+
+pass
+
+def parse(text):
+    obj = MyHTMLParser()
+    obj.feed(text)
+    return obj.data
+
+pass

{buildz-0.6.10 → buildz-0.6.12}/buildz/ioc/__init__.py

@@ -1,5 +1,5 @@
 #coding=utf-8
 
-from .init import build,default_deals
+from .init import *
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

{buildz-0.6.10 → buildz-0.6.12}/buildz/ioc/base.py

@@ -2,4 +2,5 @@
 
 from .ioc.base import *
 from .ioc_deal.base import BaseDeal, FormatDeal
-from .ioc.single import Single
+from .ioc.single import Single
+from . import wrap

{buildz-0.6.10 → buildz-0.6.12}/buildz/ioc/init.py

@@ -1,9 +1,10 @@
 #
 
 from .ioc import confs
+from .ioc.confs import ConfsList, Confs
 from .ioc_deal.base import default_deals
-
-def build(fp_init = None, add_default_deals = True):
+from . import wrap
+def build(fp_init = None, add_default_deals = True, add_wrap = True):
     obj = confs.Confs()
     if (fp_init is not None):
         if type(fp_init)==dict:
@@ -12,6 +13,8 @@ def build(fp_init = None, add_default_deals = True):
             obj.init_fp(fp_init)
     if add_default_deals:
         obj.add_fp(default_deals)
+    if add_wrap:
+        obj.add_decorator()
     return obj
 
 pass

{buildz-0.6.10 → buildz-0.6.12}/buildz/ioc/ioc/base.py

@@ -64,6 +64,8 @@ class EncapeData(Base):
                 type = conf.confs.get_data_type(data, 0, conf.default_type())
             if confs is None:
                 confs = conf.confs
+        else:
+            self.sid = None
         self.src = src
         self.conf = conf
         self.confs = confs

{buildz-0.6.10 → buildz-0.6.12}/buildz/ioc/ioc/conf.py

@@ -174,6 +174,17 @@ class Conf(Base):
             return obj
         obj = self.confs.get_data(id, self.id, src=src, info = info)
         return obj
+    def full_ids(self, local = True):
+        rst = []
+        arr = [self.datas]
+        if local:
+            arr.append(self.locals)
+        for datas in arr:
+            for id in datas:
+                gid = self.confs.gid(self.namespace, id)
+                item = [gid, id, self]
+                rst.append(item)
+        return rst
     def get(self, *args, **maps):
         return self.get_obj(*args, **maps)
     def default_type(self):
@@ -182,6 +193,8 @@ class Conf(Base):
         return self._default_type
     def get_var(self, key, i = -1):
         return self.confs.get_var(key, i)
+    def var_keys(self):
+        return self.confs.var_keys()
     def push_var(self, key, val):
         return self.confs.push_var(key,val)
     def has_var(self, key):