Skip to content

Commit 072d167

Browse files
ionite34ionite34
authored
Merge branch 'dev' into fixes
2 parents 2b1a749 + 66d57d9 commit 072d167

5 files changed

Lines changed: 48 additions & 117 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
1212
- Fixed Inference hotkey weight adjustment multi-line behavior, now works as expected like the first line.
1313
- Fixed updates to versions with commit hash version parts not being recognized when the current version has no commit hash part.
1414
- Fixed Inference Extra Networks card not updating with newly added model files.
15+
- Fixed incorrect ROCmLibs being installed for RX 6800/6800XT users of Comfy-Zluda or AMDGPU-Forge
16+
- Fixed missing text when missing localized versions for Italian and Chinese languages
1517

1618
## v2.14.0
1719
### Added

‎StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,12 @@ _ when downloadUrl.Contains("gfx1010")
835835
}
836836

837837
// gfx1031
838-
if (name.Contains("6700") || name.Contains("6750") || name.Contains("6800") || name.Contains("6850"))
838+
if (
839+
name.Contains("6700")
840+
|| name.Contains("6750")
841+
|| name.Contains("6800M")
842+
|| name.Contains("6850M")
843+
)
839844
{
840845
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1031.for.hip.sdk.6.2.4.littlewu.s.logic.7z";
841846
}

‎StabilityMatrix.Avalonia/Languages/Resources.it-it.resx‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -641,45 +641,6 @@
641641
<data name="Label_Branch" xml:space="preserve">
642642
<value>Branch</value>
643643
</data>
644-
<data name="Label_AutoScrollToEnd" xml:space="preserve">
645-
<value></value>
646-
</data>
647-
<data name="Label_License" xml:space="preserve">
648-
<value></value>
649-
</data>
650-
<data name="Label_SharedModelStrategyShort" xml:space="preserve">
651-
<value></value>
652-
</data>
653-
<data name="Label_PleaseSelectDataDirectory" xml:space="preserve">
654-
<value></value>
655-
</data>
656-
<data name="Label_DataFolderName" xml:space="preserve">
657-
<value></value>
658-
</data>
659-
<data name="Label_CurrentDirectory" xml:space="preserve">
660-
<value></value>
661-
</data>
662-
<data name="Text_AppWillRelaunchAfterUpdate" xml:space="preserve">
663-
<value></value>
664-
</data>
665-
<data name="Action_RemindMeLater" xml:space="preserve">
666-
<value></value>
667-
</data>
668-
<data name="Action_InstallNow" xml:space="preserve">
669-
<value></value>
670-
</data>
671-
<data name="Label_ReleaseNotes" xml:space="preserve">
672-
<value></value>
673-
</data>
674-
<data name="Action_OpenProjectEllipsis" xml:space="preserve">
675-
<value></value>
676-
</data>
677-
<data name="Action_SaveAsEllipsis" xml:space="preserve">
678-
<value></value>
679-
</data>
680-
<data name="Action_RestoreDefaultLayout" xml:space="preserve">
681-
<value></value>
682-
</data>
683644
<data name="Label_CivitAi" xml:space="preserve">
684645
<value>CivitAI</value>
685646
</data>

