Merge pull request LykosAI#516 from ionite34/fix-secrets-manager

Fix downloads failing from secretmanager load
LykosAI · Feb 10, 2024 · 55dc469 · 55dc469
2 parents 89f0545 + f822f4d
commit 55dc469
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added new package: [Stable Diffusion WebUI Forge](https://github.com/lllyasviel/stable-diffusion-webui-forge) by lllyasviel
 - Added extension management for SD.Next and Stable Diffusion WebUI-UX
 
+## v2.8.3
+### Fixed
+- Fixed user tokens read error causing failed downloads
+- Failed downloads will now log error messages
+
 ## v2.8.2
 ### Added
 - Added missing GFPGAN link to Automatic1111 packages

diff --git a/StabilityMatrix.Core/Models/TrackedDownload.cs b/StabilityMatrix.Core/Models/TrackedDownload.cs
@@ -317,6 +317,8 @@ private void OnDownloadTaskCompleted(Task task)
                 return;
             }
 
+            Logger.Warn(Exception, "Download {Download} failed", FileName);
+
             OnProgressStateChanging(ProgressState.Failed);
             ProgressState = ProgressState.Failed;
         }

diff --git a/StabilityMatrix.Core/Services/DownloadService.cs b/StabilityMatrix.Core/Services/DownloadService.cs
@@ -326,7 +326,7 @@ private async Task AddConditionalHeaders(HttpClient client, Uri url)
         if (url.Host.Equals("civitai.com", StringComparison.OrdinalIgnoreCase))
         {
             // Add auth if we have it
-            if (await secretsManager.LoadAsync().ConfigureAwait(false) is { CivitApi: { } civitApi })
+            if (await secretsManager.SafeLoadAsync().ConfigureAwait(false) is { CivitApi: { } civitApi })
             {
                 logger.LogTrace(
                     "Adding Civit auth header {Signature} for download {Url}",

diff --git a/StabilityMatrix.Core/Services/SecretsManager.cs b/StabilityMatrix.Core/Services/SecretsManager.cs
@@ -45,11 +45,7 @@ public async Task<Secrets> SafeLoadAsync()
         }
         catch (Exception e)
         {
-            logger.LogWarning(
-                e,
-                "Failed to load secrets ({ExcType}), saving new instance",
-                e.GetType().Name
-            );
+            logger.LogError(e, "Failed to load secrets ({ExcType}), saving new instance", e.GetType().Name);
 
             var secrets = new Secrets();
             await SaveAsync(secrets).ConfigureAwait(false);
-Original file line number
+Diff line change
@@ Expand Up / @@ -317,6 +317,8 @@ private void OnDownloadTaskCompleted(Task task) @@
                     return;
                 }
+                Logger.Warn(Exception, "Download {Download} failed", FileName);
                 OnProgressStateChanging(ProgressState.Failed);
                 ProgressState = ProgressState.Failed;
             }
@@ Expand Down @@