Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@ private async Task<bool> IsEnabledInternalAsync()
);
_logger.LogDebug("Response status: {response}", response.StatusCode);

if (!response.IsSuccessStatusCode)
{
var errorResponse = await response.Content.ReadAsStringAsync();
_logger.LogDebug("LM error: {errorResponse}", errorResponse);
return null;
}

var res = await response.Content.ReadFromJsonAsync<OllamaLanguageModelCompletionResponse>();
if (res is null)
{
Expand Down Expand Up @@ -173,7 +180,7 @@ private async Task<bool> IsEnabledInternalAsync()
return null;
}

if (_configuration.CacheResponses && _cacheChatCompletion.TryGetValue(messages, out var cachedResponse))
if (_configuration.CacheResponses && _cacheChatCompletion.TryGetCacheValue(messages, out var cachedResponse))
{
_logger.LogDebug("Returning cached response for message: {lastMessage}", messages.Last().Content);
return cachedResponse;
Expand Down Expand Up @@ -221,9 +228,17 @@ private async Task<bool> IsEnabledInternalAsync()
);
_logger.LogDebug("Response: {response}", response.StatusCode);

if (!response.IsSuccessStatusCode)
{
var errorResponse = await response.Content.ReadAsStringAsync();
_logger.LogDebug("LM error: {errorResponse}", errorResponse);
return null;
}

var res = await response.Content.ReadFromJsonAsync<OllamaLanguageModelChatCompletionResponse>();
if (res is null)
{
_logger.LogDebug("Response: null");
return res;
}

Expand All @@ -240,15 +255,15 @@ private async Task<bool> IsEnabledInternalAsync()

internal static class OllamaCacheChatCompletionExtensions
{
public static OllamaLanguageModelChatCompletionMessage[]? GetKey(
this Dictionary<OllamaLanguageModelChatCompletionMessage[], OllamaLanguageModelChatCompletionResponse> cache,
public static ILanguageModelChatCompletionMessage[]? GetKey(
this Dictionary<ILanguageModelChatCompletionMessage[], OllamaLanguageModelChatCompletionResponse> cache,
ILanguageModelChatCompletionMessage[] messages)
{
return cache.Keys.FirstOrDefault(k => k.SequenceEqual(messages));
}

public static bool TryGetValue(
this Dictionary<OllamaLanguageModelChatCompletionMessage[], OllamaLanguageModelChatCompletionResponse> cache,
public static bool TryGetCacheValue(
this Dictionary<ILanguageModelChatCompletionMessage[], OllamaLanguageModelChatCompletionResponse> cache,
ILanguageModelChatCompletionMessage[] messages, out OllamaLanguageModelChatCompletionResponse? value)
{
var key = cache.GetKey(messages);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private async Task<bool> IsEnabledInternalAsync()
return null;
}

if (_configuration.CacheResponses && _cacheChatCompletion.TryGetValue(messages, out var cachedResponse))
if (_configuration.CacheResponses && _cacheChatCompletion.TryGetCacheValue(messages, out var cachedResponse))
{
_logger.LogDebug("Returning cached response for message: {lastMessage}", messages.Last().Content);
return cachedResponse;
Expand Down Expand Up @@ -173,6 +173,13 @@ private async Task<bool> IsEnabledInternalAsync()
var response = await client.PostAsJsonAsync(url, payload);
_logger.LogDebug("Response: {response}", response.StatusCode);

if (!response.IsSuccessStatusCode)
{
var errorResponse = await response.Content.ReadAsStringAsync();
_logger.LogDebug("LM error: {errorResponse}", errorResponse);
return null;
}

var res = await response.Content.ReadFromJsonAsync<OpenAIChatCompletionResponse>();
if (res is null)
{
Expand All @@ -192,15 +199,15 @@ private async Task<bool> IsEnabledInternalAsync()

internal static class OpenAICacheChatCompletionExtensions
{
public static OpenAIChatCompletionMessage[]? GetKey(
this Dictionary<OpenAIChatCompletionMessage[], OpenAIChatCompletionResponse> cache,
public static ILanguageModelChatCompletionMessage[]? GetKey(
this Dictionary<ILanguageModelChatCompletionMessage[], OpenAIChatCompletionResponse> cache,
ILanguageModelChatCompletionMessage[] messages)
{
return cache.Keys.FirstOrDefault(k => k.SequenceEqual(messages));
}

public static bool TryGetValue(
this Dictionary<OpenAIChatCompletionMessage[], OpenAIChatCompletionResponse> cache,
public static bool TryGetCacheValue(
this Dictionary<ILanguageModelChatCompletionMessage[], OpenAIChatCompletionResponse> cache,
ILanguageModelChatCompletionMessage[] messages, out OpenAIChatCompletionResponse? value)
{
var key = cache.GetKey(messages);
Expand Down
4 changes: 2 additions & 2 deletions dev-proxy-plugins/Http.cs
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ internal static class Http
"secret",
"x-secret",
"access-key",
"api-key",
"apikey"
"apikey",
"code"
];
}
Loading