buildz 0.6.32__tar.gz → 0.6.33__tar.gz

{buildz-0.6.32/buildz.egg-info → buildz-0.6.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.32
+Version: 0.6.33
 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.32 → buildz-0.6.33}/buildz/auto/log.py

@@ -7,7 +7,7 @@ from ..base import Base
 from ..ioc import wrap
 from ..tools import *
 import time, sys
-from ..tz.log import FpLog
+from ..logz import FpLog
 @wrap.obj(id="log")
 @wrap.obj_sets(cache="ref,cache")
 class AutoLog(FpLog):

buildz-0.6.33/buildz/db/__init__.py

@@ -0,0 +1,2 @@
+
+from .tls import *

{buildz-0.6.32 → buildz-0.6.33}/buildz/db/dv/basez.py

@@ -1,5 +1,6 @@
 import sys
 from .structz import ItDv
+from buildz.db import tls
 def sp(obj):
     return super(obj.__class__, obj)
 
@@ -57,6 +58,47 @@ class SimpleDv(ItDv):
     def execute(self, sql, vals=()):
         tmp = self.cursor.execute(sql, vals)
         return tmp
+    def insert_or_update(self, maps, table, keys = None):
+        if type(maps)!=dict:
+            maps = maps.__dict__
+        if keys is None:
+            keys = []
+        if type(keys) not in (list, tuple):
+            keys = [keys]
+        update = False
+        conds = ""
+        if len(keys)>0:
+            need_query = True
+            conds = []
+            for k in keys:
+                if k not in maps:
+                    need_query = False
+                    break
+                v = maps[k]
+                if type(v)==str:
+                    v = f"'{v}'"
+                if v not is None:
+                    cond = f"{k} = {v}"
+                else:
+                    cond = f"{k} is null"
+                conds.append(cond)
+            if need_query:
+                conds = " and ".join(conds)
+                sql_search = f"select count(*) from {table} where {conds}"
+                rst = self.query(sql_search)[1][0]
+                update = rst>0
+        if update:
+            keys = set(keys)
+            kvs = [[k,tls.py2sql(v)] for k,v in maps.items() if k not in keys]
+            sets = [f"{k}={v}"]
+            sets = ",".join(sets)
+            sql = f"update {table} set {sets} where {conds}"
+        else:
+            kvs = [k, tls.py2sql(v) for k,v in maps.items()]
+            ks = ",".join([kv[0] for kv in kvs])
+            vs = ",".join([kv[1] for kv in kvs])
+            sql = f"insert into {table}({ks}) values({vs});"
+        return self.execute(sql)
 
 pass
 

buildz-0.6.33/buildz/db/dv/orm.py

@@ -0,0 +1,36 @@
+#coding=utf-8
+
+from buildz import Base
+from buildz.db import tls
+class TableObject(Base):
+    def init(self, keys, table=None, translates=None, primary_keys=None, auto_translate=True, dv = None):
+        if table_name is None:
+            table = tls.lower(self.__class__.__name__)
+        self.table = table
+        if translates is None:
+            translates = {}
+        for key in keys:
+            if key not in translates:
+                k_py, k_sql = key,key
+                if auto_translate:
+                    k_py,k_sql = tls.upper(key), tls.lower(key)
+                translates[k_py] = k_sql
+        self.translates = translates
+        self.keys = keys
+        if primary_keys is None:
+            primary_keys = []
+        self.primary_keys = primary_keys
+        self.dv = dv
+    def save(self, obj, dv=None):
+        if dv is None:
+            dv = self.dv
+        assert dv is not None
+        if type(obj)!=dict:
+            tmp = {}
+            for k in self.translates:
+                if hasattr(obj, k):
+                    tmp[k] = getattr(obj, k)
+            obj = tmp
+        obj = {self.translates[k]:v for k,v in obj.items()}
+        return dv.insert_or_update(obj, self.table, self.primary_keys)
+

{buildz-0.6.32 → buildz-0.6.33}/buildz/db/dv/structz.py

@@ -1,5 +1,9 @@
 #import pymysql
 import sys
