Merge pull request #7 from east-and-west-magic/feature-print-timecost

app.py

@@ -9,6 +9,7 @@ from gradio_client import Client
 from extract import extract
 import app_util
 from pgsoft.pgconst.const import service_list, functionality_list, game_list
+from pgsoft.pgdate.date_utils import beijing
 
 #######################
 # proxy version
@@ -65,57 +66,72 @@ 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"
+
+    service_start = beijing()
+    print(f">>>>>>>>>>>>>>> service starts at {service_start} <<<<<<<<<<<<<<")
     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":
+    elif 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":
+    elif 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 service_list[1:]:
-            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(
-            service,
-            game,
-            functionality,
-            nlp_command,  # hidden,
-            api_name="/predict",
-        )
-        outp = json.loads(res)
-        # add proxy version info to the output
-        outp["proxy-version"] = proxy_version
-        outp["user"] = user_name
-        outp["game"] = game
-        app_util.call_logger(outp, identity, 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"
-        )
+    else:
+        try:
+            assert "games" in service_list
+            if service == "games":            
+                print(f"{beijing()} [{user_name}] [{game}] {nlp_command}")
+            client = Client(
+                url,
+                hf_token=token,
+                verbose=False,
+            )
+            calling_start = beijing()
+            print(f"calling ai starts at {calling_start}")
+            res = client.predict(
+                service,
+                game,
+                functionality,
+                nlp_command,  # hidden,
+                api_name="/predict",
+            )
+            calling_end = beijing()
+            timecost = calling_end.timestamp() - calling_start.timestamp()
+            print(f"calling ai ends at {calling_end}, costs {timecost:.2f}s")
+            outp = json.loads(res)
+            # add proxy version info to the output
+            outp["proxy-version"] = proxy_version
+            outp["user"] = user_name
+            outp["game"] = game
+            calling_start = beijing()
+            print(f"calling logger starts at {beijing()}")
+            app_util.call_logger(outp, identity, token)
+            calling_end = beijing()
+            timecost = calling_end.timestamp() - calling_start.timestamp()
+            print(f"calling logger ends at {calling_end}, costs {timecost:.2f}s")
+        except Exception as e:
+            return (
+                f"{type(e)}, {str(e)}. \nyou may want to make "
+                + "sure your hf_token is correct"
+            )
+    service_end = beijing()
+    timecost = service_end.timestamp() - service_start.timestamp()
+    print(
+        f">>>>>>>>>>>>>>> service ends at {service_end}, "
+        + f"costs {timecost:.2f}s <<<<<<<<<<<<<<<"
+    )
+    return json.dumps(outp, indent=4)
 
 
 demo = gr.Interface(