From 0c1529a987b6be8942ac2ce8c6740e1fcc369704 Mon Sep 17 00:00:00 2001 From: iceljc <46039045+iceljc@users.noreply.github.com> Date: Tue, 4 Aug 2026 17:24:01 -0500 Subject: [PATCH] Revert "Fix membase json" --- .../BotSharp.Plugin.Membase/Interfaces/IMembaseApi.cs | 2 +- src/Plugins/BotSharp.Plugin.Membase/MembasePlugin.cs | 6 +----- .../BotSharp.Plugin.OpenAI/Providers/ProviderHelper.cs | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Plugins/BotSharp.Plugin.Membase/Interfaces/IMembaseApi.cs b/src/Plugins/BotSharp.Plugin.Membase/Interfaces/IMembaseApi.cs index f8f5dcdc3..8ab05160d 100644 --- a/src/Plugins/BotSharp.Plugin.Membase/Interfaces/IMembaseApi.cs +++ b/src/Plugins/BotSharp.Plugin.Membase/Interfaces/IMembaseApi.cs @@ -60,7 +60,7 @@ public interface IMembaseApi Task ValidatePgtDefinitionAsync(string graphId, string definitionId, [Body] PgtValidationRequest request); [Post("/graph/{graphId}/pgt-external/{correlationId}/complete")] - Task CompletePgtExternalAsync(string graphId, string correlationId, [FromBody] object body); + Task CompletePgtExternalAsync(string graphId, string correlationId, [FromBody] object emptyBody); #endregion #region Procedure diff --git a/src/Plugins/BotSharp.Plugin.Membase/MembasePlugin.cs b/src/Plugins/BotSharp.Plugin.Membase/MembasePlugin.cs index 69f47ae30..dcd0ff091 100644 --- a/src/Plugins/BotSharp.Plugin.Membase/MembasePlugin.cs +++ b/src/Plugins/BotSharp.Plugin.Membase/MembasePlugin.cs @@ -26,11 +26,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config) services.AddHttpContextAccessor(); services.AddTransient(); - // Use plain Web options WITHOUT Refit's default ObjectToInferredTypesConverter: - // consumers (ObjectExtensions.TryGetValue, GraphBuilder, GetNodePropertiesOrDefault) - // rely on Dictionary values deserializing as JsonElement. - services.AddRefitClient(new RefitSettings( - new SystemTextJsonContentSerializer(new JsonSerializerOptions(JsonSerializerDefaults.Web))) + services.AddRefitClient(new RefitSettings { CollectionFormat = CollectionFormat.Multi }) diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/ProviderHelper.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/ProviderHelper.cs index 121b7a6d5..df937390d 100644 --- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/ProviderHelper.cs +++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/ProviderHelper.cs @@ -9,10 +9,6 @@ public static OpenAIClient GetClient(string provider, string model, string? apiK { var settingsService = services.GetRequiredService(); var settings = settingsService.GetSetting(provider, model); - if (settings == null && string.IsNullOrEmpty(apiKey)) - { - throw new InvalidOperationException($"No LLM model settings found for '{provider}.{model}'. Register the model under LlmProviders (appsettings/user secrets) or pass an api key."); - } var options = !string.IsNullOrEmpty(settings?.Endpoint) ? new OpenAIClientOptions { Endpoint = new Uri(settings.Endpoint) } : null; return new OpenAIClient(new ApiKeyCredential(apiKey ?? settings!.ApiKey), options);