buildz 0.5.91__tar.gz → 0.6.2__tar.gz

{buildz-0.5.91/buildz.egg-info → buildz-0.6.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.5.91
-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)
+Version: 0.6.2
+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
 Author-email: 1309458652@qq.com
@@ -21,9 +21,11 @@ License-File: LICENSE
     buildz.argx: 按格式读命令行参数
     buildz.tz: 加些工具，目前只有myerse diff字符串比较算法
     buildz.demo: 使用参考，运行"python -m buildz"会用这个模块
+    buildz.db: sql集成工具，自用，里面import了其他sql库，使用运行"python -m buildz.db 配置文件路径"
 代码关系:
     buildz.xf, buildz.pyz, buildz.argx, buildz.fz, buildz.tz都是独立的模块
     buildz.ioc需要buildz.xf和buildz.pyz
+    buildz.db需要buildz.xf
     buildz.demo需要其他全部模块
 
 运行python -m buildz查看帮助

{buildz-0.5.91 → buildz-0.6.2}/README.md

@@ -8,9 +8,11 @@
     buildz.argx: 按格式读命令行参数
     buildz.tz: 加些工具，目前只有myerse diff字符串比较算法
     buildz.demo: 使用参考，运行"python -m buildz"会用这个模块
+    buildz.db: sql集成工具，自用，里面import了其他sql库，使用运行"python -m buildz.db 配置文件路径"
 代码关系:
     buildz.xf, buildz.pyz, buildz.argx, buildz.fz, buildz.tz都是独立的模块
     buildz.ioc需要buildz.xf和buildz.pyz
+    buildz.db需要buildz.xf
     buildz.demo需要其他全部模块
 
 运行python -m buildz查看帮助

buildz-0.6.2/buildz/db/__main__.py

@@ -0,0 +1,3 @@
+#coding=utf-8
+from . import runz
+runz.main()

buildz-0.6.2/buildz/db/dv/basez.py

@@ -0,0 +1,80 @@
+import sys
+from .structz import ItDv
+def sp(obj):
+    return super(obj.__class__, obj)
+
+pass
+class SimpleDv(ItDv):
+    # func to impl:
+    def to_list(self, query_result):
+        return []
+    def sql_tables(self):
+        return "select TABLE_NAME tableName,TABLE_COMMENT comemnt,TABLE_ROWS dataNums from information_schema.tables where table_schema='"+self.db+"'"
+    def new_con(self):
+        return None
+    def new_cursor(self):
+        return None
+    def init(self, *argv, **maps):
+        pass
+    # func already impl
+    def check_query(self, s):
+        arr = s.split(" ")
+        k = arr[0].strip().lower()
+        rst = k not in "delete,insert,update,create,drop,commit".split(",")
+        return rst
+    def __init__(self, host, port, user, pwd, db, *argv, **maps):
+        self.host = host
+        self.port = port
+        self.user = user
+        self.pwd = pwd
+        self.db = db
+        self.con = None
+        self.cursor = None
+        self.init(*argv, **maps)
+    def begin(self):
+        self.con = self.new_con()
+        self.cursor = self.new_cursor()
+    def close(self):
+        self.cursor.close()
+        self.con.close()
+        self.cursor = None
+        self.con = None
+    def is_open(self):
+        return self.cursor is not None
+    def commit(self):
+        self.cursor.close()
+        self.con.commit()
+        self.cursor = self.new_cursor()
+    def refresh(self):
+        self.cursor.close()
+        self.cursor = self.new_cursor()
+    def query(self, sql, vals=()):
+        # return list, first row is key
+        tmp = self.cursor.execute(sql, vals)
+        print("[TESTZ] exe:",tmp)
+        rst = self.cursor.fetchall()
+        return self.to_list(rst)
+    def execute(self, sql, vals=()):
+        tmp = self.cursor.execute(sql, vals)
+        return tmp
+
+pass
+
+# user|pwd@host:port/db
+def fetch(args):
+    if type(args) == str:
+        args = args.split(" ")
+    url = args[0].strip()
+    url, db = url.split("/")
+    tmp = url.split(":")
+    if len(tmp)==2:
+        host, port = tmp
+        port = int(port)
+    else:
+        host = tmp[0]
+        port = None
+    user = args[1].strip()
+    pwd = args[2].strip()
+    return host, port, user, pwd, db
+
+pass

buildz-0.6.2/buildz/db/dv/clickhousez.py

