buildz 0.6.13__tar.gz → 0.6.15__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.13
+Version: 0.6.15
 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
@@ -33,6 +33,7 @@ License-File: LICENSE
 持续更新中。。。
 2024/09/25:
 修复bug，增强html的搜索功能，增强auto配置功能
+auto里加了个request的demo，里面用的requests库，可以直接配置来进行http调用
 2024/09/24:
 增加模块html:html页面解析
 增加模块auto:自动化调用

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

@@ -20,6 +20,7 @@
 持续更新中。。。
 2024/09/25:
 修复bug，增强html的搜索功能，增强auto配置功能
+auto里加了个request的demo，里面用的requests库，可以直接配置来进行http调用
 2024/09/24:
 增加模块html:html页面解析
 增加模块auto:自动化调用

{buildz-0.6.13 → buildz-0.6.15}/buildz/auto/cache.py

@@ -56,8 +56,8 @@ class Save(Base):
         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:
+            self.log.warn(f"cache not save cause 'cache.save' is None")
             return
         fz.makefdir(fp)
         rst  = self.cache.data
@@ -67,7 +67,7 @@ class Save(Base):
 
 pass
 @wrap.obj(id="cache")
-@wrap.obj_args("ref, log")
+@wrap.obj_args("ref, log", "env, cache.rfp.current.first, false")
 class Cache(Base):
     def get(self, key):
         ks = key.split(".")
@@ -76,16 +76,49 @@ class Cache(Base):
         xf.sets(self.data, key.split("."), val)
     def remove(self, key):
         xf.removes(self.data, key.split("."))
-    def init(self, log):
+    def init(self, log, current_first=False):
+        self.current_first = current_first
         self.log = log
         self.data = {}
+    def set_current(self, dp):
+        if type(dp)!=list:
+            dp = [dp]
+        self.set("cache.path.current", dp)
+    def add_current(self, dp):
+        dps = self.get_current()
+        if dps is None:
+            dps = []
+        if dp in dps:
+            return
+        dps.append(dp)
+        self.set_current(dps)
+    def get_current(self):
+        dps = self.get("cache.path.current")
+        if type(dps)!=list:
+            dps = [dps]
+        return dps
+    def rfp(self, fp):
+        dps = [None,"."]
+        cfps = self.get_current()
+        if cfps is not None:
+            if self.current_first:
+                dps = cfps+dps
+            else:
+                dps = dps+cfps
+        for dp in dps:
+            _fp = fp
+            if dp is not None:
+                _fp = os.path.join(dp, fp)
+            if os.path.isfile(_fp):
+                return _fp
+        return fp
     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)
+        xf.fill(data, self.data, replace=0)
         return True
 
 pass

{buildz-0.6.13 → buildz-0.6.15}/buildz/auto/config.py

@@ -5,12 +5,14 @@ from ..base import Base
 from ..ioc import wrap
 import os
 @wrap.obj(id="buildz.auto.config.load")
+@wrap.obj_set(cache="ref, cache")
 class Config(Base):
     def call(self, maps, fp):
         configs = xf.g(maps, configs=[])
         if type(configs)!=list:
             configs = [configs]
         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

{buildz-0.6.13 → buildz-0.6.15}/buildz/auto/deal_type.py

@@ -4,11 +4,15 @@ from .. import ioc
 from ..base import Base
 from ..ioc import wrap
 class DealType(Base):
-    def init(self, deals = {}):
+    def init(self, deals = {}, cache = None):
         self.deals = deals
+        self.cache = cache
     def call(self, data):
         if type(data)==str:
-            data = xf.loadf(data)
+            fp = data
+            if self.cache is not None:
+                fp = self.cache.rfp(fp)
+            data = xf.loadf(fp)
         _type = xf.g(data, type = None)
         return self.deals[_type](data)
 
@@ -27,7 +31,7 @@ class DefDeal(Base):
         rst = {}
         for _type, calls in data.items():
             rst[_type] = factory(calls)
