Post all measurement types in ocsm (#53)

* Post all measurement types in ocsm

* Use oa ads variable for internal routing

* Strip trailist '/' in urls

Author: fedjo

.env.example

@@ -20,9 +20,12 @@ JWT_SIGNING_KEY=c2bab29d257f0ffc52d9ac677d4ff6d1d9d5e92e3d3939d3f4cwc
 JWT_ALG=HS256
 JWT_CRYPT_CONTEXT_SCHEME=bcrypt
 
-# FARM CALENDAR
+# FARM CALENDAR JOBS
 PUSH_THI_TO_FARMCALENDAR=True
-FARM_CALENDAR_URL=http://farmcalendar:8002
-
-# TASKS
+PUSH_FF_TO_FARMCALENDAR=
+PUSH_SPRAY_F_TO_FARMCALENDAR=
 INTERVAL_THI_TO_FARMCALENDAR=8
+
+# OA ADS ROUTING
+GATEKEEPER_URL=
+GATEKEEPER_FARM_CALENDAR_API=

docker-compose.yml

@@ -29,7 +29,7 @@ services:
       WEATHER_SRV_GATEKEEPER_PASSWORD: ${GATEKEEPER_SUPERUSER_PASSWORD}
       # FARM CALENDAR
       PUSH_THI_TO_FARMCALENDAR: ${PUSH_THI_TO_FARMCALENDAR}
-      FARM_CALENDAR_URL: ${FARM_CALENDAR_URL}
+      GATEKEEPER_FARM_CALENDAR_API: ${GATEKEEPER_FARM_CALENDAR_API}
       INTERVAL_THI_TO_FARMCALENDAR: ${INTERVAL_THI_TO_FARMCALENDAR}
     volumes:
       - ./data:/data:rw

src/core/config.py

@@ -20,7 +20,7 @@
 EXTRA_ALLOWED_HOSTS = os.environ.get('EXTRA_ALLOWED_HOSTS', "*").replace(' ', '').split(',')
 
 # GATEKEEPER
-GATEKEEPER_URL = os.environ.get('GATEKEEPER_URL', '')
+GATEKEEPER_URL = os.environ.get('GATEKEEPER_URL', '').rstrip('/')
 WEATHER_SRV_GATEKEEPER_USER = os.environ.get('WEATHER_SRV_GATEKEEPER_USER', '')
 WEATHER_SRV_GATEKEEPER_PASSWORD = os.environ.get('WEATHER_SRV_GATEKEEPER_PASSWORD', '')
 
@@ -31,7 +31,7 @@
 PUSH_THI_TO_FARMCALENDAR=os.environ.get('PUSH_THI_TO_FARMCALENDAR', '')
 PUSH_FLIGHT_FORECAST_TO_FARMCALENDAR=os.environ.get('PUSH_FLIGHT_FORECAST_TO_FARMCALENDAR', '')
 PUSH_SPRAY_F_TO_FARMCALENDAR=os.environ.get('PUSH_SPRAY_F_TO_FARMCALENDAR', '')
-FARM_CALENDAR_URL = os.environ.get('FARM_CALENDAR_URL', 'http://farmcalendar:8002')
+GATEKEEPER_FARM_CALENDAR_API = os.environ.get('GATEKEEPER_FARM_CALENDAR_API', 'http://farmcalendar:8002/api/v1/').rstrip('/')
 
 # TASKS
 INTERVAL_THI_TO_FARMCALENDAR = os.environ.get('INTERVAL_HOURS_THI_TO_FARMCALENDAR', 8)

src/external_services/interoperability.py

@@ -39,7 +39,7 @@ class InteroperabilitySchema:
                 "numericValue": 22.53,
                 "unit": "qudt:DEG_C"
             }
-        }
+    }
 
     collection_schema = {
         '@id': "",
@@ -162,7 +162,7 @@ def predictions_to_jsonld(cls, predictions: List[Prediction], spatial_entity: Po
                         "unit": property_schema[p.measurement_type]["unit"]
                     }
 
-                collection_schema["hasMember"].append(item_schema)
+                    collection_schema["hasMember"].append(item_schema)
                 semantic_data['@graph'].append(collection_schema)
         except Exception as e: # pylint: disable=W0718:broad-exception-caught
             logger.exception(e)

src/services/farmcalendar_service.py

@@ -21,7 +21,7 @@
 class FarmCalendarServiceClient(MicroserviceClient):
 
     def __init__(self, app: FastAPI):
-        super().__init__(base_url=config.FARM_CALENDAR_URL, service_name="Farm Calendar", app=app)
+        super().__init__(base_url=config.GATEKEEPER_FARM_CALENDAR_API, service_name="Farm Calendar", app=app)
 
     @backoff.on_exception(
         backoff.expo,
@@ -32,14 +32,14 @@ def __init__(self, app: FastAPI):
         max_tries=3
     )
     async def fetch_or_create_activity_type(self, activity_type: str, description: str) -> str:
-        act_jsonld = await self.get(f'/api/v1/FarmCalendarActivityTypes/?name={activity_type}')
+        act_jsonld = await self.get(f'/FarmCalendarActivityTypes/?name={activity_type}')
 
         if not self._get_activity_type_id(act_jsonld):
             json_payload = {
                 "name": activity_type,
                 "description": description,
             }
-            act_jsonld = await self.post('/api/v1/FarmCalendarActivityTypes/', json=json_payload)
+            act_jsonld = await self.post('/FarmCalendarActivityTypes/', json=json_payload)
 
         return self._get_activity_type_id(act_jsonld)
 
@@ -78,7 +78,7 @@ def _get_activity_type_id(self, jsonld: dict) -> Optional[str]:
         max_tries=3
     )
     async def fetch_locations(self):
-        response = await self.get('/api/v1/FarmParcels/')
+        response = await self.get('/FarmParcels/')
 
         locations = []
         for parcel in response.get("@graph", []):
@@ -116,7 +116,7 @@ async def fetch_and_cache_locations(self):
         max_tries=3
     )
     async def fetch_uavs(self):
-        response = await self.get(f'/api/v1/AgriculturalMachines/')
+        response = await self.get(f'/AgriculturalMachines/')
         uavmodels = [ uav.get("model") for uav in response.get("@graph", []) if uav.get("model", None)]
         return uavmodels
 
@@ -155,7 +155,7 @@ async def send_thi(self, lat, lon):
         )
         json_payload = observation.model_dump(by_alias=True, exclude_none=True)
         logger.debug(json_payload)
-        await self.post('/api/v1/Observations/', json=json_payload)
+        await self.post('/Observations/', json=json_payload)
 
     # Async function to post Flight Forecast data with JWT authentication
     @backoff.on_exception(
@@ -189,7 +189,7 @@ async def send_flight_forecast(self, lat, lon, uavmodels):
             )
             json_payload = observation.model_dump(by_alias=True, exclude_none=True)
             logger.debug(json_payload)
-            await self.post('/api/v1/Observations/', json=json_payload)
+            await self.post('/Observations/', json=json_payload)
 
     # Async function to post spray conditions Forecast data with JWT authentication
     @backoff.on_exception(
@@ -224,4 +224,4 @@ async def send_spray_forecast(self, lat, lon):
 
             json_payload = observation.model_dump(by_alias=True, exclude_none=True)
             logger.debug(json_payload)
-            await self.post('/api/v1/Observations/', json=json_payload)
+            await self.post('/Observations/', json=json_payload)