Update app.py

app.py

@@ -7,14 +7,14 @@ import random
 import bg
 from rembg import remove as rm
 import datetime 
-from huggingface_hub import (HfApi)
+from huggingface_hub import (HfApi,file_exists)
 import uuid
 import json
 import requests
 uid=uuid.uuid4()
 proc1=diff
 proc2=diff 
-
+this_url='https://omnibus-game-test.hf.space/'
 save_data='https://huggingface.co/datasets/Omnibus/game-data-1/raw/main/'
 token_self = os.environ['HF_TOKEN']
 api=HfApi(token=token_self)
@@ -26,7 +26,30 @@ platform = 'https://huggingface.co/spaces/Omnibus/game-test/resolve/main/assets/
 star = 'https://huggingface.co/spaces/Omnibus/game-test/resolve/main/assets/star.png'
 bomb = 'https://huggingface.co/spaces/Omnibus/game-test/resolve/main/assets/bomb.png'
 dude = 'https://huggingface.co/spaces/Omnibus/game-test/resolve/main/assets/dude.png'
-
+def predict(text, url_params):
+    load_game=url_params.get('game')
+    print (load_game)
+    if load_game != None:
+        try:
+            r = requests.get(f'{save_data}/games/{load_game}.omnigame') 
+            lod = json.loads(r.text)
+            #out_lod.append(lod)
+            print (lod)
+        except:
+            print("cannot load game")
+            pass
+        
+    else:
+       pass
+    return ["" + text + "", 'out']
+get_window_url_params = """
+    function(text_input, url_params) {
+        console.log(text_input, url_params);
+        const params = new URLSearchParams(window.location.search);
+        url_params = Object.fromEntries(params);
+        return [text_input, url_params];
+        }
+    """     
 
 
 def game_fn(sky=sky,star=star,bomb=bomb,platform=platform,dude=dude):
@@ -96,8 +119,18 @@ def enemy_fn(inp):
     out_url = f'https://omnibus-game-test.hf.space/file={out_file}'    
     return out,out_url
 
-def save_game(background_img,star_img,enemy_img,platform_img,dude_img):
+def save_game(name,score,background_img,star_img,enemy_img,platform_img,dude_img):
     user_repo=save_data.split('datasets/',1)[1].split('/raw',1)[0]
+    timestamp=str(datetime.datetime.now())
+    timename=timestamp.replace(" ","--").replace(":","-").replace(".","-")    
+    if name != "":
+        if file_exists(f"{user_repo}", f"games/{name}.omnigame",repo_type="dataset"):
+            return "Game Saved with this Name.  Choose a different Name."
+        else:
+            game=name
+    else:
+        game=timename
+    
     #out_lod=[]
     try:
         r = requests.get(f'{save_data}game_data.json') 
@@ -107,13 +140,12 @@ def save_game(background_img,star_img,enemy_img,platform_img,dude_img):
     except:
         lod=[]
         pass