@@ -0,0 +1,34 @@
+
+try:
+    import clickhouse_driver
+except ModuleNotFoundError:
+    raise Exception("module not found, try: pip install clickhouse-driver")
+from clickhouse_driver import connect
+from clickhouse_driver import Client
+import sys
+from .basez import SimpleDv, fetch
+from .structz import CMD
+class Db(SimpleDv):
+    # func to impl:
+    def to_list(self, rst):
+        rows = self.cursor.description
+        keys = [k[0].lower() for k in rows]
+        result = []
+        result.append(keys)
+        if rst is None or len(rst)==0:
+            return result
+        result += rst
+        return result
+    def new_con(self):
+        return connect('clickhouse://{user}:{pwd}@{host}:{port}/{db}'.format(user = self.user, db = self.db, pwd =self.pwd, host = self.host, port = self.port))
+    def new_cursor(self):
+        return self.con.cursor()
+    def init(self, *argv, **maps):
+        pass
+
+pass
+def build(argv, conf):
+    dv = Db(*fetch(argv))
+    return CMD(dv)
+
+pass

buildz-0.6.2/buildz/db/dv/lib/readme

@@ -0,0 +1,10 @@
+put oracle lib file here:
+oci.dll
+ocijdbc21.dll
+ociw32.dll
+oramysql.dll
+orannzsbb.dll
+oraocci21.dll
+oraocci21d.dll
+oraociei.dll
+orasql.dll

buildz-0.6.2/buildz/db/dv/mysqlz.py

@@ -0,0 +1,38 @@
+try:
+    import pymysql
+except ModuleNotFoundError:
+    raise Exception("module not found, try: pip install pymysql")
+import sys
+from .basez import SimpleDv, fetch
+from .structz import CMD
+class Db(SimpleDv):
+    # func to impl:
+    def to_list(self, rst):
+        result = []
+        if rst is None or len(rst)==0:
+            return result
+        a = rst[0]
+        keys = list(a.keys())
+        result.append(keys)
+        for obj in rst:
+            v = [obj[k] for k in keys]
+            result.append(v)
+        return result
+    def new_con(self):
+        return pymysql.connect(host=self.host, 
+            port = self.port, user =self.user, 
+            password =self.pwd, database = self.db,
+            charset='utf8',init_command="SET SESSION time_zone='+08:00'")
+    def new_cursor(self):
+        return self.con.cursor(pymysql.cursors.DictCursor)
+    def init(self, *argv, **maps):
+        if self.port is None:
+            self.port = 3306
+        pass
+
+pass
+def build(argv, conf):
+    dv = Db(*fetch(argv))
+    return CMD(dv)
+
+pass

buildz-0.6.2/buildz/db/dv/oraclez.py

@@ -0,0 +1,59 @@
+
+import os
+import sys
+dp = os.path.dirname(__file__)
+gdp = os.path.join(dp, "lib")
+
+def init_path(dp):
+    path = os.environ["PATH"] 
+    if sys.platform.lower().find("win")>=0:
+        cb = ";"
+    else:
+        cb = ":"
+    path = path +cb+dp
+    os.environ["PATH"] = path
+
+pass
+
+#init_path(dp)
+import sys
+from .basez import SimpleDv, fetch
+from .structz import CMD
+class Db(SimpleDv):
+    # func to impl:
+    def to_list(self, rst):
+        rows = self.cursor.description
+        keys = [k[0].lower() for k in rows]
+        result = []
+        result.append(keys)
+        if rst is None or len(rst)==0:
+            return result
+        result += rst
+        return result
+    def new_con(self):
+        if self.port is not None:
+            add = ":"+str(self.port)
+        else:
+            add = ""
+        try:
+            import cx_Oracle as pymysql
+        except ModuleNotFoundError:
+            raise Exception("module not found, try: pip install cx-Oracle")
+        return pymysql.connect(self.user, self.pwd, self.host+add+"/"+self.db)
+    def new_cursor(self):
+        return self.con.cursor()
+    def init(self, *argv, **maps):
+        pass
+
+pass
+def build(argv, conf):
+    k = 'oracle_lib'
+    dp = gdp
+    if k in conf:
+        dp = conf[k]
+    init_path(dp)
+    #print(f"oracle lib: {dp}")
+    dv = Db(*fetch(argv))
+    return CMD(dv)
+
+pass

buildz-0.6.2/buildz/db/dv/structz.py