+import datetime
+import decimal
+from buildz import logz
+from buildz.db import tls
 class ItDv:
     def begin(self):
         pass
@@ -28,10 +32,12 @@ class CMD:
         return self.dv.begin()
     def close(self):
         return self.dv.close()
-    def __init__(self, dv, simple_format = True):
+    def __init__(self, dv, simple_format = True, log = None):
         self.s_rst = ""
         self.dv = dv
         self.simple_format = simple_format
+        self.log = logz.make(log)
+        self.insert_or_update = dv.insert_or_update
     def __enter__(self, *argv, **maps):
         self.dv.begin()
         return self
@@ -79,9 +85,20 @@ class CMD:
         if type(obj) == decimal.Decimal:
             obj = str(obj) 
         if type(obj) == bytes:
-            obj = list(obj)[0]
+            for code in "utf-8,gbk".split(","):
+                try:
+                    obj = obj.decode(code)
+                    break
+                except:
+                    continue
+            else:
+                obj = list(obj)
+            #obj = list(obj)[0]
         import json
-        rs = json.dumps(obj, ensure_ascii=0)
+        try:
+            rs = json.dumps(obj, ensure_ascii=0)
+        except:
+            rs = json.dumps(str(obj), ensure_ascii=0)
         return rs
     def tr_sz(self, s, sz):
         try:
@@ -89,7 +106,7 @@ class CMD:
             s = s+(b" "*(sz-len(s)))
             s = s.decode("gbk")
         except Exception as exp:
-            print("TR_SZ exp:", exp)
+            self.log.error("TR_SZ exp:", exp)
         return s
     def format(self, arr):
         arr = [[self.rp(k) for k in obj] for obj in arr]
@@ -126,7 +143,7 @@ class CMD:
                 s = f.read().decode(cd)
             arr = s.split(";")
             n = len(arr)
-            print(f"[TESTZ] done fread {fp}: {len(arr)}")
+            self.log.info(f"[TESTZ] done fread {fp}: {len(arr)}")
             i=0
             for sql in arr:
                 sql=sql.replace("\r","")

buildz-0.6.33/buildz/db/tls.py

@@ -0,0 +1,32 @@
+#
+def lower(val):
+    rst = ""
+    for c in val:
+        if c.lower()!=c:
+            c = "_"+c.lower()
+        rst+=c
+    return rst
+pass
+def upper(val):
+    rst = ""
+    mark_up = False
+    for c in val:
+        if c == "_":
+            mark_up = True
+            continue
+        if mark_up:
+            c = c.upper()
+        rst+=c
+    return rst
+pass
+def py2sql(val):
+    if val is None:
+        return 'null'
+    if type(val)==str:
+        return f"'{val}'"
+    if type(val) == datetime.datetime:
+        val = str(val) 
+    if type(val) == decimal.Decimal:
+        val = str(val)
+    return val
+pass

buildz-0.6.32/buildz/tz/log.py → buildz-0.6.33/buildz/logz.py

@@ -1,11 +1,10 @@
 #
 
 
-from .. import xf
-from .. import ioc
-from ..base import Base
-from ..ioc import wrap
-from ..tools import *
+from . import xf, ioc, fz
+from .base import Base
+from .ioc import wrap
+#from .tools import *
 import time, sys
 class Log(Base):
     def tag(self, _tag):
@@ -56,13 +55,14 @@ def mstr(s):
     if s is None or len(s)==0:
         return s
     return s[:1].upper()+s[1:].lower()
-class FpLog(Log):
-    def init(self, fp = None,shows =None, tag=None, format=None):
+class FormatLog(Log):
+    def init(self, shows =None, tag=None, format=None):
         if format is None:
             format = "[{LEVEL}] %Y-%m-%d %H:%M:%S {tag} {msg}\n"
         self.format=format
         super().init(shows, tag)
-        self.fp = fp
+    def output(self, msg):
+        raise Exception("impl")
     def log(self, level, tag, *args):
         m_level = level.lower()
         u_level = level.upper()