-    timestamp=str(datetime.datetime.now())
-    timename=timestamp.replace(" ","--").replace(":","-").replace(".","-")
+
     print(timestamp)
     try: 
         api.upload_file(
         path_or_fileobj=background_img,
-        path_in_repo=f"{save_data.split('main/',1)[1]}/images/background/{timename}-background_img.png",
+        path_in_repo=f"{save_data.split('main/',1)[1]}/images/background/{game}-background_img.png",
         repo_id=save_data.split('datasets/',1)[1].split('/raw',1)[0],
         token=token_self,
         repo_type="dataset",
@@ -124,7 +156,7 @@ def save_game(background_img,star_img,enemy_img,platform_img,dude_img):
     try: 
         api.upload_file(
         path_or_fileobj=star_img,
-        path_in_repo=f"{save_data.split('main/',1)[1]}/images/star/{timename}-star_img.png",
+        path_in_repo=f"{save_data.split('main/',1)[1]}/images/star/{game}-star_img.png",
         repo_id=save_data.split('datasets/',1)[1].split('/raw',1)[0],
         token=token_self,
         repo_type="dataset",
@@ -135,7 +167,7 @@ def save_game(background_img,star_img,enemy_img,platform_img,dude_img):
     try: 
         api.upload_file(
         path_or_fileobj=enemy_img,
-        path_in_repo=f"{save_data.split('main/',1)[1]}/images/enemy/{timename}-enemy_img.png",
+        path_in_repo=f"{save_data.split('main/',1)[1]}/images/enemy/{game}-enemy_img.png",
         repo_id=save_data.split('datasets/',1)[1].split('/raw',1)[0],
         token=token_self,
         repo_type="dataset",
@@ -145,9 +177,11 @@ def save_game(background_img,star_img,enemy_img,platform_img,dude_img):
         pass           
     block = {'index': len(lod) + 1,
             'timestamp': timestamp,
-            'background_url': f'https://huggingface.co/datasets/{user_repo}/resolve/main/images/background/{timename}-background_img.png',
-            'star_url': f'https://huggingface.co/datasets/{user_repo}/resolve/main/images/star/{timename}-star_img.png',
-            'enemy_url': f'https://huggingface.co/datasets/{user_repo}/resolve/main/images/enemy/{timename}-enemy_img.png',
+            'game_name': game,
+            'score': score, 
+            'background_url': f'https://huggingface.co/datasets/{user_repo}/resolve/main/images/background/{game}-background_img.png',
+            'star_url': f'https://huggingface.co/datasets/{user_repo}/resolve/main/images/star/{game}-star_img.png',
+            'enemy_url': f'https://huggingface.co/datasets/{user_repo}/resolve/main/images/enemy/{game}-enemy_img.png',
             #'platform_url': f'https://huggingface.co/datasets/{repo}/{space}/raw/main/{platform_img}',
             #'dude_url': f'https://huggingface.co/datasets/{repo}/{space}/raw/main/{dude_img}',
             }
@@ -169,7 +203,38 @@ def save_game(background_img,star_img,enemy_img,platform_img,dude_img):
         print("success")
     except Exception as e:
         print (e)
-        pass
+        return f'Error Saving Game: {e}'
+    block = {'game_name': game,
+            'timestamp': timestamp,
+            'background_url': f'https://huggingface.co/datasets/{user_repo}/resolve/main/images/background/{game}-background_img.png',
+            'star_url': f'https://huggingface.co/datasets/{user_repo}/resolve/main/images/star/{game}-star_img.png',
+            'enemy_url': f'https://huggingface.co/datasets/{user_repo}/resolve/main/images/enemy/{game}-enemy_img.png',
+            #'platform_url': f'https://huggingface.co/datasets/{repo}/{space}/raw/main/{platform_img}',
+            #'dude_url': f'https://huggingface.co/datasets/{repo}/{space}/raw/main/{dude_img}',
+            }
+    print(block)
+    lod.append(block)    
+    
+    json_object = json.dumps(lod, indent=4)
+    with open("tmp2.json", "w") as outfile:
+        outfile.write(json_object)
+    try: 
+        api.upload_file(
+        path_or_fileobj="tmp2.json",
+        path_in_repo=f"{save_data.split('main/',1)[1]}/games/{game}.omnigame",
+        repo_id=save_data.split('datasets/',1)[1].split('/raw',1)[0],
+        token=token_self,
+        repo_type="dataset",
+        )
+        os.remove("tmp2.json")
+        print("success")
+        game_url=f'{this_url}?game={game}'
+    except Exception as e:
+        print (e)
+        return f'Error Saving Game: {e}'
+    return f"Game Saved\nURL: {game_url}"
+
+        
 score_js="""
 
 function(text_input) {
@@ -204,25 +269,27 @@ with gr.Blocks() as app:
         update_game=gr.Button("Make Game")
         #start_prompt=gr.Textbox(value="beautiful landscape, real, 8k",visible=False)
     html_game = gr.HTML()
-    save_btn=gr.Button("Save")
+    with gr.Row():
+        game_name=gr.Textbox(label="Name for Game (optional)")
+        save_btn=gr.Button("Save")
+        message=gr.Textbox(label="Status",interactive=False)
     get_score=gr.Button("Get Score")
+    with gr.Row():
+        score=gr.Textbox()
+        url_params=gr.Textbox()
     with gr.Row():
         text_input=gr.Textbox()
         url_params=gr.Textbox()
-        
+        acc=gr.Textbox()
     def return_score(text):
-        '''if url_params.get('url') ==check_acc:
-            out = gr.update(visible=True)
-        else:
-            out=gr.update(visible=False)
-            #out=gr.HTML.update("""<head><meta http-equiv="refresh" content="0;URL='https://huggingface.co/spaces"></head>""")'''
-        return ["" + text + ""]
-    get_score.click(return_score,text_input,[text_input],_js=score_js)
-    save_btn.click(save_game,[out_im_sky,out_im_star,out_im_enemy,out_im_enemy,out_im_enemy],None)
+        return text
+    get_score.click(return_score,score,[score],_js=score_js)
+    save_btn.click(save_game,[game_name,score,out_im_sky,out_im_star,out_im_enemy,out_im_enemy,out_im_enemy],message)
     update_game.click(game_fn,[out_sky_url,out_star_url,out_enemy_url],html_game)
     btn_sky.click(sky_fn,prompt_sky,[out_im_sky,out_sky_url])
     btn_star.click(star_fn,prompt_star,[out_im_star,out_star_url])
     btn_enemy.click(enemy_fn,prompt_enemy,[out_im_enemy,out_enemy_url])
+    app.load(predict,[text_input,url_params],[text_output,acc], _js=get_window_url_params) 
 
     #app.load(sky_fn,prompt_sky,[out_im_sky,out_sky_url]).then(game_fn,[out_sky_url],html_game)
 app.queue(concurrency_count=10).launch()