Skip to content

Commit 49fcda5

Browse files
mythzmythz
committed
Update DTOs + add jobs.db test
1 parent 4967a00 commit 49fcda5

File tree

3 files changed

+44
-167
lines changed

3 files changed

+44
-167
lines changed

‎BlazorDiffusion.ServiceInterface/AiServer/dtos.cs

Lines changed: 4 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Options:
2-
Date: 2024-08-25 14:46:41
2+
Date: 2024-08-25 21:30:13
33
Version: 8.31
44
Tip: To override a DTO option, remove "//" prefix before updating
55
BaseUrl: https://localhost:5005
@@ -20,8 +20,8 @@
2020
//InitializeCollections: True
2121
//ExportValueTypes: False
2222
//IncludeTypes:
23-
//ExcludeTypes:
24-
//AddNamespaces:
23+
ExcludeTypes: BackgroundJob,JobSummary,ScheduledTask,CompletedJob,FailedJob,BackgroundJobBase,BackgroundJobOptions,WorkerStats,BackgroundJobState
24+
AddNamespaces: ServiceStack.Jobs
2525
//AddDefaultXmlNamespace: http://schemas.servicestack.net/types
2626
*/
2727

@@ -31,11 +31,11 @@
3131
using System.Runtime.Serialization;
3232
using ServiceStack;
3333
using ServiceStack.DataAnnotations;
34+
using ServiceStack.Jobs;
3435
using System.IO;
3536
using AiServer.ServiceModel;
3637
using AiServer.ServiceModel.Types;
3738
using AiServer.ServiceInterface.Speech;
38-
using ServiceStack.Jobs;
3939
using AiServer.ServiceInterface;
4040

4141
namespace AiServer.ServiceInterface
@@ -1556,155 +1556,3 @@ public partial class QueryDiffusionApiTypes
15561556

15571557
}
15581558

