buildz 0.8.0__tar.gz → 0.8.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.0
+Version: 0.8.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

{buildz-0.8.0 → buildz-0.8.2}/buildz/base.py

@@ -1,6 +1,14 @@
 #coding=utf-8
 from . import pyz
-def fcBase(cls, lst=0, keys = tuple()):
+def fc_s2l(s):
+    if type(s)!=str:
+        return s
+    arr = s.split(",")
+    arr = [k.strip() for k in arr]
+    return arr
+def fcBase(cls, lst=0, keys = tuple(), fcs = tuple()):
+    keys = fc_s2l(keys)
+    fcs = fc_s2l(fcs)
     class _Base(cls):
         def str(self):
             return str(self.__class__)
@@ -10,10 +18,10 @@ def fcBase(cls, lst=0, keys = tuple()):
             return self.str()
         def __repr__(self):
             return self.repr()
-        def __call__(self, *a, **b):
-            return self.call(*a, **b)
-        def call(self, *a, **b):
-            return None
+        # def __call__(self, *a, **b):
+        #     return self.call(*a, **b)
+        # def call(self, *a, **b):
+        #     return None
         def init(self, *a, **b):
             pass
         def __init__(self, *a, **b):
@@ -26,6 +34,11 @@ def fcBase(cls, lst=0, keys = tuple()):
                     del b[k]
             super().__init__(*sa, **sb)
             self.init(*a, **b)
+    for fc in fcs:
+        base_fc = "__"+fc+"__"
+        def _base_fc(obj, *a, **b):
+            return getattr(obj, fc)(*a, **b)
+        setattr(_Base, base_fc, _base_fc)
     return _Base
 
 class Base:

{buildz-0.8.0 → buildz-0.8.2}/buildz/db/dv/orm.py

@@ -193,13 +193,13 @@ class TableObject(Base):
             dv = self.dv
         assert dv is not None
         return dv
-    def query(self, sql, dv=None, sql2py=True):
+    def query(self, sql, dv=None, sql2py=False):
         dv=self.rdv(dv)
         rst = dv.query(sql, as_map=1)
         if sql2py:
             rst = [self.sql2py(it) for it in rst]
         return rst
-    def query_all(self, dv=None, sql2py=True):
+    def query_all(self, dv=None, sql2py=False):
         sql = f"select * from {self.table};"
         return self.query(sql, dv, sql2py)
     def execute(self, sql, dv=None):

buildz-0.8.2/buildz/db/install.txt

@@ -0,0 +1,6 @@
+do pip install if needed
+pip install:
+pymysql (to use mysql)
+cx-Oracle(and download oracle???.dll from oracle website and copy to ./dv/lib)(to use oracle)
+clickhouse-driver(to use clickhouse)
+psycopg (or psycopg2, no test)(to use postgresql)

buildz-0.8.2/buildz/db/run.conf

@@ -0,0 +1,20 @@
+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
+
+# run by:
+#   python -m buildz.db.sc run.conf
+
+# sqlite3:
+# dv: sqlite3
+# db: filepath
+# src: ...
+# out: ...
+# sec: 0.5

{buildz-0.8.0 → buildz-0.8.2}/buildz/db/sc.py

@@ -1,10 +1,19 @@
 #coding=utf-8
 from . import runz
-from .. import Base, xf
+from .. import Base, xf, pyz
 
 
+from ..sc.subrun import Runner
 from ..sc.lst import FcFpsListener
 from buildz.db import runz
+from buildz import dz
+class ScRunner(Runner):
+    def loadf(self, fp):
+        conf = xf.loadf(fp)
+        dz.s(conf, fps=[dz.g(conf, src=None)])
+        return conf
+    def process_command(self):
+        return f"python -m buildz.db.subsc {self.fp}"
 class DbRunner(Base):
     def init(self, conf_fp, listener):
         self.fp = conf_fp
@@ -39,6 +48,14 @@ def run():
     lst.run()
 
 pass
+def test():
+    import sys
+    fp = runz.FP
+    if len(sys.argv)>1:
+        fp = sys.argv[1]
+    lst = FcFpsListener()
+    runner = ScRunner(fp, lst)
+    lst.run()
 
