Use IDA MQTT message to update inspection view

equinor · Jan 30, 2025 · b0a0159 · b0a0159
1 parent faa27d6
commit b0a0159
Show file tree

Hide file tree

Showing 17 changed files with 188 additions and 33 deletions.
diff --git a/backend/api/EventHandlers/MqttEventHandler.cs b/backend/api/EventHandlers/MqttEventHandler.cs
@@ -83,6 +83,7 @@ public override void Subscribe()
             MqttService.MqttIsarPressureReceived += OnIsarPressureUpdate;
             MqttService.MqttIsarPoseReceived += OnIsarPoseUpdate;
             MqttService.MqttIsarCloudHealthReceived += OnIsarCloudHealthUpdate;
+            MqttService.MqttIdaInspectionResultReceived += OnIdaInspectionResultUpdate;
         }
 
         public override void Unsubscribe()
@@ -95,6 +96,7 @@ public override void Unsubscribe()
             MqttService.MqttIsarPressureReceived -= OnIsarPressureUpdate;
             MqttService.MqttIsarPoseReceived -= OnIsarPoseUpdate;
             MqttService.MqttIsarCloudHealthReceived -= OnIsarCloudHealthUpdate;
+            MqttService.MqttIdaInspectionResultReceived -= OnIdaInspectionResultUpdate;
         }
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -674,5 +676,38 @@ private async void OnIsarCloudHealthUpdate(object? sender, MqttReceivedArgs mqtt
 
             TeamsMessageService.TriggerTeamsMessageReceived(new TeamsMessageEventArgs(message));
         }
+
+        private async void OnIdaInspectionResultUpdate(object? sender, MqttReceivedArgs mqttArgs)
+        {
+            var inspectionResult = (IdaInspectionResultMessage)mqttArgs.Message;
+
+            var inspectionResultMessage = new InspectionResultMessage
+            {
+                InspectionId = inspectionResult.InspectionId,
+                StorageAccount = inspectionResult.StorageAccount,
+                BlobContainer = inspectionResult.BlobContainer,
+                BlobName = inspectionResult.BlobName,
+            };
+
+            var installation = await InstallationService.ReadByInstallationCode(
+                inspectionResult.BlobContainer,
+                readOnly: true
+            );
+
+            if (installation == null)
+            {
+                _logger.LogError(
+                    "Installation with code {Code} not found when processing IDA inspection result update",
+                    inspectionResult.BlobContainer
+                );
+                return;
+            }
+
+            _ = SignalRService.SendMessageAsync(
+                "Inspection Visulization Ready",
+                installation,
+                inspectionResultMessage
+            );
+        }
     }
 }
diff --git a/backend/api/MQTT/MessageModels/IdaInspectionResult.cs b/backend/api/MQTT/MessageModels/IdaInspectionResult.cs
@@ -0,0 +1,35 @@
+using System.Text.Json.Serialization;
+
+namespace Api.Mqtt.MessageModels
+{
+#nullable disable
+    public class IdaInspectionResultMessage : MqttMessage
+    {
+        [JsonPropertyName("inspection_id")]
+        public string InspectionId { get; set; }
+
+        [JsonPropertyName("storageAccount")]
+        public required string StorageAccount { get; set; }
+
+        [JsonPropertyName("blobContainer")]
+        public required string BlobContainer { get; set; }
+
+        [JsonPropertyName("blobName")]
+        public required string BlobName { get; set; }
+    }
+
+    public class InspectionResultMessage
+    {
+        [JsonPropertyName("inspectionId")]
+        public string InspectionId { get; set; }
+
+        [JsonPropertyName("storageAccount")]
+        public required string StorageAccount { get; set; }
+
+        [JsonPropertyName("blobContainer")]
+        public required string BlobContainer { get; set; }
+
+        [JsonPropertyName("blobName")]
+        public required string BlobName { get; set; }
+    }
+}
diff --git a/backend/api/MQTT/MqttService.cs b/backend/api/MQTT/MqttService.cs
@@ -85,6 +85,7 @@ public MqttService(ILogger<MqttService> logger, IConfiguration config)
         public static event EventHandler<MqttReceivedArgs>? MqttIsarPressureReceived;
         public static event EventHandler<MqttReceivedArgs>? MqttIsarPoseReceived;
         public static event EventHandler<MqttReceivedArgs>? MqttIsarCloudHealthReceived;
