remote-run-everything 2.0.8__py3-none-any.whl → 2.0.9__py3-none-any.whl

remote_run_everything/__init__.py

@@ -1,5 +1,6 @@
 from remote_run_everything.deploy.by_http import ByHttp
 from remote_run_everything.deploy.by_sftp import BySftp
+from remote_run_everything.deploy.process_manage import ProcessManage
 
 from remote_run_everything.db.crude_duck import CrudeDuck
 from remote_run_everything.db.crud_sqlalchemy import Crud

remote_run_everything/deploy/process_manage.py

@@ -0,0 +1,46 @@
+import os, signal
+import subprocess, sys
+class ProcessManage:
+    def is_process_running(self,pid):
+        import psutil
+        try:
+            process = psutil.Process(pid)
+            # Check if process is still running
+            return process.is_running()
+        except psutil.NoSuchProcess:
+            return False
+        except psutil.AccessDenied:
+            # Process exists but we don't have permission to access it
+            print(f"Access denied to process {pid}")
+            return True
+    def read_pid_file(self,pidfile):
+        if os.path.exists(pidfile):
+            with open(pidfile, "rb") as f:
+                pid = f.read().decode()
+                return pid
+        return None
+
+    # 只需要在程序中引入这个函数,启动后会把 os.getpid()存入,然后有了pid,结合psutil,什么都有了
+    def write_pid_file(self,pidfile,pid):
+        with open(pidfile, "wb") as f:
+            s = str(pid).encode()
+            f.write(s)
+
+    def kill_by_pid(self,pid):
+        try:
+            os.kill(int(pid), signal.SIGTERM)
+        except Exception as e:
+            print("kill err==", e)
+
+    def popen_with_pid(self, workdir,  app):
+        os.chdir(workdir)
+        process = subprocess.Popen(app, creationflags=subprocess.CREATE_NEW_CONSOLE)
+        pid= process.pid
+        print("new pid====",pid)
+        return pid
+        # sys.exit()
+
+    def restart_windows(self):
+        os.system("shutdown -t 0 -r -f")
+
+

remote_run_everything/tools/common.py

@@ -1,11 +1,7 @@
-import jinja2, requests, os
-import pandas as pd
 import socket, os, tomllib
-import base64
-import os, signal
-import subprocess, sys
 from remote_run_everything.tools.common1 import Common1
-
+import pandas as pd
+import jinja2, os,base64,struct, glob, arrow, uuid, hashlib
 
 class Common(Common1):
     @property
@@ -25,31 +21,102 @@ class Common(Common1):
             data = tomllib.load(f)
         return data
 
