buildz 0.7.6__tar.gz → 0.7.8__tar.gz

{buildz-0.7.6/buildz.egg-info → buildz-0.7.8}/PKG-INFO

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

@@ -6,7 +6,7 @@ from ..base import Base
 from ..ioc import wrap
 from .. import logz
 ns = wrap.ns("buildz.cache")
-import os,re
+import os,re,json
 
 
 @ns.obj(id="cache.save")
@@ -70,7 +70,8 @@ class Cache(Base):
             self.save()
     def remove(self, key):
         xf.removes(self.data, key.split(self.spt))
-    def init(self, fps="cache.js", log=None, current_first=False, spt = ".", key_currents = "buildz.cache.path.currents", key_basedir = "buildz.cache.path.basedir", save_index = -1, auto_save = False):
+    def init(self, fps="cache.js", log=None, current_first=False, spt = ".", key_currents = "buildz.cache.path.currents", key_basedir = "buildz.cache.path.basedir", save_index = -1, auto_save = False, load_replace=False, save_json = False):
+        self.save_json = save_json
         if type(fps) not in (tuple, list):
             fps = [fps]
         self.fps = fps
@@ -80,6 +81,7 @@ class Cache(Base):
         self.key_currents = key_currents
         self.key_basedir = key_basedir
         self.save_index = save_index
+        self.load_replace = load_replace
         self.data = {}
         self.auto_save = auto_save
     def set_currents(self, dp):
@@ -127,13 +129,18 @@ class Cache(Base):
         if basedir is not None:
             fp = os.path.join(basedir, fp)
         return fp
-    def save(self, fp = None):
+    def save(self, fp = None, save_json=None):
         if fp is None:
             fp = self.fps[self.save_index]
         fp = self.rfp(fp)
         fz.makefdir(fp)
-        rst  = self.data
-        rs = xf.dumps(rst, format=True).encode("utf-8")
+        rst = self.data
+        if save_json is None:
+            save_json = self.save_json
+        if save_json:
+            rs = json.dumps(rst, indent=4, ensure_ascii= False).encode("utf-8")
+        else:
+            rs = xf.dumps(rst, format=True).encode("utf-8")
         fz.write(rs, fp, 'wb')
     def load(self, fps = None):
         if fps is None:
@@ -144,7 +151,7 @@ class Cache(Base):
             if os.path.isfile(fp):
                 self.log.info(f"load cache from {fp}")
                 xdata = xf.flush_maps(xf.loadf(fp),visit_list=True)
-                xf.fill(xdata, data, replace=1)
+                xf.fill(xdata, data, replace=self.load_replace)
         xf.fill(data, self.data, replace=0)
 
 pass
@@ -172,6 +179,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.6 → buildz-0.7.8}/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,6 +85,8 @@ 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:
@@ -125,7 +129,10 @@ class SimpleDv(ItDv):
             self.cursor.execute("commit;")
         return tmp
     def iou_sql(self, table, ks, vs, sets, qs):
-        sql = f"insert into {table}({ks}) values({vs}) on duplicate key update {sets}"
+        if len(sq)==0:
+            sql = f"insert into {table}({ks}) values({vs})"
+        else:
+            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):
         if type(update_keys)==str:

{buildz-0.7.6 → buildz-0.7.8}/buildz/db/dv/orm.py

