rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switch from Betalgo.OpenAI to Betalgo.Ranul.OpenAI and update

Browse source
This commit is contained in:
Madpeter 2025-02-05 17:24:31 +00:00
parent 0c491144e3
commit 07bd928747
3 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SecondBotEvents/Commands/Notecard.cs
View file

@ -2,7 +2,6 @@
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Assets; using OpenMetaverse.Assets;
using SecondBotEvents.Services; using SecondBotEvents.Services;
using static OpenAI.ObjectModels.StaticValues.AssistantsStatics.MessageStatics;
namespace SecondBotEvents.Commands namespace SecondBotEvents.Commands

2
SecondBotEvents/SecondBotEvents.csproj
View file

@ -13,7 +13,7 @@
<None Remove="Services\template.html" /> <None Remove="Services\template.html" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Betalgo.OpenAI" Version="8.7.1" /> <PackageReference Include="Betalgo.Ranul.OpenAI" Version="9.0.1" />
<PackageReference Include="Discord.Net" Version="3.17.1" /> <PackageReference Include="Discord.Net" Version="3.17.1" />
<PackageReference Include="Discord.Net.WebSocket" Version="3.17.1" /> <PackageReference Include="Discord.Net.WebSocket" Version="3.17.1" />
<PackageReference Include="EmbedIO" Version="3.4.3" /> <PackageReference Include="EmbedIO" Version="3.4.3" />

26
SecondBotEvents/Services/ChatGptService.cs
View file

@ -1,27 +1,17 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OpenMetaverse; using OpenMetaverse;
using SecondBotEvents.Config; using SecondBotEvents.Config;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text;
using System.Linq; 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 System.Threading.Tasks;
using OpenAI.Interfaces;
using System.Diagnostics;
using Swan; using Swan;
using StackExchange.Redis; 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 namespace SecondBotEvents.Services
{ {
@ -556,13 +546,13 @@ namespace SecondBotEvents.Services
try try
{ {
string replyMessage = ""; string replyMessage = "";
var openAiService = new OpenAIService(new OpenAiOptions() var openAiService = new OpenAIService(new OpenAIOptions()
{ {
ApiKey = myConfig.GetApiKey(), ApiKey = myConfig.GetApiKey(),
}); });
if((myConfig.GetOrganizationId() != null) && (myConfig.GetOrganizationId() != "none")) if((myConfig.GetOrganizationId() != null) && (myConfig.GetOrganizationId() != "none"))
{ {
openAiService = new OpenAIService(new OpenAiOptions() openAiService = new OpenAIService(new OpenAIOptions()
{ {
ApiKey = myConfig.GetApiKey(), ApiKey = myConfig.GetApiKey(),
Organization = myConfig.GetOrganizationId(), Organization = myConfig.GetOrganizationId(),
@ -570,7 +560,7 @@ namespace SecondBotEvents.Services
} }
if(myConfig.GetProvider() != "openai") if(myConfig.GetProvider() != "openai")
{ {
openAiService = new OpenAIService(new OpenAiOptions() openAiService = new OpenAIService(new OpenAIOptions()
{ {
ApiKey = myConfig.GetApiKey(), ApiKey = myConfig.GetApiKey(),
Organization = myConfig.GetOrganizationId(), Organization = myConfig.GetOrganizationId(),