buildz 0.7.8__tar.gz → 0.8.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.7.8
+Version: 0.8.0
 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.8.0/buildz/db/__main__.py

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

buildz-0.8.0/buildz/db/sc.py

@@ -0,0 +1,44 @@
+#coding=utf-8
+from . import runz
+from .. import Base, xf
+
+
+from ..sc.lst import FcFpsListener
+from buildz.db import runz
+class DbRunner(Base):
+    def init(self, conf_fp, listener):
+        self.fp = conf_fp
+        self.lstn = listener
+        self.lstn.set_update(self.update)
+        self.lstn.set_deal_exp(self.deal_exp)
+        self.reset()
+    def reset(self, last_update=False):
+        self.lstn.clean()
+        self.lstn.add(self.fp,last_update)
+        conf = xf.loadf(self.fp)
+        src = xf.g(conf, src=None)
+        self.lstn.add(src,last_update)
+        sec = xf.g(conf, sec=0.1)
+        self.lstn.set_wait(sec)
+    def update(self, fps):
+        self.reset(True)
+        runz.test(self.fp)
+    def deal_exp(self, exp, fmt_exc):
+        print(f"exp: {exp}")
+        print(f"traceback: \n{fmt_exc}")
+
+pass
+#runz.main()
+def run():
+    import sys
+    fp = runz.FP
+    if len(sys.argv)>1:
+        fp = sys.argv[1]
+    lst = FcFpsListener()
+    runner = DbRunner(fp, lst)
+    lst.run()
+
+pass
+
+
+

{buildz-0.7.8 → buildz-0.8.0}/buildz/pathz.py

@@ -32,6 +32,7 @@ class Path(Base):
         return os.path.join(*a)
     @staticmethod
     def rjoin(path, *a):
+        a = [k.strip() for k in a if k.strip()!=""]
         if path is None:
             return os.path.join(*a)
         return os.path.join(path, *a)
@@ -39,7 +40,7 @@ class Path(Base):
     def rfp(paths, *a, last=-1, check_abs=False):
         if check_abs and len(a)>0:
             f = a[0]
-            if f[0]=="/" or f.find(":")>0:
+            if f[:1]=="/" or f.find(":")>0:
                 return Path.join(*a)
         #print(f"[TESTZ] a: {a}, paths: {paths}")
         #fp = os.path.join(*a)

buildz-0.8.0/buildz/sc/__main__.py

@@ -0,0 +1,3 @@
+from . import subrun
+from .. import pyz
+pyz.lc(locals(), subrun.test)

buildz-0.8.0/buildz/sc/lst.py

@@ -0,0 +1,68 @@
+
+from buildz import Base
+import os,time, traceback
+class FpsListener(Base):
+    def init(self, wait_sec=0.1):
+        self.fps = {}
+        self.wait_sec = wait_sec
+        self.running=False
+    def set_wait(self, wait):
+        self.wait_sec = wait
+    def update(self, fps):
+        pass
+    def deal_exp(self, exp, format_exc):
+        pass
+    def add(self, fp, last_update=False):
+        if type(last_update)==bool:
+            if last_update:
+                last_update = os.path.getmtime(fp)
+            else:
+                last_update = 0
+        self.fps[fp] = last_update
+    def clean(self):
+        self.fps = {}
+    def reset(self, fps, last_update=False):
+        self.clean()
+        for fp in fps:
+            self.add(fp, last_update)
+    def run(self):
+        self.running = True
+        while self.running:
+            self.work()
+            time.sleep(self.wait_sec)
+    def work(self):
+        upds = []
+        for fp,sec in self.fps.items():
+            curr = os.path.getmtime(fp)
+            if curr!=sec:
+                upds.append(fp)
+            self.fps[fp]=curr
+        if len(upds)==0:
+            return
+        try:
+            self.update(upds)
+        except Exception as exp:
+            trs = traceback.format_exc()
+            try:
+                self.deal_exp(exp, trs)
+            except Exception as exp1:
+                print(f"exp in deal_exp({exp}): {exp1}")
+                traceback.print_exc()
+
+pass
+
+class FcFpsListener(FpsListener):
+    def init(self,wait_sec=0.1):
+        super().init(wait_sec)
+        self.fc_update = None
+        self.fc_exp = None
+    def set_update(self, fc):
+        self.fc_update = fc
+    def set_deal_exp(self, fc):
+        self.fc_exp = fc
+    def update(self, fps):
+        return self.fc_update(fps)
+    def deal_exp(self, exp, fmt_exc):
+        return self.fc_exp(exp, fmt_exc)
+
+pass

