27 update report for irrigation and farm calendar (#28)

JoleVLF · JoleVLF · web-flow · commit 017b13418f75 · 2025-04-07T14:12:36.000+02:00
* Readme update

* Update data regarding the farm activity calendar

* Update report.py

File report upsert

* Updata data model and logging

---------

Co-authored-by: JoleVLF &lt;Jovan@DESKTOP-JTIACNO&gt;
diff --git a/app/api/api_v1/endpoints/report.py b/app/api/api_v1/endpoints/report.py
@@ -85,19 +85,6 @@ async def generate_generic_observation_report(
 
 
     """
-    possible_names = [
-        "Pesticides",
-        "Irrigation",
-        "Fertilization",
-        "CropStressIndicator",
-        "CropGrowthObservation",
-    ]
-    if observation_type_name not in possible_names:
-        raise HTTPException(
-            status_code=400,
-            detail=f"Observation type name: {observation_type_name} is not inside supported types: {possible_names}",
-        )
-
     if observation_type_name == "CropGrowthObservation":
         observation_type_name = "Crop Growth Stage Observation"
 
@@ -151,10 +138,11 @@ async def generate_generic_observation_report(
 
     else:
         try:
+            dt = json.load(data.file)
             pdf = process_farm_calendar_data(
                 activity_type_info=observation_type_name,
-                observations=json.load(data.file)["observations"],
-                farm_activities=json.load(data.file)["farm_activities"],
+                observations=dt["observations"],
+                farm_activities=dt["farm_activities"],
             )
 
         except JSONDecodeError as e:
diff --git a/app/init_gatekeeper.py b/app/init_gatekeeper.py
@@ -38,7 +38,7 @@ def register_apis_to_gatekeeper():
                 "endpoint": f"api/v1/{api.path.strip('/')}",
                 "methods": list(api.methods),
             }
-            logger.info("Port registered", settings.REPORTING_SERVICE_PORT)
+            logger.info("Port registered: %s", settings.REPORTING_SERVICE_PORT)
             api_response = requests.post(
                 url=settings.REPORTING_GATEKEEPER_BASE_URL + "api/register_service/",
                 headers={
diff --git a/app/schemas/animals.py b/app/schemas/animals.py
@@ -24,6 +24,6 @@ class Animal(BaseModel):
     birthdate: datetime
     isMemberOfAnimalGroup: Optional[AnimalGroup]
     status: int
-    invalidatedAtTime: Optional[datetime]
-    dateCreated: datetime
-    dateModified: datetime
+    invalidatedAtTime: Optional[datetime] = None
+    dateCreated: Optional[datetime] = None
+    dateModified: Optional[datetime] = None
diff --git a/app/schemas/compost.py b/app/schemas/compost.py
@@ -1,34 +1,42 @@
 from pydantic import BaseModel, Field
-from typing import List
+from typing import List, Optional
 from datetime import datetime
 
 
+class HasResult(BaseModel):
+    type: str = Field(alias="@type")
+    id: str = Field(alias="@id")
+    unit: Optional[str] = (None,)
+    hasValue: Optional[str] = None
+
+
 class CropObservation(BaseModel):
     """Model for observations"""
 
     type: str = Field(alias="@type")
     id: str = Field(alias="@id")
-    activityType: str
+    activityType: dict
     title: str
     details: str
-    hasStartDatetime: datetime
-    hasEndDatetime: datetime
-    responsibleAgent: str
-    usesAgriculturalMachinery: List[str]
-    hasValue: str
-    isMeasuredIn: str
-    relatesToProperty: str
+    hasStartDatetime: Optional[datetime] = None
+    hasEndDatetime: Optional[datetime] = None
+    responsibleAgent: Optional[str] = None
+    usesAgriculturalMachinery: List[dict] = []
+    hasResult: Optional[HasResult] = None
+    isMeasuredIn: Optional[str] = None
+    relatesToProperty: Optional[str] = None
+    observedProperty: Optional[str] = None
 
 
 class Operation(BaseModel):
     """Model for farm operations"""
 
     type: str = Field(alias="@type")
     id: str = Field(alias="@id")
-    activityType: str
+    activityType: dict
     title: str
     details: str
-    hasStartDatetime: datetime
-    hasEndDatetime: datetime
-    responsibleAgent: str
-    usesAgriculturalMachinery: List[str]
+    hasStartDatetime: Optional[datetime] = None
+    hasEndDatetime: Optional[datetime] = None
+    responsibleAgent: Optional[str] = None
+    usesAgriculturalMachinery: List[dict] = []
diff --git a/app/schemas/irrigation.py b/app/schemas/irrigation.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import List
+from typing import List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -16,13 +16,13 @@ class IrrigationOperation(BaseModel):
 
     type: str = Field(alias="@type")
     id: str = Field(alias="@id")
-    activityType: str
+    activityType: dict
     title: str
     details: str
-    hasStartDatetime: datetime
-    hasEndDatetime: datetime
-    responsibleAgent: str
-    usesAgriculturalMachinery: List[str]
+    hasStartDatetime: Optional[datetime] = None
+    hasEndDatetime: Optional[datetime] = None
+    responsibleAgent: Optional[str] = None
+    usesAgriculturalMachinery: List[dict] = []
     hasAppliedAmount: QuantityValue
     usesIrrigationSystem: str
-    operatedOn: str
+    operatedOn: Optional[dict] = None
diff --git a/app/utils/animals_report.py b/app/utils/animals_report.py
@@ -65,7 +65,7 @@ def create_pdf_from_animals(animals: List[Animal]):
         pdf.cell(
             0,
             10,
-            f"Created: {animal.dateCreated} | Modified: {animal.dateModified}",
+            f"Created: {animal.dateCreated if animal.dateCreated else 'N/A'} | Modified: {animal.dateModified if animal.dateModified else 'N/A'}",
             ln=True,
         )
         pdf.ln(10)
diff --git a/app/utils/farm_calendar_report.py b/app/utils/farm_calendar_report.py
@@ -61,30 +61,96 @@ def create_farm_calendar_pdf(calendar_data: FarmCalendarData) -> EX:
 
         pdf.set_font("FreeSerif", "", 9)
         pdf.multi_cell(0, 10, f"Details: {operation.details}", ln=True)
-        pdf.cell(0, 10, f"Start: {operation.hasStartDatetime}", ln=True)
-        pdf.cell(0, 10, f"End: {operation.hasEndDatetime}", ln=True)
-        pdf.cell(0, 10, f"Responsible: {operation.responsibleAgent}", ln=True)
+
+        if operation.hasStartDatetime:
+            pdf.cell(
+                0,
+                10,
+                f"Start: {operation.hasStartDatetime}",
+                ln=True,
+            )
+
+        if operation.hasEndDatetime:
+            pdf.cell(
+                0,
+                10,
+                f"End: {operation.hasEndDatetime}",
+                ln=True,
+            )
+
+        (
+            pdf.cell(0, 10, f"Responsible: {operation.responsibleAgent}", ln=True)
+            if operation.responsibleAgent
+            else None
+        )
+        pdf.cell(0, 10, f"Type: {operation.activityType.get('@id', 'N/A')}", ln=True)
 
         if operation.usesAgriculturalMachinery:
-            pdf.cell(0, 10, "Machinery:", ln=True)
-            for machinery in operation.usesAgriculturalMachinery:
-                pdf.cell(0, 10, f"  - {machinery.split(':')[3]}", ln=True)
+            machinery_ids = ", ".join(
+                [
+                    machinery.get("@id", "N/A").split(":")[3]
+                    for machinery in operation.usesAgriculturalMachinery
+                ]
+            )
+            pdf.cell(0, 10, f"Machinery IDs: {machinery_ids}", ln=True)
 
         for x in calendar_data.observations:
             pdf.set_font("FreeSerif", "B", 10)
             pdf.cell(0, 10, "Observations:", ln=True)
             pdf.set_font("FreeSerif", "", 10)
-            pdf.cell(0, 10, f"Value: {x.hasValue}", ln=True)
-            pdf.cell(0, 10, f"Property: {x.relatesToProperty}", ln=True)
+            (
+                pdf.cell(0, 10, f"Value: {x.hasResult.hasValue}", ln=True)
+                if x.hasResult
+                else None
+            )
+            (
+                pdf.cell(0, 10, f"Value unit: {x.hasResult.unit}", ln=True)
+                if x.hasResult
+                else None
+            )
+            (
+                pdf.cell(0, 10, f"Property: {x.relatesToProperty}", ln=True)
+                if x.relatesToProperty
+                else None
+            )
+            (
+                pdf.cell(0, 10, f"Observed Property: {x.observedProperty}", ln=True)
+                if x.observedProperty
+                else None
+            )
             pdf.cell(0, 10, f"Details: {x.details}", ln=True)
-            pdf.cell(0, 10, f"Start: {x.hasStartDatetime}", ln=True)
-            pdf.cell(0, 10, f"End: {x.hasEndDatetime}", ln=True)
-            pdf.cell(0, 10, f"Responsible: {x.responsibleAgent}", ln=True)
+
+            if x.hasStartDatetime:
+                pdf.cell(
+                    0,
+                    10,
+                    f"Start: {x.hasStartDatetime}",
+                    ln=True,
+                )
+
+            if x.hasEndDatetime:
+                pdf.cell(
+                    0,
+                    10,
+                    f"Start: {x.hasEndDatetime}",
+                    ln=True,
+                )
+
+            (
+                pdf.cell(0, 10, f"Responsible: {x.responsibleAgent}", ln=True)
+                if x.responsibleAgent
+                else None
+            )
 
             if x.usesAgriculturalMachinery:
-                pdf.cell(0, 10, "Machinery:", ln=True)
-                for machinery in operation.usesAgriculturalMachinery:
-                    pdf.cell(0, 10, f"  - {machinery.split(':')[3]}", ln=True)
+                machinery_ids = ", ".join(
+                    [
+                        machinery.get("@id", "N/A").split(":")[3]
+                        for machinery in x.usesAgriculturalMachinery
+                    ]
+                )
+                pdf.cell(0, 10, f"Machinery IDs: {machinery_ids}", ln=True)
+
         pdf.ln(10)
 
     return pdf
diff --git a/app/utils/irrigation_report.py b/app/utils/irrigation_report.py
@@ -6,14 +6,11 @@
 from utils import EX, add_fonts
 from schemas.irrigation import *
 
-
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 
-def parse_irrigation_operations(
-    data: dict,
-) -> Optional[List[IrrigationOperation]]:
+def parse_irrigation_operations(data: dict) -> Optional[List[IrrigationOperation]]:
     """
     Parse list of irrigation operations from JSON data
     """
@@ -48,32 +45,63 @@ def create_pdf_from_operations(operations: List[IrrigationOperation]):
         pdf.set_font("FreeSerif", "B", 9)
         pdf.cell(0, 10, f"Operation: {op.title}", ln=True)
 
+        # Activity Type
+        activity_type = op.activityType.get(
+            "@id", "N/A"
+        )  # You can adjust this to extract the specific part you need
+        pdf.set_font("FreeSerif", "B", 9)
+        pdf.cell(0, 10, f"Activity Type: {activity_type}", ln=True)
+
         # Details
         pdf.set_font("FreeSerif", "", 9)
         pdf.multi_cell(0, 10, f"Details: {op.details}")
         pdf.ln(5)
 
-        pdf.cell(0, 10, f"Operated on Parcel: {op.operatedOn.split(':')[3]}", ln=True)
-        pdf.cell(0, 10, f"Start: {op.hasStartDatetime}", ln=True)
-        pdf.cell(0, 10, f"End: {op.hasEndDatetime}", ln=True)
+        # Parcel ID extraction
+        parcel_id = (
+            op.operatedOn.get("@id", "N/A").split(":")[3] if op.operatedOn else "N/A"
+        )
+        pdf.cell(0, 10, f"Operated on Parcel: {parcel_id}", ln=True)
 
+        # Date and Time
+        pdf.cell(
+            0,
+            10,
+            f"Start: {op.hasStartDatetime if op.hasStartDatetime else 'N/A'}",
+            ln=True,
+        )
+        pdf.cell(
+            0, 10, f"End: {op.hasEndDatetime if op.hasEndDatetime else 'N/A'}", ln=True
+        )
+
+        # Applied Amount
         pdf.cell(
             0,
             10,
             f"Applied Amount: {op.hasAppliedAmount.numericValue} {op.hasAppliedAmount.unit}",
             ln=True,
         )
 
+        # Irrigation System
         pdf.cell(0, 10, f"Irrigation System: {op.usesIrrigationSystem}", ln=True)
-        pdf.cell(0, 10, f"Responsible Agent: {op.responsibleAgent}", ln=True)
 
+        # Responsible Agent
+        pdf.cell(
+            0,
+            10,
+            f"Responsible Agent: {op.responsibleAgent if op.responsibleAgent else 'N/A'}",
+            ln=True,
+        )
+
+        # Machinery IDs (if any)
         if op.usesAgriculturalMachinery:
-            pdf.cell(
-                0,
-                10,
-                f"Machinery IDs: {', '.join(op.usesAgriculturalMachinery).split(':')[3]}",
-                ln=True,
+            machinery_ids = ", ".join(
+                [
+                    machinery.get("@id", "N/A").split(":")[3]
+                    for machinery in op.usesAgriculturalMachinery
+                ]
             )
+            pdf.cell(0, 10, f"Machinery IDs: {machinery_ids}", ln=True)
 
         pdf.ln(10)
 
@@ -84,7 +112,6 @@ def process_irrigation_data(json_data: dict):
     """
     Process irrigation data and generate PDF report
     """
-
     operations = parse_irrigation_operations(json_data)
 
     if not operations:

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ def register_apis_to_gatekeeper():`
`38`	`38`	`"endpoint": f"api/v1/{api.path.strip('/')}",`
`39`	`39`	`"methods": list(api.methods),`
`40`	`40`	`}`
`41`		`- logger.info("Port registered", settings.REPORTING_SERVICE_PORT)`
	`41`	`+ logger.info("Port registered: %s", settings.REPORTING_SERVICE_PORT)`
`42`	`42`	`api_response = requests.post(`
`43`	`43`	`url=settings.REPORTING_GATEKEEPER_BASE_URL + "api/register_service/",`
`44`	`44`	`headers={`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ def create_pdf_from_animals(animals: List[Animal]):`
`65`	`65`	`pdf.cell(`
`66`	`66`	`0,`
`67`	`67`	`10,`
`68`		`- f"Created: {animal.dateCreated} \| Modified: {animal.dateModified}",`
	`68`	`+ f"Created: {animal.dateCreated if animal.dateCreated else 'N/A'} \| Modified: {animal.dateModified if animal.dateModified else 'N/A'}",`
`69`	`69`	`ln=True,`
`70`	`70`	`)`
`71`	`71`	`pdf.ln(10)`