@@ -105,10 +105,8 @@ def make(data, table=None, data_keys = "sql_key,sql_def,py_key".split(","), py_n
 pass
 
 class TableObject(Base):
-    def clone(self, table_name, py_name = None):
-        sql_create = self.sql_create.replace("<table>", table_name)
-        sql_delete = self.sql_delete.replace("<table>", table_name)
-        obj = TableObject(self.keys, table_name, self.src_py2sqls, self.query_keys, self.auto_translate, self.dv, sql_create, sql_delete, py_name)
+    def clone(self):
+        obj = TableObject(self.keys, self.table, self.src_py2sqls, self.query_keys, self.auto_translate, self.dv, self.sql_create, self.sql_delete, self.py_name)
         return obj
     """
         字段映射
@@ -149,9 +147,10 @@ class TableObject(Base):
         self.query_keys = query_keys
         self.dv = dv
         self.py2sql=self.to_sql
-        self.sql2py = self.toPy
+        self.sql2py = self.to_py
         self.sql_create = sql_create
         self.sql_delete = sql_delete
+        self.auto_translate = auto_translate
     def create(self, dv=None):
         assert self.sql_create is not None
         if self.sql_create.find("<table>")>=0:
@@ -180,7 +179,7 @@ class TableObject(Base):
     def to_sql_keys(self, keys):
         obj = [k for k in keys if k in self.py2sqls]
         return obj
-    def toPy(self, obj):
+    def to_py(self, obj):
         if type(obj)!=dict:
             tmp = {}
             for k in self.sql2pys:
@@ -203,6 +202,9 @@ class TableObject(Base):
     def query_all(self, dv=None, sql2py=True):
         sql = f"select * from {self.table};"
         return self.query(sql, dv, sql2py)
+    def execute(self, sql, dv=None):
+        dv=self.rdv(dv)
+        return dv.execute(sql)
     def filter_sql(self, obj):
         if type(obj)!=dict:
             tmp = {}
@@ -212,6 +214,9 @@ class TableObject(Base):
             obj = tmp
         obj = {k:v for k,v in obj.items() if k in self.keys}
         return obj
+    def commit(self, dv=None):
+        dv = self.rdv(dv)
+        dv.execute("commit")
     def save(self, obj, dv=None, py2sql = True, commit=False, check = True, update_keys = None):
         dv = self.rdv(dv)
         if type(update_keys)==str:

{buildz-0.7.6 → buildz-0.7.8}/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
@@ -91,7 +93,10 @@ class Db(SimpleDv):
             rst = [{k:v for k,v in zip(keys, dt)} for dt in rst]
         return rst
     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}"
+        if len(qs)==0:
+            sql = f"insert into {table}({ks}) values({vs})"
+        else:
+            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.6 → buildz-0.7.8}/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.8/buildz/threads/__init__.py

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

buildz-0.7.8/buildz/threads/impl.py

@@ -0,0 +1,65 @@
+#
+
+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, traceback_exp):
+        if self.fc_exp is not None:
+            return self.fc_exp(exp, traceback_exp)
+        print("FcTask exp:", exp)
+        print("traceback:", traceback_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.8/buildz/threads/pool.py

@@ -0,0 +1,125 @@
+
+import threading,time
+from .. import Base
+class Task(Base):
+    def run(self):
+        pass
+    def deal_exp(self, exp, traceback_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:
+                import traceback
+                try:
+                    task.deal_exp(exp, traceback.format_exc())
+                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.8/buildz/threads/test.py

@@ -0,0 +1,22 @@
+
+from buildz.threads import *
+import time
+tasks = SimpleTasks()
+manager = RangeManager(1,3)
+pool = Pool(tasks, manager)
+print(pool)
+import threading,time
+def test(sec):
+    _id = threading.get_ident()
+    print(f"thread {_id} [start]")
+    time.sleep(sec)
+    print(f"thread {_id} stop")
+
+pass
+pool.add_task(FcTask(test, [0.5]))
+pool.start()
+for i in range(10):
+    pool.add_task(FcTask(test, [0.5]))
+
+
+time.sleep(2.0)

{buildz-0.7.6 → buildz-0.7.8}/buildz/xf/cpp/loaderz/deal/dict.cpp

@@ -1,6 +1,7 @@
 
 #include"dict.h"
 #include"../mg.h"
+#include<iostream>
 Item* DictDeal::build(Item* obj, Manager& mg) {
     ItemList& list = *(ItemList*)obj->val;
     int size = list.size();
@@ -16,6 +17,9 @@ Item* DictDeal::build_arr(ItemList& arr, Int2& arr_pos, Manager& mg){
     if (size%3!=0){
         std::stringstream errs;
         errs<<"u f in map: "<<arr.size();
+        // for(int i=0;i<size;i++){
+        //     std::cout<<"index:"<<i<<":"<<arr[i]->str()<<std::endl;
+        // }
         throw Exp(errs.str(), arr_pos);
     }
     void* rst = mg.callback->create(TYPE_DICT, NULL, (size/3));

{buildz-0.7.6 → buildz-0.7.8}/buildz/xf/cpp/loaderz/deal/str.cpp

@@ -17,16 +17,16 @@ bool StrDeal::deal(BufferBase& buffer, ItemList& rst, Manager& mg){
     buffer.pos(rm_pos);
     buffer.clean2read(ll);
     //ItemList* arr = new ItemList();
-    ItemList arr, mg_arr;
-    arr.reserve(16);
-    mg_arr.reserve(16);
+    // ItemList arr, mg_arr;
+    // arr.reserve(16);
+    // mg_arr.reserve(16);
     if (rm_size>0){
         if (!note){
             std::stringstream errs;
             errs<<"unexcept char before string: "<<rm;
             throw Exp(errs.str(), rm_pos);
         } else {
-            arr.push_back(new Item(rm, rm_pos, BUILD_TYPE_STR, false));
+            rst.push_back(new Item(rm, rm_pos, BUILD_TYPE_STR, false));
         }
     }
     bool do_judge = true;
@@ -77,9 +77,9 @@ bool StrDeal::deal(BufferBase& buffer, ItemList& rst, Manager& mg){
     buffer.clean();
     int build_type = TYPE_STR;
     if (translate&&mark_l2) {
-	char* tdata = do_translate(data);
-	delete data;
-	data=tdata;
+        char* tdata = do_translate(data);
+        delete data;
+        data=tdata;
         //build_type = TYPE_STR_TRANSLATE;
     }
     void* real_obj = mg.callback->create(build_type, data);

{buildz-0.7.6 → buildz-0.7.8}/buildz/xf/cpp/pcxf.pyx

@@ -105,7 +105,7 @@ def loads(s,coding="utf-8"):
     return rst
 
 pass
-def loadx(s,coding="utf-8"):
+def loadx(s,coding="utf-8", out_args=False):
     """
         和python版loadx区别：
             cpp版没有dict和list，全是Args
@@ -123,6 +123,11 @@ def loadx(s,coding="utf-8"):
     #     rst = rst[0]
     if type(rst)==Args and rst.size()==1 and len(rst.args)==1:
         rst = rst.args[0]
+    if type(rst)==Args and not out_args:
+        if rst.size()==len(rst.args):
+            rst = rst.args
+        elif rst.size()==len(rst.maps):
+            rst = rst.maps
     return rst
 
 pass

{buildz-0.7.6 → buildz-0.7.8/buildz.egg-info}/PKG-INFO

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

@@ -246,6 +246,10 @@ 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/threads/test.py
 buildz/tz/__init__.py
 buildz/tz/code.py
 buildz/tz/myers_diff.py

{buildz-0.7.6 → buildz-0.7.8}/setup.py

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