remote-run-everything 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

remote_run_everything/__init__.py

@@ -1,5 +1,4 @@
 from remote_run_everything.deploy.by_http import ByHttp
-from remote_run_everything.deploy.by_http_server import ByHttpServer, cherrypy_in_daemon
 
 from remote_run_everything.db.crude_duck import CrudeDuck
 from remote_run_everything.db.crud_sqlalchemy import Crud

remote_run_everything/db/crude_duck.py

@@ -48,6 +48,9 @@ class CrudeDuck:
         scheme = {i[0]: i[1] for i in con.sql(sql).fetchall()}
         return scheme
 
+    def quot_comma(self, l):
+        return ','.join([f"'{i}'" for i in l])
+
     def max_id(self, con, table):
         sql = f'select max(id) from {table}'
         a = con.sql(sql).fetchone()

remote_run_everything/deploy/by_http.py

@@ -29,17 +29,20 @@ 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)
 
     def up(self, disallow_keys=None):
-        if os.name == "nt":
-            return self.up_win(disallow_keys)
-        assert self.dbpath.endswith(".db"), "dbpath should be xxx.db"
+        # if os.name == "nt":
+        #     return self.up_win(disallow_keys)
+        # assert self.dbpath.endswith(".db"), "dbpath should be xxx.db"
         c = Crud()
         eg = c.sqlite_engine(self.dbpath)
         c.create_table(eg, Up)
@@ -53,30 +56,16 @@ 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()
         c.insert_many(eg, mod, add_l)
 
-    def up_win(self, disallow_keys=None):
-        from mongo_emb import PyMongoEmb
-        if not os.path.exists(self.dbpath):
-            os.makedirs(self.dbpath)
-        assert os.path.isdir(self.dbpath), "dbpath should be dir"
-        path = os.path.normpath(self.dbpath)
-        db = PyMongoEmb(path)
-        col = db['up']
-        loc_files = self.t.all_local_path(self.local, disallow_keys)
-        for dic in loc_files:
-            dic['host'] = self.host
-            # time path host
-            if col.find_one(dic) is not None:
-                continue
-            if os.path.normpath(os.path.dirname(dic['path'])) == path: continue
-            self.t.push(self.host, dic['path'], self.local, self.remote)
-            print("up==", dic)
-            col.update_one({"host": self.host, "path": dic['path']}, {"$set": {"time": dic['time']}}, upsert=True)
+

remote_run_everything/deploy/by_http_tool.py

@@ -5,19 +5,27 @@ import os, glob, arrow, requests
 
 class ByHttpTool:
     def push(self, host, f, local, remote):
-        b64 = Common().readb64(f)
-        push_url = f"{host}/wb64"
-        path = self.loc2remote(f, local, remote)
-        pay = {"b64": b64, "path": path}
-        res = requests.post(push_url, json=pay).json()
-        return res
+        # b64 = Common().readb64(f)
+      # 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
+        return self.upload_file(host, rpath, lpath)
+
 
     def pull(self, host, f, local, remote):
-        res = requests.post(f"{host}/rb64", json={"path": f}).json()
-        b64 = res['data']
-        path = self.remote2loc(f, local, remote)
-        Common().writeb64(path, b64)
-        return path
+        rpath = f
+        lpath = self.remote2loc(f, local, remote)
+        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)
 
     def all_remote_path(self, host, root, disallow_keys=None):
         url = f"{host}/iterdir"
@@ -62,3 +70,21 @@ class ByHttpTool:
     def remote2loc(self, f, local, remote):
         rela = os.path.relpath(f, remote)
         return f"{local}/{rela}"
+
+    def download_file(self, host, rpath, lpath):
+        ldir = os.path.dirname(lpath)
+        os.makedirs(ldir, exist_ok=True)
+        url = f"{host}/downfile"
+        pay = {"path": rpath}
+        # NOTE the stream=True parameter below
+        with requests.post(url, data=pay, stream=True) as r:
+            r.raise_for_status()
+            with open(lpath, 'wb') as f:
+                for chunk in r.iter_content(chunk_size=8192):
+                    f.write(chunk)
+
+    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}).json()
+        return r['status']

{remote_run_everything-2.0.4.dist-info → remote_run_everything-2.0.6.dist-info}/METADATA

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

{remote_run_everything-2.0.4.dist-info → remote_run_everything-2.0.6.dist-info}/RECORD

