From 07bd92874733831dd2004da3415c091092d35d07 Mon Sep 17 00:00:00 2001 From: Madpeter <57852827+Madpeterz@users.noreply.github.com> Date: Wed, 5 Feb 2025 17:24:31 +0000 Subject: [PATCH] switch from Betalgo.OpenAI to Betalgo.Ranul.OpenAI and update --- SecondBotEvents/Commands/Notecard.cs | 1 - SecondBotEvents/SecondBotEvents.csproj | 2 +- SecondBotEvents/Services/ChatGptService.cs | 26 +++++++--------------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/SecondBotEvents/Commands/Notecard.cs b/SecondBotEvents/Commands/Notecard.cs index 25eb2ab..68542b9 100644 --- a/SecondBotEvents/Commands/Notecard.cs +++ b/SecondBotEvents/Commands/Notecard.cs @@ -2,7 +2,6 @@ using OpenMetaverse; using OpenMetaverse.Assets; using SecondBotEvents.Services; -using static OpenAI.ObjectModels.StaticValues.AssistantsStatics.MessageStatics; namespace SecondBotEvents.Commands diff --git a/SecondBotEvents/SecondBotEvents.csproj b/SecondBotEvents/SecondBotEvents.csproj index 932dc2a..363b5ff 100644 --- a/SecondBotEvents/SecondBotEvents.csproj +++ b/SecondBotEvents/SecondBotEvents.csproj @@ -13,7 +13,7 @@ - + diff --git a/SecondBotEvents/Services/ChatGptService.cs b/SecondBotEvents/Services/ChatGptService.cs index 3b80e13..60fe3fd 100644 --- a/SecondBotEvents/Services/ChatGptService.cs +++ b/SecondBotEvents/Services/ChatGptService.cs @@ -1,27 +1,17 @@ using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using OpenMetaverse; using SecondBotEvents.Config; using System; using System.Collections.Generic; -using System.Text; using System.Linq; -using System.Reflection; -using System.Net.Http; -using OpenMetaverse.ImportExport.Collada14; -using OpenMetaverse.Packets; -using OpenAI.Managers; -using OpenAI; -using Microsoft.Extensions.DependencyInjection; -using OpenAI.ObjectModels.RequestModels; -using OpenAI.ObjectModels; -using OpenAI.ObjectModels.ResponseModels; using System.Threading.Tasks; -using OpenAI.Interfaces; -using System.Diagnostics; using Swan; using StackExchange.Redis; -using Discord.Rest; +using Betalgo.Ranul.OpenAI.Managers; +using Betalgo.Ranul.OpenAI; +using Betalgo.Ranul.OpenAI.ObjectModels.ResponseModels; +using Betalgo.Ranul.OpenAI.ObjectModels.RequestModels; +using Betalgo.Ranul.OpenAI.ObjectModels; namespace SecondBotEvents.Services { @@ -556,13 +546,13 @@ namespace SecondBotEvents.Services try { string replyMessage = ""; - var openAiService = new OpenAIService(new OpenAiOptions() + var openAiService = new OpenAIService(new OpenAIOptions() { ApiKey = myConfig.GetApiKey(), }); if((myConfig.GetOrganizationId() != null) && (myConfig.GetOrganizationId() != "none")) { - openAiService = new OpenAIService(new OpenAiOptions() + openAiService = new OpenAIService(new OpenAIOptions() { ApiKey = myConfig.GetApiKey(), Organization = myConfig.GetOrganizationId(), @@ -570,7 +560,7 @@ namespace SecondBotEvents.Services } if(myConfig.GetProvider() != "openai") { - openAiService = new OpenAIService(new OpenAiOptions() + openAiService = new OpenAIService(new OpenAIOptions() { ApiKey = myConfig.GetApiKey(), Organization = myConfig.GetOrganizationId(),