merge proxy

.gitignore

@@ -1 +1,3 @@
 .venv
+__pycache__
+*.json

app.py

@@ -7,6 +7,13 @@ from zoneinfo import ZoneInfo
 import gradio as gr
 from gradio_client import Client
 from extract import extract
+import app_util
+
+#######################
+# proxy version
+#######################
+proxy_version = "1.0.0-2023-11-28-a"  # merge to demo
+
 
 functionality_shared = [
     "games",
@@ -14,6 +21,7 @@ functionality_shared = [
     "tokenization",
     "upload game",
     "download game",
+    "list games",
 ]
 
 game_list = [
@@ -38,15 +46,15 @@ print(f"[Seattle]: {t.replace(microsecond=0)}")
 
 
 spaces = {
-    "b_demo_hf": "stevez-proxy",
-    "pgdemo2": "stevez-proxy2",
-    "pgdemo3": "pgsoft-proxy3",
+    "b_demo_hf": "stevez-ai",
+    "pgdemo2": "stevez-ai2",
+    "pgdemo3": "stevez-ai3",
 }
 
 identity = os.environ.get("identity")
 if not identity:
     identity = "b_demo_hf"
-space = "stevez-proxy"
+space = "stevez-ai"
 if identity in spaces:
     space = spaces[identity]
 
@@ -78,36 +86,53 @@ def run(hf_token, service, game, functionality, nlp_command):
         if functionality == "AI":
             if nlp_command in ["", None]:
                 return "please make sure the command is not empty"
+    if service == "download game":
+        res = app_util.call_clouddisk(service, nlp_command, token)
+        if res is None:
+            outp = {"status": "Failure"}
+        else:
+            outp = {"status": "OK", "result": json.loads(res)}
+        return json.dumps(outp)
+    if service == "upload game":
+        res = app_util.call_clouddisk(service, nlp_command, token)
+        if res is None:
+            outp = {"status": "Failure"}
+        else:
+            outp = {"status": "OK", "result": res}
+        return json.dumps(outp)
+    if service == "list games":
+        res = app_util.call_clouddisk(service, nlp_command, token)
+        if res is None:
+            outp = {"status": "Failure"}
+        else:
+            outp = {"status": "OK", "result": json.loads(res)["result"]}
+        return json.dumps(outp)
 
     try:
         if service not in functionality_shared[1:]:
-            pass
-
+            t = datetime.now()
+            t = t.astimezone(ZoneInfo("Asia/Shanghai"))
+            # t = t.replace(microsecond=0)
+            print(f"{t} [{user_name}] [{game}] {nlp_command}")
         client = Client(
             url,
             hf_token=token,
             verbose=False,
         )
         res = client.predict(
-            user_name,
             service,
             game,
             functionality,
-            nlp_command,
-            nlp_command,
+            nlp_command,  # hidden,
             api_name="/predict",
         )
-        # if service in [
-        #     "upload game",
-        #     "download game",
-        # ]:
-        #     res2 = json.loads(res[0])
-        #     return json.dumps(res2,indent=4)
-        # else:
-        #     res2 = json.loads(res[0])
-        #     return json.dumps(res2[0], indent=4)
-        res2 = json.loads(res[0])
-        return json.dumps(res2, indent=4)
+        outp = json.loads(res[0])
+        # add proxy version info to the output
+        outp["proxy-version"] = proxy_version
+        outp["user"] = user_name
+        outp["game"] = game
+        app_util.call_logger(outp, token)
+        return json.dumps(outp, indent=4)
     except Exception as e:
         return (
             f"{type(e)}, {str(e)}. \nyou may want to make sure your hf_token is correct"
@@ -138,6 +163,7 @@ demo = gr.Interface(
     ],
     outputs="text",
     title="Demo",
+    allow_flagging="never",
 )
 
 demo.launch()

app_util.py

@@ -0,0 +1,49 @@
+import json
+
+from gradio_client import Client
+
+
+def call_logger(log_info, hf_token) -> None:
+    #######################
+    # logging
+    #######################
+    urls = [
+        'https://hubei-hunan-logger.hf.space',
+        'https://hubei-hunan-logger2.hf.space',
+    ]
+
+    for url in urls:
+        try:
+            client = Client(
+                url,
+                hf_token = hf_token,
+                verbose = False,
+            )
+            client.submit(json.dumps(log_info))
+            print(f'[logging to {url}] OK')
+        except Exception as e:
+            print(f'[logging to {url}] error: {e}')
+
+
+def call_clouddisk(service, arg, hf_token) -> str | None:
+    ##########################
+    # upload or download game
+    ##########################
+    urls = [
+        "https://pgsoft-clouddisk.hf.space",
+        # "https://pgsoft-clouddisk2.hf.space",
+    ]
+
+    for url in urls:
+        try:
+            client = Client(
+                url,
+                hf_token=hf_token,
+                verbose=False,
+            )
+            res = client.predict(service, arg, api_name="/predict")
+            print("[call_clouddisk] OK")
+            return res
+        except Exception as e:
+            print(f"[call_clouddisk] {type(e)}: {e}")
+            return None