Update process_data.py

process_data.py

@@ -42,10 +42,10 @@ def generate_json(input_data, parameters):
     interactions_prompt = "Extract the interactions information."
     trial_prompt = "Extract the trial information."
     
-    if input_data["input_context"]:
-        farm_prompt = input_data["input_context"] + farm_prompt
-        interactions_prompt = input_data["input_context"] + interactions_prompt
-        trial_prompt = input_data["input_context"] + trial_prompt
+    if parameters["combined_pre_prompt"]:
+        farm_prompt = parameters["combined_pre_prompt"] + farm_prompt
+        interactions_prompt = parameters["combined_pre_prompt"] + interactions_prompt
+        trial_prompt = parameters["combined_pre_prompt"] + trial_prompt
 
         
     try:
@@ -166,11 +166,12 @@ def generate_json_pieces(input_data, parameters):
     # figure out what happens when there's 
     # chaining, pre-prompts, context, etc .... 
     
-    if input_data["input_context"]:
-        field_prompt = input_data["input_text_pieces"]["field_data_input"] + field_prompt
-    #    farm_prompt = input_data["input_text_pieces"]["field_data_input"] + farm_prompt
-    #    farm_prompt = input_data["input_text_pieces"]["field_data_input"] + farm_prompt
-    #    farm_prompt = input_data["input_text_pieces"]["field_data_input"] + farm_prompt
+    if parameters["combined_pre_prompt"]:
+        field_prompt = parameters["combined_pre_prompt"] + field_prompt
+        plant_prompt = parameters["combined_pre_prompt"] + plant_prompt
+        log_prompt = parameters["combined_pre_prompt"] + log_prompt
+        soil_prompt = parameters["combined_pre_prompt"] + soil_prompt
+        yield_prompt = parameters["combined_pre_prompt"] + yield_prompt
 
     try:
         # Call OpenAI API to generate structured output based on prompt
@@ -255,7 +256,7 @@ def pre_processing(input_data, parameters):
 
     Returns: 
         (dict) input_data
-        input_data["input_context"] = (bool) whether the input text should be used as context or not
+        input_data["input_context"] = (str) the text which should be used as context or "EMPTY" to indicate there is no context
         input_data["input_text"] = (str) input text
     """
     if input_data["stepwise_json_creation"] == "stepwisejsoncreation":
@@ -275,9 +276,10 @@ def pre_processing(input_data, parameters):
                 input_data["input_text_pieces"]["pre_processed_pieces"][text_label] = response_text
         else:
             # Add in here the other schemas (interactions and trials)
-            input_context = f"You are processing farm activity data. Here's important context of the data {parameters['combined_prompt']}. With this context in mind, "
-            input_data["input_context"] = input_context
-            return input_data
+            #if parameters['combined_prompt']:
+            #    input_context = f"You are processing farm activity data. Here's important context of the data {parameters['combined_pre_prompt']}. With this context in mind, "
+            #    input_data["input_context"] = input_context
+            #    return input_data
             
         
     if input_data["stepwise_json_creation"] == "singlejsoncreation":    
@@ -317,13 +319,13 @@ def pre_processing(input_data, parameters):
                 except Exception as e:
                     print(f"Failed to parse response as JSON. Error was: {e}")
     
-            input_data["input_context"] = False
-            input_data["input_text"] = input_text
-            return input_data
+            #input_data["input_context"] = "EMPTY"
+            #input_data["input_text"] = input_text
+            #return input_data
         else:
-            input_context = f"You are processing farm activity, interactions, and trial data. Here's important context of the data {parameters['combined_prompt']}. With this context in mind, "
-            input_data["input_context"] = input_context
-            return input_data
+            #input_context = f"You are processing farm activity, interactions, and trial data. Here's important context of the data {parameters['combined_pre_prompt']}. With this context in mind, "
+            #input_data["input_context"] = input_context
+            #return input_data
         
 
     
@@ -366,7 +368,7 @@ def process_specifications(input_data, parameters):
         return generate_json_pieces(processed_input, parameters)
     elif input_data["stepwise_json_creation"][0] == "singlejsoncreation":
         print("You are elifing into single json creation")
-        input_data["input_context"] = False
+        #input_data["input_context"] = "EMPTY"
         if parameters["pre_prompt"] == True:
             print("You are preprocessing now")
             processed_input = pre_processing(input_data, parameters)