+        public static event EventHandler<MqttReceivedArgs>? MqttIdaInspectionResultReceived;
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
@@ -143,6 +144,9 @@ private Task OnMessageReceived(MqttApplicationMessageReceivedEventArgs messageRe
                 case Type type when type == typeof(IsarCloudHealthMessage):
                     OnIsarTopicReceived<IsarCloudHealthMessage>(content);
                     break;
+                case Type type when type == typeof(IdaInspectionResultMessage):
+                    OnIdaTopicReceived<IdaInspectionResultMessage>(content);
+                    break;
                 default:
                     _logger.LogWarning(
                         "No callback defined for MQTT message type '{type}'",
@@ -303,5 +307,51 @@ private void OnIsarTopicReceived<T>(string content)
                 _logger.LogWarning("{msg}", e.Message);
             }
         }
+
+        private void OnIdaTopicReceived<T>(string content)
+            where T : MqttMessage
+        {
+            T? message;
+
+            try
+            {
+                message = JsonSerializer.Deserialize<T>(content, serializerOptions);
+                if (message is null)
+                {
+                    throw new JsonException();
+                }
+            }
+            catch (Exception ex)
+                when (ex is JsonException or NotSupportedException or ArgumentException)
+            {
+                _logger.LogError(
+                    "Could not create '{className}' object from MQTT message json",
+                    typeof(T).Name
+                );
+                return;
+            }
+
+            var type = typeof(T);
+            try
+            {
+                var raiseEvent = type switch
+                {
+                    _ when type == typeof(IdaInspectionResultMessage) =>
+                        MqttIdaInspectionResultReceived,
+                    _ => throw new NotImplementedException(
+                        $"No event defined for message type '{typeof(T).Name}'"
+                    ),
+                };
+                // Event will be null if there are no subscribers
+                if (raiseEvent is not null)
+                {
+                    raiseEvent(this, new MqttReceivedArgs(message));
+                }
+            }
+            catch (NotImplementedException e)
+            {
+                _logger.LogWarning("{msg}", e.Message);
+            }
+        }
     }
 }
diff --git a/backend/api/MQTT/MqttTopics.cs b/backend/api/MQTT/MqttTopics.cs
@@ -23,6 +23,7 @@ public static class MqttTopics
                 { "isar/+/pressure", typeof(IsarPressureMessage) },
                 { "isar/+/pose", typeof(IsarPoseMessage) },
                 { "isar/+/cloud_health", typeof(IsarCloudHealthMessage) },
+                { "ida/visualization_available", typeof(IdaInspectionResultMessage) },
             };
 
         /// <summary>

diff --git a/backend/api/appsettings.Development.json b/backend/api/appsettings.Development.json
@@ -36,7 +36,8 @@
       "isar/+/pressure",
       "isar/+/pose",
       "isar/+/cloud_health",
-      "isar/+/media_config"
+      "isar/+/media_config",
+      "ida/visualization_available"
     ],
     "MaxRetryAttempts": 5,
     "ShouldFailOnMaxRetries": false

diff --git a/backend/api/appsettings.Local.json b/backend/api/appsettings.Local.json
@@ -36,7 +36,8 @@
       "isar/+/pressure",
       "isar/+/pose",
       "isar/+/cloud_health",
-      "isar/+/media_config"
+      "isar/+/media_config",
+      "ida/visualization_available"
     ],
     "MaxRetryAttempts": 5,
     "ShouldFailOnMaxRetries": false

diff --git a/backend/api/appsettings.Production.json b/backend/api/appsettings.Production.json
@@ -32,7 +32,8 @@
       "isar/+/pressure",
       "isar/+/pose",
       "isar/+/cloud_health",
-      "isar/+/media_config"
+      "isar/+/media_config",
+      "ida/visualization_available"
     ],
     "MaxRetryAttempts": 15,
     "ShouldFailOnMaxRetries": true