@@ -0,0 +1,207 @@
+#import pymysql
+import sys
+class ItDv:
+    def begin(self):
+        pass
+    def close(self):
+        pass
+    def is_open(self):
+        return False
+    def commit(self):
+        pass
+    def refresh(self):
+        pass
+    def check_query(self, s):
+        return False
+    def query(self, sql, vals=()):
+        # return list, first row is key
+        return []
+    def execute(self, sql, vals=()):
+        return None
+    def sql_tables(self):
+        return ""
+
+pass
+
+class CMD:
+    def begin(self):
+        return self.dv.begin()
+    def close(self):
+        return self.dv.close()
+    def __init__(self, dv, simple_format = True):
+        self.s_rst = ""
+        self.dv = dv
+        self.simple_format = simple_format
+    def __enter__(self, *argv, **maps):
+        self.dv.begin()
+        return self
+    def __exit__(self, *argv, **maps):
+        self.dv.close()
+    def exec(self, fc, sql, vals = ()):
+        need_close = False
+        if not self.dv.is_open():
+            self.dv.begin()
+            need_close = True
+        rst = fc(sql, vals)
+        if need_close:
+            self.dv.close()
+        return rst
+    def query(self, sql, vals = ()):
+        return self.exec(self.dv.query, sql, vals)
+    def execute(self, sql, vals = ()):
+        return self.exec(self.dv.execute, sql, vals)
+    def s_print(self, *args):
+        args = [str(k) for k in args]
+        s = " ".join(args)
+        s = s+"\n"
+        self.s_rst += s
+    def s_flush(self):
+        out = self.s_rst
+        self.s_rst = ""
+        return out
+    def rp(self, s):
+        return s
+        rps = ["\n\\n","\r\\r","\t\\t"]
+        for rp in rps:
+            s = s.replace(rp[0], rp[1:])
+        return s
+    def sz(self, s):
+        try:
+            s = s.encode("gbk")
+        except Exception as exp:
+            print("SZ exp:", exp)
+        return min(100, len(s))
+    def jstr(self, obj):
+        import datetime
+        import decimal
+        if type(obj) == datetime.datetime:
+            obj = str(obj) 
+        if type(obj) == decimal.Decimal:
+            obj = str(obj) 
+        if type(obj) == bytes:
+            obj = list(obj)[0]
+        import json
+        rs = json.dumps(obj, ensure_ascii=0)
+        return rs
+    def tr_sz(self, s, sz):
+        try:
+            s = s.encode("gbk")
+            s = s+(b" "*(sz-len(s)))
+            s = s.decode("gbk")
+        except Exception as exp:
+            print("TR_SZ exp:", exp)
+        return s
+    def format(self, arr):
+        arr = [[self.rp(k) for k in obj] for obj in arr]
+        if self.simple_format and len(arr)>0:
+            sz = [[self.sz(k) for k in obj] for obj in arr]
+            l = len(arr[0])
+            szs = [max([obj[i] for obj in sz]) for i in range(l)]
+            arr = [[self.tr_sz(obj[i], szs[i]) for i in range(l)] for obj in arr]
+        arr = [" | ".join(k) for k in arr]
+        arr = ["[[ "+k+" ]]" for k in arr]
+        return "\n".join(arr)
+    def single(self, s):
+        s=s.strip()
+        if s == "commits":
+            self.dv.commit()
+        elif s == "reset":
+            self.dv.close()
+            self.dv.begin()
+        elif s == "refresh":
+            self.dv.refresh()
+        elif s == "table":
+            s = self.dv.sql_tables()
+            self.s_print(self.single(s))
+        elif s == "exit":
+            raise Exception("exit")
+        elif s.split(" ")[0] == "source":
+            # source filepath [encoding]
+            arr = s.split(" ")
+            fp =arr[1].strip()
+            cd = "utf-8"
+            if len(arr)>2:
+                cd = arr[2].strip().lower()
+            with open(fp, 'rb') as f:
+                s = f.read().decode(cd)
+            arr = s.split(";")
+            for sql in arr:
+                if sql.strip() == "":
+                    continue
+                _sql = sql+";"
+                self.s_print("sql:", _sql)
+                tmp = self.execute(_sql)
+                self.s_print(tmp)
+            self.s_print("done source", fp)
+        elif s.split(" ")[0] == "export":
+            # export filepath encoding sql;
+            self.s_print("export:", s)
+            arr = s.split(" ")
+            fp =arr[1].strip()
+            cd = arr[2].strip().lower()
+            s = " ".join(arr[3:])
+            self.s_print("sql:", s)
+            rst = self.query(s)
+            result = []
+            if len(rst)>0:
+                keys = rst[0]
+                rst = rst[1:]
+                result.append(['"'+v.lower()+'"' for v in keys])
+                for i, obj in zip(range(len(rst)), rst):
+                    v = ['"'+str(k)+'"' for k in obj]
+                    result.append(v)
+            result = [", ".join(k) for k in result]
+            rs = "\n".join(result)
+            with open(fp, "wb") as f:
+                f.write(rs.encode(cd))
+            self.s_print("done write \"{s}\" to {fp}".format(s = s, fp = fp))
+        elif s == "":
+            return ""
+        else:
+            self.s_print("SQL:", s)
+            try:
+                if self.dv.check_query(s):
+                    rst = self.query(s)
+                    result = []
+                    if len(rst)>0:
+                        keys = rst[0]
+                        rst = rst[1:]
+                        result.append(["KEY"]+keys)
+                        for i, obj in zip(range(len(rst)), rst):
+                            v = [self.jstr(k) for k in obj]
+                            result.append([str(i)]+v)
+                    self.s_print(self.format(result))
+                else:
+                    rst = self.execute(s)
+                    self.s_print(rst)
+            except Exception as exp:
+                import traceback
+                traceback.print_exc()
+                self.s_print("Error sql line:", exp)
+            self.s_print("")
+        return self.s_flush()
+    def run(self):
+        self.begin()
+        try:
+            while True:
+                rst = []
+                while True:
+                    s = input(":").strip()
+                    if s in "cls, clear".split(","):
+                        import os
+                        os.system(s)
+                        continue
+                    rst.append(s)
+                    if s.find(";")>=0:
+                        break
+                s = " ".join(rst)
+                s = s.split(";")[0].strip()
+                if s == "exit":
+                    break
+                rst = self.single(s)
+                print(rst)
+                print("")
+        finally:
+            self.close()
+
+pass

