more small changes to fit structure

app.py

@@ -66,6 +66,10 @@ class Structure(str, Enum):
     LOAMYSAND = 'loamy sand'
     SAND = 'sand'
     SILT = 'silt'
+
+class Yield(BaseModel):
+    quantity: str = Field(..., title="Quantity", description="A description of the total yield (harvested amount) from this planting, including units when available")
+    quality: str = Field(..., title="Quality", description="The product quality of the harvest.  For example, small or large fruits, sweet or tart flavor, easily molding or containing mold, high number of product seconds, etc.")
     
 class Soil(BaseModel): 
     description: str = Field(..., title="Description", description="A general description of the soil")
@@ -83,17 +87,13 @@ class Planting(BaseModel):
     crop: List[str] = Field(..., title="Crop", description="A list of the crops in this planting")
     variety: List[str] = Field(..., title="Variety", description="A list of the crop varieties in this planting")
     logs: List[Log] = Field(..., title="Logs", description="A list of all the logs that are associated with the farm activities")
-    soil: List[Soil] = Field(..., title="Soil", description="Information about the soil associated with or observed during the time of this planting")
+    soil: Soil = Field(..., title="Soil", description="Information about the soil associated with or observed during the time of this planting")
+    harvestYield: Yield = Field(..., title="Yield", description="Quantitative and qualitative observations regarding the yield of harvest") 
 
-class Yield(BaseModel):
-    quantity: str = Field(..., title="Quantity", description="A description of the total yield (harvested amount) from this planting, including units when available")
-    quality: str = Field(..., title="Quality", description="The product quality of the harvest.  For example, small or large fruits, sweet or tart flavor, easily molding or containing mold, high number of product seconds, etc.")
-    
 class FarmActivities(BaseModel):
     name: str = Field(..., title="Name", description="The name of the agricultural field.")
     description: str = Field(..., title="Description", description="The description of the agricultural field.")
     plantings: List[Planting] = Field(..., title="Plantings", description="All of the plantings which have occurred on this field.")
-    harvestYield: Yield = Field(..., title="Yield", description="Quantitative and qualitative observations regarding the yield of harvest") 
     
 # These are the components for Trials
 # TBD