remote-run-everything 2.0.5__tar.gz → 2.0.7__tar.gz

{remote_run_everything-2.0.5/remote_run_everything.egg-info → remote_run_everything-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remote_run_everything
-Version: 2.0.5
+Version: 2.0.7
 Summary: Deploy Tools
 Author-email: Wang Qi <wangmarkqi@gmail.com>
 License-Expression: MIT

{remote_run_everything-2.0.5 → remote_run_everything-2.0.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "remote_run_everything"
-version = "2.0.5"
+version = "2.0.7"
 authors = [
   { name="Wang Qi", email="wangmarkqi@gmail.com" },
 ]
@@ -18,3 +18,6 @@ license-files = ["LICEN[CS]E*"]
 Homepage = 'https://github.com/wangmarkqi/remote_run_everything'
 Issues = "https://github.com/wangmarkqi/remote_run_everything/issues"
 
+[build-system]
+requires = ["setuptools>=40.8.0", "wheel","sqlalchemy","arrow","duckdb","requests","paramiko"]
+build-backend = "setuptools.build_meta"

{remote_run_everything-2.0.5 → remote_run_everything-2.0.7}/remote_run_everything/__init__.py

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

{remote_run_everything-2.0.5 → remote_run_everything-2.0.7}/remote_run_everything/deploy/by_http.py

@@ -29,9 +29,12 @@ class ByHttp:
             sql = f"select * from down where path='{path}' and time='{t}' "
             res = con.sql(sql).fetchone()
             if res is not None: continue
+            ok=self.t.pull(self.host, path, self.local, self.remote)
+            if ok!="ok":
+                print ("err==",ok,dic)
+                continue
             print("down", dic)
             con.execute(f"delete from down where path='{path}' ")
-            self.t.pull(self.host, path, self.local, self.remote)
             add_l.append(dic)
         con.commit()
         c.insert_many(eg, mod, add_l)
@@ -53,10 +56,13 @@ class ByHttp:
             sql = f"select * from up where path='{path}' and time='{t}' and host='{self.host}' "
             res = con.sql(sql).fetchone()
             if res is not None: continue
+            ok=self.t.push(self.host, path, self.local, self.remote)
+            if ok!="ok":
+                print ("err==",ok,dic)
+                continue
             print("up==", dic)
             sql = f"delete from  up where path='{path}' and  host='{self.host}'"
             con.execute(sql).commit()
-            self.t.push(self.host, path, self.local, self.remote)
             dic['host'] = self.host
             add_l.append(dic)
         con.commit()

{remote_run_everything-2.0.5 → remote_run_everything-2.0.7}/remote_run_everything/deploy/by_http_tool.py

@@ -6,23 +6,26 @@ import os, glob, arrow, requests
 class ByHttpTool:
     def push(self, host, f, local, remote):
         # b64 = Common().readb64(f)
-        # push_url = f"{host}/wb64"
+      # push_url = f"{host}/wb64"
         # pay = {"b64": b64, "path": path}
         # res = requests.post(push_url, json=pay).json()
         rpath = self.loc2remote(f, local, remote)
         lpath = f
-        self.upload_file(host, rpath, lpath)
-        return
+        return self.upload_file(host, rpath, lpath)
+
 
     def pull(self, host, f, local, remote):
         rpath = f
         lpath = self.remote2loc(f, local, remote)
-        self.download_file(host, rpath, lpath)
+        try:       
+            self.download_file(host, rpath, lpath)
+            return "ok"
+        except Exception as e:
+            return str(e)
         # res = requests.post(f"{host}/rb64", json={"path": f}).json()
         # b64 = res['data']
         # path = self.remote2loc(f, local, remote)
         # Common().writeb64(path, b64)
-        return
 
     def all_remote_path(self, host, root, disallow_keys=None):
         url = f"{host}/iterdir"
@@ -83,6 +86,5 @@ class ByHttpTool:
     def upload_file(self, host, rpath, lpath):
         url = f"{host}/upfile"
         files = {'files': open(lpath, 'rb')}
-        r = requests.post(url, files=files, data={'path': rpath})
-        if "ok" in r.text: return "ok"
-        return "fail"
+        r = requests.post(url, files=files, data={'path': rpath}).json()
+        return r['status']

remote_run_everything-2.0.7/remote_run_everything/deploy/by_sftp.py

@@ -0,0 +1,75 @@
+import os.path
+from remote_run_everything.db.crud_sqlalchemy import Crud
+from remote_run_everything.deploy.record_mod import Up, Down
+from remote_run_everything.db.crude_duck import CrudeDuck
+from remote_run_everything.deploy.by_http_tool import ByHttpTool
+import paramiko
+from pathlib import Path
+
+class BySftp:
+    def __init__(self, host,port,user,pwd, local, remote, dbpath):
+        self.host=host
+        self.cli=self.sftp_cli(host,port,user,pwd)
+        self.local = local
+        self.remote = remote
+        self.dbpath = dbpath
+        self.t = ByHttpTool()
+    def sftp_cli(self,host,port,user,pwd):
+        ssh = paramiko.SSHClient()
+        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        transport = paramiko.Transport(host, port)
+        transport.connect(None, user, pwd)
+        cli= paramiko.SFTPClient.from_transport(transport)
+        return cli
+
+    def up(self, disallow_keys=None):
+        c = Crud()
+        eg = c.sqlite_engine(self.dbpath)
+        c.create_table(eg, Up)
+        con = CrudeDuck().install_sql_ext(self.dbpath)
+        mod = Up
+        loc_files = self.t.all_local_path(self.local, disallow_keys)
+        add_l = []
+        for dic in loc_files:
+            path = dic['path']
+            t = dic['time']
+            sql = f"select * from up where path='{path}' and time='{t}' and host='{self.host}' "
+            res = con.sql(sql).fetchone()
+            if res is not None: continue
+
+            rpath = self.t.loc2remote(path, self.local, self.remote)
+            rpath=rpath.replace("\\","/")
+            lpath=path.replace("\\","/")
+            res=self.upload_file(rpath, lpath)
+            print("up==", path,res)
+            if res=="ok":
+                sql = f"delete from  up where path='{path}' and  host='{self.host}'"
+                con.execute(sql).commit()
+                dic['host'] = self.host
+                add_l.append(dic)
+        con.commit()
+        c.insert_many(eg, mod, add_l)
+
+    def mkdirs(self,fpath):
+        dpath = os.path.dirname(fpath)
+        l=dpath.split('/')
+        if len(l)==0:return
+        if l[0]=="":l[0]="/"
+        for i in range(len(l)+1):
+            if i<=1:continue
+            ll=l[:i]
+            path=os.path.join(*ll)
+            try:
+                # default mod 777
+                path=path.replace('\\','/')
+                self.cli.mkdir(path)
+            except Exception as e:
+                pass
+
+    def upload_file(self, rpath, lpath):
+        self.mkdirs(rpath)
+        try:
+            self.cli.put(lpath, rpath)
+            return "ok"
+        except:
+            return "fail"

{remote_run_everything-2.0.5 → remote_run_everything-2.0.7/remote_run_everything.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remote_run_everything
-Version: 2.0.5
+Version: 2.0.7
 Summary: Deploy Tools
 Author-email: Wang Qi <wangmarkqi@gmail.com>
 License-Expression: MIT

{remote_run_everything-2.0.5 → remote_run_everything-2.0.7}/remote_run_everything.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ remote_run_everything/db/kv_store.py
 remote_run_everything/deploy/__init__.py
 remote_run_everything/deploy/by_http.py
 remote_run_everything/deploy/by_http_tool.py
+remote_run_everything/deploy/by_sftp.py
 remote_run_everything/deploy/record_mod.py
 remote_run_everything/nosql/__init__.py
 remote_run_everything/nosql/no_sql.py