@@ -1,13 +1,12 @@
-remote_run_everything/__init__.py,sha256=QZgJLX-Wjt31-7gK1IREJ68ipzznnKs8Qiwd0F3jBMQ,850
+remote_run_everything/__init__.py,sha256=s0ZYAkpui5x47uOzKMkghoVW9-yW6Y4xvoEntyB0_cc,760
 remote_run_everything/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 remote_run_everything/db/backup.py,sha256=_mDUNQo1q6Gc75-diwadrooZsdV89KGG9mIcS4rmcBQ,1152
 remote_run_everything/db/crud_sqlalchemy.py,sha256=cDyDGHwE-1TUBZrXMVDTjIa4Z0ZUQvM9m9sk-eIwaSM,5192
-remote_run_everything/db/crude_duck.py,sha256=qo3KSUTTVkSmVMfyK4UmMkJS4fQdj_xN57zwDpwzxEE,4290
+remote_run_everything/db/crude_duck.py,sha256=OYkE26_Js_PFr0DoBOBCZ6tYxsp7BhhNvGMn7-rJgWA,4370
 remote_run_everything/db/kv_store.py,sha256=Df2Lp2l5ip0YQuTdVnlQbkZT_Sz01j9D5bJ8PYaSFRY,3357
 remote_run_everything/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-remote_run_everything/deploy/by_http.py,sha256=bDbngxTTkGnMAvUw7yJ9aQAdMbvDUJlLnbBGhTAO8U8,3343
-remote_run_everything/deploy/by_http_server.py,sha256=_CVOQvUMnZKIJ8eVYXcnAPNBBR9lwSE_Kk6cu41sxuE,1726
-remote_run_everything/deploy/by_http_tool.py,sha256=x2GUi7x4MIhTcaxIsk-nXDQBgUdSO_rSN5z81bnEAoA,2178
+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/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
@@ -21,8 +20,8 @@ remote_run_everything/tools/decorators.py,sha256=SIacNAs7afgkU0D09J-s-YscCVnxSG8
 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.4.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-remote_run_everything-2.0.4.dist-info/METADATA,sha256=HK6gxT8Axt5Nx6nqolwh0KFGc054ntD6RDj6O9OjAc8,3121
-remote_run_everything-2.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-remote_run_everything-2.0.4.dist-info/top_level.txt,sha256=1TUcAqPgSwiVBqUHz-1pZFXvRpr9cudEYlmfw_mztRY,22
-remote_run_everything-2.0.4.dist-info/RECORD,,
+remote_run_everything-2.0.6.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+remote_run_everything-2.0.6.dist-info/METADATA,sha256=y5vDF98lRt0ZfgIpzrh3byYsG-rmkhq8nM2AWVLtiOQ,3121
+remote_run_everything-2.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+remote_run_everything-2.0.6.dist-info/top_level.txt,sha256=1TUcAqPgSwiVBqUHz-1pZFXvRpr9cudEYlmfw_mztRY,22
+remote_run_everything-2.0.6.dist-info/RECORD,,

remote_run_everything/deploy/by_http_server.py

@@ -1,56 +0,0 @@
-import cherrypy
-from remote_run_everything.deploy.by_http_tool import ByHttpTool
-from remote_run_everything.tools.common import Common
-
-from cherrypy.process.plugins import Daemonizer
-
-
-def cherrypy_in_daemon(myapp, port, prefix):
-    cherrypy.config.update({
-        "server.socket_port": port,
-    })
-    Daemonizer(cherrypy.engine).subscribe()
-    cherrypy.tree.mount(myapp(), prefix)
-    cherrypy.engine.start()
-    cherrypy.engine.block()
-
-
-class ByHttpServer:
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @cherrypy.tools.json_in()
-    def rb64(self):
-        try:
-            args = cherrypy.request.json
-            path = args['path']
-            data = Common().readb64(path)
-            return {"status": "ok", "data": data}
-        except Exception as e:
-            return {"status": "fail", "data": str(e)}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @cherrypy.tools.json_in()
-    def wb64(self):
-        try:
-            args = cherrypy.request.json
-            path = args['path']
-            b64 = args['b64']
-            Common().writeb64(path, b64)
-            return {"status": "ok", "data": path}
-        except Exception as e:
-            return {"status": "fail", "data": str(e)}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @cherrypy.tools.json_in()
-    def iterdir(self):
-        try:
-            args = cherrypy.request.json
-            root = args['root']
-            disallow = args.get("disallow_keys", [])
-            data = ByHttpTool().all_local_path(root, disallow)
-            return {"status": "ok", "data": data}
-        except Exception as e:
-            return {"status": "fail", "data": str(e)}