flow id sessions prefix

backend/src/utilities/database.py

@@ -56,6 +56,9 @@ def _normalize_json_fields(payload: Dict[str, Any]) -> None:
 
 
 def _derive_flow_id(payload: Dict[str, Any]) -> Optional[str]:
+    session_id = payload.get("capture_session_id")
+    session_prefix = f"{session_id}:" if session_id not in (None, "") else ""
+
     dpi_metadata = payload.get("dpi_metadata")
     if not isinstance(dpi_metadata, dict):
         return None
@@ -64,22 +67,22 @@ def _derive_flow_id(payload: Dict[str, Any]) -> Optional[str]:
     if isinstance(tcp_meta, dict):
         stream = tcp_meta.get("stream")
         if stream not in (None, "", []):
-            return f"tcp:{stream}"
+            return f"{session_prefix}tcp:{stream}"
 
     udp_meta = dpi_metadata.get("udp")
     if isinstance(udp_meta, dict):
         stream = udp_meta.get("stream")
         if stream not in (None, "", []):
-            return f"udp:{stream}"
+            return f"{session_prefix}udp:{stream}"
 
     tshark_meta = dpi_metadata.get("tshark")
     if isinstance(tshark_meta, dict):
         tcp_stream = tshark_meta.get("tcp_stream")
         if tcp_stream not in (None, "", []):
-            return f"tcp:{tcp_stream}"
+            return f"{session_prefix}tcp:{tcp_stream}"
         udp_stream = tshark_meta.get("udp_stream")
         if udp_stream not in (None, "", []):
-            return f"udp:{udp_stream}"
+            return f"{session_prefix}udp:{udp_stream}"
 
     return None