@@ -73,8 +73,12 @@ class FpLog(Log):
             tag = "base"
         rst = time.strftime(self.format, time.localtime(time.time()))
         msg = replaces(rst, "{Level}", x_level, "{level}", m_level, "{LEVEL}", u_level, "{tag}", tag, "{msg}", msg)
-        # rst = rst.replace("{level}",level).replace("{tag}", tag).replace
-        # msg = f"[{level}] {date} {tag} {msg}\n"
+        self.output(msg)
+class FpLog(FormatLog):
+    def init(self, fp = None,shows =None, tag=None, format=None):
+        super().init(shows, tag, format)
+        self.fp = fp
+    def output(self, msg):
         sys.stdout.write(msg)
         if self.fp is not None:
             fp = time.strftime(self.fp)
@@ -82,3 +86,26 @@ class FpLog(Log):
             fz.write(msg.encode("utf-8"), fp, 'ab')
 
 pass
+class StdLog(FormatLog):
+    def output(self, msg):
+        sys.stdout.write(msg)
+
+pass
+
+class Logs(Log):
+    def init(self, logs, shows = None, tag= None):
+        super().init(shows, tag)
+        self.logs = logs
+    def log(self, level, tag, *args):
+        for _log in self.logs:
+            _log.log(level, tag, *args)
+
+pass
+
+def build(obj=None, shows=None, tag=None, format=None):
+    if obj is None:
+        return StdLog(shows, tag, format)
+    return obj
+
+pass
+make=build

buildz-0.6.33/buildz/tools.py

@@ -0,0 +1,4 @@
+#coding=utf-8
+# from buildz.tools import *
+from . import pyz,xf,fz,Base, ioc, logz,xz
+from .tz.time import timecost,showcost

{buildz-0.6.32 → buildz-0.6.33}/buildz/tz/time/timez.py

@@ -1,6 +1,6 @@
 import time
 from ... import Base
-from ..log import FpLog
+from ...logz import FpLog
 class Clock(Base):
     def default(self, cost, fc, rst, *a, **b):
         print(f"cost {cost} sec on {fc}")

{buildz-0.6.32 → buildz-0.6.33}/buildz/xf/mapz.py

@@ -193,6 +193,10 @@ def removes(maps, keys):
     return None
 
 pass
+dset = sets
+dget = gets
+dhas = has
+dremove = removes
 def l2m(arr, **maps):
     rst = {}
     i = 0

buildz-0.6.33/buildz/xz/__init__.py

@@ -0,0 +1 @@
+from .trs import Translate

buildz-0.6.33/buildz/xz/conf.js

@@ -0,0 +1,16 @@
+
+main:{
+    data.total: total
+    data.diff: datas1
+    datas1: [datas, list, trs.datas]
+}
+
+trs.datas: {
+    var0: code
+    var1: name
+    var2: group
+    var3: num
+    var4: val
+    _: [type, val, 'A']
+    _1: [typeV, var, x]
+}

buildz-0.6.33/buildz/xz/data.js

@@ -0,0 +1,35 @@
+{
+    data: {
+        total: 1024
+        diff: [
+            {
+                var0: 001
+                var1: 测试
+                var2: 100
+                var3: 1000
+                var4: 1e2
+            }
+            {
+                var0: 002
+                var1: 测试
+                var2: 102
+                var3: 1002
+                var4: 2e3
+            }
+            {
+                var0: 003
+                var1: 测试
+                var2: 300
+                var3: 3000
+                var4: 3e4
+            }
+            {
+                var0: 004
+                var1: 测试
+                var2: 104
+                var3: 1004
+                var4: 4e5
+            }
+        ]
+    }
+}

buildz-0.6.33/buildz/xz/test.py

@@ -0,0 +1,12 @@
+#
+
+from buildz.xz import trs
+from buildz import xf
+
+data = xf.loadf("data.js")
+conf = xf.loadf("conf.js")
+
+obj = trs.Translate(conf, inline = 1, remove_src = 1, vars = {"x":"test"})
+rst = obj(data)
+print(rst)
+

