Merge pull request #21 from SovereignEdgeEU-COGNIT/dev

Some fixes

Author: a-puente

cognit/modules/_cognit_frontend_client.py

@@ -221,7 +221,6 @@ def _get_edge_cluster_address(self) -> str:
         if self.is_max_latency_activated:
 
             self.logger.debug("Max latency is activated, calculating latency for Edge Cluster Frontend Engines")
-            # Calculate latency for each Edge Cluster Frontend Engine
             cluster_latencies = self.latency_calculator.get_latency_for_clusters(self.available_ecfs)
 
             if not cluster_latencies:

cognit/modules/_device_runtime_state_machine.py

@@ -8,6 +8,7 @@
 from cognit.models._device_runtime import Call
 from statemachine import StateMachine, State
 
+from threading import Event
 import sys
 
 sys.path.append(".")
@@ -64,7 +65,7 @@ class DeviceRuntimeStateMachine(StateMachine):
     token_not_valid_ready = ready.to(init, unless=["is_cfc_connected"])
     token_not_valid_ready_2 = ready.to(init, unless=["is_ecf_connected"])
     # 4.3 The requirements have changed, therefore, the requirements are uploaded again
-    ready_update_requirements = ready.to(send_init_request, cond=["is_cfc_connected", "is_ecf_connected", "have_requirements_changed"])
+    ready_update_requirements = ready.to(send_init_request, cond=["is_cfc_connected", "is_ecf_connected", "have_requirements_changed"], unless=["is_new_ecf_address_set"])
     # 4.4 Connect to the Edge Cluster Frontend Client if the address has changed
     ready_update_ecf_address = ready.to(get_ecf_address, cond=["is_cfc_connected", "is_ecf_connected", "is_new_ecf_address_set"], unless=["have_requirements_changed"])
 
@@ -97,6 +98,7 @@ def __init__(self, config: CognitConfig, requirements: Scheduling, call_queue: C
         self.call_queue = call_queue
         self.sync_results_queue = sync_result_queue
 
+        self.update_ecf_address_event = Event()
         super().__init__()
 
     # Get credentials by instantiating a CognitFrontendClient and authenticates to the Cognit Frontend  
@@ -222,11 +224,7 @@ def get_new_ecf_address(self):
         """
         Get the new Edge Cluster Frontend address from the CFC.
         """
-        self.new_ecf_address = self.cfc._get_edge_cluster_address()
-
-        if self.new_ecf_address == self.ecc_address:
-            self.logger.debug("New ECF address is the same as the current one")
-            self.new_ecf_address = None
+        self.update_ecf_address_event.set()
 
     # Checks if CF client has connection with the CF
     def is_cfc_connected(self):

cognit/modules/_latency_calculator.py

@@ -67,12 +67,6 @@ def get_latency_for_clusters(self, edge_clusters: list) -> dict:
                     continue
 
                 latency_by_cluster[cluster_ip] = latency
-
-        # Return lowest latency cluster as JSON string
-        if not latency_by_cluster:
-
-            self.logger.error("No valid edge clusters found.")
-            return {"error": "No valid edge clusters found."}
 
         return latency_by_cluster
 

cognit/modules/_sm_handler.py

@@ -79,6 +79,17 @@ def handle_ready_state(self):
         """
         Handle the ready state
         """
+        if self.sm.update_ecf_address_event.is_set():
+
+            self.logger.info("Updating ECF address...")
+            self.sm.new_ecf_address = self.sm.cfc._get_edge_cluster_address()
+
+            if self.sm.new_ecf_address == self.sm.ecc_address:
+                self.logger.info("New ECF address is the same as the current one. No update needed.")
+                self.sm.new_ecf_address = None
+
+            self.sm.update_ecf_address_event.clear() 
+
         if not self.sm.is_cfc_connected():
             self.sm.token_not_valid_ready()
         elif not self.sm.is_ecf_connected():

examples/minimal_offload_sync.dockerfile

@@ -6,6 +6,9 @@ WORKDIR /cognit
 # Copy repository inside the image
 COPY . .
 
+# Install ping to calculate latency
+RUN apt update -y && apt install iputils-ping -y
+
 # Install dependencies with no cache and build/install package directly to avoid leftover artifacts
 RUN pip install --upgrade --no-cache-dir pip setuptools wheel \
     && pip install --no-cache-dir -r requirements.txt \