Merge pull request #4 from east-and-west-magic/init-house-server

app.py

@@ -15,7 +15,7 @@ from str_util import normalize_text
 #######################
 # proxy version
 #######################
-proxy_version = "1.0.0-2024-01-18-a"  # reconstruct ai calling
+proxy_version = "1.0.0-2024-05-14-a"
 
 t = datetime.now()
 t = t.astimezone(ZoneInfo("Asia/Shanghai"))
@@ -117,12 +117,12 @@ demo = gr.Interface(
             info="Shared services",
         ),
         gr.Radio(
-            ["watermelon"],
-            value="watermelon",
+            ["house"],
+            value="house",
             info="Which game you want the AI to support?",
         ),
         gr.Radio(
-            functionality_list,
+            functionality_list[:1],
             value=functionality_list[0],
             # label = "What do you want to do?",
             info="What functionality?",

app_util.py

@@ -37,22 +37,25 @@ def call_logger(log_info, caller, hf_token) -> None:
     print(f"calling logger ends at {calling_end}, costs {timecost:.2f}s")
 
 
-dataset_id = "pgsoft/watermelon"
-local_dir = "game"
-if not os.path.exists(local_dir):
-    os.mkdir(local_dir)
+dataset_id = "pgsoft/game"
+tempdir = "game"
+gamename = "house"
+localdir = os.path.join(tempdir, gamename)
+if not os.path.exists(localdir):
+    os.makedirs(localdir)
 hf_api = HfApi()
 
 
 def file_service(service, arg: str, token: str):
     """download game, upload game, or list games"""
     if service == "download game":
-        filepath = arg.strip() + ".json"
+        filename = arg.strip() + ".json"
+        remotepath = "/".join(["house", filename[:2], filename])
         res = download(
             dataset_id,
-            filepath,
+            remotepath=remotepath,
             repo_type="dataset",
-            localdir=local_dir,
+            localdir=tempdir,
             token=token,
         )
         if not res:
@@ -92,9 +95,10 @@ def file_service(service, arg: str, token: str):
         maxtry = 5
         for retry in range(maxtry):
             md5code = md5(obj)
+            remotepath = "/".join([gamename, md5code[:2], md5code + ".json"])
             if not hf_api.file_exists(
                 repo_id=dataset_id,
-                filename=md5code + ".json",
+                filename=remotepath,
                 repo_type="dataset",
                 token=token,
             ):
@@ -102,22 +106,24 @@ def file_service(service, arg: str, token: str):
             sleep(0.1)
             obj["upload-time"] = beijing().__str__()
             maxtry -= 1
-        filename = md5code + ".json"
         if not maxtry and hf_api.file_exists(
             repo_id=dataset_id,
-            filename=md5code + ".json",
+            filename=remotepath,
             repo_type="dataset",
             token=token,
         ):
             print(f"[{service}] error: file exists")
             return None
-        localpath = os.sep.join([local_dir, filename])
+        filedir = os.path.join(localdir, md5code[:2])
+        if not os.path.exists(filedir):
+            os.mkdir(filedir)
+        filepath = os.path.join(filedir, md5code + ".json")
         content = json.dumps(game, indent=4)
-        with open(localpath, "w") as f:
+        with open(filepath, "w") as f:
             f.write(content)
         res = upload(
-            localpath,
-            filename,
+            filepath,
+            remotepath,
             dataset_id,
             "dataset",
             token,
@@ -136,7 +142,11 @@ def file_service(service, arg: str, token: str):
         )
         if games is None:
             return None
-        games = {item.split(".")[0]: item for item in games if len(item) >= 32}
+        games = {
+            item.split(".")[0][-32:]: item
+            for item in games
+            if item.endswith(".json") and item.startswith("house")
+        }
         print(f"[{service}] OK")
         return games
     else:

call_pgai.py

@@ -13,7 +13,7 @@ def post_to_pgai_helper(command: str) -> Any:
     }
 
     header = {'accept': 'application/json', 'Content-Type': 'application/json'}
-    url_base = "https://steveagi-pgai.hf.space/games/watermelon/nlp"
+    url_base = "https://steveagi-pgai.hf.space/games/house/nlp"
     url_read = f"{url_base}/r"
 
     try: