Merge pull request #17 from east-and-west-magic/feature-dev-pipeline

app.py

@@ -23,18 +23,28 @@ t = t.astimezone(ZoneInfo("America/Los_Angeles"))
 print(f"[Seattle]: {t.replace(microsecond=0)}")
 
 
-spaces = {
-    "b_demo_hf": "stevez-ai",
-    "pgdemo2": "stevez-ai2",
-    "pgdemo3": "stevez-ai3",
+ais = {
+    "b_demo_hf": "stevez/ai",
+    "pgdemo2": "stevez/ai2",
+    "pgdemo_dev": "stevez/ai_dev",
+}
+
+clouddisks = {
+    "b_demo_hf": "pgsoft/clouddisk",
+    "pgdemo2": "pgsoft/clouddisk",
+    "pgdemo_dev": "pgsoft/clouddisk_dev",
 }
 
 identity = os.environ.get("identity")
+print(f"identity: {identity}")
 if not identity:
-    identity = "b_demo_hf"
-space = "stevez-ai"
-if identity in spaces:
-    space = spaces[identity]
+    identity = "pgdemo_dev"
+ai = "stevez/ai_dev"
+if identity in ais:
+    ai = ais[identity]
+clouddisk = "pgsoft/clouddisk_dev"
+if identity in clouddisks:
+    clouddisk = clouddisks[identity]
 
 
 def run(hf_token, service, game, functionality, nlp_command):
@@ -48,10 +58,9 @@ def run(hf_token, service, game, functionality, nlp_command):
         user_name = "__fake__"
 
     # redirect all traffic to the proxy sever
-    global space
+    global ai, clouddisk
     if redirect is not None:
-        space = redirect
-    url = f"https://{space}.hf.space"
+        ai = redirect
 
     if token is None or token == "":
         return "please specify hf token"
@@ -68,7 +77,7 @@ def run(hf_token, service, game, functionality, nlp_command):
     service_start = beijing()
     print(f"<<<<<<<<<<<<<< service starts at {service_start} <<<<<<<<<<<<<<")
     if service in ["download game", "upload game", "list games"]:
-        res = app_util.call_clouddisk(service, nlp_command, token)
+        res = app_util.call_clouddisk(clouddisk, service, nlp_command, token)
         res = json.loads(res)
         if res["result"] is None:
             outp = {"status": "Failure"}
@@ -85,7 +94,7 @@ def run(hf_token, service, game, functionality, nlp_command):
             game,
             functionality,
             nlp_command,
-            url,
+            ai,
             token,
         )
         if isinstance(outp, str):

app_util.py

@@ -32,25 +32,19 @@ def call_logger(log_info, caller, hf_token) -> None:
     print(f"calling logger ends at {calling_end}, costs {timecost:.2f}s")
 
 
-def call_clouddisk(service, arg, hf_token) -> str | None:
+def call_clouddisk(url: str, service, arg, hf_token) -> str | None:
     ##########################
     # upload or download game
     ##########################
-    urls = [
-        "https://pgsoft-clouddisk.hf.space",
-        # "https://pgsoft-clouddisk2.hf.space",
-    ]
-
-    for url in urls:
-        try:
-            client = Client(
-                url,
-                hf_token=hf_token,
-                verbose=False,
-            )
-            res = client.predict(service, arg, api_name="/predict")
-            print("[call_clouddisk] OK")
-            return res
-        except Exception as e:
-            print(f"[call_clouddisk] {type(e)}: {e}")
-            return None
+    try:
+        client = Client(
+            url,
+            hf_token=hf_token,
+            verbose=False,
+        )
+        res = client.predict(service, arg, api_name="/predict")
+        print(f"[call_clouddisk] {service} from {url} [OK]")
+        return res
+    except Exception as e:
+        print(f"[call_clouddisk] {type(e)}: {e}")
+        return None