mirror of
https://github.com/bitwarden/server
synced 2025-12-18 09:13:19 +00:00
PM-24367 add personal_id to onyx api call (#6154)
This commit is contained in:
@@ -40,5 +40,6 @@ public class BillingSettings
|
|||||||
{
|
{
|
||||||
public virtual string ApiKey { get; set; }
|
public virtual string ApiKey { get; set; }
|
||||||
public virtual string BaseUrl { get; set; }
|
public virtual string BaseUrl { get; set; }
|
||||||
|
public virtual int PersonaId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ public class FreshdeskController : Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
// create the onyx `answer-with-citation` request
|
// create the onyx `answer-with-citation` request
|
||||||
var onyxRequestModel = new OnyxAnswerWithCitationRequestModel(model.TicketDescriptionText);
|
var onyxRequestModel = new OnyxAnswerWithCitationRequestModel(model.TicketDescriptionText, _billingSettings.Onyx.PersonaId);
|
||||||
var onyxRequest = new HttpRequestMessage(HttpMethod.Post,
|
var onyxRequest = new HttpRequestMessage(HttpMethod.Post,
|
||||||
string.Format("{0}/query/answer-with-citation", _billingSettings.Onyx.BaseUrl))
|
string.Format("{0}/query/answer-with-citation", _billingSettings.Onyx.BaseUrl))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -20,11 +20,12 @@ public class OnyxAnswerWithCitationRequestModel
|
|||||||
[JsonPropertyName("retrieval_options")]
|
[JsonPropertyName("retrieval_options")]
|
||||||
public RetrievalOptions RetrievalOptions { get; set; }
|
public RetrievalOptions RetrievalOptions { get; set; }
|
||||||
|
|
||||||
public OnyxAnswerWithCitationRequestModel(string message)
|
public OnyxAnswerWithCitationRequestModel(string message, int personaId = 1)
|
||||||
{
|
{
|
||||||
message = message.Replace(Environment.NewLine, " ").Replace('\r', ' ').Replace('\n', ' ');
|
message = message.Replace(Environment.NewLine, " ").Replace('\r', ' ').Replace('\n', ' ');
|
||||||
Messages = new List<Message>() { new Message() { MessageText = message } };
|
Messages = new List<Message>() { new Message() { MessageText = message } };
|
||||||
RetrievalOptions = new RetrievalOptions();
|
RetrievalOptions = new RetrievalOptions();
|
||||||
|
PersonaId = personaId;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,5 +31,10 @@
|
|||||||
"storage": {
|
"storage": {
|
||||||
"connectionString": "UseDevelopmentStorage=true"
|
"connectionString": "UseDevelopmentStorage=true"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"billingSettings": {
|
||||||
|
"onyx": {
|
||||||
|
"personaId": 68
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,9 @@
|
|||||||
"payPal": {
|
"payPal": {
|
||||||
"production": true,
|
"production": true,
|
||||||
"businessId": "4ZDA7DLUUJGMN"
|
"businessId": "4ZDA7DLUUJGMN"
|
||||||
|
},
|
||||||
|
"onyx": {
|
||||||
|
"personaId": 7
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Logging": {
|
"Logging": {
|
||||||
|
|||||||
@@ -76,7 +76,8 @@
|
|||||||
},
|
},
|
||||||
"onyx": {
|
"onyx": {
|
||||||
"apiKey": "SECRET",
|
"apiKey": "SECRET",
|
||||||
"baseUrl": "https://cloud.onyx.app/api"
|
"baseUrl": "https://cloud.onyx.app/api",
|
||||||
|
"personaId": 7
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user