buildz 0.6.15__tar.gz → 0.6.17__tar.gz

{buildz-0.6.15/buildz.egg-info → buildz-0.6.17}/PKG-INFO

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

@@ -61,8 +61,8 @@ class Save(Base):
             return
         fz.makefdir(fp)
         rst  = self.cache.data
-        rs = xf.dumps(rst, format=True)
-        fz.write(rs, fp, 'w')
+        rs = xf.dumps(rst, format=True).encode("utf-8")
+        fz.write(rs, fp, 'wb')
         return True
 
 pass
@@ -117,7 +117,7 @@ class Cache(Base):
         data = {}
         if os.path.isfile(fp):
             self.log.info(f"load cache from {fp}")
-            data = xf.flush_maps(xf.loadf(fp),visit_list=False)
+            data = xf.flush_maps(xf.loadf(fp),visit_list=True)
         xf.fill(data, self.data, replace=0)
         return True
 

buildz-0.6.17/buildz/auto/defs.py

@@ -0,0 +1,46 @@
+#
+from ..tools import *
+from buildz.ioc import wrap
+@wrap.obj(id="defs")
+@wrap.obj_args("ref, cache", "ref, log", "ref, cache.modify")
+class Defs(Base):
+    def init(self, cache, log, upd):
+        self.cache = cache
+        self.log = log
+        self.upd = upd
+    def update(self, s, defs, ignore=None):
+        if type(s)==dict:
+            rst = {}
+            for k,v in s.items():
+                if k == ignore:
+                    continue
+                k,v = self.update(k, defs), self.update(v, defs)
+                rst[k] = v
+            return rst
+        elif type(s)==list:
+            rst = []
+            for v in s:
+                v = self.update(v,defs)
+                rst.append(v)
+            return rst
+        for k,v in defs.items():
+            if k==s:
+                s = v
+                continue
+            if type(k)!=str:
+                continue
+            if type(s)!=str:
+                continue
+            s = s.replace(k,str(v))
+        return s
+    def call(self, data, fc=None):
+        defs = self.upd(xf.g(data, defs = {}))
+        data = self.update(data, defs, "defs")
+        data = self.upd(data)
+        if fc is None:
+            return True
+        return fc(data)
+
+pass
+
+

buildz-0.6.17/buildz/auto/init.py

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

{buildz-0.6.15 → buildz-0.6.17}/buildz/auto/log.py

@@ -11,6 +11,7 @@ import time, sys
 class Log(Base):
     def init(self):
         self.fp = None
+        self.show=[]
     def log(self, level, *args):
         args = [str(k) for k in args]
         msg = " ".join(args)
@@ -22,16 +23,28 @@ class Log(Base):
             fz.makefdir(fp)
             fz.write(msg.encode("utf-8"), fp, 'ab')
     def info(self, *args):
+        if "info" not in self.shows:
+            return
         self.log("INFO", *args)
     def warn(self, *args):
+        if "warn" not in self.shows:
+            return
         self.log("WARN", *args)
     def debug(self, *args):
+        if "debug" not in self.shows:
+            return
         self.log("DEBUG", *args)
     def error(self, *args):
+        if "error" not in self.shows:
+            return
         self.log("ERROR", *args)
     def call(self, maps, fp):
         fp = xf.g(maps, log = None)
         self.fp = fp
+        shows = xf.get(maps, "log.shows")
+        if shows is None:
+            shows = ["info", "warn", "error"]
+        self.shows = shows
         return True
 
 pass

{buildz-0.6.15 → buildz-0.6.17}/buildz/auto/request.py

@@ -13,14 +13,16 @@ except:
 
 pass
 class Request(Base):
-    def init(self, http_type, use_session, log, upd):
+    def init(self, http_type, use_session, log, upd, cache=None, debug=False):
         self.type = http_type
+        self.cache = cache
         self.use_session = use_session
         self.log = log
         self.upd = upd
         self.fc = None
         self.fcs = None
         self.key_data = None
+        self.debug = debug
         self.build()
     def build(self):
         fcs = {}
@@ -54,9 +56,14 @@ class Request(Base):
         url = xf.g(data, url=None)
         xf.s(data, status_code = rp.status_code)
         xf.s(data, result_code = rp.status_code)
+        if self.debug:
+            self.log.debug(f"request url '{url}' return code: {rp.status_code}")
         try:
             xf.s(data, result_content=rp.content)