‎StabilityMatrix.Avalonia/Languages/Resources.zh-Hans.resx‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,54 +1281,6 @@
12811281
<data name="Text_RestartMayBeRequiredForSystemChanges" xml:space="preserve">
12821282
<value>系统更改可能需要重启才能生效。</value>
12831283
</data>
1284-
<data name="Label_ReleasesUnavailableForThisPackage" xml:space="preserve">
1285-
<value></value>
1286-
</data>
1287-
<data name="Text_UnexpectedError_Description" xml:space="preserve">
1288-
<value></value>
1289-
</data>
1290-
<data name="Text_UnexpectedErrorRecoverable_Description" xml:space="preserve">
1291-
<value></value>
1292-
</data>
1293-
<data name="Action_ShowLogInExplorer" xml:space="preserve">
1294-
<value></value>
1295-
</data>
1296-
<data name="Action_ShowLogInFinder" xml:space="preserve">
1297-
<value></value>
1298-
</data>
1299-
<data name="Label_ExtensionPacks" xml:space="preserve">
1300-
<value></value>
1301-
</data>
1302-
<data name="Label_NoExtensionPacksFound" xml:space="preserve">
1303-
<value></value>
1304-
</data>
1305-
<data name="Label_OpenExtensionPacksFolder" xml:space="preserve">
1306-
<value></value>
1307-
</data>
1308-
<data name="Label_InstallExtensionPack" xml:space="preserve">
1309-
<value></value>
1310-
</data>
1311-
<data name="Label_AddToExistingPack" xml:space="preserve">
1312-
<value></value>
1313-
</data>
1314-
<data name="Label_NewExtensionPack" xml:space="preserve">
1315-
<value></value>
1316-
</data>
1317-
<data name="Label_CreateExtensionPackExplanation" xml:space="preserve">
1318-
<value></value>
1319-
</data>
1320-
<data name="Label_ImportExtensionPacksExplanation" xml:space="preserve">
1321-
<value></value>
1322-
</data>
1323-
<data name="Label_OrWithHyphensAround" xml:space="preserve">
1324-
<value></value>
1325-
</data>
1326-
<data name="Action_OpenOnOpenModelDb" xml:space="preserve">
1327-
<value></value>
1328-
</data>
1329-
<data name="Label_Wildcards" xml:space="preserve">
1330-
<value></value>
1331-
</data>
13321284
<data name="Action_GoToSettings" xml:space="preserve">
13331285
<value>前往设置</value>
13341286
</data>

‎StabilityMatrix.Avalonia/ViewModels/Inference/PromptCardViewModel.cs‎

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Text;
33
using System.Text.Json;
44
using System.Text.Json.Nodes;
5+
using AsyncAwaitBestPractices;
56
using Avalonia.Controls.Notifications;
67
using AvaloniaEdit;
78
using AvaloniaEdit.Document;
@@ -222,43 +223,53 @@ public override async Task OnLoadedAsync()
222223
{
223224
IsPromptAmplifyTeachingTipOpen = true;
224225
}
226+
}
225227

226-
_ = Task.Run(async () =>
227-
{
228-
try
228+
protected override Task OnInitialLoadedAsync()
229+
{
230+
Task.Run(async () =>
229231
{
230-
if (accountsService.LykosStatus == null)
232+
try
231233
{
232-
await accountsService.RefreshAsync();
233-
}
234+
var isLoggedIn = await accountsService.HasStoredLykosAccountAsync();
235+
if (!isLoggedIn)
236+
{
237+
return;
238+
}
234239

235-
SetTokenThreshold();
236-
}
237-
catch (Exception ex)
238-
{
239-
logger.LogError(ex, "Error refreshing account data");
240-
}
240+
SetTokenThreshold();
241+
}
242+
catch (Exception ex)
243+
{
244+
logger.LogError(ex, "Error refreshing account data");
245+
}
241246

242-
try
243-
{
244-
var result = await promptGenApi.AccountMeTokens();
245-
TokensRemaining = result.Available;
246-
}
247-
catch (ApiException e)
248-
{
249-
if (e.StatusCode != HttpStatusCode.Unauthorized && e.StatusCode != HttpStatusCode.NotFound)
247+
try
250248
{
251-
notificationService.Show(
252-
"Error retrieving prompt amplifier data",
253-
e.Message,
254-
NotificationType.Error
255-
);
256-
return;
249+
var result = await promptGenApi.AccountMeTokens();
250+
TokensRemaining = result.Available;
251+
}
252+
catch (ApiException e)
253+
{
254+
if (
255+
e.StatusCode != HttpStatusCode.Unauthorized
256+
&& e.StatusCode != HttpStatusCode.NotFound
257+
)
258+
{
259+
notificationService.Show(
260+
"Error retrieving prompt amplifier data",
261+
e.Message,
262+
NotificationType.Error
263+
);
264+
return;
265+
}
266+
267+
TokensRemaining = -1;
257268
}
269+
})
270+
.SafeFireAndForget(onException: ex => logger.LogError(ex, "Error getting prompt amplifier data"));
258271

259-
TokensRemaining = -1;
260-
}
261-
});
272+
return Task.CompletedTask;
262273
}
263274

264275
private void SetTokenThreshold()

0 commit comments

Comments
 (0)