Use new GetMappingSettings

Author: reakaleek

Directory.Packages.props

@@ -25,7 +25,7 @@
     <PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
     <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.1.0" />
     <PackageVersion Include="FakeItEasy" Version="8.3.0" />
-    <PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.13.0" />
+    <PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.13.1" />
     <PackageVersion Include="InMemoryLogger" Version="1.0.66" />
     <PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />

src/tooling/Elastic.Documentation.Tooling/Exporters/ElasticsearchMarkdownExporter.cs

@@ -8,7 +8,6 @@
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Search;
 using Elastic.Documentation.Serialization;
-using Elastic.Documentation.Site.Navigation;
 using Elastic.Ingest.Elasticsearch;
 using Elastic.Ingest.Elasticsearch.Catalog;
 using Elastic.Ingest.Elasticsearch.Semantic;
@@ -22,7 +21,7 @@
 namespace Elastic.Documentation.Tooling.Exporters;
 
 public class ElasticsearchMarkdownExporter(ILoggerFactory logFactory, IDiagnosticsCollector collector, DocumentationEndpoints endpoints)
-	: ElasticsearchMarkdownExporterBase<CatalogIndexChannelOptions<DocumentationDocument>, DocumentationCatalogIndexChannel>
+	: ElasticsearchMarkdownExporterBase<CatalogIndexChannelOptions<DocumentationDocument>, CatalogIndexChannel<DocumentationDocument>>
 		(logFactory, collector, endpoints)
 {
 	/// <inheritdoc />
@@ -34,61 +33,26 @@ public class ElasticsearchMarkdownExporter(ILoggerFactory logFactory, IDiagnosti
 	};
 
 	/// <inheritdoc />
-	protected override DocumentationCatalogIndexChannel NewChannel(CatalogIndexChannelOptions<DocumentationDocument> options) => new(options);
+	protected override CatalogIndexChannel<DocumentationDocument> NewChannel(CatalogIndexChannelOptions<DocumentationDocument> options) => new(options);
 }
 
 public class ElasticsearchMarkdownSemanticExporter(ILoggerFactory logFactory, IDiagnosticsCollector collector, DocumentationEndpoints endpoints)
-	: ElasticsearchMarkdownExporterBase<SemanticIndexChannelOptions<DocumentationDocument>, DocumentationSemanticIndexChannel>
+	: ElasticsearchMarkdownExporterBase<SemanticIndexChannelOptions<DocumentationDocument>, SemanticIndexChannel<DocumentationDocument>>
 		(logFactory, collector, endpoints)
 {
 	/// <inheritdoc />
 	protected override SemanticIndexChannelOptions<DocumentationDocument> NewOptions(DistributedTransport transport) => new(transport)
 	{
 		GetMapping = (inferenceId, _) => CreateMapping(inferenceId),
+		GetMappingSetting = (_, _) => CreateMappingSetting(),
 		IndexFormat = "semantic-documentation-{0:yyyy.MM.dd.HHmmss}",
 		ActiveSearchAlias = "semantic-documentation",
 		IndexNumThreads = IndexNumThreads,
 		InferenceCreateTimeout = TimeSpan.FromMinutes(4)
 	};
 
 	/// <inheritdoc />
-	protected override DocumentationSemanticIndexChannel NewChannel(SemanticIndexChannelOptions<DocumentationDocument> options) => new(options);
-}
-
-// Custom channel classes that override the settings
-public class DocumentationCatalogIndexChannel(CatalogIndexChannelOptions<DocumentationDocument> options) : CatalogIndexChannel<DocumentationDocument>(options)
-{
-	protected override IReadOnlyDictionary<string, string> GetDefaultComponentIndexSettings()
-	{
-		var settings = new Dictionary<string, string>
-		{
-			["analysis.analyzer.default_search.tokenizer"] = "whitespace",
-			["analysis.analyzer.default_search.filter.0"] = "lowercase",
-			["analysis.analyzer.default_search.filter.1"] = "synonyms_filter",
-			["analysis.filter.synonyms_filter.type"] = "synonym",
-			["analysis.filter.synonyms_filter.synonyms_set"] = "docs",
-			["analysis.filter.synonyms_filter.updateable"] = "true",
-		};
-		return settings;
-	}
-}
-
-public class DocumentationSemanticIndexChannel(SemanticIndexChannelOptions<DocumentationDocument> options)
-	: SemanticIndexChannel<DocumentationDocument>(options)
-{
-	protected override IReadOnlyDictionary<string, string> GetDefaultComponentIndexSettings()
-	{
-		var settings = new Dictionary<string, string>
-		{
-			["analysis.analyzer.default_search.tokenizer"] = "whitespace",
-			["analysis.analyzer.default_search.filter.0"] = "lowercase",
-			["analysis.analyzer.default_search.filter.1"] = "synonyms_filter",
-			["analysis.filter.synonyms_filter.type"] = "synonym",
-			["analysis.filter.synonyms_filter.synonyms_set"] = "docs",
-			["analysis.filter.synonyms_filter.updateable"] = "true",
-		};
-		return settings;
-	}
+	protected override SemanticIndexChannel<DocumentationDocument> NewChannel(SemanticIndexChannelOptions<DocumentationDocument> options) => new(options);
 }
 
 public abstract class ElasticsearchMarkdownExporterBase<TChannelOptions, TChannel>(
@@ -107,13 +71,39 @@ public abstract class ElasticsearchMarkdownExporterBase<TChannelOptions, TChanne
 
 	protected int IndexNumThreads => 8;
 
+	protected static string CreateMappingSetting() =>
+		// language=json
+		"""
+		{
+		  "analysis": {
+		    "analyzer": {
+		      "synonyms_analyzer": {
+		        "tokenizer": "whitespace",
+		        "filter": [
+		          "lowercase",
+		          "synonyms_filter"
+		        ]
+		      }
+		    },
+		    "filter": {
+		      "synonyms_filter": {
+		        "type": "synonym",
+		        "synonyms_set": "docs",
+		        "updateable": true
+		      }
+		    }
+		  }
+		}
+		""";
+
 	protected static string CreateMapping(string? inferenceId) =>
 		// langugage=json
 		$$"""
 		  {
 		    "properties": {
 		      "title": {
 		        "type": "text",
+		        "search_analyzer": "synonyms_analyzer",
 		        "fields": {
 		          "keyword": {
 		            "type": "keyword"
@@ -275,8 +265,8 @@ public async ValueTask<bool> ExportAsync(MarkdownExportFileContext fileContext,
 			Description = fileContext.SourceFile.YamlFrontMatter?.Description,
 
 			Abstract = !string.IsNullOrEmpty(body)
-				 	? body[..Math.Min(body.Length, 400)] + " " + string.Join(" \n- ", headings)
-				 	: string.Empty,
+				? body[..Math.Min(body.Length, 400)] + " " + string.Join(" \n- ", headings)
+				: string.Empty,
 			Applies = fileContext.SourceFile.YamlFrontMatter?.AppliesTo,
 			UrlSegmentCount = url.Split('/', StringSplitOptions.RemoveEmptyEntries).Length,
 			Parents = navigation.GetParentsOfMarkdownFile(file).Select(i => new ParentDocument