diff --git a/backend/api/appsettings.Staging.json b/backend/api/appsettings.Staging.json
@@ -36,7 +36,8 @@
       "isar/+/pressure",
       "isar/+/pose",
       "isar/+/cloud_health",
-      "isar/+/media_config"
+      "isar/+/media_config",
+      "ida/visualization_available"
     ],
     "MaxRetryAttempts": 15,
     "ShouldFailOnMaxRetries": true

diff --git a/backend/api/appsettings.Test.json b/backend/api/appsettings.Test.json
@@ -30,7 +30,8 @@
       "isar/+/pressure",
       "isar/+/pose",
       "isar/+/cloud_health",
-      "isar/+/media_config"
+      "isar/+/media_config",
+      "ida/visualization_available"
     ],
     "MaxRetryAttempts": 15,
     "ShouldFailOnMaxRetries": true

diff --git a/broker/mosquitto/config/access_control b/broker/mosquitto/config/access_control
@@ -7,8 +7,14 @@ topic readwrite isar/#
 user flotilla
 topic read isar/#
 
+user flotilla
+topic read ida/#
+
 user analytics
 topic read isar/+/inspection_result
 
 user ida
 topic read isar/+/inspection_result
+
+user ida
+topic write ida/visualization_available
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -29,7 +29,7 @@ if (config.AI_CONNECTION_STRING.length > 0) {
     appInsights.trackPageView()
 }
 
