PM-26208 updated api endpoint (#6431)

src/Billing/Models/OnyxAnswerWithCitationRequestModel.cs

@@ -1,35 +1,58 @@
-// FIXME: Update this file to be null safe and then delete the line below
-#nullable disable
-
-
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
+using static Bit.Billing.BillingSettings;
 
 namespace Bit.Billing.Models;
 
-public class OnyxAnswerWithCitationRequestModel
+public class OnyxRequestModel
 {
-    [JsonPropertyName("messages")]
-    public List<Message> Messages { get; set; }
-
     [JsonPropertyName("persona_id")]
     public int PersonaId { get; set; } = 1;
 
     [JsonPropertyName("retrieval_options")]
-    public RetrievalOptions RetrievalOptions { get; set; }
+    public RetrievalOptions RetrievalOptions { get; set; } = new RetrievalOptions();
 
-    public OnyxAnswerWithCitationRequestModel(string message, int personaId = 1)
+    public OnyxRequestModel(OnyxSettings onyxSettings)
+    {
+        PersonaId = onyxSettings.PersonaId;
+        RetrievalOptions.RunSearch = onyxSettings.SearchSettings.RunSearch;
+        RetrievalOptions.RealTime = onyxSettings.SearchSettings.RealTime;
+    }
+}
+
+/// <summary>
+/// This is used with the onyx endpoint /query/answer-with-citation
+/// which has been deprecated. This can be removed once later
+/// </summary>
+public class OnyxAnswerWithCitationRequestModel : OnyxRequestModel
+{
+    [JsonPropertyName("messages")]
+    public List<Message> Messages { get; set; } = new List<Message>();
+
+    public OnyxAnswerWithCitationRequestModel(string message, OnyxSettings onyxSettings) : base(onyxSettings)
     {
         message = message.Replace(Environment.NewLine, " ").Replace('\r', ' ').Replace('\n', ' ');
         Messages = new List<Message>() { new Message() { MessageText = message } };
-        RetrievalOptions = new RetrievalOptions();
-        PersonaId = personaId;
+    }
+}
+
+/// <summary>
+/// This is used with the onyx endpoint /chat/send-message-simple-api
+/// </summary>
+public class OnyxSendMessageSimpleApiRequestModel : OnyxRequestModel
+{
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+
+    public OnyxSendMessageSimpleApiRequestModel(string message, OnyxSettings onyxSettings) : base(onyxSettings)
+    {
+        Message = message.Replace(Environment.NewLine, " ").Replace('\r', ' ').Replace('\n', ' ');
     }
 }
 
 public class Message
 {
     [JsonPropertyName("message")]
-    public string MessageText { get; set; }
+    public string MessageText { get; set; } = string.Empty;
 
     [JsonPropertyName("sender")]
     public string Sender { get; set; } = "user";

src/Billing/Models/OnyxAnswerWithCitationResponseModel.cs

@@ -1,33 +0,0 @@
-// FIXME: Update this file to be null safe and then delete the line below
-#nullable disable
-
-using System.Text.Json.Serialization;
-
-namespace Bit.Billing.Models;
-
-public class OnyxAnswerWithCitationResponseModel
-{
-    [JsonPropertyName("answer")]
-    public string Answer { get; set; }
-
-    [JsonPropertyName("rephrase")]
-    public string Rephrase { get; set; }
-
-    [JsonPropertyName("citations")]
-    public List<Citation> Citations { get; set; }
-
-    [JsonPropertyName("llm_selected_doc_indices")]
-    public List<int> LlmSelectedDocIndices { get; set; }
-
-    [JsonPropertyName("error_msg")]
-    public string ErrorMsg { get; set; }
-}
-
-public class Citation
-{
-    [JsonPropertyName("citation_num")]
-    public int CitationNum { get; set; }
-
-    [JsonPropertyName("document_id")]
-    public string DocumentId { get; set; }
-}

src/Billing/Models/OnyxResponseModel.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Bit.Billing.Models;
+
+public class OnyxResponseModel
+{
+    [JsonPropertyName("answer")]
+    public string Answer { get; set; } = string.Empty;
+
+    [JsonPropertyName("answer_citationless")]
+    public string AnswerCitationless { get; set; } = string.Empty;
+
+    [JsonPropertyName("error_msg")]
+    public string ErrorMsg { get; set; } = string.Empty;
+}