Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent frontend search if Azure AI is not configured #15135

Merged
merged 3 commits into from
Jan 20, 2024
Merged

Prevent frontend search if Azure AI is not configured #15135

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
142aefa
Prevent front end search if Azure AI is not configured
MikeAlhayek Jan 20, 2024
4be3552
cleanup
MikeAlhayek Jan 20, 2024
dcecfe0
Merge branch 'main' into ma/azure-ai-search-setting
MikeAlhayek Jan 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/OrchardCore/OrchardCore.Search.AzureAI.Core/Services/AzureAISearchService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Threading.Tasks;
using Azure.Search.Documents;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using OrchardCore.Contents.Indexing;
using OrchardCore.Search.Abstractions;
using OrchardCore.Search.AzureAI.Models;
Expand All @@ -13,7 +14,8 @@ public class AzureAISearchService(
ISiteService siteService,
AzureAIIndexDocumentManager indexDocumentManager,
AzureAISearchIndexSettingsService indexSettingsService,
ILogger<AzureAISearchService> logger
ILogger<AzureAISearchService> logger,
IOptions<AzureAISearchDefaultOptions> azureAIOptions
) : ISearchService
{
public const string Key = "Azure AI Search";
Expand All @@ -22,17 +24,26 @@ ILogger<AzureAISearchService> logger
private readonly AzureAIIndexDocumentManager _indexDocumentManager = indexDocumentManager;
private readonly AzureAISearchIndexSettingsService _indexSettingsService = indexSettingsService;
private readonly ILogger<AzureAISearchService> _logger = logger;
private readonly AzureAISearchDefaultOptions _azureAIOptions = azureAIOptions.Value;

public string Name => Key;

public async Task<SearchResult> SearchAsync(string indexName, string term, int start, int size)
{
var result = new SearchResult();

if (!_azureAIOptions.IsConfigurationExists())
{
_logger.LogWarning("Azure AI Search: Couldn't execute search. The Azure AI Search has not been configured.");

return result;
}

var siteSettings = await _siteService.GetSiteSettingsAsync();
var searchSettings = siteSettings.As<AzureAISearchSettings>();

var index = !string.IsNullOrWhiteSpace(indexName) ? indexName.Trim() : searchSettings.SearchIndex;

var result = new SearchResult();
if (string.IsNullOrEmpty(index))
{
_logger.LogWarning("Azure AI Search: Couldn't execute search. No search provider settings was defined.");
Expand Down