-const queryClient = new QueryClient()
+export const queryClient = new QueryClient()
 
 const App = () => (
     <AuthProvider>

diff --git a/frontend/src/components/Contexts/InpectionsContext.tsx b/frontend/src/components/Contexts/InpectionsContext.tsx
@@ -1,9 +1,15 @@
-import { createContext, FC, useContext, useState } from 'react'
+import { createContext, FC, useContext, useEffect, useState } from 'react'
 import { Task } from 'models/Task'
+import { SignalREventLabels, useSignalRContext } from './SignalRContext'
+import { IdaInspectionVisualizationReady } from 'models/Inspection'
+import { useQuery } from '@tanstack/react-query'
+import { BackendAPICaller } from 'api/ApiCaller'
+import { queryClient } from '../../App'
 
 interface IInspectionsContext {
     selectedInspectionTask: Task | undefined
     switchSelectedInspectionTask: (selectedInspectionTask: Task | undefined) => void
+    fetchImageData: (inspectionId: string) => any
 }
 
 interface Props {
@@ -13,22 +19,51 @@ interface Props {
 const defaultInspectionsContext = {
     selectedInspectionTask: undefined,
     switchSelectedInspectionTask: () => undefined,
+    fetchImageData: () => undefined,
 }
 
 const InspectionsContext = createContext<IInspectionsContext>(defaultInspectionsContext)
 
 export const InspectionsProvider: FC<Props> = ({ children }) => {
+    const { registerEvent, connectionReady } = useSignalRContext()
     const [selectedInspectionTask, setSelectedInspectionTask] = useState<Task>()
 
+    useEffect(() => {
+        if (connectionReady) {
+            registerEvent(SignalREventLabels.inspectionVisualizationReady, (username: string, message: string) => {
+                const inspectionVisualizationData: IdaInspectionVisualizationReady = JSON.parse(message)
+                queryClient.invalidateQueries({
+                    queryKey: ['fetchInspectionData', inspectionVisualizationData.inspectionId],
+                })
+                fetchImageData(inspectionVisualizationData.inspectionId)
+            })
+        }
+    }, [registerEvent, connectionReady])
+
     const switchSelectedInspectionTask = (selectedTask: Task | undefined) => {
         setSelectedInspectionTask(selectedTask)
     }
 
+    const fetchImageData = (inspectionId: string) => {
+        const data = useQuery({
+            queryKey: ['fetchInspectionData', inspectionId],
+            queryFn: async () => {
+                const imageBlob = await BackendAPICaller.getInspection(inspectionId)
+                return URL.createObjectURL(imageBlob)
+            },
+            retry: 1,
+            staleTime: 10 * 60 * 1000, // If data is received, stale time is 10 min before making new API call
+            enabled: inspectionId !== undefined,
+        })
+        return data
+    }
+
     return (
         <InspectionsContext.Provider
             value={{
                 selectedInspectionTask,
                 switchSelectedInspectionTask,
+                fetchImageData,
             }}
         >
             {children}

diff --git a/frontend/src/components/Contexts/SignalRContext.tsx b/frontend/src/components/Contexts/SignalRContext.tsx
@@ -123,4 +123,5 @@ export enum SignalREventLabels {
     inspectionUpdated = 'Inspection updated',
     alert = 'Alert',
     mediaStreamConfigReceived = 'Media stream config received',
+    inspectionVisualizationReady = 'Inspection Visulization Ready',
 }
diff --git a/frontend/src/components/Pages/InspectionReportPage/InspectionReportUtilities.tsx b/frontend/src/components/Pages/InspectionReportPage/InspectionReportUtilities.tsx
@@ -1,26 +1,9 @@
-import { useQuery } from '@tanstack/react-query'
-import { BackendAPICaller } from 'api/ApiCaller'
-import { Task, TaskStatus } from 'models/Task'
+import { useInspectionsContext } from 'components/Contexts/InpectionsContext'
+import { Task } from 'models/Task'
 import { StyledInspectionImage } from './InspectionStyles'
 
-export const fetchImageData = (task: Task) => {
-    const data = useQuery({
-        queryKey: ['fetchInspectionData', task.isarTaskId],
-        queryFn: async () => {
-            const imageBlob = await BackendAPICaller.getInspection(task.inspection.isarInspectionId)
-            return URL.createObjectURL(imageBlob)
-        },
-        retryDelay: 60 * 1000, // Waits 1 min before retrying, regardless of how many retries
-        staleTime: 10 * 60 * 1000, // If data is received, stale time is 10 min before making new API call
-        enabled:
-            task.status === TaskStatus.Successful &&
-            task.isarTaskId !== undefined &&
-            task.inspection.isarInspectionId !== undefined,
-    })
-    return data
-}
-
 export const GetInspectionImage = ({ task }: { task: Task }) => {
-    const { data } = fetchImageData(task)
+    const { fetchImageData } = useInspectionsContext()
+    const { data } = fetchImageData(task.inspection.isarInspectionId)
     return <>{data !== undefined && <StyledInspectionImage src={data} />}</>
 }
diff --git a/frontend/src/components/Pages/InspectionReportPage/InspectionStyles.tsx b/frontend/src/components/Pages/InspectionReportPage/InspectionStyles.tsx
@@ -80,7 +80,6 @@ export const StyledInspectionOverviewDialogView = styled.div`
     gap: 8px;
     overflow-y: scroll;
 `
-
 export const StyledImagesSection = styled.div`
     display: flex;
     align-items: center;

diff --git a/frontend/src/components/Pages/InspectionReportPage/InspectionView.tsx b/frontend/src/components/Pages/InspectionReportPage/InspectionView.tsx
@@ -16,9 +16,7 @@ import {
     StyledInspection,
 } from './InspectionStyles'
 import { InspectionOverviewDialogView } from './InspectionOverview'
-import { fetchImageData } from './InspectionReportUtilities'
 import { useState } from 'react'
-
 interface InspectionDialogViewProps {
     selectedTask: Task
     tasks: Task[]
@@ -28,8 +26,8 @@ export const InspectionDialogView = ({ selectedTask, tasks }: InspectionDialogVi
     const { TranslateText } = useLanguageContext()
     const { installationName } = useInstallationContext()
     const { switchSelectedInspectionTask } = useInspectionsContext()
-    const { data } = fetchImageData(selectedTask)
-
+    const { fetchImageData } = useInspectionsContext()
+    const { data } = fetchImageData(selectedTask.inspection.isarInspectionId)
     const [switchImageDirection, setSwitchImageDirection] = useState<number>(0)
 
     const closeDialog = () => {

diff --git a/frontend/src/models/Inspection.ts b/frontend/src/models/Inspection.ts
@@ -30,3 +30,10 @@ export enum InspectionType {
     ThermalVideo = 'ThermalVideo',
     Audio = 'Audio',
 }
+
+export interface IdaInspectionVisualizationReady {
+    inspectionId: string
+    storageAccount: string
+    blobContainer: string
+    blobName: string
+}