-        obj = DealType(rst)
+        obj = DealType(rst, self.mg.get("cache"))
         maps['deal_obj'] = obj
         return True
 

{buildz-0.6.13 → buildz-0.6.15}/buildz/auto/init.py

@@ -9,4 +9,4 @@
 
 
 
-from . import deal, deal_type, factory, cache, verify, log, save, config
+from . import deal, deal_type, factory, cache, verify, log, save, config,request

buildz-0.6.15/buildz/auto/request.py

@@ -0,0 +1,131 @@
+#
+
+from ..tools import *
+from buildz.ioc import wrap
+import json
+
+try:
+    import requests as rq
+    session = rq.session()
+except:
+    rq = None
+    session = None
+
+pass
+class Request(Base):
+    def init(self, http_type, use_session, log, upd):
+        self.type = http_type
+        self.use_session = use_session
+        self.log = log
+        self.upd = upd
+        self.fc = None
+        self.fcs = None
+        self.key_data = None
+        self.build()
+    def build(self):
+        fcs = {}
+        global rq, session
+        if rq is None:
+            return
+        obj = rq
+        if self.use_session:
+            obj = session
+        fcs['get'] = [obj.get, "params"]
+        fcs['post'] = [obj.post, "data"]
+        fcs['json'] = [obj.post, "json"]
+        fcs['put'] = [obj.put, "json"]
+        fcs['delete'] = [obj.delete, 'json']
+        self.fcs = fcs
+        self.fc = self.fcs[self.type][0]
+        self.key_data = self.fcs[self.type][1]
+    def get_set(self, data, kd, maps, km):
+        v = xf.get(data, kd)
+        if v is not None:
+            maps[km] = v
+    def req(self, data):
+        url = xf.g(data, url=None)
+        maps = {}
+        self.get_set(data, "data", maps, self.key_data)
+        self.get_set(data, "cookies", maps, "cookies")
+        self.get_set(data, "headers", maps, "headers")
+        self.get_set(data, "proxies", maps, "proxies")
+        return self.fc(url, **maps)
+    def rsp(self, rp, data):
+        url = xf.g(data, url=None)
+        xf.s(data, status_code = rp.status_code)
+        xf.s(data, result_code = rp.status_code)
+        try:
+            xf.s(data, result_content=rp.content)
+            s = xf.decode(rp.content, "utf-8")
+            xf.s(data, result_text=s)
+        except Exception as exp:
+            self.log.warn(f"exp in deal response on '{url}': {exp}")
+        try:
+            obj = json.loads(s)
+            xf.s(data, result=obj)
+        except Exception as exp:
+            #self.log.warn(f"exp in deal response on '{url}': {exp}")
+            pass
+        try:
+            xf.s(data, result_cookies=dict(rp.cookies))
+        except Exception as exp:
+            self.log.warn(f"exp in deal response on '{url}': {exp}")
+        try:
+            xf.s(data, result_headers = dict(rp.headers))
+        except Exception as exp:
+            self.log.warn(f"exp in deal response on '{url}': {exp}")
+        return True
+    def call(self, data, fc=None):
+        if self.fc is None:
+            self.log.error("install requests to use this(pip install requests)")
+            return False
+        if self.upd is not None:
+            data = self.upd(data)
+        url = xf.g(data, url=None)
+        try:
+            rp = self.req(data)
+        except Exception as exp:
+            self.log.error("error in request '{url}' with method {self.type}: {exp}")
+            return False
+        self.rsp(rp, data)
+        if fc is None:
+            return True
+        return fc(data)
+
+pass
+
+
+@wrap.obj(id="request.post")
+@wrap.obj_args("post", "env, request.session, false", "ref, log", "ref, cache.modify")
+class Post(Request):
+    pass
+
+pass
+
+@wrap.obj(id="request.json")
+@wrap.obj_args("json", "env, request.session, false", "ref, log", "ref, cache.modify")
+class Json(Request):
+    pass
+
+pass
+
+@wrap.obj(id="request.get")
+@wrap.obj_args("get", "env, request.session, false", "ref, log", "ref, cache.modify")
+class Get(Request):
+    pass
+
+pass
+
+@wrap.obj(id="request.put")
+@wrap.obj_args("put", "env, request.session, false", "ref, log", "ref, cache.modify")
+class Put(Request):
+    pass
+
+pass
+
+@wrap.obj(id="request.delete")
+@wrap.obj_args("delete", "env, request.session, false", "ref, log", "ref, cache.modify")
+class Delete(Request):
+    pass
+
+pass

