Merge pull request LykosAI#1162 from ionite34/fix-civit

(cherry picked from commit 2b6773a08161299068444289de646348fe615140)

Author: ionite34

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+## v2.15.3
+### Fixed
+- Fixed [#1424](https://github.com/LykosAI/StabilityMatrix/issues/1424) - Civitai account 401 error when connecting accounts, updated for new API changes
+
 ## v2.15.2
 ### Changed
 - Updated Avalonia to 11.3.7

StabilityMatrix.Avalonia/Services/AccountsService.cs

@@ -172,8 +172,10 @@ public async Task CivitLoginAsync(string apiToken)
         var secrets = await secretsManager.SafeLoadAsync();
 
         // Get id first using the api token
-        var userAccount = await civitTRPCApi.GetUserAccountDefault(apiToken);
-        var id = userAccount.Result.Data.Json.Id;
+        var userAccount = await civitTRPCApi.GetUserAccount(bearerToken: apiToken);
+        var id =
+            userAccount.InnerJson?.Id
+            ?? throw new InvalidOperationException("GetUserAccount did not contain an id");
 
         // Then get the username using the id
         var account = await civitTRPCApi.GetUserById(new CivitGetUserByIdRequest { Id = id }, apiToken);
@@ -241,7 +243,7 @@ secrets.LykosAccountV2 is not null
                     {
                         IsConnected = true,
                         Principal = principal,
-                        User = user
+                        User = user,
                     }
                 );
 
@@ -282,27 +284,55 @@ private async Task RefreshHuggingFaceAsync(Secrets secrets)
                 if (response.IsSuccessStatusCode && response.Content != null)
                 {
                     // Token is valid, user info fetched
-                    logger.LogInformation("Hugging Face token is valid. User: {Username}", response.Content.Name);
-                    OnHuggingFaceAccountStatusUpdate(new HuggingFaceAccountStatusUpdateEventArgs(true, response.Content.Name));
+                    logger.LogInformation(
+                        "Hugging Face token is valid. User: {Username}",
+                        response.Content.Name
+                    );
+                    OnHuggingFaceAccountStatusUpdate(
+                        new HuggingFaceAccountStatusUpdateEventArgs(true, response.Content.Name)
+                    );
                 }
                 else
                 {
                     // Token is likely invalid or other API error
-                    logger.LogWarning("Hugging Face token validation failed. Status: {StatusCode}, Error: {Error}, Content: {Content}", response.StatusCode, response.Error?.ToString(), await response.Error?.GetContentAsAsync<string>() ?? "N/A");
-                    OnHuggingFaceAccountStatusUpdate(new HuggingFaceAccountStatusUpdateEventArgs(false, null, $"Token validation failed: {response.StatusCode}"));
+                    logger.LogWarning(
+                        "Hugging Face token validation failed. Status: {StatusCode}, Error: {Error}, Content: {Content}",
+                        response.StatusCode,
+                        response.Error?.ToString(),
+                        await response.Error?.GetContentAsAsync<string>() ?? "N/A"
+                    );
+                    OnHuggingFaceAccountStatusUpdate(
+                        new HuggingFaceAccountStatusUpdateEventArgs(
+                            false,
+                            null,
+                            $"Token validation failed: {response.StatusCode}"
+                        )
+                    );
                 }
             }
             catch (ApiException apiEx)
             {
                 // Handle Refit's ApiException (network issues, non-success status codes not caught by IsSuccessStatusCode if IApiResponse isn't used directly)
-                logger.LogError(apiEx, "Hugging Face API request failed during token validation. Content: {Content}", await apiEx.GetContentAsAsync<string>() ?? "N/A");
-                OnHuggingFaceAccountStatusUpdate(new HuggingFaceAccountStatusUpdateEventArgs(false, null, "API request failed during token validation."));
+                logger.LogError(
+                    apiEx,
+                    "Hugging Face API request failed during token validation. Content: {Content}",
+                    await apiEx.GetContentAsAsync<string>() ?? "N/A"
+                );
+                OnHuggingFaceAccountStatusUpdate(
+                    new HuggingFaceAccountStatusUpdateEventArgs(
+                        false,
+                        null,
+                        "API request failed during token validation."
+                    )
+                );
             }
             catch (Exception ex)
             {
                 // Handle other unexpected errors
                 logger.LogError(ex, "An unexpected error occurred during Hugging Face token validation.");
-                OnHuggingFaceAccountStatusUpdate(new HuggingFaceAccountStatusUpdateEventArgs(false, null, "An unexpected error occurred."));
+                OnHuggingFaceAccountStatusUpdate(
+                    new HuggingFaceAccountStatusUpdateEventArgs(false, null, "An unexpected error occurred.")
+                );
             }
         }
         else