-
+pyz.lc(locals(), test)
 

buildz-0.8.2/buildz/db/subrun.py

@@ -0,0 +1,10 @@
+
+from . import runz
+
+from .sc import ScRunner
+def test():
+    argv = ScRunner.process_argv()
+    fp = runz.FP
+    if len(argv)>1:
+        fp = argv[1]
+    runz.test(fp)

buildz-0.8.2/buildz/db/subsc.py

@@ -0,0 +1,13 @@
+
+from .. import xf, pyz, dz
+from .sc import ScRunner
+def test():
+    import sys
+    fp = sys.argv[1]
+    conf = xf.loadf(fp)
+    dz.s(conf, run="buildz.db.subrun.test")
+    ScRunner.process_update(conf)
+
+pass
+
+pyz.lc(locals(), test)

{buildz-0.8.0 → buildz-0.8.2}/buildz/sc/subrun.py

@@ -6,6 +6,12 @@ import os, sys
 from multiprocessing import Process
 import subprocess
 class Runner(Base):
+    """
+        监听目标文件的修改来运行目标代码，本代码通过子进程来运行目标代码，每次目标文件修改后，都会新建子进程运行目标代码，通过子进程运行目标代码主要考虑两点：
+            1，目标文件可能就是包含目标代码的文件，或者是目标代码import的文件，当前进程已经import的模块是不会随着模块文件的修改而改变的，新建子进程来运行则不会有该问题
+            2，python的线程无法被kill，在更新目标文件后，运行目标代码的线程如果没结束，要等其结束才能重新运行，子进程则可以被kill，监听到目标文件修改后，可以直接把子进程kill后重新创建子进程来运行目标代码
+    """
+    argv = []
     def init(self, fp, lst):
         fp = os.path.abspath(fp)
         self.dp = os.path.dirname(fp)
@@ -17,8 +23,10 @@ class Runner(Base):
         self.process = None
         self.exist_psutil = True
         self.reset()
+    def loadf(self, fp):
+        return xf.loadf(fp)
     def reset(self,last_update=False):
-        conf = xf.loadf(self.fp)
+        conf = self.loadf(self.fp)
         fps, target, dp = dz.g(conf, fps = [], run=None, dp="")
         dp = self.path.fp(dp)
         sys.path.append(dp)
@@ -30,11 +38,15 @@ class Runner(Base):
         self.target=target
         self.conf = conf
     @staticmethod
+    def process_argv():
+        return Runner.argv
+    @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
+        Runner.argv = sys.argv
         sys.argv = args
         stds = [stdin, stdout, stderr]
         stds = [list(k) if type(k) in (list, tuple) else [k] for k in stds]
@@ -82,13 +94,15 @@ class Runner(Base):
         children = parent_process.children(recursive=True)
         for child in children:
             child.kill()
+    def process_command(self):
+        return f"python -m buildz.sc.subchild {self.fp}"
     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 = subprocess.Popen(self.process_command())
         #p = Process(target = self.process_update,args=[self.conf], daemon=True)
         #p.start()
         self.process = p

{buildz-0.8.0 → buildz-0.8.2}/buildz/tools.py

@@ -2,4 +2,5 @@
 # from buildz.tools import *
 from . import pyz,xf,fz,Base, ioc, logz,xz, pathz, cachez, argz, evalz
 from .tz.time import timecost,showcost
-from .ioc import wrap
+from .ioc import wrap
+from .base import fcBase

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.0
+Version: 0.8.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

{buildz-0.8.0 → buildz-0.8.2}/buildz.egg-info/SOURCES.txt

@@ -67,6 +67,8 @@ buildz/db/install.txt
 buildz/db/run.conf
 buildz/db/runz.py
 buildz/db/sc.py
+buildz/db/subrun.py
+buildz/db/subsc.py
 buildz/db/tls.py
 buildz/db/dv/__init__.py
 buildz/db/dv/basez.py

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

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

buildz-0.8.0/buildz/db/install.txt

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

buildz-0.8.0/buildz/db/run.conf

@@ -1,10 +0,0 @@
-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