buildz-0.8.0/buildz/sc/oldversion/run.py

@@ -0,0 +1,114 @@
+#
+
+from .lst import FcFpsListener
+from .. import Base, xf, dz, pathz, pyz
+import os, sys
+from multiprocessing import Process
+class TestFc:
+    def __init__(self, fc):
+        self.fc = fc
+    def __call__(self, *a, **b):
+        print(f"[TESTZ] call: {self.fc}(*{a}, **{b})")
+        self.fc(*a,**b)
+class Test:
+    def __init__(self, file):
+        self.file = file
+    # def write(self):
+    #     pass
+    def __getattr__(self, key):
+        fc = getattr(self.file, key)
+        print(f"[TESTZ] get: {key} = {fc}")
+        if not callable:
+            return fc
+        #return getattr(self.file, key)
+        return TestFc(fc)
+class Runner(Base):
+    def init(self, fp, lst):
+        fp = os.path.abspath(fp)
+        self.dp = os.path.dirname(fp)
+        self.path = pathz.Path(fp=self.dp)
+        self.fp = fp
+        self.lst = lst
+        self.lst.set_update(self.update)
+        self.lst.set_deal_exp(self.deal_exp)
+        self.process = None
+        self.reset()
+    def reset(self,last_update=False):
+        conf = xf.loadf(self.fp)
+        fps, target, dp = dz.g(conf, fps = [], run=None, dp="")
+        dp = self.path.fp(dp)
+        sys.path.append(dp)
+        self.path.set("sc", dp)
+        fps = [self.path.sc(fp) for fp in fps]
+        self.lst.clean()
+        self.lst.add(self.fp, last_update)
+        [self.lst.add(fp, last_update) for fp in fps]
+        self.target=target
+        self.conf = conf
+    @staticmethod
+    def process_update(conf):
+        target, sc_path, args, stdin, stdout, stderr = dz.g(conf, run=None,sc_path=__file__, args=[], stdin = "std", stdout = "std", stderr="std")
+        encoding = dz.g(conf, encoding="utf-8")
+        import sys, os
+        args = [sc_path]+args
+        sys.argv = args
+        stds = [stdin, stdout, stderr]
+        stds = [list(k) if type(k) in (list, tuple) else [k] for k in stds]
+        modes = "rww"
+        for std, mode in zip(stds, modes):
+            if len(std)<3:
+                std.append(mode)
+        objs = []
+        files = {}
+        for std in stds:
+            do_close = False
+            if std[0]=='std':
+                obj = sys.stdin if std[-1]=='r' else sys.stdout
+            elif std[0]=='str':
+                obj = io.StringIO(std[1])
+            else:
+                if std[1] not in files:
+                    files[std[1]] = open(std[1], std[-1], encoding=encoding)
+                obj = files[std[1]]
+            objs.append(obj)
+        #bak = [sys.stdin, sys.stdout, sys.stderr]
+        sys.stdin = objs[0]
+        sys.stdout = objs[1]
+        sys.stderr = objs[2]#Test(objs[2])#objs[2]
+        #print(f"stdin: {sys.stdin}, stdout: {sys.stdout}, stderr: {sys.stderr}")
+        #print(f"files: {files}")
+        try:
+            #print(f"start process: {os.getpid()}")
+            fc = pyz.load(target)
+            if callable(fc):
+                fc()
+        except Exception as exp:
+            #print(f"exp:", exp)
+            #print(f"exp in process: {os.getpid()}")
+            raise exp
+        finally:
+            #print(f"done process: {os.getpid()}, {objs[2].closed}")
+            for fp, f in files.items():
+                f.flush()
+            #sys.stdout = bak[1]
+    def update(self, fps):
+        if self.process is not None:
+            if self.process.is_alive():
+                self.process.kill()
+            self.process = None
+        self.reset(True)
+        p = Process(target = self.process_update,args=[self.conf], daemon=True)
+        p.start()
+        self.process = p
+    def deal_exp(self, exp, fmt_exc):
+        print(f"exp: {exp}")
+        print(f"traceback: \n{fmt_exc}")
+
+def test():
+    fp = sys.argv[1]
+    lst = FcFpsListener()
+    runner = Runner(fp, lst)
+    lst.run()
+
+pass
+pyz.lc(locals(), test)

