Skip to content

Fixes prompty pattern matching. Closes #1325 #1326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garrytrinder merged 2 commits into from
Jul 15, 2025
+5 −5
Merged

Fixes prompty pattern matching. Closes #1325 #1326

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
188108e
Fixes prompty pattern matching. Closes #1325
waldekmastykarz Jul 14, 2025
8796e3f
Merge branch 'main' into fix-prompty-prepare-type
garrytrinder Jul 15, 2025
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
6 changes: 3 additions & 3 deletions DevProxy.Abstractions/LanguageModel/BaseLanguageModelClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public async Task<bool> IsEnabledAsync(CancellationToken cancellationToken)
return _lmAvailable.Value;
}

protected abstract IEnumerable<ILanguageModelChatCompletionMessage> ConvertMessages(ChatMessage[] messages);
protected abstract IEnumerable<ILanguageModelChatCompletionMessage> ConvertMessages(IEnumerable<ChatMessage> messages);

protected abstract Task<ILanguageModelCompletionResponse?> GenerateChatCompletionCoreAsync(IEnumerable<ILanguageModelChatCompletionMessage> messages, CompletionOptions? options, CancellationToken cancellationToken);

Expand All @@ -105,8 +105,8 @@ public async Task<bool> IsEnabledAsync(CancellationToken cancellationToken)
var promptContents = File.ReadAllText(filePath);

var prompty = Prompt.FromMarkdown(promptContents);
if (prompty.Prepare(parameters) is not ChatMessage[] promptyMessages ||
promptyMessages.Length == 0)
if (prompty.Prepare(parameters) is not IEnumerable<ChatMessage> promptyMessages ||
!promptyMessages.Any())
Comment thread
garrytrinder marked this conversation as resolved.
{
Logger.LogError("No messages found in the prompt file: {FilePath}", filePath);
return (null, null);
Expand Down
2 changes: 1 addition & 1 deletion DevProxy.Abstractions/LanguageModel/OllamaLanguageModelClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public sealed class OllamaLanguageModelClient(
}
}

protected override IEnumerable<ILanguageModelChatCompletionMessage> ConvertMessages(ChatMessage[] messages)
protected override IEnumerable<ILanguageModelChatCompletionMessage> ConvertMessages(IEnumerable<ChatMessage> messages)
{
return messages.Select(m => new OllamaLanguageModelChatCompletionMessage
{
Expand Down
2 changes: 1 addition & 1 deletion DevProxy.Abstractions/LanguageModel/OpenAILanguageModelClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public sealed class OpenAILanguageModelClient(
}
}

protected override IEnumerable<ILanguageModelChatCompletionMessage> ConvertMessages(ChatMessage[] messages)
protected override IEnumerable<ILanguageModelChatCompletionMessage> ConvertMessages(IEnumerable<ChatMessage> messages)
{
return messages.Select(m => new OpenAIChatCompletionMessage
{
Expand Down