Skip to content

Commit 7f832ef

Browse files
nicholasbarlownicholasbarlow
committed
Merge branch 'release/4.4.0'
2 parents 84ccae7 + 70d9bf0 commit 7f832ef

23 files changed

+487
-336
lines changed

‎ExternalSearch.Providers.AzureOpenAI.sln.DotSettings‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTrailingCommaInMultilineLists/@EntryIndexedValue">WARNING</s:String>
3+
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_INITIALIZER_ELEMENTS_ON_LINE/@EntryValue">1</s:Int64>
4+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/NESTED_TERNARY_STYLE/@EntryValue">EXPANDED</s:String>
5+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
6+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
7+
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">240</s:Int64>
8+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_TERNARY_EXPR_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
9+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
10+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
11+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
12+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
13+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
214
<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=Id/@EntryIndexedValue">True</s:Boolean>
315
<s:Boolean x:Key="/Default/UserDictionary/Words/=GIIN/@EntryIndexedValue">True</s:Boolean>
416
<s:Boolean x:Key="/Default/UserDictionary/Words/=ICIJ/@EntryIndexedValue">True</s:Boolean>

‎ExternalSearch.Providers.BvD.sln.DotSettings‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Packages.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<_AutoFixture>4.11.0</_AutoFixture>
55
<_CluedIn>4.4.0</_CluedIn>
66
</PropertyGroup>
7+
<PropertyGroup>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
710
<ItemGroup>
811
<!--
912
Specified versions for dependencies in test projects
@@ -34,5 +37,6 @@
3437
<PackageReference Update="CluedIn.Core" Version="$(_CluedIn)" />
3538
<!-- <PackageReference Update="CluedIn.Core.Agent" Version="$(_CluedIn)" />-->
3639
<PackageReference Update="CluedIn.ExternalSearch" Version="$(_CluedIn)" />
40+
<PackageReference Update="CluedIn.Rules" Version="$(_CluedIn)" />
3741
</ItemGroup>
3842
</Project>

‎src/ExternalSearch.Providers.AzureOpenAI.Provider/AzureOpenAIProviderProviderComponent.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using CluedIn.Core.Providers;
55
using CluedIn.Core.Server;
66
using ComponentHost;
7+
using Microsoft.Extensions.Caching.Memory;
78
using Constants = CluedIn.ExternalSearch.Providers.AzureOpenAI.Constants;
89

910
namespace CluedIn.Provider.ExternalSearch.Providers.AzureOpenAI;
@@ -26,6 +27,8 @@ public AzureOpenAIProviderProviderComponent(ComponentInfo componentInfo) : base(
2627
// Dev. Note: Potential for compiler warning here ... CA2214: Do not call overridable methods in constructors
2728
// this class has been sealed to prevent the CA2214 waring being raised by the compiler
2829
Container.Register(Component.For<AzureOpenAIProviderProviderComponent>().Instance(this));
30+
31+
Container.Register(Component.For<IMemoryCache>().UsingFactoryMethod(x => new MemoryCache(new MemoryCacheOptions())));
2932
}
3033

3134
/**********************************************************************************************************

‎src/ExternalSearch.Providers.AzureOpenAI.Provider/AzureOpenAISearchProviderProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private static IProviderMetadata GetMetaData()
4646
SupportsConfiguration = true,
4747
SupportsAutomaticWebhookCreation = false,
4848
SupportsWebHooks = false,
49-
Type = "Enricher"
49+
Type = "Enricher",
5050
};
5151
}
5252

‎src/ExternalSearch.Providers.AzureOpenAI/AzureOpenAIExternalSearchJobData.cs‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,22 @@ public class AzureOpenAIExternalSearchJobData : CrawlJobData
77
{
88
public AzureOpenAIExternalSearchJobData(IDictionary<string, object> configuration)
99
{
10-
ApiToken = GetValue<string>(configuration, Constants.KeyName.ApiToken);
1110
AcceptedEntityType = GetValue<string>(configuration, Constants.KeyName.AcceptedEntityType);
12-
BaseUrl = GetValue<string>(configuration, Constants.KeyName.BaseUrl);
13-
AiModel = GetValue<string>(configuration, Constants.KeyName.AiModel);
11+
AiDeployment = GetValue<string>(configuration, Constants.KeyName.AiDeployment);
1412
Prompt = GetValue<string>(configuration, Constants.KeyName.Prompt);
15-
//ResponseVocabularyKey = GetValue<string>(configuration, Constants.KeyName.ResponseVocabularyKey);
1613
}
1714

18-
public string ApiToken { get; set; }
1915
public string AcceptedEntityType { get; set; }
20-
public string BaseUrl { get; set; }
21-
public string AiModel { get; set; }
16+
public string AiDeployment { get; set; }
2217
public string Prompt { get; set; }
23-
//public string ResponseVocabularyKey { get; set; }
2418

2519
public IDictionary<string, object> ToDictionary()
2620
{
2721
return new Dictionary<string, object>
2822
{
29-
{ Constants.KeyName.ApiToken, ApiToken },
3023
{ Constants.KeyName.AcceptedEntityType, AcceptedEntityType },
31-
{ Constants.KeyName.BaseUrl, BaseUrl },
32-
{ Constants.KeyName.AiModel, AiModel },
24+
{ Constants.KeyName.AiDeployment, AiDeployment },
3325
{ Constants.KeyName.Prompt, Prompt },
34-
//{ Constants.KeyName.ResponseVocabularyKey, ResponseVocabularyKey },
3526
};
3627
}
3728
}

0 commit comments

Comments
 (0)