1559-
namespace ServiceStack.Jobs
1560-
{
1561-
public partial class BackgroundJob
1562-
: BackgroundJobBase
1563-
{
1564-
public virtual long Id { get; set; }
1565-
}
1566-
1567-
public partial class BackgroundJobBase
1568-
: IMeta
1569-
{
1570-
public BackgroundJobBase()
1571-
{
1572-
Args = new Dictionary<string, string>{};
1573-
Meta = new Dictionary<string, string>{};
1574-
}
1575-
1576-
public virtual long Id { get; set; }
1577-
public virtual long? ParentId { get; set; }
1578-
public virtual string RefId { get; set; }
1579-
public virtual string Worker { get; set; }
1580-
public virtual string Tag { get; set; }
1581-
public virtual string BatchId { get; set; }
1582-
public virtual string Callback { get; set; }
1583-
public virtual long? DependsOn { get; set; }
1584-
public virtual DateTime? RunAfter { get; set; }
1585-
public virtual DateTime CreatedDate { get; set; }
1586-
public virtual string CreatedBy { get; set; }
1587-
public virtual string RequestId { get; set; }
1588-
public virtual string RequestType { get; set; }
1589-
public virtual string Command { get; set; }
1590-
public virtual string Request { get; set; }
1591-
public virtual string RequestBody { get; set; }
1592-
public virtual string UserId { get; set; }
1593-
public virtual string Response { get; set; }
1594-
public virtual string ResponseBody { get; set; }
1595-
public virtual BackgroundJobState State { get; set; }
1596-
public virtual DateTime? StartedDate { get; set; }
1597-
public virtual DateTime? CompletedDate { get; set; }
1598-
public virtual DateTime? NotifiedDate { get; set; }
1599-
public virtual int? RetryLimit { get; set; }
1600-
public virtual int Attempts { get; set; }
1601-
public virtual int DurationMs { get; set; }
1602-
public virtual int? TimeoutSecs { get; set; }
1603-
public virtual double? Progress { get; set; }
1604-
public virtual string Status { get; set; }
1605-
public virtual string Logs { get; set; }
1606-
public virtual DateTime? LastActivityDate { get; set; }
1607-
public virtual string ReplyTo { get; set; }
1608-
public virtual string ErrorCode { get; set; }
1609-
public virtual ResponseStatus Error { get; set; }
1610-
public virtual Dictionary<string, string> Args { get; set; }
1611-
public virtual Dictionary<string, string> Meta { get; set; }
1612-
}
1613-
1614-
public partial class BackgroundJobOptions
1615-
{
1616-
public BackgroundJobOptions()
1617-
{
1618-
Args = new Dictionary<string, string>{};
1619-
}
1620-
1621-
public virtual string RefId { get; set; }
1622-
public virtual long? ParentId { get; set; }
1623-
public virtual string Worker { get; set; }
1624-
public virtual DateTime? RunAfter { get; set; }
1625-
public virtual string Callback { get; set; }
1626-
public virtual long? DependsOn { get; set; }
1627-
public virtual string UserId { get; set; }
1628-
public virtual int? RetryLimit { get; set; }
1629-
public virtual string ReplyTo { get; set; }
1630-
public virtual string Tag { get; set; }
1631-
public virtual string BatchId { get; set; }
1632-
public virtual string CreatedBy { get; set; }
1633-
public virtual int? TimeoutSecs { get; set; }
1634-
public virtual Dictionary<string, string> Args { get; set; }
1635-
public virtual bool? RunCommand { get; set; }
1636-
}
1637-
1638-
public enum BackgroundJobState
1639-
{
1640-
Queued,
1641-
Started,
1642-
Executed,
1643-
Completed,
1644-
Failed,
1645-
Cancelled,
1646-
}
1647-
1648-
public partial class CompletedJob
1649-
: BackgroundJobBase
1650-
{
1651-
}
1652-
1653-
public partial class FailedJob
1654-
: BackgroundJobBase
1655-
{
1656-
}
1657-
1658-
public partial class JobSummary
1659-
{
1660-
public virtual long Id { get; set; }
1661-
public virtual long? ParentId { get; set; }
1662-
public virtual string RefId { get; set; }
1663-
public virtual string Worker { get; set; }
1664-
public virtual string Tag { get; set; }
1665-
public virtual string BatchId { get; set; }
1666-
public virtual DateTime CreatedDate { get; set; }
1667-
public virtual string CreatedBy { get; set; }
1668-
public virtual string RequestType { get; set; }
1669-
public virtual string Command { get; set; }
1670-
public virtual string Request { get; set; }
1671-
public virtual string Response { get; set; }
1672-
public virtual string UserId { get; set; }
1673-
public virtual string Callback { get; set; }
1674-
public virtual DateTime? StartedDate { get; set; }
1675-
public virtual DateTime? CompletedDate { get; set; }
1676-
public virtual BackgroundJobState State { get; set; }
1677-
public virtual int DurationMs { get; set; }
1678-
public virtual int Attempts { get; set; }
1679-
public virtual string ErrorCode { get; set; }
1680-
public virtual string ErrorMessage { get; set; }
1681-
}
1682-
1683-
public partial class ScheduledTask
1684-
{
1685-
public virtual long Id { get; set; }
1686-
public virtual string Name { get; set; }
1687-
public virtual TimeSpan? Interval { get; set; }
1688-
public virtual string CronExpression { get; set; }
1689-
public virtual string RequestType { get; set; }
1690-
public virtual string Command { get; set; }
1691-
public virtual string Request { get; set; }
1692-
public virtual string RequestBody { get; set; }
1693-
public virtual BackgroundJobOptions Options { get; set; }
1694-
public virtual DateTime? LastRun { get; set; }
1695-
public virtual long? LastJobId { get; set; }
1696-
}
1697-
1698-
public partial class WorkerStats
1699-
{
1700-
public virtual string Name { get; set; }
1701-
public virtual long Queued { get; set; }
1702-
public virtual long Received { get; set; }
1703-
public virtual long Completed { get; set; }
1704-
public virtual long Retries { get; set; }
1705-
public virtual long Failed { get; set; }
1706-
public virtual TimeSpan? RunningTime { get; set; }
1707-
}
1708-
1709-
}
1710-

‎BlazorDiffusion.ServiceInterface/Score.cs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -163,16 +163,16 @@ public static void LoadAnalytics(IDbConnection db)
163163
}
164164
AlbumSearchCountMap = new(albumSearchCountMap);
165165

166-
Log.DebugFormat($"Scores.LoadAnalytics() took {0}ms", sw.ElapsedMilliseconds);
166+
Log.DebugFormat($"Scores.LoadAnalytics() took {sw.ElapsedMilliseconds:N0}ms");
167167
}
168168

