Merge pull request #3 from east-and-west-magic/feature-log-username

app.py

@@ -42,9 +42,9 @@ def run(hf_token, service, game, functionality, nlp_command):
     """
 
     # reuse hf_token field as json string
-    token, user_name, redirect, source, _ = extract(hf_token)
-    if user_name is None:
-        user_name = "__fake__"
+    token, user, redirect, source, username, _ = extract(hf_token)
+    if user is None:
+        user = "__fake__"
 
     # redirect all traffic to the proxy sever
     global ai
@@ -74,7 +74,7 @@ def run(hf_token, service, game, functionality, nlp_command):
     else:
         assert "games" in service_list
         if service == "games":
-            print(f"{beijing()} [{user_name}] [{game}] {nlp_command}")
+            print(f"{beijing()} [{user}] [{game}] {nlp_command}")
         nlp_command = normalize_text(nlp_command)
         call_pgai.from_cache = True
         outp = call_pgai.call_pgai(
@@ -92,10 +92,10 @@ def run(hf_token, service, game, functionality, nlp_command):
         # add proxy version info to the output
         outp["timestamp"] = beijing().__str__()
         outp["proxy-version"] = proxy_version
-        outp["user"] = user_name
+        outp["user"] = user
+        outp["username"] = username
         outp["game"] = game
-        if source:
-            outp["source"] = source
+        outp["source"] = source
         outp["cache"] = call_pgai.from_cache
         app_util.call_logger(outp, identity, token)
     service_end = beijing()

extract.py

@@ -3,33 +3,18 @@ import json
 
 def extract(hf_token):
     """
-    Extract token, user, redirect, source, and info from input hf_token.
+    Extract token, user, redirect, source, username and info from input hf_token.
     If hf_token is simple, it is the token itself.
     """
     info = {}  # a copy of hf_token in json format
     try:
-        info = json.loads(hf_token)
+        info = dict(json.loads(hf_token))
     except json.decoder.JSONDecodeError:
-        return hf_token, None, None, None, None
+        return hf_token, None, None, None, None,None
+    token = info.get("token", None)
+    user = info.get("user", None)
+    redirect = info.get("redirect", None)
+    source = info.get("source", None)
+    username = info.get("username", None)
 
-    try:
-        token = info["token"]
-    except KeyError:
-        token = None
-
-    try:
-        user = info["user"]
-    except KeyError:
-        user = None
-
-    try:
-        redirect = info["redirect"]
-    except KeyError:
-        redirect = None
-
-    try:
-        source = info["source"]
-    except KeyError:
-        source = None
-
-    return token, user, redirect, source, info
+    return token, user, redirect, source, username, info