buildz-0.8.0/buildz/sc/oldversion/thrun.py

@@ -0,0 +1,42 @@
+#
+
+from .lst import FcFpsListener
+from .. import Base, xf, dz, pathz, pyz
+import os, sys
+class Runner(Base):
+    def init(self, fp, lst):
+        fp = os.path.abspath(fp)
+        self.dp = os.path.dirname(fp)
+        self.path = pathz.Path(fp=self.dp)
+        self.fp = fp
+        self.lst = lst
+        self.lst.set_update(self.update)
+        self.lst.set_deal_exp(self.deal_exp)
+        self.reset()
+    def reset(self,last_update=False):
+        conf = xf.loadf(self.fp)
+        fps, target, dp = dz.g(conf, fps = [], run=None, dp="")
+        dp = self.path.fp(dp)
+        sys.path.append(dp)
+        self.path.set("sc", dp)
+        fps = [self.path.sc(fp) for fp in fps]
+        self.lst.clean()
+        self.lst.add(self.fp, last_update)
+        [self.lst.add(fp, last_update) for fp in fps]
+        self.target=target
+    def update(self, fps):
+        self.reset(True)
+        fc = pyz.load(self.target)
+        fc()
+    def deal_exp(self, exp, fmt_exc):
+        print(f"exp: {exp}")
+        print(f"traceback: \n{fmt_exc}")
+
+def test():
+    fp = sys.argv[1]
+    lst = FcFpsListener()
+    runner = Runner(fp, lst)
+    lst.run()
+
+pass
+pyz.lc(locals(), test)

buildz-0.8.0/buildz/sc/subchild.py

@@ -0,0 +1,13 @@
+#
+
+from . import subrun
+from .. import xf, pyz
+def test():
+    import sys
+    fp = sys.argv[1]
+    conf = xf.loadf(fp)
+    subrun.Runner.process_update(conf)
+
+pass
+
+pyz.lc(locals(), test)

buildz-0.8.0/buildz/sc/subrun.py

@@ -0,0 +1,106 @@
+#
+
+from .lst import FcFpsListener
+from .. import Base, xf, dz, pathz, pyz
+import os, sys
+from multiprocessing import Process
+import subprocess
+class Runner(Base):
+    def init(self, fp, lst):
+        fp = os.path.abspath(fp)
+        self.dp = os.path.dirname(fp)
+        self.path = pathz.Path(fp=self.dp)
+        self.fp = fp
+        self.lst = lst
+        self.lst.set_update(self.update)
+        self.lst.set_deal_exp(self.deal_exp)
+        self.process = None
+        self.exist_psutil = True
+        self.reset()
+    def reset(self,last_update=False):
+        conf = xf.loadf(self.fp)
+        fps, target, dp = dz.g(conf, fps = [], run=None, dp="")
+        dp = self.path.fp(dp)
+        sys.path.append(dp)
+        self.path.set("sc", dp)
+        fps = [self.path.sc(fp) for fp in fps]
+        self.lst.clean()
+        self.lst.add(self.fp, last_update)
+        [self.lst.add(fp, last_update) for fp in fps]
+        self.target=target
+        self.conf = conf
+    @staticmethod
+    def process_update(conf):
+        target, sc_path, args, stdin, stdout, stderr = dz.g(conf, run=None,sc_path=__file__, args=[], stdin = "std", stdout = "std", stderr="std")
+        encoding = dz.g(conf, encoding="utf-8")
+        import sys, os
+        args = [sc_path]+args
+        sys.argv = args
+        stds = [stdin, stdout, stderr]
+        stds = [list(k) if type(k) in (list, tuple) else [k] for k in stds]
+        modes = "rww"
+        for std, mode in zip(stds, modes):
+            if len(std)<3:
+                std.append(mode)
+        objs = []
+        files = {}
+        for std in stds:
+            do_close = False
+            if std[0]=='std':
+                obj = sys.stdin if std[-1]=='r' else sys.stdout
+            elif std[0]=='str':
+                obj = io.StringIO(std[1])
+            else:
+                if std[1] not in files:
+                    files[std[1]] = open(std[1], std[-1], encoding=encoding)
+                obj = files[std[1]]
+            objs.append(obj)
+        sys.stdin = objs[0]
+        sys.stdout = objs[1]
+        sys.stderr = objs[2]
+        try:
+            fc = pyz.load(target)
+            if callable(fc):
+                fc()
+        except Exception as exp:
+            raise exp
+        finally:
+            for fp, f in files.items():
+                f.flush()
+    def kill_chs(self, pid):
+        if not self.exist_psutil:
+            return
+        try:
+            import psutil
+        except ModuleNotFoundError as exp:
+            self.exist_psutil = False
+            print(f"[WARN] psutil not installed, children process of subprocess will not being killed")
+            print(f"[WARN] if children processes exists and need to be killed, do 'pip install psutil' by yourself and restart")
+            print(f"[警告] 没有装psutil，本代码无法删除目标进程的子进程，如果需要本代码删除子进程，需要装psutil然后重启: pip install psutil")
+            return
+        parent_process = psutil.Process(pid)
+        children = parent_process.children(recursive=True)
+        for child in children:
+            child.kill()
+    def update(self, fps):
+        if self.process is not None:
+            self.kill_chs(self.process.pid)
+            self.process.kill()
+            self.process = None
+        self.reset(True)
+        p = subprocess.Popen(f"python -m buildz.sc.subchild {self.fp}")
+        #p = Process(target = self.process_update,args=[self.conf], daemon=True)
+        #p.start()
+        self.process = p
+    def deal_exp(self, exp, fmt_exc):
+        print(f"exp: {exp}")
+        print(f"traceback: \n{fmt_exc}")
+
+def test():
+    fp = sys.argv[1]
+    lst = FcFpsListener()
+    runner = Runner(fp, lst)
+    lst.run()
+
+pass
+pyz.lc(locals(), test)