169169
public static bool PopulateArtifactScores(Artifact artifact)
170170
{
171171
var isPrimary = PrimaryArtifactCreativeMap.ContainsKey(artifact.Id);
172-
var likesCount = ArtifactLikesCountMap.TryGetValue(artifact.Id, out var likes) ? likes : 0;
173-
var albumsCount = ArtifactInAlbumsCountMap.TryGetValue(artifact.Id, out var albums) ? albums : 0;
174-
var downloadsCount = ArtifactDownloadsCountMap.TryGetValue(artifact.Id, out var downloads) ? downloads : 0;
175-
var searchCount = ArtifactSearchCountMap.TryGetValue(artifact.Id, out var searches) ? searches : 0;
172+
var likesCount = ArtifactLikesCountMap.GetValueOrDefault(artifact.Id, 0);
173+
var albumsCount = ArtifactInAlbumsCountMap.GetValueOrDefault(artifact.Id, 0);
174+
var downloadsCount = ArtifactDownloadsCountMap.GetValueOrDefault(artifact.Id, 0);
175+
var searchCount = ArtifactSearchCountMap.GetValueOrDefault(artifact.Id, 0);
176176
var score = Calculate(isPrimary: isPrimary, artifact: artifact);
177177

178178
if (likesCount != artifact.LikesCount ||
@@ -221,8 +221,7 @@ public TimeBonus(TimeSpan age, int weight)
221221
}
222222

223223
public static TimeSpan TemporalScoreThreshold = TimeSpan.FromDays(63);
224-
static TimeBonus[] TimeBonuses = new TimeBonus[]
225-
{
224+
static TimeBonus[] TimeBonuses = [
226225
new(TimeSpan.FromMinutes(10), 2000),
227226
new(TimeSpan.FromMinutes(20), 1800),
228227
new(TimeSpan.FromMinutes(40), 1500),
@@ -244,10 +243,10 @@ public TimeBonus(TimeSpan age, int weight)
244243
new(TimeSpan.FromDays(42), 60),
245244
new(TimeSpan.FromDays(49), 50),
246245
new(TimeSpan.FromDays(56), 40),
247-
new(TemporalScoreThreshold, 30),
248-
};
246+
new(TemporalScoreThreshold, 30)
247+
];
249248

250-
public static int CaclulateTemporalScore(Artifact artifact)
249+
public static int CalculateTemporalScore(Artifact artifact)
251250
{
252251
var now = DateTime.UtcNow;
253252
var age = now - artifact.CreatedDate;
@@ -266,7 +265,7 @@ public static int CaclulateTemporalScore(Artifact artifact)
266265

267266
public static bool PopulateTemporalScore(Artifact artifact)
268267
{
269-
var temporalScore = CaclulateTemporalScore(artifact);
268+
var temporalScore = CalculateTemporalScore(artifact);
270269
if (artifact.TemporalScore != temporalScore)
271270
{
272271
artifact.TemporalScore = temporalScore;

‎BlazorDiffusion.Tests/JobTests.cs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using System.IO;
2+
using NUnit.Framework;
3+
using ServiceStack;
4+
using ServiceStack.Data;
5+
using ServiceStack.OrmLite;
6+
using ServiceStack.Text;
7+
using ServiceStack.Jobs;
8+
9+
namespace BlazorDiffusion.Tests;
10+
11+
public class JobTests
12+
{
13+
IDbConnectionFactory ResolveDbFactory() => new ConfigureDb().ConfigureAndResolve<IDbConnectionFactory>();
14+
15+
[Test]
16+
public void Dump_ScheduledTasks()
17+
{
18+
var hostDir = "../../../../BlazorDiffusion";
19+
var jobsPath = Path.GetFullPath(Path.Combine(hostDir, "App_Data/jobs/jobs.db"));
20+
21+
var dbFactory = ResolveDbFactory();
22+
dbFactory.RegisterConnection("jobs.db",
23+
$"DataSource={jobsPath};Cache=Shared", SqliteDialect.Provider);
24+
using var db = dbFactory.OpenDbConnection("jobs.db");
25+
26+
var rows = db.Select<ScheduledTask>();
27+
rows.PrintDump();
28+
}
29+
30+
}

0 commit comments

Comments
 (0)