From 9869f4379bf4f997402ff14e9e318678236b2113 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Fri, 12 Apr 2019 17:27:30 -0600
Subject: [PATCH] fixed caching generator not using prompts

---
 generate.sh | 6 +++---
 main.py     | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/generate.sh b/generate.sh
index b7b7dae..9ccce8b 100755
--- a/generate.sh
+++ b/generate.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-START=25
-END=50
+START=0
+END=15
 for ((I=START;I<END;I++));
 do
-	python3 main.py "$(($I * 2))" "$(( ($I + 1) * 2 ))" &
+	python3 main.py "$(($I * 1))" "$(( ($I + 1) * 1 ))" &
 done
diff --git a/main.py b/main.py
index 0efe002..94d676f 100644
--- a/main.py
+++ b/main.py
@@ -124,7 +124,7 @@ def about():
 
 def cache_file(seed, prompt_num, choices, response, tag):
 
-    blob_file_name = "prompt" + str(prompt_num) + "/seed" + str(seed) + "/" + tag
+    blob_file_name = "fixed-prompt" + str(prompt_num) + "/seed" + str(seed) + "/" + tag
     for action in choices:
         blob_file_name = blob_file_name + str(action)
     blob = bucket.blob(blob_file_name)
@@ -135,7 +135,7 @@ def cache_file(seed, prompt_num, choices, response, tag):
 
 
 def retrieve_from_cache(seed, prompt_num, choices, tag):
-    blob_file_name = "prompt" + str(prompt_num) + "/seed" + str(seed) + "/" + tag
+    blob_file_name = "fixed-prompt" + str(prompt_num) + "/seed" + str(seed) + "/" + tag
 
     for action in choices:
         blob_file_name = blob_file_name + str(action)
@@ -230,6 +230,7 @@ def generate_cache():
             response = action_results
             
         else:
+            prompt = initial_prompt + last_action_result
             action_results = [generate_action_result(prompt, phrase) for phrase in phrases]
             response = json.dumps(action_results)
             cache_file(seed, prompt_num, choices, response, "choices")
@@ -238,7 +239,7 @@ def generate_cache():
         for j in range(4):
             new_choices = choices[:]
             new_choices.append(j)
-            action_queue.append([seed, 0, new_choices, initial_prompt, un_jsoned[j]])
+            action_queue.append([seed, 0, new_choices, initial_prompt, un_jsoned[j][1]])
 
 if __name__ == '__main__':
     if(len(sys.argv) > 1):