buildz 0.7.5__tar.gz → 0.7.7__tar.gz

{buildz-0.7.5/buildz.egg-info → buildz-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.7.5
+Version: 0.7.7
 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.7.5 → buildz-0.7.7}/buildz/cachez/cache.py

@@ -172,6 +172,8 @@ class Caches(Base):
         self.set_currents = cache.set_currents
         self.set_basedir = cache.set_basedir
         self.get_basedir = cache.get_basedir
+        self.save = cache.save
+        self.load = cache.load
         self.has_file = cache.has
         self.has_mem = mem.has
     def get_file(self, key):

{buildz-0.7.5 → buildz-0.7.7}/buildz/db/dv/basez.py

@@ -74,6 +74,8 @@ class SimpleDv(ItDv):
             rst = rst[1:]
             rst = [{k:v for k,v in zip(keys, dt)} for dt in rst]
         return rst
+    def clone(self):
+        return type(self)(self.host, self.port, self.user, sel.pwd, self.db, self.as_map, *self.argv, **self.maps)
     def __init__(self, host, port, user, pwd, db, as_map=False, *argv, **maps):
         self.host = host
         self.port = port
@@ -83,8 +85,12 @@ class SimpleDv(ItDv):
         self.con = None
         self.cursor = None
         self.as_map = as_map
+        self.argv = argv
+        self.maps = maps
         self.init(*argv, **maps)
     def begin(self):
+        if self.con is not None:
+            return
         self.con = self.new_con()
         self.cursor = self.new_cursor()
     def open(self):
@@ -122,7 +128,7 @@ class SimpleDv(ItDv):
         if commit:
             self.cursor.execute("commit;")
         return tmp
-    def iou_sql(self, table, ks, vs, sets):
+    def iou_sql(self, table, ks, vs, sets, qs):
         sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
         return sql
     def insert_or_update(self, maps, table, keys = None, update_keys = None):
@@ -162,7 +168,7 @@ class SimpleDv(ItDv):
         sets = ",".join(sets)
         ks = ",".join([kv[0] for kv in kvs])
         vs = ",".join([str(kv[1]) for kv in kvs])
-        sql = self.iou_sql(table, ks, vs, sets)
+        sql = self.iou_sql(table, ks, vs, sets, keys)
         #sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
         return self.execute(sql)
         if update:

{buildz-0.7.5 → buildz-0.7.7}/buildz/db/dv/orm.py

@@ -60,7 +60,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
                     key:
                         table: 表名
                         query_keys: 默认null，orm做插入/更新时，判断数据是插入还是更新的查询方式
-                        auto_translate: 默认true，如果没有配置“转py后字段名”，是否自动转(a_b=>aB)
+                        auto_translate: 默认false，如果没有配置“转py后字段名”，是否自动转(a_b=>aB)
                         sql_before: 新增一条建表前sql语句
                         sql_after: 新增一条建表后sql语句
                         sql_delete_before: 新增一条删表前sql语句
@@ -78,7 +78,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
     elif type(data) == dict:
         data = dict2list(data)
     conf = {}
-    xf.s(conf, sql_before = [], sql_after = [], sql_delete_before=[], sql_delete_after=[],auto_translate=True,table=table,keys=[],py2sqls={},query_keys=None, data_keys = data_keys, vars=[], py_name = py_name)
+    xf.s(conf, sql_before = [], sql_after = [], sql_delete_before=[], sql_delete_after=[],auto_translate=False,table=table,keys=[],py2sqls={},query_keys=None, data_keys = data_keys, vars=[], py_name = py_name)
     for it in data:
         if len(it)==1 and type(it[0]) in (list, tuple):
             deal_item(it[0], conf)
@@ -99,7 +99,7 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
     sqls_del = sqls[2]+[sql_del]+sqls[3]
     sqls = [sqls_crt, sqls_del]
     sqls = [(";\n".join(k)+";").replace(";;",";") for k in sqls]
-    obj = TableObject(*xf.g(conf, keys=[], table=table, py2sqls = None, query_keys=None,auto_translate=True), sql_create = sqls[0], sql_delete = sqls[1], py_name = py_name)
+    obj = TableObject(*xf.g(conf, keys=[], table=table, py2sqls = None, query_keys=None,auto_translate=False), sql_create = sqls[0], sql_delete = sqls[1], py_name = py_name)
     return sqls, obj
 
 pass
