Skip to content

Commit f73e54a

Browse files
BaseOrchestrator fixed
1 parent b0bb43b commit f73e54a

6 files changed

Lines changed: 26 additions & 8 deletions

File tree

App/kernel-memory/service/Core/Handlers/DeleteDocumentHandler.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ public DeleteDocumentHandler(
3737
public async Task<(bool success, DataPipeline updatedPipeline)> InvokeAsync(
3838
DataPipeline pipeline, CancellationToken cancellationToken = default)
3939
{
40-
this._log.LogDebug("Deleting document, pipeline '{0}/{1}'", pipeline.Index, pipeline.DocumentId);
40+
this._log.LogDebug("Deleting document, pipeline '{0}/{1}'",
41+
pipeline.Index.Replace("\r", string.Empty).Replace("\n", string.Empty),
42+
pipeline.DocumentId.Replace("\r", string.Empty).Replace("\n", string.Empty));
4143

4244
// Delete embeddings
4345
foreach (IMemoryDb db in this._memoryDbs)

App/kernel-memory/service/Core/Handlers/DeleteGeneratedFilesHandler.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ public DeleteGeneratedFilesHandler(
3232
public async Task<(bool success, DataPipeline updatedPipeline)> InvokeAsync(
3333
DataPipeline pipeline, CancellationToken cancellationToken = default)
3434
{
35-
this._log.LogDebug("Deleting generated files, pipeline '{0}/{1}'", pipeline.Index, pipeline.DocumentId);
35+
this._log.LogDebug("Deleting generated files, pipeline '{0}/{1}'",
36+
pipeline.Index.Replace("\r", string.Empty).Replace("\n", string.Empty),
37+
pipeline.DocumentId.Replace("\r", string.Empty).Replace("\n", string.Empty));
3638

3739
// Delete files, leaving the status file
3840
await this._documentStorage.EmptyDocumentDirectoryAsync(

App/kernel-memory/service/Core/Handlers/DeleteIndexHandler.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ public DeleteIndexHandler(
3737
public async Task<(bool success, DataPipeline updatedPipeline)> InvokeAsync(
3838
DataPipeline pipeline, CancellationToken cancellationToken = default)
3939
{
40-
this._log.LogDebug("Deleting index, pipeline '{0}/{1}'", pipeline.Index, pipeline.DocumentId);
40+
this._log.LogDebug("Deleting index, pipeline '{0}/{1}'",
41+
pipeline.Index.Replace("\r", string.Empty).Replace("\n", string.Empty),
42+
pipeline.DocumentId.Replace("\r", string.Empty).Replace("\n", string.Empty));
4143

4244
// Delete index from vector storage
4345
foreach (IMemoryDb db in this._memoryDbs)

App/kernel-memory/service/Core/Handlers/SummarizationParallelHandler.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ public SummarizationParallelHandler(
5656
public async Task<(bool success, DataPipeline updatedPipeline)> InvokeAsync(
5757
DataPipeline pipeline, CancellationToken cancellationToken = default)
5858
{
59-
this._log.LogDebug("Generating summary, pipeline '{0}/{1}'", pipeline.Index, pipeline.DocumentId);
59+
this._log.LogDebug("Generating summary, pipeline '{0}/{1}'",
60+
pipeline.Index.Replace("\r", string.Empty).Replace("\n", string.Empty),
61+
pipeline.DocumentId.Replace("\r", string.Empty).Replace("\n", string.Empty));
6062

6163
foreach (DataPipeline.FileDetails uploadedFile in pipeline.Files)
6264
{

App/kernel-memory/service/Core/Pipeline/BaseOrchestrator.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,10 @@ protected async Task UploadFilesAsync(DataPipeline currentPipeline, Cancellation
428428
/// <param name="cancellationToken">Task cancellation token</param>
429429
protected async Task UpdatePipelineStatusAsync(DataPipeline pipeline, CancellationToken cancellationToken)
430430
{
431-
this.Log.LogDebug("Saving pipeline status to '{0}/{1}/{2}'", pipeline.Index, pipeline.DocumentId, Constants.PipelineStatusFilename);
431+
this.Log.LogDebug("Saving pipeline status to '{0}/{1}/{2}'",
432+
pipeline.Index.Replace("\r", string.Empty).Replace("\n", string.Empty),
433+
pipeline.DocumentId.Replace("\r", string.Empty).Replace("\n", string.Empty),
434+
Constants.PipelineStatusFilename);
432435
try
433436
{
434437
await this._documentStorage.WriteFileAsync(
@@ -453,7 +456,10 @@ protected static string ToJson(object data, bool indented = false)
453456

454457
private async Task UploadFormFilesAsync(DataPipeline pipeline, CancellationToken cancellationToken)
455458
{
456-
this.Log.LogDebug("Uploading {0} files, pipeline '{1}/{2}'", pipeline.FilesToUpload.Count, pipeline.Index, pipeline.DocumentId);
459+
this.Log.LogDebug("Uploading {0} files, pipeline '{1}/{2}'",
460+
pipeline.FilesToUpload.Count,
461+
pipeline.Index.Replace("\r", string.Empty).Replace("\n", string.Empty),
462+
pipeline.DocumentId.Replace("\r", string.Empty).Replace("\n", string.Empty));
457463

458464
await this._documentStorage.CreateIndexDirectoryAsync(pipeline.Index, cancellationToken).ConfigureAwait(false);
459465
await this._documentStorage.CreateDocumentDirectoryAsync(pipeline.Index, pipeline.DocumentId, cancellationToken).ConfigureAwait(false);

App/kernel-memory/service/Core/Pipeline/DistributedPipelineOrchestrator.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,17 @@ private async Task<bool> RunPipelineStepAsync(
233233
pipeline = updatedPipeline;
234234
pipeline.LastUpdate = DateTimeOffset.UtcNow;
235235

236-
this.Log.LogInformation("Handler {0} processed pipeline {1} successfully", currentStepName, pipeline.DocumentId);
236+
this.Log.LogInformation("Handler {0} processed pipeline {1} successfully",
237+
currentStepName,
238+
pipeline.DocumentId.Replace("\r", string.Empty).Replace("\n", string.Empty));
237239
pipeline.MoveToNextStep();
238240
await this.MoveForwardAsync(pipeline, cancellationToken).ConfigureAwait(false);
239241
}
240242
else
241243
{
242-
this.Log.LogError("Handler {0} failed to process pipeline {1}", currentStepName, pipeline.DocumentId);
244+
this.Log.LogError("Handler {0} failed to process pipeline {1}",
245+
currentStepName,
246+
pipeline.DocumentId.Replace("\r", string.Empty).Replace("\n", string.Empty));
243247
}
244248

245249
// Note: returning True, the message is removed from the queue

0 commit comments

Comments
 (0)