buildz-0.6.33/buildz/xz/trs.py

@@ -0,0 +1,174 @@
+
+from buildz import xf, Base
+class Translate(Base):
+    """
+    conf:
+    main: [
+        null, mdict
+        [
+
+        ]
+    ]
+    main: [
+        [data.total, total] // [data.total, total, key]
+        [data.diff, datas, list, translates]
+    ]
+    or: 
+    main: {
+        data.total: total
+        data.diff: [datas, list, translates]
+    }
+    translates: {
+        ...
+    }
+    """
+    def init(self, conf, src_spt=".",dst_spt = ".", inline = False, remove_src = False, vars = None):
+        self.conf = conf
+        self.src_spt = src_spt
+        self.dst_spt = dst_spt
+        self.inline = inline
+        self.remove_src = remove_src
+        self.cache_conf = {}
+        self.vars = vars
+    def kfc(self, fckey, val, vars=None):
+        fc = self.var(fckey, vars)
+        return fc(val)
+    def var(self, key, vars=None):
+        #print(f"[TESTZ] vars: {vars}")
+        if vars is None:
+            vars = self.vars
+        #print(f"[TESTZ] vars: {vars}")
+        if vars is None:
+            raise Exception(f"var not found: {key}")
+        if type(vars)==dict:
+            if key not in vars:
+                raise Exception(f"var not found: {key}")
+            return vars[key]
+        if callable(vars):
+            return vars(key)
+        return vars.get(key)
+    def call(self, data, key = "main", vars=None):
+        trs = xf.get(self.conf, key)
+        #print(f"[TESTZ] trs: {trs}")
+        trs = expand(trs)
+        #print(f"[TESTZ] expand.trs: {trs}")
+        return self.deal(data, trs,vars)
+    def conf_get(self, key):
+        if key in self.cache_conf:
+            return self.cache_conf[key]
+        assert key in self.conf
+        rst = self.conf[key]
+        rst = dict2list(rst)
+        self.cache_conf[key] = rst
+        return rst
+    def src_get(self, data, key):
+        if self.src_spt is not None:
+            key = key.split(self.src_spt)
+        return xf.gets(data, key)
+    def dst_set(self, data, key, val):
+        #print(f"[TESTZ] key: {key}")
+        if self.dst_spt is not None:
+            key = key.split(self.dst_spt)
+        return xf.sets(data, key, val)
+    def src_has(self, data, key):
+        if self.src_spt is not None:
+            key = key.split(self.src_spt)
+        return xf.has(data, key)
+    def src_remove(self, data, key):
+        if self.src_spt is not None:
+            key = key.split(self.src_spt)
+        return xf.removes(data, key)
+    def get_type(self, trs):
+        if len(trs)==2:
+            if type(trs[1]) not in (list, dict):
+                return "key"
+            return trs[0]
+        return trs[2]
+    def deal(self, data, trs, vars=None):
+        """
+            type: key, 
+            conf = [
+                key, target_key, type, info
+            ]
+            key: return [target_key, target_val, exists]
+        """
+        # trs = xf.get(conf, key)
+        # trs = dict2list(trs)
+        _type = self.get_type(trs)
+        #print(f"[TESTZ] deal.trs: {trs}")
+        if _type in ("list", "dict"):
+            info = trs[-1]
+            if type(info) == str:
+                info = self.conf_get(info)
+            trs[-1] = info
+        if _type == "list":
+            _trs = trs[-1]
+            _trs = expand(_trs)
+            if self.inline:
+                rst = data
+            else:
+                rst = [None]*len(data)
+            for i in range(len(data)):
+                dt = data[i]
+                _rst = self.deal(dt, _trs, vars)
+                rst[i] = _rst
+        elif _type == "dict":
+            if self.inline:
+                rst = data
+            else:
+                rst = {}
+            for _trs in trs[-1]:
+                #print(f"[TESTZ] _trs: {_trs}")
+                _trs = expand(_trs)
+                #print(f"[TESTZ] expand_trs: {_trs}")
+                src_key, target_key = _trs[:2]
+                _ctype = self.get_type(_trs)
+                if _ctype == "val":
+                    _rst = _trs[3]
+                elif _ctype == "var":
+                    _rst = self.var(_trs[3], vars)
+                else:
+                    if not self.src_has(data, src_key):
+                        continue
+                    val = self.src_get(data, src_key)
+                    if _ctype == "key":
+                        _rst = val
+                    elif _ctype == "kfc":
+                        _rst = self.kfc(_trs[3], val, vars)
+                    else:
+                        _rst = self.deal(val, _trs, vars)
+                if self.inline and self.remove_src and _ctype not in ("val", "var"):
+                    self.src_remove(data, src_key)
+                    #del data[src_key]
+                self.dst_set(rst, target_key, _rst)
+                #rst[target_key] = _rst
+        else:
+            raise Exception("error")
+        return rst
+def dict2list(trs):
+    if type(trs)==dict:
+        tmp = []
+        for k,v in trs.items():
+            if type(v) not in [list, tuple]:
+                v = [v]
+            if type(v)==tuple:
+                v = list(v)
+            if len(v)==1:
+                v = v+["key"]
+            v = [k]+v
+            tmp.append(v)
+        trs = tmp
+    return trs
+def expand(trs):
+    trs = dict2list(trs)
+    if len(trs)>0:
+        k = trs[0]
+        if type(k) in (list, tuple):
+            trs = ['dict', trs]
+    if len(trs)>1:
+        val = trs[-1]
+        if type(val)==dict:
+            trs[-1] = dict2list(val)
+    return trs
+
+pass