buildz-0.6.2/buildz/db/install.txt

@@ -0,0 +1,4 @@
+pip install:
+pymysql
+cx-Oracle(and download oracle???.dll from oracle website and copy to ./dv/lib)
+clickhouse-driver

buildz-0.6.2/buildz/db/run.conf

@@ -0,0 +1,10 @@
+dv: mysql
+db1: "ip:port/db"
+db2: "ip:port/db"
+db: db1
+user: root
+pwd: pwd
+src: sqls/mysql.sql
+out: sqls/mysql.sql.out
+sec: 0.5
+oracle_lib: gits\buildz_upd\buildz\db\dv\lib

buildz-0.6.2/buildz/db/runz.py

@@ -0,0 +1,103 @@
+
+import sys
+import os
+import time
+from buildz import xf
+FP = "run.conf"
+def find(arr, k, base = 0):
+    for i in range(base, len(arr)):
+        if arr[i]==k:
+            return i
+    return -1
+
+pass
+def test(fp):
+    obj = xf.loads(xf.fread(fp))
+    dv = obj['dv']
+    if __name__ == "__main__":
+        if dv == 'mysql':
+            from dv.mysqlz import build
+        elif dv == 'oracle':
+            from dv.oraclez import build
+        elif dv == 'clickhouse':
+            from dv.clickhousez import build
+    else:
+        if dv == 'mysql':
+            from .dv.mysqlz import build
+        elif dv == 'oracle':
+            from .dv.oraclez import build
+        elif dv == 'clickhouse':
+            from .dv.clickhousez import build
+    db_url = obj['db']
+    db_url = obj[db_url]
+    user = obj['user']
+    pwd = obj['pwd']
+    src = obj['src']
+    out = obj['out']
+    sqls = xf.fread(src)
+    sqls = sqls.replace("\r\n", "\n").rstrip().split("\n")
+    sqls_strip = [k.strip() for k in sqls]
+    i = find(sqls_strip, "!!begin")
+    bi = i
+    if i < 0:
+        bi=0
+    j = find(sqls_strip, "!!end", bi)
+    sqls = sqls[i+1:j]
+    sqls = [k for k in sqls if k.lstrip()[:2]!="--"]
+    sqls = "\n".join(sqls)
+    sqls = sqls.split(";")
+    print(f"[TESTZ] sqls:{sqls}")
+    cmd = build([db_url, user, pwd], obj)
+    cmd.dv.begin()
+    print("[TESTZ] A")
+    with open(out, 'wb') as f:
+        for sql in sqls:
+            if sql.strip()=="":
+                continue
+            if sql.strip() == "exit":
+                break
+            print("[TESTZ] B")
+            rst = cmd.single(sql)
+            print("[TESTZ] C")
+            f.write(rst.encode("utf-8"))
+    cmd.close()
+
+pass
+class Runner:
+    def __init__(self, fp):
+        self.fp = fp
+    def init(self):
+        self.obj = xf.loads(xf.fread(self.fp))
+        self.fps = [self.fp, self.obj['src']]
+        self.fps = [os.path.abspath(fp) for fp in self.fps]
+        self.curr = [0,0]
+    def run(self):
+        while True:
+            secs = [os.path.getmtime(fp) for fp in self.fps]
+            if self.curr != secs:
+                print(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()), "done update")
+                self.init()
+                self.curr = secs
+                test(self.fp)
+            time.sleep(float(self.obj['sec']))
+
+pass
+
+def run(fp):
+    r = Runner(fp)
+    r.init()
+    r.run()
+
+pass
+def main():
+    fp = FP
+    if len(sys.argv)>1:
+        fp = sys.argv[1]
+    return run(fp)
+
+pass
+
+if __name__=="__main__":
+    main()
+
+pass