buildz-0.8.0/buildz/sc/test/inc.py

@@ -0,0 +1,3 @@
+#
+def fc():
+    print("includexxx", __name__)

buildz-0.8.0/buildz/sc/test/x.js

@@ -0,0 +1,9 @@
+
+
+dp: ''
+fps: [x.py, inc.py]
+run: x.test
+args: []
+stdin: std // std, [file, ...], [str, ....]
+stdout: std//[file, out.txt] // std, [file, ...]
+stderr: std//[file, out.txt]

buildz-0.8.0/buildz/sc/test/x.py

@@ -0,0 +1,27 @@
+
+import inc, time, os
+from multiprocessing import Process
+import subprocess
+print('test x')
+def fc():
+    while True:
+        print(f"subprocess: {os.getpid()} running")
+        time.sleep(1.0)
+def test():
+    try:
+        inc.fc()
+        print("xxxtestxxxxxxxx", __name__)
+        return
+        subprocess.run("python inc.py")
+        print("done subprocess")
+        p = Process(target=fc, daemon=True)
+        print("process")
+        p.start()
+        print("process start")
+        while True:
+            print(f"process {os.getpid()} running")
+            time.sleep(0.5)
+            #p.kill()
+    finally:
+        pass
+pass

{buildz-0.7.8 → buildz-0.8.0}/buildz/threads/pool.py

@@ -23,6 +23,7 @@ class Worker(Base):
         self.work_time=0
         self.th = None
     def start(self):
+        assert self.th is None
         self.th = threading.Thread(target=self.run,daemon=True)
         self.th.start()
     def safe_stop(self):
@@ -56,6 +57,7 @@ class Worker(Base):
             self.wait_time+=task_start-start
             self.work_time+=finish-task_start
         self.running = False
+        self.th = None
 
 pass
 class Tasks(Base):

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

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

@@ -66,6 +66,7 @@ buildz/db/__main__.py
 buildz/db/install.txt
 buildz/db/run.conf
 buildz/db/runz.py
+buildz/db/sc.py
 buildz/db/tls.py
 buildz/db/dv/__init__.py
 buildz/db/dv/basez.py
@@ -246,6 +247,15 @@ buildz/netz/test/__main__.py
 buildz/netz/test/test.py
 buildz/netz/test/test_cli.py
 buildz/netz/test/test_gw.py
+buildz/sc/__main__.py
+buildz/sc/lst.py
+buildz/sc/subchild.py
+buildz/sc/subrun.py
+buildz/sc/oldversion/run.py
+buildz/sc/oldversion/thrun.py
+buildz/sc/test/inc.py
+buildz/sc/test/x.js
+buildz/sc/test/x.py
 buildz/threads/__init__.py
 buildz/threads/impl.py
 buildz/threads/pool.py

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

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

buildz-0.7.8/buildz/db/__main__.py

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