buildz 0.6.13__tar.gz → 0.6.14__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.13
+Version: 0.6.14
 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.13 → buildz-0.6.14}/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

{buildz-0.6.13 → buildz-0.6.14}/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.14/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.14/buildz/auto/test/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"
+        }
+    }
+}

{buildz-0.6.13 → buildz-0.6.14}/buildz/auto/test/config.js

@@ -5,5 +5,6 @@ log: %Y%m%d_log.txt
 def.deal: {
     types: {
         http.get: [request, verify, save]
+        get: [request.get, verify, save]
     }
 }

buildz-0.6.14/buildz/auto/test/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"
+]
+save: {
+    test2.headers.content_type: result_headers.Content-Type
+}

{buildz-0.6.13 → buildz-0.6.14}/buildz/auto/test/test.js

@@ -23,4 +23,5 @@ datas: [
     }
     // 或者配置所在的文件
     item1.js
+    item2.js
 ]

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

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

@@ -21,12 +21,14 @@ 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/item2.js
 buildz/auto/test/test.js
 buildz/auto/test/test.py
 buildz/db/__main__.py

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

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

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
-    }
-}