Merge pull request #6 from east-and-west-magic/feature-use-pgsoft

app.py

@@ -8,33 +8,12 @@ import gradio as gr
 from gradio_client import Client
 from extract import extract
 import app_util
+from pgsoft.pgconst.const import service_list, functionality_list, game_list
 
 #######################
 # proxy version
 #######################
-proxy_version = "1.0.0-2023-11-28-a"  # merge to demo
-
-
-functionality_shared = [
-    "games",
-    "greet",
-    "tokenization",
-    "upload game",
-    "download game",
-    "list games",
-]
-
-game_list = [
-    "angry birds",
-    "snake",
-]
-
-functionality_list = [
-    "AI",
-    "functionality",
-    "json dedup",
-    "json",
-]
+proxy_version = "1.0.0-2023-12-01-a"  # use pgconst
 
 t = datetime.now()
 t = t.astimezone(ZoneInfo("Asia/Shanghai"))
@@ -78,7 +57,7 @@ def run(hf_token, service, game, functionality, nlp_command):
     if token is None or token == "":
         return "please specify hf token"
 
-    if service not in functionality_shared[1:]:
+    if service not in service_list[1:]:
         if game is None:
             return "please specify which game"
         if functionality is None:
@@ -109,7 +88,7 @@ def run(hf_token, service, game, functionality, nlp_command):
         return json.dumps(outp)
 
     try:
-        if service not in functionality_shared[1:]:
+        if service not in service_list[1:]:
             t = datetime.now()
             t = t.astimezone(ZoneInfo("Asia/Shanghai"))
             # t = t.replace(microsecond=0)
@@ -131,7 +110,7 @@ def run(hf_token, service, game, functionality, nlp_command):
         outp["proxy-version"] = proxy_version
         outp["user"] = user_name
         outp["game"] = game
-        app_util.call_logger(outp, token)
+        app_util.call_logger(outp, identity, token)
         return json.dumps(outp, indent=4)
     except Exception as e:
         return (
@@ -144,8 +123,8 @@ demo = gr.Interface(
     inputs=[
         "text",
         gr.Radio(
-            functionality_shared,
-            value=functionality_shared[0],
+            service_list,
+            value=service_list[0],
             info="Shared services",
         ),
         gr.Radio(

app_util.py

@@ -3,26 +3,26 @@ import json
 from gradio_client import Client
 
 
-def call_logger(log_info, hf_token) -> None:
+def call_logger(log_info, caller, hf_token) -> None:
     #######################
     # logging
     #######################
     urls = [
-        'https://hubei-hunan-logger.hf.space',
-        'https://hubei-hunan-logger2.hf.space',
+        "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,
+                hf_token=hf_token,
+                verbose=False,
             )
-            client.submit(json.dumps(log_info))
-            print(f'[logging to {url}] OK')
+            client.submit(json.dumps(log_info), caller)
+            print(f"[logging to {url}] OK")
         except Exception as e:
-            print(f'[logging to {url}] error: {e}')
+            print(f"[logging to {url}] error: {e}")
 
 
 def call_clouddisk(service, arg, hf_token) -> str | None:

req.txt

@@ -57,3 +57,4 @@ tzdata==2023.3
 urllib3==2.0.6
 uvicorn==0.23.2
 websockets==11.0.3
+git+https://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@github.com/east-and-west-magic/pgsoft.git@tag-2023-12-01-a