-    def kill_by_pidfile(self, pidfile):
-        if os.path.exists(pidfile):
-            with open(pidfile, "rb") as f:
-                pid = f.read().decode()
-            print("exist pid===", pid)
-        try:
-            os.kill(int(pid), signal.SIGTERM)
-        except Exception as e:
-            print("kill err==", e)
-
-    def start_with_pidfile(self, workdir, pidfile, app):
-        os.chdir(workdir)
-        process = subprocess.Popen(app, creationflags=subprocess.CREATE_NEW_CONSOLE)
-        print("new pid====", process.pid)
-        with open(pidfile, "wb") as f:
-            s = str(process.pid).encode()
-            f.write(s)
-        sys.exit()
-
-    def supervise(self, pidfile, app, workdir=None):
-        if workdir is None:
-            workdir = os.path.dirname(pidfile)
-        self.kill_by_pidfile(pidfile)
-        self.start_with_pidfile(workdir, pidfile, app)
+    def table_search(self, data, search):
+        res = []
+        for i in data:
+            if search == "":
+                res.append(i)
+            elif search != "" and search in str(i):
+                res.append(i)
+        return res
+
+    def split_page(self, numPerPage, cur, search, data):
+        data = self.table_search(data, search)
+        if data is None or len(data) == 0:
+            return {"total": 0, "data": []}
+        cur = int(cur)
+        res = {"total": len(data)}
+        n = int(numPerPage)
+        total = len(data)
+        start = (cur - 1) * n
+        end = cur * n
+        if start > total - 1:
+            res['data'] = []
+        elif end > total - 1:
+            remainder = total % numPerPage
+            if remainder == 0:
+                res['data'] = data[-numPerPage:]
+            else:
+                res['data'] = data[-remainder:]
+        else:
+            res['data'] = data[start:end]
+        return res
+
+    def render(self, dir, html, data):
+        env = jinja2.Environment(loader=jinja2.FileSystemLoader(f'{dir}/templates'))
+        template = env.get_template(html)
+        outputText = template.render(data=data)  # this is where to put args
+        return outputText
+
+    def inven_everyday(self, df, begin, end):
+        df1 = df.groupby(by=['id', 'date']).sum()
+        # 可以把复合index重新拆分成columns
+        trades = df1.reset_index()
+        trades['id'] = trades['id']
+        trades['date'] = trades['date']
+        # create a range of dates for the merged dataframe pd.datetime.today()
+        if not begin:
+            begin = df['date'].min()
+        if not end:
+            end = df['date'].max()
+        index_of_dates = pd.date_range(begin, end).to_frame().reset_index(drop=True).rename(columns={0: 'date'}).astype(
+            str)
+        # create a merged dataframe with columns date / stock / stock_Tr.
+        merged = pd.merge(index_of_dates, trades, how='left', on='date')
+        # create a pivottable showing the shares_TR of each stock for each date
+        shares_tr = merged.pivot(index='date', columns='id', values='q')
+        shares_tr = shares_tr.dropna(axis=1, how='all').fillna(0)
+        cumShares = shares_tr.cumsum()
+        cumShares.index = cumShares.index.astype(str)
+        return cumShares
+
+    def writeb64(self, path, b64):
+        dir = os.path.dirname(path)
+        if not os.path.exists(dir):
+            os.makedirs(dir, exist_ok=True)
+        content = base64.b64decode(b64)
+        with open(path, "wb") as f:
+            f.write(content)
+            os.chmod(path, 0o777)
+
+    def readb64(self, f):
+        with open(f, "rb") as file:
+            encoded_string = base64.b64encode(file.read())
+            return encoded_string.decode()
+
+    def prefix_zero(self, n, d):
+        if len(str(d)) >= n: return str(d)[-n:]
+        l = ["0"] * (n - len(str(d)))
+        zeros = "".join(l)
+        return f"{zeros}{d}"
+
+    def ascii2hex(self,l):
+        tu = [i.replace("0x", "") for i in l]
+        tu = [self.prefix_zero(2, i) for i in tu]
+        return  "".join(tu)
+
+    def ascii2int(self,l,big):
+        s=self.ascii2hex(l)
+        b = bytes.fromhex(s)
+        if big:
+            return int.from_bytes(b, byteorder='big')
+        return int.from_bytes(b, byteorder='little')
 
+    def ascii2float(self,l,big):
+        s=self.ascii2hex(l)
+        if big:
+            return struct.unpack('>f', bytes.fromhex(s))[0]
+        return struct.unpack('<f', bytes.fromhex(s))[0]
 
 if __name__ == '__main__':
     g = Common()

remote_run_everything/tools/common1.py

@@ -1,88 +1,8 @@
-import pandas as pd
 import jinja2, os,base64,struct, glob, arrow, uuid, hashlib
 
 
 class Common1:
 
