refactor: Renamed CollectMetadata to CollectMetadataIfRequired.

tryAGI · May 3, 2024 · c38570f · c38570f
1 parent a07e22c
commit c38570f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/DocumentLoaders/Abstractions/src/DataSourceExtensions.cs b/src/DocumentLoaders/Abstractions/src/DataSourceExtensions.cs
@@ -28,7 +28,7 @@ public static IReadOnlyDictionary<string, object> ToMetadata(this DataSource dat
     /// <param name="settings"></param>
     /// <param name="dataSource"></param>
     /// <returns></returns>
-    public static IReadOnlyDictionary<string, object>? CollectMetadata(
+    public static IReadOnlyDictionary<string, object>? CollectMetadataIfRequired(
         this DocumentLoaderSettings? settings,
         DataSource dataSource)
     {
@@ -43,11 +43,11 @@ public static IReadOnlyDictionary<string, object> ToMetadata(this DataSource dat
     /// <param name="metadata"></param>
     /// <param name="additionalMetadata"></param>
     /// <returns></returns>
-    public static IReadOnlyDictionary<string, object>? With(
-        this IReadOnlyDictionary<string, object>? metadata,
+    public static IReadOnlyDictionary<string, object> With(
+        this IReadOnlyDictionary<string, object> metadata,
         IReadOnlyDictionary<string, object> additionalMetadata)
     {
-        return metadata?
+        return metadata
             .Concat(additionalMetadata)
             .ToDictionary(pair => pair.Key, pair => pair.Value);
     }

diff --git a/src/DocumentLoaders/Abstractions/src/FileLoader.cs b/src/DocumentLoaders/Abstractions/src/FileLoader.cs
@@ -35,8 +35,8 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
         //     }
         // }
 
-        var metadata = settings.CollectMetadata(dataSource);
-
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
+        
         return [new Document(content, metadata: metadata)];
     }
 }
diff --git a/src/DocumentLoaders/Pdf/src/AsposePdfSource.cs b/src/DocumentLoaders/Pdf/src/AsposePdfSource.cs
@@ -20,8 +20,8 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
         var textAbsorber = new TextAbsorber();
         pdfDocument.Pages.Accept(textAbsorber);
 
-        var metadata = settings.CollectMetadata(dataSource);
-
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
+        
         return [new Document(textAbsorber.Text, metadata: metadata)];
     }
 }
diff --git a/src/DocumentLoaders/Pdf/src/PdfPigPdfSource.cs b/src/DocumentLoaders/Pdf/src/PdfPigPdfSource.cs
@@ -18,11 +18,11 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
         using var stream = await dataSource.GetStreamAsync(cancellationToken).ConfigureAwait(false);
         using var document = PdfDocument.Open(stream, new ParsingOptions());
 
-        var metadata = settings.CollectMetadata(dataSource);
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
 
         return document
             .GetPages()
-            .Select(page => new Document(page.Text, metadata.With(new Dictionary<string, object>
+            .Select(page => new Document(page.Text, metadata?.With(new Dictionary<string, object>
             {
                 { "page", page.Number },
             })))

diff --git a/src/DocumentLoaders/WebBase/src/HtmlLoader.cs b/src/DocumentLoaders/WebBase/src/HtmlLoader.cs
@@ -33,7 +33,7 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
             document.QuerySelector("html") ??
             throw new NotSupportedException("Not supported for pages without <html> tag");
 
-        var metadata = settings.CollectMetadata(dataSource);
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
 
         return [new Document(html.TextContent, metadata: metadata)];
     }

diff --git a/src/DocumentLoaders/Word/src/WordLoader.cs b/src/DocumentLoaders/Word/src/WordLoader.cs
@@ -35,7 +35,7 @@ public async Task<IReadOnlyCollection<Document>> LoadAsync(
             }
         }
 
-        var metadata = settings.CollectMetadata(dataSource);
+        var metadata = settings.CollectMetadataIfRequired(dataSource);
 
         return documents
             .Select(text => new Document(text, metadata: metadata))