{buildz-0.6.32 → buildz-0.6.33/buildz.egg-info}/PKG-INFO

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

@@ -7,6 +7,7 @@ buildz/__main__.py
 buildz/argx.py
 buildz/base.py
 buildz/cmd.py
+buildz/logz.py
 buildz/pyz.py
 buildz/tools.py
 buildz.egg-info/PKG-INFO
@@ -37,15 +38,18 @@ buildz/auto/test/res/data/fp.js
 buildz/auto/test/res/data/item1.js
 buildz/auto/test/res/data/item2.js
 buildz/auto/test/res/data/test.js
+buildz/db/__init__.py
 buildz/db/__main__.py
 buildz/db/install.txt
 buildz/db/run.conf
 buildz/db/runz.py
+buildz/db/tls.py
 buildz/db/dv/__init__.py
 buildz/db/dv/basez.py
 buildz/db/dv/clickhousez.py
 buildz/db/dv/mysqlz.py
 buildz/db/dv/oraclez.py
+buildz/db/dv/orm.py
 buildz/db/dv/postgresqlz.py
 buildz/db/dv/sqlite3z.py
 buildz/db/dv/structz.py
@@ -135,7 +139,6 @@ buildz/ioc/ioc_deal/conf/var_lists.js
 buildz/ioc/ioc_deal/conf/xfile_defaults.js
 buildz/ioc/ioc_deal/conf/xfile_lists.js
 buildz/tz/__init__.py
-buildz/tz/log.py
 buildz/tz/myers_diff.py
 buildz/tz/test_xfind.py
 buildz/tz/xfind.py
@@ -204,4 +207,9 @@ buildz/xf/writer/deal/jsonval.py
 buildz/xf/writer/deal/listz.py
 buildz/xf/writer/deal/mapz.py
 buildz/xf/writer/deal/reval.py
-buildz/xf/writer/deal/strz.py
+buildz/xf/writer/deal/strz.py
+buildz/xz/__init__.py
+buildz/xz/conf.js
+buildz/xz/data.js
+buildz/xz/test.py
+buildz/xz/trs.py

{buildz-0.6.32 → buildz-0.6.33}/setup.py

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

buildz-0.6.32/buildz/tools.py

@@ -1,4 +0,0 @@
-#coding=utf-8
-# from buildz.tools import *
-from . import pyz,xf,fz,Base, ioc
-from .tz.time import timecost,showcost