buildz-0.6.15/buildz/auto/run.py

@@ -0,0 +1,39 @@
+from .. import xf,fz
+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 add_current(self, dp):
+        self.mg.get("cache").add_current(dp)
+    def call(self, fp):
+        self.log = self.mg.get("log")
+        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}")
+            if len(fps)!=1:
+                self.log.error(f"can't find filepath: {fp}")
+                return False
+            fp = fps[0]
+        maps = xf.loadf(fp)
+        dp = os.path.dirname(os.path.abspath(fp))
+        self.add_current(dp)
+        config = self.mg.get("buildz.auto.config.load")
+        if not config(maps, fp):
+            return False
+        calls = xf.g(maps, calls = [])
+        for deal in calls:
+            fc = self.mg.get(deal)
+            if not fc(maps, fp):
+                return False
+        return True
+
+pass
+

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

@@ -0,0 +1,16 @@
+{
+    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.13/buildz/auto/test → buildz-0.6.15/buildz/auto/test/config}/config.js

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

buildz-0.6.15/buildz/auto/test/data/item2.js

@@ -0,0 +1,15 @@
+note: test2
+url: "https://#{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"
+}
+data: {
+}
+verify: [
+    "status_code, 200"
+    "result_headers.Content-Type, 'text/html; charset=utf-8'"
+]
+save: {
+    test2.headers.content_type: result_headers.Content-Type
+}

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

@@ -1,4 +1,4 @@
-configs: config.js
+configs: config/config.js
 datas: [
     //写一个配置
     {
@@ -23,4 +23,5 @@ datas: [
     }
     // 或者配置所在的文件
     item1.js
+    item2.js
 ]

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

@@ -16,8 +16,9 @@ class Req(Base):
 
 pass
 from buildz.auto import Run
+import sys
 def test():
-    Run()("test.js")
+    Run()("data/test")
 
 pass
 pyz.lc(locals(), test)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.13
+Version: 0.6.15
 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
@@ -33,6 +33,7 @@ License-File: LICENSE
 持续更新中。。。
 2024/09/25:
 修复bug，增强html的搜索功能，增强auto配置功能
+auto里加了个request的demo，里面用的requests库，可以直接配置来进行http调用
 2024/09/24:
 增加模块html:html页面解析
 增加模块auto:自动化调用

{buildz-0.6.13 → buildz-0.6.15}/buildz.egg-info/SOURCES.txt

@@ -21,14 +21,16 @@ buildz/auto/deal_type.py
 buildz/auto/factory.py
 buildz/auto/init.py
 buildz/auto/log.py
+buildz/auto/request.py
 buildz/auto/run.py
 buildz/auto/save.py
 buildz/auto/verify.py
-buildz/auto/test/cache.js
-buildz/auto/test/config.js
-buildz/auto/test/item1.js
-buildz/auto/test/test.js
 buildz/auto/test/test.py
+buildz/auto/test/cache/cache.js
+buildz/auto/test/config/config.js
+buildz/auto/test/data/item1.js
+buildz/auto/test/data/item2.js
+buildz/auto/test/data/test.js
 buildz/db/__main__.py
 buildz/db/install.txt
 buildz/db/run.conf

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

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

buildz-0.6.13/buildz/auto/run.py

@@ -1,24 +0,0 @@
-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/test/cache.js

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