Skip to content

Commit

Permalink
progress
Browse files Browse the repository at this point in the history
  • Loading branch information
BeepBeepBopBop committed Nov 28, 2024
1 parent d2a5adb commit 5feb001
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
16 changes: 10 additions & 6 deletions LM-Kit-Maestro/Services/LMKitService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,11 @@ private async Task<LMKitResult> HandleLmKitRequest(LMKitRequest promptRequest)
// Ensuring we don't touch anything until Lm-Kit objects' state has been set to handle this prompt request.
_lmKitServiceSemaphore.Wait();

LMKitResult promptResult;
LMKitResult result;

if (promptRequest.CancellationTokenSource.IsCancellationRequested || ModelLoadingState == LMKitModelLoadingState.Unloaded)
{
promptResult = new LMKitResult()
result = new LMKitResult()
{
Status = LMKitTextGenerationStatus.Cancelled
};
Expand All @@ -223,20 +223,24 @@ private async Task<LMKitResult> HandleLmKitRequest(LMKitRequest promptRequest)
}
else
{
BeforeSubmittingPrompt(((PromptRequestParameters)promptRequest.Parameters!).Conversation);
if (promptRequest.RequestType == LMKitRequestType.Prompt)
{
BeforeSubmittingPrompt(((PromptRequestParameters)promptRequest.Parameters!).Conversation);
}

_lmKitServiceSemaphore.Release();

promptResult = await SubmitRequest(promptRequest);
result = await SubmitRequest(promptRequest);
}

if (_requestSchedule.Contains(promptRequest))
{
_requestSchedule.Remove(promptRequest);
}

promptRequest.ResponseTask.TrySetResult(promptResult);
promptRequest.ResponseTask.TrySetResult(result);

return promptResult;
return result;

}

Expand Down
2 changes: 1 addition & 1 deletion LM-Kit-Maestro/ViewModels/ConversationViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public async Task Delete()
[RelayCommand]
private async Task RegenerateResponse(MessageViewModel message)
{
var response = await _lmKitService.RegenerateResponse(_lmKitConversation, message.LMKitMessage);
var response = await _lmKitService.RegenerateResponse(_lmKitConversation, message.LMKitMessage!);
}

protected override void HandleSubmit()
Expand Down

0 comments on commit 5feb001

Please sign in to comment.