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

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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "remote_run_everything"
-version = "2.0.4"
+version = "2.0.5"
 authors = [
   { name="Wang Qi", email="wangmarkqi@gmail.com" },
 ]

{remote_run_everything-2.0.4 → remote_run_everything-2.0.5}/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-2.0.4 → remote_run_everything-2.0.5}/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-2.0.4 → remote_run_everything-2.0.5}/remote_run_everything/deploy/by_http.py

@@ -37,9 +37,9 @@ class ByHttp:
         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)
@@ -62,21 +62,4 @@ class ByHttp:
         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-2.0.4 → remote_run_everything-2.0.5}/remote_run_everything/deploy/by_http_tool.py

@@ -5,19 +5,24 @@ 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
+        self.upload_file(host, rpath, lpath)
+        return
 
     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)
+        self.download_file(host, rpath, lpath)
+        # 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"
@@ -62,3 +67,22 @@ 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})
+        if "ok" in r.text: return "ok"
+        return "fail"

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

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

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

@@ -14,7 +14,6 @@ remote_run_everything/db/crude_duck.py
 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_server.py
 remote_run_everything/deploy/by_http_tool.py
 remote_run_everything/deploy/record_mod.py
 remote_run_everything/nosql/__init__.py
@@ -29,5 +28,4 @@ remote_run_everything/tools/decorators.py
 remote_run_everything/tools/sqlacodegen_go_struct.py
 remote_run_everything/vsconf/conf_txt.py
 remote_run_everything/vsconf/core.py
-test/test.py
-test/test_server.py
+test/test.py

{remote_run_everything-2.0.4 → remote_run_everything-2.0.5}/test/test.py

@@ -6,7 +6,9 @@ import requests
 from multiprocessing import Process
 from remote_run_everything.tools.common import Common
 from remote_run_everything.db.crude_duck import CrudeDuck
+from remote_run_everything.deploy.by_http_tool import ByHttpTool
 from remote_run_everything import VsConf
+
 host = "http://39.96.40.177:8888/deploy"
 remote = "/data/temp"
 local = "D://wq/temp"
@@ -18,13 +20,13 @@ def push_example():
 
 
 def test():
-    wdir="D://mygit/remote_run_everything"
-    vs=VsConf()
+    wdir = "D://mygit/remote_run_everything"
+    vs = VsConf()
     vs.vs_rust()
 
 
 def pull_local():
-    host = "http://127.0.0.1:9900/deploy"
+    host = "http://127.0.0.1:8888/deploy"
     local = "D://mypy/econ/templates"
     remote = "D://wq/temp/econ/templates"
     bh = ByHttp(host, local, remote, "D://wq/temp/testlocal.db")
@@ -38,18 +40,33 @@ def test_dec():
 
 
 def testscheme():
-    dic=Common().read_conf()['pg']
-    con=CrudeDuck().install_pg_ext(**{**dic,"dbname":"projects"})
+    dic = Common().read_conf()['pg']
+    con = CrudeDuck().install_pg_ext(**{**dic, "dbname": "projects"})
     dic = Common().read_conf()['mysql']['test']
     dic['dbname'] = Common().read_conf()['mysql']['md']['test']
-    print( CrudeDuck().scheme(con, "projects", 'kv',"pg"))
+    print(CrudeDuck().scheme(con, "projects", 'kv', "pg"))
     con = CrudeDuck().install_mysql_ext(**dic)
-    print( CrudeDuck().scheme(con, "md-test", 'c_dictionary',"mysql"))
-    con=CrudeDuck().install_sql_ext("D://wq/temp/conf.db")
-    sch = CrudeDuck().scheme(con, "conf", 'down',"sqlite3")
-    print(sch,len(sch))
-    CrudeDuck().delete_by_id(con,"up",0)
+    print(CrudeDuck().scheme(con, "md-test", 'c_dictionary', "mysql"))
+    con = CrudeDuck().install_sql_ext("D://wq/temp/conf.db")
+    sch = CrudeDuck().scheme(con, "conf", 'down', "sqlite3")
+    print(sch, len(sch))
+    CrudeDuck().delete_by_id(con, "up", 0)
+
+
+def test_up():
+    t = ByHttpTool()
+    url = "http://127.0.0.1:8888/deploy"
+    res = t.upload_file(url, "D://wq/r1.db", "D://wq/raw.db")
+    print(11111, res)
+
+
+def up():
+    host = "http://127.0.0.1:8888/deploy"
+    remote= "D://wq/up/temp"
+    local= "D://wq/temp/"
+    bh = ByHttp(host, local, remote, "D://wq/testlocal.db")
+    bh.up()
 
 
 if __name__ == '__main__':
-    push_example()
+    up()

remote_run_everything-2.0.4/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)}

remote_run_everything-2.0.4/test/test_server.py

@@ -1,22 +0,0 @@
-from remote_run_everything.deploy.by_http_server import ByHttpServer
-import cherrypy, os
-from cherrypy.process.plugins import Daemonizer
-import time
-
-
-
-
-
-def cherry():
-    cherrypy.config.update({
-        "server.socket_port": 9900,
-    })
-    if os.name != "nt":
-        d = Daemonizer(cherrypy.engine)
-        d.subscribe()
-
-    cherrypy.quickstart(ByHttpServer(), "/deploy")
-
-
-if __name__ == '__main__':
-    cherry()