Update process_data.py

process_data.py

@@ -197,7 +197,7 @@ def generate_json_pieces(input_data, parameters):
         
         print("FIELD JSON: ")
         print(field_generated_json) # debugging
-        farm_pretty_json = field_generated_json.json()
+        field_pretty_json = field_generated_json.json()
 
         
         plant_response = client.beta.chat.completions.parse(
@@ -264,19 +264,21 @@ def generate_json_pieces(input_data, parameters):
         print(yield_generated_json) # debugging
         yield_pretty_json = yield_generated_json.json()
 
+        plantings = {
+            **plant_pretty_json,
+            "logs": log_pretty_json,
+            "soil": soil_pretty_json,
+            "yield_": yield_pretty_json
+        }
         
-        #combined_json = field_response.choices[0].message.parsed.copy()
-        #combined_json["plantings"] = plant_response.choices[0].message.parsed
-        #combined_json["plantings"]["logs"] = log_response.choices[0].message.parsed
-        #combined_json["plantings"]["soil"] = soil_response.choices[0].message.parsed
-        #combined_json["plantings"]["yield"] = yield_response.choices[0].message.parsed
-        
-        #print(combined_json) # debugging
+        farm_activities = {
+            **field_pretty_json,
+            "plantings": plantings
+        }
 
-        #pretty_json = combined_json.json()
+        final_pretty_json = farm_activities.json()
 
-        # this is a hack because i need to make the other two schemas still 
-        return pretty_json, pretty_json, pretty_json
+        return final_pretty_json, final_pretty_json, final_pretty_json
     except Exception as e:
         return {"error": "Failed to generate valid JSON. " + str(e)}