saherelm/xAiModels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix usage of Enrichers and Dto Structures ...

Browse Source
This commit is contained in:
saherelm
2026-08-08 09:42:28 +03:30
parent 17bbe401ae
commit 000408ae3f
12 changed files with 408 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Providers/Enrichers/XAiConversationEnricher.cs
+7 -12
View File
@@ -6,7 +6,6 @@ using xAiModels.Interfaces;
using xAiModels.Interfaces.Dtos;
using xAiModels.Interfaces.Enrichers;
using xAiModels.Models.Dtos;
using xAiModels.Models.Entities;
using xCommons.Extensions;
using xIdentityService.Interfaces;
using xIdentityService.Extensions;
@@ -58,14 +57,14 @@ namespace xAiModels.Providers.Enrichers
//
// Attached Resolved Info to Destination ...
destination.Owner = ownerTask.Result;
destination.TitleLocales = titleLocalesTask.Result;
destination.TitleResource = titleLocalesTask.Result;
var project = projectTask.Result;
if (!project.IsNullOrDefault())
{
destination.ProjectTitle = project.Title;
destination.ProjectDescription = project.Description;
destination.ProjectTitleLocales = project.TitleLocales;
destination.ProjectDescriptionLocales = project.DescriptionLocales;
destination.ProjectTitleResource = project.TitleResource;
destination.ProjectDescriptionResource = project.DescriptionResource;
}
}
@@ -76,7 +75,7 @@ namespace xAiModels.Providers.Enrichers
/// <param name="destinations"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
public async Task<IEnumerable<XAiConversationDto>> EnrichRangeAsync(
public async Task EnrichRangeAsync(
IEnumerable<XAiConversationDto> sources,
IEnumerable<XAiConversationDto> destinations,
CancellationToken cancellationToken = default
@@ -90,9 +89,6 @@ namespace xAiModels.Providers.Enrichers
//
await Task.WhenAll(tasks);
//
return destinations;
}
//
@@ -137,24 +133,23 @@ namespace xAiModels.Providers.Enrichers
/// <param name="title"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
private async Task<XLocaleResourceDto[]> ResolveTitleLocalesAsync(
private async Task<XResourceDto> ResolveTitleLocalesAsync(
string title,
CancellationToken cancellationToken = default
)
{
//
XLocaleResourceDto[] result = [];
XResourceDto result = null;
if (title.IsNullOrEmpty())
{
return result;
}
//
var locales = await conversationTitleResourceProvider.GetLocales(
result = await conversationTitleResourceProvider.GetResource(
identifier: title,
cancellationToken: cancellationToken
);
result = [.. locales];
//
return result;
Providers/Enrichers/XAiMessageEnricher.cs
+143
View File
@@ -0,0 +1,143 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using xAiModels.Interfaces.Enrichers;
using xAiModels.Models.Dtos;
using xCommons.Extensions;
using xIdentityService.Interfaces;
using xIdentityService.Extensions;
using xModels.Dtos;
using System.Linq;
using xAiModels.Interfaces.Dtos;
namespace xAiModels.Providers.Enrichers
{
public class XAiMessageEnricher : IXAiMessageEnricher
{
private readonly IXIdentityProvider identityProvider;
private readonly IXAiConversationRepositoryService conversationRepositoryService;
public XAiMessageEnricher(
IXIdentityProvider identityProvider,
IXAiConversationRepositoryService conversationRepositoryService
)
{
this.identityProvider = identityProvider;
this.conversationRepositoryService = conversationRepositoryService;
}
public async Task EnrichAsync(
XAiMessageDto source,
XAiMessageDto destination,
CancellationToken cancellationToken = default
)
{
//
// Run independent async operations concurrently
var ownerTask = ResolveOwnerAsync(source.OwnerId, cancellationToken);
var conversationTask = ResolveConversationAsync(source.ConversationId, cancellationToken);
//
// wait until All Tasks Resolved ...
await Task.WhenAll(ownerTask, conversationTask);
//
// Attached Resolved Info to Destination ...
destination.Owner = ownerTask.Result;
if (!conversationTask.Result.IsNullOrDefault())
{
//
destination.ConversationTitle = conversationTask.Result.Title;
destination.ConversationTitleResouce = conversationTask.Result.TitleResource;
}
}
public async Task EnrichRangeAsync(
IEnumerable<XAiMessageDto> sources,
IEnumerable<XAiMessageDto> destinations,
CancellationToken cancellationToken = default
)
{
//
// Make Tasks Ready ...
var tasks = sources.Zip(destinations, (src, dst) =>
EnrichAsync(src, dst, cancellationToken)
);
//
await Task.WhenAll(tasks);
}
//
#region Private ...
/// <summary>
/// Reading Owner User Info ...
/// </summary>
/// <param name="ownerId"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
private async Task<XPersonDto> ResolveOwnerAsync(
string ownerId,
CancellationToken cancellationToken = default
)
{
//
XPersonDto result = null;
//
// Validate ...
if (ownerId.IsNullOrEmpty())
{
return result;
}
//
// Try to Retrieve User Info ...
var device = identityProvider.GetDevice();
var userInfo = await identityProvider.GetUserInfo(
device: device,
userSelectByParam: ownerId
);
result = userInfo.ToXPersonDto();
//
return result;
}
/// <summary>
/// Reading Conversation ...
/// </summary>
/// <param name="conversationId"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
private async Task<XAiConversationDto> ResolveConversationAsync(
Guid conversationId,
CancellationToken cancellationToken = default
)
{
//
XAiConversationDto result = null;
//
// Validate ...
if (conversationId.IsNull() ||
conversationId.IsDefaultGuid()
)
{
return result;
}
//
result = await conversationRepositoryService.GetAsync(
id: conversationId,
includeBuilder: null,
ignoreSoftDeleteds: true,
cancellationToken: cancellationToken
);
//
return result;
}
#endregion
}
}
Providers/Enrichers/XAiProjectEnricher.cs
+191
View File
@@ -0,0 +1,191 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using xAiModels.Interfaces.Enrichers;
using xAiModels.Models.Dtos;
using xCommons.Extensions;
using xIdentityService.Interfaces;
using xIdentityService.Extensions;
using xModels.Dtos;
using xAiModels.Interfaces;
using xAiModels.Interfaces.Dtos;
namespace xAiModels.Providers.Enrichers
{
public class XAiProjectEnricher : IXAiProjectEnricher
{
private readonly IXIdentityProvider identityProvider;
private readonly IXAiProjectTitleResourceProvider projectTitleResourceProvider;
private readonly IXAiConversationRepositoryService conversationRepositoryService;
private readonly IXAiProjectDescriptionResourceProvider projectDescriptionResourceProvider;
public XAiProjectEnricher(
IXIdentityProvider identityProvider,
IXAiProjectTitleResourceProvider projectTitleResourceProvider,
IXAiConversationRepositoryService conversationRepositoryService,
IXAiProjectDescriptionResourceProvider projectDescriptionResourceProvider
)
{
this.identityProvider = identityProvider;
this.projectTitleResourceProvider = projectTitleResourceProvider;
this.conversationRepositoryService = conversationRepositoryService;
this.projectDescriptionResourceProvider = projectDescriptionResourceProvider;
}
public Task EnrichAsync(
XAiProjectDto source,
XAiProjectDto destination,
CancellationToken cancellationToken = default
)
{
throw new NotImplementedException();
}
public Task EnrichRangeAsync(
IEnumerable<XAiProjectDto> sources,
IEnumerable<XAiProjectDto> destinations,
CancellationToken cancellationToken = default
)
{
throw new NotImplementedException();
}
//
#region Private ...
/// <summary>
/// Reading Owner User Info ...
/// </summary>
/// <param name="ownerId"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
private async Task<XPersonDto> ResolveOwnerAsync(
string ownerId,
CancellationToken cancellationToken = default
)
{
//
XPersonDto result = null;
//
// Validate ...
if (ownerId.IsNullOrEmpty())
{
return result;
}
//
// Try to Retrieve User Info ...
var device = identityProvider.GetDevice();
var userInfo = await identityProvider.GetUserInfo(
device: device,
userSelectByParam: ownerId
);
result = userInfo.ToXPersonDto();
//
return result;
}
/// <summary>
/// Retrieve Title Resource ...
/// </summary>
/// <param name="identifier"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
private async Task<XResourceDto> ResolveTitleAsync(
string identifier,
CancellationToken cancellationToken = default
)
{
//
XResourceDto result = null;
//
// Validate ...
if (identifier.IsNullOrEmpty())
{
return result;
}
//
result = await projectTitleResourceProvider.GetResource(
identifier: identifier,
cancellationToken: cancellationToken
);
//
return result;
}
/// <summary>
/// Retrieve Description Resource ...
/// </summary>
/// <param name="identifier"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
private async Task<XResourceDto> ResolveDescriptionAsync(
string identifier,
CancellationToken cancellationToken = default
)
{
//
XResourceDto result = null;
//
// Validate ...
if (identifier.IsNullOrEmpty())
{
return result;
}
//
result = await projectDescriptionResourceProvider.GetResource(
identifier: identifier,
cancellationToken: cancellationToken
);
//
return result;
}
/// <summary>
/// Retrieve Project Conversations ...
/// </summary>
/// <param name="projectId"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
private async Task<List<XAiConversationDto>> ResolveConversationsAsync(
Guid projectId,
CancellationToken cancellationToken = default
)
{
//
List<XAiConversationDto> result = [];
//
// Validate ...
if (projectId.IsNull() ||
projectId.IsDefaultGuid()
)
{
return result;
}
//
var items = await conversationRepositoryService.FindManyAsync(
orderBuilder: null,
includeBuilder: null,
ignoreSoftDeleteds: true,
predicate: x => x.Id == projectId,
cancellationToken: cancellationToken
);
result = [.. items];
//
return result;
}
#endregion
}
}