-    def table_search(self, data, search):
-        res = []
-        for i in data:
-            if search == "":
-                res.append(i)
-            elif search != "" and search in str(i):
-                res.append(i)
-        return res
-
-    def split_page(self, numPerPage, cur, search, data):
-        data = self.table_search(data, search)
-        if data is None or len(data) == 0:
-            return {"total": 0, "data": []}
-        cur = int(cur)
-        res = {"total": len(data)}
-        n = int(numPerPage)
-        total = len(data)
-        start = (cur - 1) * n
-        end = cur * n
-        if start > total - 1:
-            res['data'] = []
-        elif end > total - 1:
-            remainder = total % numPerPage
-            if remainder == 0:
-                res['data'] = data[-numPerPage:]
-            else:
-                res['data'] = data[-remainder:]
-        else:
-            res['data'] = data[start:end]
-        return res
-
-    def render(self, dir, html, data):
-        env = jinja2.Environment(loader=jinja2.FileSystemLoader(f'{dir}/templates'))
-        template = env.get_template(html)
-        outputText = template.render(data=data)  # this is where to put args
-        return outputText
-
-    def inven_everyday(self, df, begin, end):
-        df1 = df.groupby(by=['id', 'date']).sum()
-        # 可以把复合index重新拆分成columns
-        trades = df1.reset_index()
-        trades['id'] = trades['id']
-        trades['date'] = trades['date']
-        # create a range of dates for the merged dataframe pd.datetime.today()
-        if not begin:
-            begin = df['date'].min()
-        if not end:
-            end = df['date'].max()
-        index_of_dates = pd.date_range(begin, end).to_frame().reset_index(drop=True).rename(columns={0: 'date'}).astype(
-            str)
-        # create a merged dataframe with columns date / stock / stock_Tr.
-        merged = pd.merge(index_of_dates, trades, how='left', on='date')
-        # create a pivottable showing the shares_TR of each stock for each date
-        shares_tr = merged.pivot(index='date', columns='id', values='q')
-        shares_tr = shares_tr.dropna(axis=1, how='all').fillna(0)
-        cumShares = shares_tr.cumsum()
-        cumShares.index = cumShares.index.astype(str)
-        return cumShares
-
-    def writeb64(self, path, b64):
-        dir = os.path.dirname(path)
-        if not os.path.exists(dir):
-            os.makedirs(dir, exist_ok=True)
-        content = base64.b64decode(b64)
-        with open(path, "wb") as f:
-            f.write(content)
-            os.chmod(path, 0o777)
-
-    def readb64(self, f):
-        with open(f, "rb") as file:
-            encoded_string = base64.b64encode(file.read())
-            return encoded_string.decode()
-
-    def prefix_zero(self, n, d):
-        if len(str(d)) >= n: return str(d)[-n:]
-        l = ["0"] * (n - len(str(d)))
-        zeros = "".join(l)
-        return f"{zeros}{d}"
-
     def clear_by_days(self, root, n):
         files = glob.glob(f"{root}/*/*.*", recursive=True)
         now = arrow.now()
@@ -96,23 +16,6 @@ class Common1:
         hex_string = hashlib.md5(s.encode("UTF-8")).hexdigest()
         return str(uuid.UUID(hex=hex_string))
 
-    def ascii2hex(self,l):
-        tu = [i.replace("0x", "") for i in l]
-        tu = [self.prefix_zero(2, i) for i in tu]
-        return  "".join(tu)
-
-    def ascii2int(self,l,big):
-        s=self.ascii2hex(l)
-        b = bytes.fromhex(s)
-        if big:
-            return int.from_bytes(b, byteorder='big')
-        return int.from_bytes(b, byteorder='little')
-
-    def ascii2float(self,l,big):
-        s=self.ascii2hex(l)
-        if big:
-            return struct.unpack('>f', bytes.fromhex(s))[0]
-        return struct.unpack('<f', bytes.fromhex(s))[0]
 
 
 
@@ -120,4 +23,3 @@ class Common1:
 
 if __name__ == '__main__':
     g = Common1()
-    a = g.prefix_zero(5, 111)