+            debug_ct = rp.content
             s = xf.decode(rp.content, "utf-8")
+            if self.debug:
+                self.log.debug(f"request url '{url}' return msg:{s}")
             xf.s(data, result_text=s)
         except Exception as exp:
             self.log.warn(f"exp in deal response on '{url}': {exp}")
@@ -79,13 +86,20 @@ class Request(Base):
         if self.fc is None:
             self.log.error("install requests to use this(pip install requests)")
             return False
+        if self.cache is not None:
+            debug = self.cache.get("request.debug")
+            if debug is not None:
+                self.debug = debug
         if self.upd is not None:
             data = self.upd(data)
         url = xf.g(data, url=None)
+        #self.log.debug(f"request.debug: {self.debug}")
+        if self.debug:
+            self.log.debug(f"try request url '{url}' with type {self.type}")
         try:
             rp = self.req(data)
         except Exception as exp:
-            self.log.error("error in request '{url}' with method {self.type}: {exp}")
+            self.log.error(f"error in request '{url}' with method {self.type}: {exp}")
             return False
         self.rsp(rp, data)
         if fc is None:
@@ -96,35 +110,35 @@ pass
 
 
 @wrap.obj(id="request.post")
-@wrap.obj_args("post", "env, request.session, false", "ref, log", "ref, cache.modify")
+@wrap.obj_args("post", "env, request.session, false", "ref, log", "ref, cache.modify", "ref, cache", "env, debug, false")
 class Post(Request):
     pass
 
 pass
 
 @wrap.obj(id="request.json")
-@wrap.obj_args("json", "env, request.session, false", "ref, log", "ref, cache.modify")
+@wrap.obj_args("json", "env, request.session, false", "ref, log", "ref, cache.modify", "ref, cache", "env, debug, false")
 class Json(Request):
     pass
 
 pass
 
 @wrap.obj(id="request.get")
-@wrap.obj_args("get", "env, request.session, false", "ref, log", "ref, cache.modify")
+@wrap.obj_args("get", "env, request.session, false", "ref, log", "ref, cache.modify", "ref, cache", "env, debug, false")
 class Get(Request):
     pass
 
 pass
 
 @wrap.obj(id="request.put")
-@wrap.obj_args("put", "env, request.session, false", "ref, log", "ref, cache.modify")
+@wrap.obj_args("put", "env, request.session, false", "ref, log", "ref, cache.modify", "ref, cache", "env, debug, false")
 class Put(Request):
     pass
 
 pass
 
 @wrap.obj(id="request.delete")
-@wrap.obj_args("delete", "env, request.session, false", "ref, log", "ref, cache.modify")
+@wrap.obj_args("delete", "env, request.session, false", "ref, log", "ref, cache.modify", "ref, cache", "env, debug, false")
 class Delete(Request):
     pass
 

{buildz-0.6.15 → buildz-0.6.17}/buildz/auto/run.py

@@ -4,8 +4,8 @@ from ..base import Base
 from . import init
 import os
 class Run(Base):
-    def init(self, fps=None):
-        mg = ioc.build()
+    def init(self, fps=None, init=None):
+        mg = ioc.build(init)
         if fps is not None:
             mg.add_fps(fps)
         self.mg = mg

{buildz-0.6.15 → buildz-0.6.17}/buildz/auto/test/cache/cache.js

