update

.gitignore

@@ -2,3 +2,4 @@
 gpt2/models/*
 .idea
 RL
+*.json

AI-Adventure-1f64082e4e50.json

@@ -1,12 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "ai-adventure",
-  "private_key_id": "1f64082e4e50e81ef90de898a148cd8fc861b9c2",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDS3TlwjJln4tcw\nS+nngqPojTA2f48yhoXCGO9BuxblpZaxJ4wa7+YuQDKbEOsh5u8/0B3u1CSTC5bP\nWwpMrSXQZ3uMqNEw+nNdT5pdWdimuHZSqmIzUarsxZH2ta/1/uVuw5854ZvZI8UM\n8KliU+73q5gmssZ3QgwIuEfbpXUXtqYX6iG9Sk/o//ykeCS/r726DR8gY2p7OHsd\n6d0w2//rufd88rdCEVsITycErF9JnTXVc7yWKXCUyOLQwAfHiin/WZMzSO8kePwB\nLL6Zfi92NzhNbaCdB2VhBDhvtgtbm/GLN1gd1RRet0bJUe4q+7QGdUAEitDjfKeX\nlvzAcToNAgMBAAECggEALeIGcCef79uL0I4MORyTtvQV9B3glnFwJJKRaT+hFVpp\nRmYhFfFyqEi+2kAdsfRSxhNul/vgc4C3kaoxPQsGKemCmFJZpqswtDKwl7SHsIt9\n77H0iU8xfrDk+IaDYedTnD0D5i/h3idq5sxtRyCVZJ4Zjv4ismuUO8eBl1lS99QY\nsw+PT8jCOIP86auhu21XjEgUWUf+LhaPdtOpg0uJkk5dvpWM97wpmP8oOn3T2UH7\nbk/gxqj5LrCmE3YZC3D8fHjyIJKhiHfI/YccV2NdhL+lYuS759xdsxFJDSqAyizC\nD8YINFr3zrILrF+3GuzNnFB/s1ReYrqBdzdOavnO0QKBgQD7utxriTz+KPlm5Ypv\njSafkL5p5XCJEH6cXFfTg0e48ZVDY3Juo5aQSbdqSySiKbzbz02fHbKLriMuk9GF\nh0Rs03Um2G6QW+xjHKn2pa2rpMWfanxgeM1ZoYBHKAzHE/F07EywZU7ZfNOTAJR5\nlEVl5Mks6VWr1tPdTGg8gMKDxQKBgQDWcOdJ1z2VFPpzbabITlCEQBhGrWTB+2dB\na62oyydZTLRMUmJ7ofNywF/U5N1V1DjXUk2pPd/nxTKFcem3MJvoiNRRnZMlITmN\nsbJh3sMv/Z6wfgQO/PPajX5JHAK9HAriEvtHYEno0DWuVlYCXBDMi5EzYKS6gSQL\nAWoNTSIZqQKBgAH6Zu8FZhBNPCB930efIVWRqp1kayz4jzYlV59W4cJnS5f6+RQ7\nftxlZ+aS7pfDojNL/r0oW5XTaX1dNgFJndUJGFuUydGil0n0GLXSeXnm0pK9IHsV\nl++DYGGuw+Lwmi4kCTo9oY/99h+qmoAWFTGGybnrn3u5NXMAvbT0AhNNAoGBAKks\nDOsuCQExuZuSZ78iOVb8EarAY/q80OrFfgzpqDNE1gBYBiWu0BY5OeEEZLCvaeBE\np8vaame4JHEuOskwae768zUn8Mub+IGWLDoVuTqFBMoLwDvqxp4mffhDRs3V76gG\nfYIDrosipxbQOa5G32HewUAdABe6harBBN9VeI9xAoGAIeGsuFk3dN5Wl/Ijp18R\noMx3tGTREB1XqkAojjwvLjwRrqUniGAJP8G4cZXWdsDpBDMYMpDu49lCp+r+Nxe3\nlTmFYE7Ag5q0/6CulTbofFogzgN/ajlaSWOEEHK564rYlCHWEZrThZWzGHHv1FOT\nA0qu+eWl21GfwU4irTEGCSU=\n-----END PRIVATE KEY-----\n",
-  "client_email": "360916456297-compute@developer.gserviceaccount.com",
-  "client_id": "102011190469340390254",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/360916456297-compute%40developer.gserviceaccount.com"
-}

main.py

@@ -17,7 +17,7 @@ import datetime
 from flask import g
 import os
 
-os.environ['GOOGLE_APPLICATION_CREDENTIALS']="./AI-Adventure-1f64082e4e50.json"
+os.environ['GOOGLE_APPLICATION_CREDENTIALS']="./AI-Adventure-2bb65e3a4e2f.json"
 
 from google.cloud import storage
 from google import cloud
@@ -31,7 +31,8 @@ app = Flask(__name__)
 
 
 # App Info
-gen_ip = "0.0.0.0:8090"
+#gen_ip = "http://35.192.97.36:8010/"
+gen_ip = "http://0.0.0.0:8090"
 phrases = [" You attack", " You use", " You tell", " You go"]
 prompts = ["You enter a dungeon with your trusty sword and shield. You are searching for the evil necromancer who killed your family. You've heard that he resides at the bottom of the dungeon, guarded by legions of the undead. You enter the first door and see"]
 requested_map = {}
@@ -91,9 +92,9 @@ def story_request():
         if action_results is not None:
             response = action_results
         else:
-
-            response = requests.post(gen_ip + "/generate", request.form)
-            response = response.json()
+            response = requests.post(gen_ip + "/generate",
+                                     data={"actions":"true","seed":seed, "prompt_num":prompt_num, "prompt": prompt, "choices": json.dumps(choices)})
+            response = response.text
             cache_file(seed, prompt_num, choices, response, "choices")
     else:
     
@@ -103,8 +104,8 @@ def story_request():
         if result is not None:
             response = result
         else:
-            response = requests.post(gen_ip + "/generate", request.form)
-            response = response.json()
+            response = requests.post(gen_ip + "/generate", data={"actions":"false","seed":seed, "prompt_num":prompt_num})
+            response=response.text
             cache_file(seed, prompt_num, [], response, "story")
         
     print("\nGenerated response is: \n", response)
@@ -119,8 +120,6 @@ def teardown_sess(_):
     if sess is not None:
         sess.close()
 
-
-
 if __name__ == '__main__':
       app.run(host='0.0.0.0', port=8080)
         

requirements.txt

@@ -1,4 +1,3 @@
-regex
 google-cloud-storage
 numpy
 flask

static/script.js

@@ -1,16 +1,19 @@
-var prompts = ["You enter a dungeon with your trusty sword and shield. You are searching for the evil necromancer who killed your family. You've heard that he resides at the bottom of the dungeon, guarded by legions of the undead. You enter the first door and see"]
+var prompts = ["You enter a dungeon with your trusty sword and shield. You are searching for the evil necromancer who killed your family and have heard that he resides at the bottom of the dungeon, guarded by legions of the undead. You enter the first door and see"]
 
-start_text = "<span id='a'>Adventurer@AIDungeon</span>:<span id='b'>~</span><span id='c'>$</span> ./EnterDungeon \n <br/>"
+start_text = "<span id='a'>Adventurer@AIDungeon</span>:<span id='b'>~</span><span id='c'>$</span> ./EnterDungeon \n <br/><!-- laglaglaglaglaglaglaglaglaglaglag-->"
 
 
 var acceptInput=false
+var action_waiting = false
 var inputStr = ""
+var typing = false
 var blinkCounter = 0
 var action_list = ["You attack", "You tell", "You use", "You go"]
 var prompt_num = 0
 var seed_max = 100
 var seed_min = 0
-var seed = Math.floor(Math.random() * (+seed_max - +seed_min)) + +seed_min; 
+//var seed = Math.floor(Math.random() * (+seed_max - +seed_min)) + +seed_min; 
+var seed = 108
 console.log("Seed is ", seed)
 
 var StoryTracker = {
@@ -41,8 +44,22 @@ var StoryTracker = {
         Typer.appendToText("\n\nOptions:")
     },
     
+    actionWait:function(){
+        console.log("action waiting ", action_waiting)
+        console.log("typing ", typing)
+        if(action_waiting == true || typing){
+            setTimeout(StoryTracker.actionWait, 2000);
+        }
+        else{
+            Typer.appendToText(" Generating...")
+        }
+    
+    },
+    
     addNextAction:function(action_result){
     
+        action_waiting = false
+    
         var action_results = JSON.parse(action_result)
     
         for (i = 0; i < 4; i++){
@@ -97,6 +114,8 @@ var StoryTracker = {
             StoryTracker.lastAction = StoryTracker.actions[choice_int]
             StoryTracker.lastStory = StoryTracker.results[choice_int]
             StoryTracker.makeActionRequests(StoryTracker.firstStory + StoryTracker.lastStory)
+            action_waiting = true
+            setTimeout(StoryTracker.actionWait, 2000);
             Typer.appendToText("\n")
             Typer.appendToText(StoryTracker.lastStory)
             Typer.appendToText("\n\nOptions:")
@@ -128,7 +147,8 @@ var Typer={
 	},
 	
 	appendToText:function(str){
-	    str = str.replace(".", "." + "<!-- laglaglaglaglaglaglaglaglaglag -->")
+	    str = str.replace(".", "." + "<!-- laglag-->")
+	    typing = true
 	    Typer.text = Typer.text + str;
 	},
  
@@ -151,6 +171,9 @@ var Typer={
 		    $("#console").html(text.replace(rtn,"<br/>"))
 		    window.scrollBy(0,50) 
 		}
+		else{
+		    typing = false
+		}
 		
 	},
  
@@ -179,7 +202,7 @@ function writeAppend(str){
 
 
 function startTyping(){
-    addTextTimer = setInterval("typeWords()", 30)
+    addTextTimer = setInterval("typeWords()", 25)
  
 }
 

templates/index.html

@@ -9,5 +9,6 @@
     <script type="text/javascript" src="static/script.js"> 
     </script> 
     <div id="console"></div> 
+    "\n\n\n\n"
   </body> 
 </html>