call_pgai

app.py

@@ -9,7 +9,7 @@ import app_util
 from pgsoft.pgconst.const import service_list, functionality_list, game_list
 from pgsoft.pghost import ais
 from pgsoft.pgdate.date_utils import beijing
-import call_ai
+import call_pgai
 from str_util import normalize_text
 
 #######################
@@ -76,8 +76,8 @@ def run(hf_token, service, game, functionality, nlp_command):
         if service == "games":
             print(f"{beijing()} [{user_name}] [{game}] {nlp_command}")
         nlp_command = normalize_text(nlp_command)
-        call_ai.from_cache = True
-        outp = call_ai.call_ai(
+        call_pgai.from_cache = True
+        outp = call_pgai.call_pgai(
             service,
             game,
             functionality,
@@ -85,6 +85,8 @@ def run(hf_token, service, game, functionality, nlp_command):
             ai_url,
             token,
         )
+        if outp is None:
+            return "no output"
         if isinstance(outp, str):
             return outp
         # add proxy version info to the output
@@ -94,7 +96,7 @@ def run(hf_token, service, game, functionality, nlp_command):
         outp["game"] = game
         if source:
             outp["source"] = source
-        outp["cache"] = call_ai.from_cache
+        outp["cache"] = call_pgai.from_cache
         app_util.call_logger(outp, identity, token)
     service_end = beijing()
     timecost = service_end.timestamp() - service_start.timestamp()
@@ -115,8 +117,8 @@ demo = gr.Interface(
             info="Shared services",
         ),
         gr.Radio(
-            game_list,
-            value=game_list[1],
+            ["watermelon"],
+            value="watermelon",
             info="Which game you want the AI to support?",
         ),
         gr.Radio(

call_pgai.py

@@ -0,0 +1,51 @@
+from functools import cache
+import requests
+import os
+from typing import Any
+from pgsoft.pgdate.date_utils import beijing
+import json
+
+
+def post_to_pgai_helper(command: str) -> Any:
+    myobj = {
+        "code": os.getenv("pgai_code"), 
+        "command": command,
+    }
+
+    header = {'accept': 'application/json', 'Content-Type': 'application/json'}
+    url_base = "https://steveagi-pgai.hf.space/games/watermelon/nlp"
+    url_read = f"{url_base}/r"
+
+    try:
+        res = requests.post(url_read, headers=header, json=myobj)
+        if res.status_code == 200:
+            print(res.text)
+            return res.text
+        else:
+            print(res.text)
+            return None
+    except Exception as e:
+        print(e)
+        return None
+    
+
+def call_pgai(service, game, functionality, nlp_command, url, hf_token):
+    calling_start = beijing()
+    print(f"calling ai starts at {calling_start}")
+    try:
+        res = post_to_pgai_helper(nlp_command)
+    except Exception as e:
+        return (
+            f"{type(e)}, {str(e)}. \nyou may want to make "
+            + "sure your hf_token is correct"
+        )
+    calling_end = beijing()
+    timecost = calling_end.timestamp() - calling_start.timestamp()
+    print(f"calling ai ends at {calling_end}, costs {timecost:.2f}s")
+    global from_cache
+    from_cache = False
+    if res is not None:
+        outp = json.loads(res)
+        return outp
+    else:
+        return None

requirements-local.txt

@@ -57,4 +57,4 @@ tzdata==2023.3
 urllib3==2.0.6
 uvicorn==0.23.2
 websockets==11.0.3
-git+ssh://git@github.com/east-and-west-magic/pgsoft.git@tag-2024-01-02-a
+git+ssh://git@github.com/east-and-west-magic/pgsoft.git@tag-2024-01-11-a

requirements.txt

@@ -57,4 +57,4 @@ tzdata==2023.3
 urllib3==2.0.6
 uvicorn==0.23.2
 websockets==11.0.3
-git+https://github.com/east-and-west-magic/pgsoft.git@tag-2024-01-02-a
+git+https://github.com/east-and-west-magic/pgsoft.git@tag-2024-01-11-a