@@ -1,16 +1,27 @@
-{
-    host: www.baidu.com,
-    test: {
-        url: tmpurl,
-        val: 1,
-        code: 1.99
-    },
-    result: {
-        code: 1.99
-    },
-    test2: {
-        headers: {
-            content_type: "text/html; charset=utf-8"
-        }
-    }
+{
+    cache: {
+        path: {
+            current: [
+                null,
+                "D:\\rootz\\python\\gits\\buildz_upd\\buildz\\auto\\test\\data"
+            ]
+        }
+    },
+    request: {
+        debug: false
+    },
+    host: www.baidu.com,
+    test: {
+        url: tmpurl,
+        val: 1,
+        code: 1.99
+    },
+    result: {
+        code: 1.99
+    },
+    test2: {
+        headers: {
+            content_type: "text/html; charset=utf-8"
+        }
+    }
 }

{buildz-0.6.15 → buildz-0.6.17}/buildz/auto/test/config/config.js

@@ -2,9 +2,10 @@ calls: [log, cache, def.deal.type, list, cache.save]
 cache: cache/cache.js
 cache.save: cache/cache.js
 log: log/%Y%m%d_log.txt
+log.shows: [info, warn, debug, error]
 def.deal: {
     types: {
-        http.get: [request, verify, save]
-        get: [request.get, verify, save]
+        http.get: [defs, request, verify, save]
+        get: [defs, request.get, verify, save]
     }
 }

{buildz-0.6.15 → buildz-0.6.17}/buildz/auto/test/data/item2.js

@@ -1,5 +1,8 @@
 note: test2
-url: "https://#{host}/"
+url: "https://$host/"
+defs: {
+    $host:"#{host}"
+}
 type: get
 headers: {
     User-Agent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36"

{buildz-0.6.15 → buildz-0.6.17}/buildz/auto/test/test.py

@@ -18,8 +18,12 @@ pass
 from buildz.auto import Run
 import sys
 def test():
-    Run()("data/test")
+    rst = Run(init=xf.maps(env_from_args=True))("data/test")
+    print(f"rst: {rst}")
 
 pass
 pyz.lc(locals(), test)
 
+"""
+python test.py env={debug=true}
+"""

buildz-0.6.17/buildz/html/test/demo.html

@@ -0,0 +1,2 @@
+<html>
+</html>

{buildz-0.6.15 → buildz-0.6.17}/buildz/html/test/test.py

@@ -1,7 +1,6 @@
 
 from buildz.html import parse
 from buildz.tools import *
-#demo.html太大，已经删除
 fp = "demo.html"
 s = fz.read(fp, "rb").decode("utf-8")
 

{buildz-0.6.15 → buildz-0.6.17}/buildz/html/xml.py

@@ -48,6 +48,8 @@ class HtmlTag:
         else:
             tp = "="
             v = pt
+        if val is None and tp not in ["eval", "exec"]:
+            return False
         if tp == '>':
             return val>v
         elif tp == "<":
@@ -62,6 +64,9 @@ class HtmlTag:
             return len(re.findall(v, val))>0
         elif tp == 'eval':
             return eval(v)
+        elif tp == 'exec':
+            exec(v)
+            return self.val
         else:
             raise Exception(f"not impl match type: '{tp}'")
     def check(self, args, maps):

{buildz-0.6.15 → buildz-0.6.17}/buildz/ioc/ioc/confs.py

@@ -192,6 +192,7 @@ class Confs(Base):
             //     -e a=b --env=a=b --env=c=d
             //     env: {a=b, c=d}
             env_orders: [args, sys, local, conf]
+            env_from_args: false
             // 命令行读取方式：默认xf(xf.args),可选: buildz(buidlz.argx)
             args_type: 'xf'
             // true=类型处理函数deal都是全局的（全局查找），否则优先每个配置文件里查处理函数，查不到才查全局
@@ -234,7 +235,12 @@ class Confs(Base):
         self.data_index_type = xf.g(conf, data_index_type = [0,0])
         self.deal_key_type = xf.g(conf, deal_key_type = 'type')
         self.deal_index_type = xf.g(conf, deal_index_type = 0)
-        self.env_orders = xf.g(conf, env_orders = ['sys', 'local', 'conf'])
+        self.env_orders = xf.g(conf, env_orders = None)
+        self.env_from_args = xf.g(conf, env_from_args = False)
+        if self.env_orders is None:
+            self.env_orders = ['sys', 'local', 'conf']
+            if self.env_from_args:
+                self.env_orders = ['args', 'sys', 'local', 'conf']
         self.env_fcs = {
             'args': self.get_env_args,
             'sys': self.get_env_sys,

{buildz-0.6.15 → buildz-0.6.17/buildz.egg-info}/PKG-INFO

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

@@ -18,6 +18,7 @@ buildz/auto/cache.py
 buildz/auto/config.py
 buildz/auto/deal.py
 buildz/auto/deal_type.py
+buildz/auto/defs.py
 buildz/auto/factory.py
 buildz/auto/init.py
 buildz/auto/log.py
@@ -68,6 +69,7 @@ buildz/fz/fio.py
 buildz/fz/lsf.py
 buildz/html/__init__.py
 buildz/html/xml.py
+buildz/html/test/demo.html
 buildz/html/test/test.py
 buildz/ioc/__init__.py
 buildz/ioc/base.py

{buildz-0.6.15 → buildz-0.6.17}/setup.py

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

buildz-0.6.15/buildz/auto/init.py

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