{buildz-0.5.91 → buildz-0.6.2}/buildz/fz/fio.py

@@ -81,4 +81,15 @@ def removes(fp, cover = False):
     #print(f"removedirs '{fp}'")
     os.rmdir(fp)
 
+pass
+def decode(s, coding = 'utf-8'):
+    coding = coding.lower()
+    xcoding = 'utf-8'
+    if coding == 'utf-8':
+        xcoding = 'gbk'
+    try:
+        return s.decode(coding)
+    except:
+        return s.decode(xcoding)
+
 pass

{buildz-0.5.91 → buildz-0.6.2}/buildz/ioc/ioc_deal/call.py

@@ -38,10 +38,20 @@ class CallDeal(FormatDeal):
         src = edata.src
         method = xf.g(data, method=0)
         method = pyz.load(method)
+        info = edata.info
+        iargs, imaps = None, None
+        if type(info) == dict:
+            iargs, imaps = xf.g(info, args = None, maps = None)
         args = xf.g(data, args=[])
         maps = xf.g(data, maps ={})
-        args = [self.get_obj(v, conf, src, info = edata.info) for v in args]
-        maps = {k:self.get_obj(maps[k], conf, src, info = edata.info) for k in maps}
+        if iargs is not None:
+            args = iargs
+        if imaps is not None:
+            xf.fill(imaps, maps, 1)
+        # args = [self.get_obj(v, conf, src, info = edata.info) for v in args]
+        # maps = {k:self.get_obj(maps[k], conf, src, info = edata.info) for k in maps}
+        args = [self.get_obj(v, conf, src) for v in args]
+        maps = {k:self.get_obj(maps[k], conf, src) for k in maps}
         return method(*args, **maps)
 
 pass

{buildz-0.5.91 → buildz-0.6.2}/buildz/ioc/ioc_deal/mcall.py

@@ -41,8 +41,11 @@ class MethodCallDeal(FormatDeal):
         info = xf.g(data, info=None)
         if info is not None:
             info = self.get_obj(info, src = edata.src, info = edata.info)
-        else:
-            info = edata.info
+        einfo = edata.info
+        if type(einfo)==dict and type(info) == dict:
+            xf.fill(einfo, info, 1)
+        if info is None:
+            info = einfo
         if source is not None:
             source = conf.get_obj(source, info = info)
         if source is None:
@@ -52,10 +55,19 @@ class MethodCallDeal(FormatDeal):
         if src is None:
             src = source
         method = getattr(source, method)
+        iargs, imaps = None, None
+        if type(info) == dict:
+            iargs, imaps = xf.g(info, m_args = None, m_maps = None)
         args = xf.g(data, args=[])
         maps = xf.g(data, maps ={})
-        args = [self.get_obj(v, conf, src, edata.info) for v in args]
-        maps = {k:self.get_obj(maps[k], conf, src, edata.info) for k in maps}
+        if iargs is not None:
+            args = iargs
+        if imaps is not None:
+            xf.fill(imaps, maps, 1)
+        # args = [self.get_obj(v, conf, src, edata.info) for v in args]
+        # maps = {k:self.get_obj(maps[k], conf, src, edata.info) for k in maps}
+        args = [self.get_obj(v, conf, src) for v in args]
+        maps = {k:self.get_obj(maps[k], conf, src) for k in maps}
         return method(*args, **maps)
 
 pass

{buildz-0.5.91 → buildz-0.6.2}/buildz/ioc/ioc_deal/obj.py

@@ -164,11 +164,11 @@ class ObjectDeal(FormatDeal):
         if isets is not None:
             xf.fill(isets, sets, 1)
         for k,v in sets.items():
-            v = self.get_obj(v, conf, obj, edata.info)
+            v = self.get_obj(v, conf, obj)#, edata.info)
             setattr(obj, k, v)
         call = xf.g(data, call=None)
         if call is not None:
-            self.get_obj(call, conf, obj, edata.info)
+            self.get_obj(call, conf, obj)#, edata.info)
         return obj
     def remove(self, edata:EncapeData):
         sid = edata.sid