@@ -119,7 +119,7 @@ class TableObject(Base):
         auto_translate:
             对于没有在py2sqls自定义映射的表字段，是否自动转换(py|autoTran<=>auto_tran|sql)
     """
-    def init(self, keys, table=None, py2sqls=None, query_keys=None, auto_translate=True, dv = None, sql_create=None, sql_delete=None, py_name = None):
+    def init(self, keys, table=None, py2sqls=None, query_keys=None, auto_translate=False, dv = None, sql_create=None, sql_delete=None, py_name = None):
         self.src_py2sqls = py2sqls
         if table is None:
             table = tls.lower(self.__class__.__name__)
@@ -148,7 +148,7 @@ class TableObject(Base):
             query_keys = []
         self.query_keys = query_keys
         self.dv = dv
-        self.py2sql=self.toSql
+        self.py2sql=self.to_sql
         self.sql2py = self.toPy
         self.sql_create = sql_create
         self.sql_delete = sql_delete
@@ -160,7 +160,7 @@ class TableObject(Base):
         #print(f"[TESTZ] sql_create: {self.sql_create}")
         dv = self.rdv(dv)
         dv.executes(self.sql_create)
-    def delete(self, dv=None):
+    def drop(self, dv=None):
         assert self.sql_delete is not None
         if self.sql_delete.find("<table>")>=0:
             print(f"[WARN] not delete template table by {self.sql_delete}")
@@ -168,7 +168,7 @@ class TableObject(Base):
         self.rdv(dv).execute(self.sql_delete)
     def bind(self, dv):
         self.dv = dv
-    def toSql(self, obj):
+    def to_sql(self, obj):
         if type(obj)!=dict:
             tmp = {}
             for k in self.py2sqls:
@@ -177,7 +177,7 @@ class TableObject(Base):
             obj = tmp
         obj = {self.py2sqls[k]:v for k,v in obj.items() if k in self.py2sqls}
         return obj
-    def toSqlKeys(self, keys):
+    def to_sql_keys(self, keys):
         obj = [k for k in keys if k in self.py2sqls]
         return obj
     def toPy(self, obj):
@@ -200,10 +200,10 @@ class TableObject(Base):
         if sql2py:
             rst = [self.sql2py(it) for it in rst]
         return rst
-    def queryAll(self, dv=None, sql2py=True):
+    def query_all(self, dv=None, sql2py=True):
         sql = f"select * from {self.table};"
         return self.query(sql, dv, sql2py)
-    def filterSql(self, obj):
+    def filter_sql(self, obj):
         if type(obj)!=dict:
             tmp = {}
             for k in self.sql2py:
@@ -219,11 +219,11 @@ class TableObject(Base):
         if type(obj) not in [list, tuple]:
             obj = [obj]
         if py2sql:
-            obj = [self.toSql(k) for k in obj]
+            obj = [self.to_sql(k) for k in obj]
             if update_keys is not None:
-                update_keys = self.toSqlKeys(update_keys)#[self.toSqlKeys(k) for k in update_keys]
+                update_keys = self.to_sql_keys(update_keys)#[self.to_sql_keys(k) for k in update_keys]
         else:
-            obj = [self.filterSql(k) for k in obj]
+            obj = [self.filter_sql(k) for k in obj]
         query_keys = self.query_keys
         if not check:
             query_keys = None

{buildz-0.7.5 → buildz-0.7.7}/buildz/db/dv/sqlite3z.py

@@ -20,6 +20,8 @@ class Db(SimpleDv):
         return sqlite3.connect(self.fp)
     def new_cursor(self):
         return self.con.cursor()
+    def clone(self):
+        return Db(self.fp, self.as_map)
     def __init__(self, fp, as_map=False, *argv, **maps):
         #def __init__(self, fp):
         self.con = None
@@ -90,8 +92,8 @@ class Db(SimpleDv):
             rst = rst[1:]
             rst = [{k:v for k,v in zip(keys, dt)} for dt in rst]
         return rst
-    def iou_sql(self, table, ks, vs, sets):
-        sql = f"insert into {table}({ks}) values({vs}) ON CONFLICT DO UPDATE SET {sets}"
+    def iou_sql(self, table, ks, vs, sets, qs):
+        sql = f"insert into {table}({ks}) values({vs}) ON CONFLICT({','.join(qs)}) DO UPDATE SET {sets}"
         return sql
     def insert_or_updatexxx(self, maps, table, keys = None, update_keys = None):
         if type(maps)!=dict:

{buildz-0.7.5 → buildz-0.7.7}/buildz/logz.py

@@ -88,11 +88,11 @@ def mstr(s):
 @ns.obj(id="formatLog")
 @ns.obj_args("ref, buildz.logz.shows, null", "ref, buildz.logz.tag, null", "ref, buildz.logz.format, null")
 class FormatLog(Log):
-    def init(self, shows =None, tag=None, format=None, lock = False):
+    def init(self, shows =None, tag=None, format=None, base=None, lock = False):
         if format is None:
             format = "[{LEVEL}] %Y-%m-%d %H:%M:%S [{tag}] {msg}\n"
         self.format=format
-        super().init(shows, tag, lock)
+        super().init(shows, tag, base, lock)
     def output(self, msg):
         raise Exception("impl")
     def do_log(self, level, tag, *args):
@@ -107,8 +107,8 @@ class FormatLog(Log):
         msg = replaces(rst, "{Level}", x_level, "{level}", m_level, "{LEVEL}", u_level, "{tag}", tag, "{msg}", msg)
         self.output(msg)
 class FpLog(FormatLog):
-    def init(self, fp = None,shows =None, tag=None, format=None, lock = False):
-        super().init(shows, tag, format, lock)
+    def init(self, fp = None,shows =None, tag=None, format=None, base=None, lock = False):
+        super().init(shows, tag, format, base, lock)
         self.fp = fp
     def output(self, msg):
         #sys.stdout.write(msg)

buildz-0.7.7/buildz/threads/__init__.py

@@ -0,0 +1,3 @@
+#
+from .pool import *
+from .impl import *

buildz-0.7.7/buildz/threads/impl.py

@@ -0,0 +1,64 @@
+#
+
+from .pool import *
+import threading
+class FcTask(Task):
+    def init(self, fc, args=[], maps={}, fc_exp = None):
+        self.fc = fc
+        self.args = args
+        self.maps = maps
+        self.fc_exp = fc_exp
+    def run(self):
+        return self.fc(*self.args, **self.maps)
+    def deal_exp(self, exp):
+        if self.fc_exp is not None:
+            return self.fc_exp(exp)
+        print("FcTask exp:", exp)
+class SimpleTasks(Tasks):
+    def init(self, wait_sec = 0.1):
+        self.condition = threading.Condition()
+        self.tasks = []
+        self.wait_sec = wait_sec
+        self.wait_count=0
+    def waits(self):
+        return len(self.tasks)
+    def add(self, task):
+        with self.condition:
+            self.tasks.append(task)
+            if self.wait_count>0:
+                self.condition.notify(1)
+    def pop(self):
+        with self.condition:
+            if len(self.tasks)==0:
+                self.wait_count+=1
+                self.condition.wait(self.wait_sec)
+                self.wait_count-=1
+            if len(self.tasks)==0:
+                return None
+            return self.tasks.pop(0)
+class RangeManager(WorkerManager):
+    def init(self, vmin=0, vmax=-1):
+        self.min = vmin
+        self.max = vmax
+    def change(self, workers, tasks, first_call):
+        waits = tasks.waits()
+        curr = len(workers)
+        if curr<self.min:
+            return self.min-curr
+        if self.max>0 and curr>self.max:
+            return self.max-curr
+        frees = len([wk for wk in workers if wk.wait_count>1])
+        needs = waits-frees
+        rst = curr+needs
+        if needs==0:
+            return 0
+        if needs>0:
+            if self.max>0 and rst>self.max:
+                needs = self.max-curr
+            return needs
+        else:
+            if rst<self.min:
+                needs = self.min-curr
+            return needs
+
+pass            

buildz-0.7.7/buildz/threads/pool.py

@@ -0,0 +1,124 @@
+
+import threading,time
+from .. import Base
+class Task(Base):
+    def run(self):
+        pass
+    def deal_exp(self, exp):
+        pass
+class BasePool(Base):
+    def check_run(self):
+        return False
+    def get_task(self):
+        return None
+class Worker(Base):
+    def id(self):
+        return threading.get_ident()
+    def init(self, pool):
+        self.pool = pool
+        self.running = False
+        self.do_run = False
+        self.wait_time=0
+        self.wait_count = 0
+        self.work_time=0
+        self.th = None
+    def start(self):
+        self.th = threading.Thread(target=self.run,daemon=True)
+        self.th.start()
+    def safe_stop(self):
+        self.do_run=False
+    def work_rate(self):
+        return self.work_time/(self.work_time+self.wait_time+1e-4)
+    def run(self):
+        self.wait_time=0
+        self.work_time=0
+        self.wait_count=0
+        self.running = True
+        self.do_run = True
+        while self.do_run and self.pool.check_run():
+            start = time.time()
+            task = self.pool.get_task()
+            task_start = time.time()
+            if task is None:
+                self.wait_time+=task_start-start
+                self.wait_count+=1
+                continue
+            self.wait_count=0
+            try:
+                task.run()
+            except Exception as exp:
+                try:
+                    task.deal_exp(exp)
+                except Exception as _exp:
+                    print(f"deal_exp on {exp} get except: {_exp}")
+            finish = time.time()
+            self.wait_time+=task_start-start
+            self.work_time+=finish-task_start
+        self.running = False
+
+pass
+class Tasks(Base):
+    def waits(self):
+        return 0
+    def add(self, task):
+        pass
+    def pop(self):
+        return None
+class WorkerManager(Base):
+    def change(self, workers, tasks, first_call=False):
+        return 0
+
+pass
+class Pool(BasePool):
+    def check_run(self):
+        return self.running
+    def get_task(self):
+        return self.tasks.pop()
+    def init(self, tasks, manager):
+        self.running = False
+        self.workers = []
+        self.stops = []
+        self.manager = manager
+        self.tasks = tasks
+    def start(self):
+        if self.running:
+            return
+        self.running = True
+        for wk in self.workers:
+            wk.safe_stop()
+            self.stops.append(wk)
+        self.workers = []
+        self.clean_stops()
+        self.change_workers(True)
+    def change_workers(self, first=False):
+        num = self.manager.change(self.workers, self.tasks, first)
+        if num==0:
+            return
+        if num>0:
+            for i in range(num):
+                worker = Worker(self)
+                worker.start()
+                self.workers.append(worker)
+        else:
+            for i in range(-num):
+                worker = self.workers.pop()
+                worker.safe_stop()
+                self.stops.append(worker)
+    def clean_stops(self):
+        self.stops = [wk for wk in self.stops if wk.running]
+    def check_finish(self):
+        for k in self.workers:
+            if k.running:
+                return False
+        for k in self.stops:
+            if k.running:
+                return False
+        return True
+    def stop(self):
+        self.running = False
+    def add_task(self, task):
+        self.tasks.add(task)
+        if self.running:
+            self.change_workers()
+
+pass

{buildz-0.7.5 → buildz-0.7.7}/buildz/xf/cpp/pcxf.pyx

@@ -54,6 +54,13 @@ cdef object fCreate(int type, void* dt, int ival)noexcept:
         return Args(list(),dict())
     return None
 pass
+def fetchArgs(val):
+    if type(val)==Args:
+        if val.size()==len(val.lists):
+            val = val.lists
+        elif val.size()==len(val.dicts):
+            val = val.dicts
+    return val
 cdef void fListAdd(object lst, object data)noexcept:
     #print("fListAdd:", lst, data)
     lst.append(data)
@@ -61,6 +68,7 @@ cdef void fListAddx(object lst, object data)noexcept:
     #print("fListAdd:", lst, data)
     if type(lst)==Args:
         lst = lst.args
+    data = fetchArgs(data)
     lst.append(data)
 cdef void fMapSet(object map, object key, object val)noexcept:
     #print("fMapSet:", map, key, val)
@@ -71,6 +79,8 @@ cdef void fMapSetx(object map, object key, object val)noexcept:
     #print("fMapSet:", map, key, val)
     if type(map)==Args:
         map = map.maps
+    key = fetchArgs(key)
+    val = fetchArgs(val)
     if type(key)==list:
         key = tuple(key)
     map[key]=val

{buildz-0.7.5 → buildz-0.7.7/buildz.egg-info}/PKG-INFO

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

@@ -246,6 +246,9 @@ buildz/netz/test/__main__.py
 buildz/netz/test/test.py
 buildz/netz/test/test_cli.py
 buildz/netz/test/test_gw.py
+buildz/threads/__init__.py
+buildz/threads/impl.py
+buildz/threads/pool.py
 buildz/tz/__init__.py
 buildz/tz/code.py
 buildz/tz/myers_diff.py

{buildz-0.7.5 → buildz-0.7.7}/setup.py

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