Merge pull request #4 from east-and-west-magic/change-logger

app.py

@@ -22,7 +22,7 @@ t = t.astimezone(ZoneInfo("America/Los_Angeles"))
 print(f"[Seattle]: {t.replace(microsecond=0)}")
 
 
-identity = os.environ.get("identity")
+identity = os.environ.get("identity", "local")
 print(f"identity: {identity}")
 db_token = os.environ.get("db_token")
 if db_token:

call_logger.py

@@ -1,32 +1,51 @@
 import json
-
-from gradio_client import Client
+import requests
 from pgsoft.pgdate.date_utils import beijing
 
 
-def call_logger(log_info, caller, hf_token) -> None:
+url_base = "https://hubei-hunan-logger.hf.space"
+url_add = f"{url_base}/add"
+
+
+def post_to_logger_helper(log, caller, token):
+    header = {
+        "accept": "application/json",
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {token}",
+    }
+    myobj = {
+        "log": log,
+        "caller": caller,
+    }
+    try:
+        res = requests.post(url_add, headers=header, json=myobj)
+        content = res.json()
+        if res.status_code == 200:
+            timestamp = content["timestamp"]
+            command = content["command"]
+            status = content["status"]
+            print(f"[{timestamp}] [{command}] [{status}]")
+            return True
+        else:
+            print(res.text)
+            return False
+    except Exception as e:
+        print(f"{type(e)}: {e}")
+        return False
+
+
+def call_logger(log_info, caller, token) -> None:
     #######################
     # logging
     #######################
     calling_start = beijing()
     print(f"[{calling_start}] logging starts")
     #################################################
-    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), caller)
-            print(f"[logging to {url}] OK")
-            return None
-        except Exception as e:
-            print(f"[logging to {url}] Failed, {type(e)}: {e}")
+    res = post_to_logger_helper(json.dumps(log_info), caller, token)
+    if res:
+        print(f"[logging to {url_base}] OK")
+    else:
+        print(f"[logging to {url_base}] Failed")
     #################################################
     calling_end = beijing()
     timecost = calling_end.timestamp() - calling_start.timestamp()

requirements-local.txt

@@ -1,3 +1,3 @@
 pytest
-gradio==4.39.0
+gradio==4.44.1
 git+ssh://git@github.com/east-and-west-magic/pgsoft.git@tag-2024-01-11-a