{remote_run_everything-2.0.8.dist-info → remote_run_everything-2.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remote_run_everything
-Version: 2.0.8
+Version: 2.0.9
 Summary: Deploy Tools
 Author-email: Wang Qi <wangmarkqi@gmail.com>
 License-Expression: MIT
@@ -99,22 +99,8 @@ q = {"a": 2,"b":{"$gt":1}}
 print(col.find(q))
 db.drop_db()
 ```
-## 进程管理
-```python
-import os
-class ProcessManage:
-    # nosql is instance of Nosql or Nosqlmysql or Nqsqlpg
-    def __init__(self, nosql):
-        self.db = nosql
-        self.col = self.db['pid']
 
-    # 只需要在程序中引入这个函数,启动后会把pid存入数据库,然后有了pid,结合psutil,什么都有了
-    def save_pid(self, name, cmd):
-        dic = {"name": name, "cmd": cmd, "pid": os.getpid()}
-        print("save pid", dic)
-        self.col.insert_one(dic)
 
-```
 ##  缓存装饰器
 ```python
 from remote_run_everything import cache_by_1starg,cache_by_name,cache_by_rkey,cache_by_nth_arg

{remote_run_everything-2.0.8.dist-info → remote_run_everything-2.0.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-remote_run_everything/__init__.py,sha256=gcBibYtmhA7LmV_wV2HVyAb69zFDDPzrwE_s8IQxWCE,885
+remote_run_everything/__init__.py,sha256=C4YH1LMe1BFN3ZXe1w09LW53iH-GTAFCRHPlVjXMKIs,956
 remote_run_everything/binocular/ba_front.py,sha256=wDCW5tycvaCAEau_vxhoyUEuB_9HhUMibbxr1c1SoNk,2592
 remote_run_everything/binocular/back_tool.py,sha256=eUGdkwE4TMm-hmjs4puVM-iy_iyJJuPEqdZWQxKvOGc,4873
 remote_run_everything/binocular/cam_tool.py,sha256=ASZ2opsrnjhlvV7N6hn9axUjWIeQskR3t44a8oRpppw,1032
@@ -13,6 +13,7 @@ remote_run_everything/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 remote_run_everything/deploy/by_http.py,sha256=QWL3XqLTbp9O2WadPX59uR1fGJdgd9xzg1Pv8CuxfbQ,2661
 remote_run_everything/deploy/by_http_tool.py,sha256=H_-OvpayNVGG9e93Qnq5SCT0CsDbCEVtiA2kF2XVQ8U,3166
 remote_run_everything/deploy/by_sftp.py,sha256=dGb8SmhTlFntL_wRFRSubNziSy9xrd-Uzm5AdGHgHB4,2688
+remote_run_everything/deploy/process_manage.py,sha256=kOf4rEH9yxyZldP_xvGSbfpUVhOxU0Jbl5jEcp5XIio,1511
 remote_run_everything/deploy/record_mod.py,sha256=29L-RTnvANpjbWRND7GGz5sdCzbz1Ba9QxdS858bdAY,725
 remote_run_everything/nosql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 remote_run_everything/nosql/no_sql.py,sha256=1-dT6LhrayQqLqZ4ES2tmWfXYCEXOnqwNzKgyXWYRG4,2343
@@ -20,14 +21,14 @@ remote_run_everything/nosql/no_sql_mysql.py,sha256=agpXc5UcevN_uojexD9pNG6xAR099
 remote_run_everything/nosql/no_sql_pg.py,sha256=XCrEnHKp5RVHPOyPOMICY2PnvNMkkIIDijTVKjk-ENc,2209
 remote_run_everything/nosql/no_sql_tool.py,sha256=xRu7vsDgr3JQNSo6CLNTtNNxlg4fl-Q7_vw4y9lklWI,2590
 remote_run_everything/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-remote_run_everything/tools/common.py,sha256=UozWsdBwf7mGnvv5hLiaIfalhDaSaMjDOBjky8mo2w8,1747
-remote_run_everything/tools/common1.py,sha256=ClMooqv3GF-9mmsQmJK3V6E6p4i9MLrKCp_1TcQ2h3I,4211
+remote_run_everything/tools/common.py,sha256=Pk2L8J-hVqglZocwN2IOEaF3zdQQGw-ne0uRLAu40bM,4397
+remote_run_everything/tools/common1.py,sha256=_x2ONfG8NrCalZ0_MPJxGH2JH3M1azBbMXPRVuPU4F4,576
 remote_run_everything/tools/decorators.py,sha256=SIacNAs7afgkU0D09J-s-YscCVnxSG8Qj9vSL4VzCHw,1988
 remote_run_everything/tools/sqlacodegen_go_struct.py,sha256=0xWJVCjFyEF2VjC1aGo6DmIqEQQ0Q46CfBAb9FSCUuE,3237
 remote_run_everything/vsconf/conf_txt.py,sha256=nhFuKLlts-sCIBmfr0IKv1pP-qPUvQQrsRRg21q5Gd4,2418
 remote_run_everything/vsconf/core.py,sha256=HmSEzXjGPY7R64rwfAV024YxMHwmBkLin6lGace4U0M,833
-remote_run_everything-2.0.8.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-remote_run_everything-2.0.8.dist-info/METADATA,sha256=uih3-Spo0KtwmUquIAD1NysIwA6-sdF--NIgoeXiWTM,4606
-remote_run_everything-2.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-remote_run_everything-2.0.8.dist-info/top_level.txt,sha256=1TUcAqPgSwiVBqUHz-1pZFXvRpr9cudEYlmfw_mztRY,22
-remote_run_everything-2.0.8.dist-info/RECORD,,
+remote_run_everything-2.0.9.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+remote_run_everything-2.0.9.dist-info/METADATA,sha256=0cpnt8-CRRNlR4i5lyWZJ5MtZ_l01Fufc_OkMiQn6hw,4099
+remote_run_everything-2.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+remote_run_everything-2.0.9.dist-info/top_level.txt,sha256=1TUcAqPgSwiVBqUHz-1pZFXvRpr9cudEYlmfw_mztRY,22
+remote_run_everything-2.0.9.dist-info/RECORD,,