@@ -390,7 +420,10 @@ private void OnHuggingFaceAccountStatusUpdate(HuggingFaceAccountStatusUpdateEven
         else if (e.IsConnected && HuggingFaceStatus?.IsConnected == false)
         {
             // Assuming Username might be null for now as we are not fetching it.
-            logger.LogInformation("Hugging Face account connected" + (string.IsNullOrWhiteSpace(e.Username) ? "" : $" (User: {e.Username})"));
+            logger.LogInformation(
+                "Hugging Face account connected"
+                    + (string.IsNullOrWhiteSpace(e.Username) ? "" : $" (User: {e.Username})")
+            );
         }
         else if (!e.IsConnected && !string.IsNullOrWhiteSpace(e.ErrorMessage))
         {

StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj

@@ -7,7 +7,7 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <ApplicationIcon>./Assets/Icon.ico</ApplicationIcon>
-        <Version>2.15.0-dev.999</Version>
+        <Version>2.16.0-dev.999</Version>
         <InformationalVersion>$(Version)</InformationalVersion>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

StabilityMatrix.Core/Api/ICivitTRPCApi.cs

@@ -20,13 +20,25 @@ Task<CivitUserProfileResponse> GetUserProfile(
 
     [QueryUriFormat(UriFormat.UriEscaped)]
     [Get("/api/trpc/buzz.getUserAccount")]
-    Task<CivitTrpcResponse<CivitUserAccountResponse>> GetUserAccount(
+    Task<CivitTrpcArrayResponse<CivitUserAccountResponse>> GetUserAccount(
         [Query] string input,
         [Authorize] string bearerToken,
         CancellationToken cancellationToken = default
     );
 
-    Task<CivitTrpcResponse<CivitUserAccountResponse>> GetUserAccountDefault(
+    [QueryUriFormat(UriFormat.UriEscaped)]
+    [Get("/api/trpc/buzz.getUserAccount")]
+    Task<CivitTrpcArrayResponse<CivitUserAccountResponse>> GetUserAccount(
+        [Authorize] string bearerToken,
+        CancellationToken cancellationToken = default
+    );
+
+    /// <summary>
+    /// Calls <see cref="GetUserAccount(string, string, CancellationToken)"/> with default JSON input.
+    /// Not required and returns 401 since Oct 2025 since civit changes.
+    /// Mainly just use <see cref="GetUserAccount(string, CancellationToken)"/> instead.
+    /// </summary>
+    Task<CivitTrpcArrayResponse<CivitUserAccountResponse>> GetUserAccountDefault(
         string bearerToken,
         CancellationToken cancellationToken = default
     )

StabilityMatrix.Core/Models/Api/CivitTRPC/CivitUserAccountResponse.cs

@@ -21,3 +21,28 @@ public record CivitTrpcResponseDataJson<TJson>
         public required TJson Json { get; set; }
     }
 }
+
+/// <summary>
+/// Like CivitTrpcResponse, but wrapped as the first item of an array.
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public record CivitTrpcArrayResponse<T>
+{
+    [JsonPropertyName("result")]
+    public required CivitTrpcResponseData<T> Result { get; set; }
+
+    [JsonIgnore]
+    public T? InnerJson => Result.Data.Json.FirstOrDefault();
+
+    public record CivitTrpcResponseData<TData>
+    {
+        [JsonPropertyName("data")]
+        public required CivitTrpcResponseDataJson<TData> Data { get; set; }
+    }
+
+    public record CivitTrpcResponseDataJson<TJson>
+    {
+        [JsonPropertyName("Json")]
+        public required List<TJson> Json { get; set; }
+    }
+}