Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 19:27:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

a better error handle when foundry is not available

Browse Source
This commit is contained in:
vanzue
2025-11-16 09:14:49 +08:00
parent 8b885ccf8e
commit 24ef97981c
2 changed files with 21 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs
View File

@@ -169,31 +169,23 @@ internal sealed class FoundryClient
public async Task<bool> EnsureModelLoaded(string modelId) public async Task<bool> EnsureModelLoaded(string modelId)
{ {
try Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
// Check if already loaded
if (await IsModelLoaded(modelId).ConfigureAwait(false))
{ {
Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}"); Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
return true;
// Check if already loaded
if (await IsModelLoaded(modelId).ConfigureAwait(false))
{
Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
return true;
}
// Load the model
Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
// Verify it's loaded
var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
return loaded;
}
catch (Exception ex)
{
Logger.LogError($"[FoundryClient] EnsureModelLoaded exception: {ex.Message}");
return false;
} }
// Load the model
Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
// Verify it's loaded
var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
return loaded;
} }
public async Task EnsureRunning() public async Task EnsureRunning()

37
src/common/LanguageModelProvider/FoundryLocalModelProvider.cs
View File

@@ -25,22 +25,8 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
public IChatClient? GetIChatClient(string modelId) public IChatClient? GetIChatClient(string modelId)
{ {
try Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
{ InitializeAsync().GetAwaiter().GetResult();
Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
InitializeAsync().GetAwaiter().GetResult();
}
catch (Exception ex)
{
Logger.LogError($"[FoundryLocal] Failed to initialize: {ex.Message}");
return null;
}
if (string.IsNullOrWhiteSpace(_serviceUrl) || _foundryClient == null)
{
Logger.LogError("[FoundryLocal] Service URL or manager is null");
return null;
}
if (string.IsNullOrWhiteSpace(modelId)) if (string.IsNullOrWhiteSpace(modelId))
{ {
@@ -67,21 +53,11 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
} }
// Ensure the model is loaded before returning chat client // Ensure the model is loaded before returning chat client
try var isLoaded = _foundryClient!.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
if (!isLoaded)
{ {
var isLoaded = _foundryClient.EnsureModelLoaded(modelId).GetAwaiter().GetResult(); Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
if (!isLoaded) throw new InvalidOperationException($"Failed to load the model '{modelId}'.");
{
Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
return null;
}
Logger.LogInfo($"[FoundryLocal] Model is loaded: {modelId}");
}
catch (Exception ex)
{
Logger.LogError($"[FoundryLocal] Exception ensuring model loaded: {ex.Message}");
return null;
} }
// Use ServiceUri instead of Endpoint since Endpoint already includes /v1 // Use ServiceUri instead of Endpoint since Endpoint already includes /v1
@@ -95,7 +71,6 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
var endpointUri = new Uri($"{baseUri.ToString().TrimEnd('/')}/v1"); var endpointUri = new Uri($"{baseUri.ToString().TrimEnd('/')}/v1");
Logger.LogInfo($"[FoundryLocal] Creating OpenAI client with endpoint: {endpointUri}"); Logger.LogInfo($"[FoundryLocal] Creating OpenAI client with endpoint: {endpointUri}");
Logger.LogInfo($"[FoundryLocal] Model ID for chat client: {modelId}");
return new OpenAIClient( return new OpenAIClient(
new ApiKeyCredential("none"), new ApiKeyCredential("none"),