Simplify choice message

Author: pmosk

src/endpoint/Incident.Create/Flow/FlowState/IncidentGptFlowState.cs

@@ -10,9 +10,6 @@ internal readonly record struct IncidentGptFlowState
     [JsonProperty("sourceMessage")]
     public string? SourceMessage { get; init; }
 
-    [JsonProperty("temporaryActivityId")]
-    public string? TemporaryActivityId { get; init; }
-
     [JsonProperty("errorMessage")]
     public string? ErrorMessage { get; init; }
 }

src/endpoint/Incident.Create/Flow/Step.AwaitTitle/TitleAwaitHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text;
 using GarageGroup.Infra.Bot.Builder;
 
 namespace GarageGroup.Internal.Support;
@@ -23,14 +24,24 @@ internal static ValueStepOption<string> GetStepOption(IChatFlowContext<IncidentC
             return new("Укажите заголовок");
         }
 
+        var messageBuilder = new StringBuilder("Укажите заголовок или используйте сгенерированный вариант:\n\r");
+
+        if (context.IsNotTelegramChannel())
+        {
+            messageBuilder = messageBuilder.Append(context.FlowState.Gpt.Title);
+        }
+        else
+        {
+            messageBuilder = messageBuilder.Append("<code>").Append(context.FlowState.Gpt.Title).Append("</code>");
+        }
+
         return new(
-            messageText: "Укажите заголовок или подтвердите вариант, сгенерированный нейросетью",
-            suggestions: new[]
+            messageText: messageBuilder.ToString(),
+            suggestions: new KeyValuePair<string, string>[][]
             {
-                new KeyValuePair<string, string>[]
-                {
-                    new("Подтвердить предложение нейросети", context.FlowState.Gpt.Title.TruncateTitle())
-                }
+                [
+                    new("Использовать сгенерированный заголовок", context.FlowState.Gpt.Title.TruncateTitle())
+                ]
             });
     }
 

src/endpoint/Incident.Create/Flow/Step.CallGpt/GptCallFlowStep.cs

@@ -1,27 +1,12 @@
 using GarageGroup.Infra.Bot.Builder;
-using Microsoft.Bot.Schema;
 
 namespace GarageGroup.Internal.Support;
 
 internal static class GptCallFlowStep
 {
-    internal static ChatFlow<IncidentCreateFlowState> CallGpt(this ChatFlow<IncidentCreateFlowState> chatFlow, ISupportGptApi gptApi)
+    internal static ChatFlow<IncidentCreateFlowState> CallGpt(
+        this ChatFlow<IncidentCreateFlowState> chatFlow, ISupportGptApi gptApi)
         =>
-        chatFlow.SetTypingStatus(
-            GptCallHelper.CreateTemporaryActivity,
-            ApplyTemporaryActivityId)
-        .NextValue(
-            gptApi.CompleteIncidentAsync)
-        .ReplaceActivityOrSkip(
-            GptCallHelper.CreateResultActivity);
-
-    private static IncidentCreateFlowState ApplyTemporaryActivityId(IncidentCreateFlowState flowState, ResourceResponse activityResponse)
-        =>
-        flowState with
-        {
-            Gpt = flowState.Gpt with
-            {
-                TemporaryActivityId = activityResponse.Id
-            }
-        };
+        chatFlow.SetTypingStatus().NextValue(
+            gptApi.CompleteIncidentAsync);
 }

src/endpoint/Incident.Create/Flow/Step.CallGpt/GptCallHelper.cs

@@ -2,73 +2,13 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web;
 using GarageGroup.Infra.Bot.Builder;
-using Microsoft.Bot.Builder;
-using Microsoft.Bot.Schema;
 using Microsoft.Extensions.Logging;
 
 namespace GarageGroup.Internal.Support;
 
 internal static class GptCallHelper
 {
-    internal static IActivity? CreateTemporaryActivity(IChatFlowContext<IncidentCreateFlowState> context)
-    {
-        if (context.IsNotTelegramChannel())
-        {
-            return null;
-        }
-
-        var telegramActivity = context.Activity.CreateReply();
-
-        telegramActivity.ChannelData = new TelegramChannelData(
-            parameters: new("ИИ генерирует заголовок...")
-            {
-                DisableNotification = true
-            })
-            .ToJObject();
-
-        return telegramActivity;
-    }
-
-    internal static IActivity CreateResultActivity(IChatFlowContext<IncidentCreateFlowState> context)
-    {
-        var activity = InnerCreateActivity(context);
-        if (string.IsNullOrEmpty(context.FlowState.Gpt.TemporaryActivityId))
-        {
-            return activity;
-        }
-
-        activity.Id = context.FlowState.Gpt.TemporaryActivityId;
-        return activity;
-
-        static IActivity InnerCreateActivity(IChatFlowContext<IncidentCreateFlowState> context)
-        {
-            if (string.IsNullOrEmpty(context.FlowState.Gpt.Title))
-            {
-                var errorMessage = context.FlowState.Gpt.ErrorMessage.OrNullIfWhiteSpace() ?? "Нейросеть не смогла подобрать заголовок";
-                return MessageFactory.Text(errorMessage);
-            }
-
-            if (context.IsNotTelegramChannel())
-            {
-                return MessageFactory.Text($"Нейросеть предлагает заголовок:\n\r{context.FlowState.Gpt.Title}");
-            }
-
-            var telegramActivity = context.Activity.CreateReply();
-            var encodedText = HttpUtility.HtmlEncode(context.FlowState.Gpt.Title);
-
-            telegramActivity.ChannelData = new TelegramChannelData(
-                parameters: new($"Нейросеть предлагает заголовок:\n\r<code>{encodedText}</code>")
-                {
-                    ParseMode = TelegramParseMode.Html
-                })
-                .ToJObject();
-
-            return telegramActivity;
-        }
-    }
-
     internal static ValueTask<IncidentCreateFlowState> CompleteIncidentAsync(
         this ISupportGptApi gptApi, IChatFlowContext<IncidentCreateFlowState> context, CancellationToken cancellationToken)
         =>