Skip to content

Commit cb945a8

Browse files
trrwilsontrrwilson
committed
a bit more cspell and Packages.Data.props cleanup
1 parent 6819dfc commit cb945a8

File tree

9 files changed

+33
-32
lines changed

9 files changed

+33
-32
lines changed

‎eng/Packages.Data.props‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<PackageReference Update="System.Text.Json" Version="8.0.6" />
103103
<PackageReference Update="System.Text.Encodings.Web" Version="8.0.0" />
104104
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
105-
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="9.0.9" />
105+
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
106106
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
107107
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3"/>
108108

@@ -204,10 +204,6 @@
204204
<PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="[2.1.1,6.0)" />
205205
</ItemGroup>
206206

207-
<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.Agents'))">
208-
<PackageReference Update="OpenAI" Version="[2.6.0,3.0)" />
209-
</ItemGroup>
210-
211207
<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.Projects'))">
212208
<PackageReference Update="OpenAI" Version="[2.7.0,3.0)" />
213209
<!-- Foundry libs depend on OpenAI; float SCM with upstream version -->

‎sdk/ai/Azure.AI.Projects.OpenAI/src/Telemetry/OpenTelemetryScope.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@
101101
// // TODO: check if structured outputs should be events and follow content recording flag
102102
// //var structuredInputs = promptAgentDefinition.StructuredInputs;
103103

104-
// string evnt = s_traceContent ? JsonSerializer.Serialize(
104+
// string traceEvent = s_traceContent ? JsonSerializer.Serialize(
105105
// new EventContent (promptAgentDefinition.Instructions),
106106
// EventsContext.Default.EventContent
107107
// ) : JsonSerializer.Serialize("", EventsContext.Default.String);
108108

109109
// ActivityTagsCollection messageTags = new() {
110110
// { GenAiSystemKey, GenAiSystemValue},
111-
// { GenAiEventContent, evnt }
111+
// { GenAiEventContent, traceEvent }
112112
// };
113113

114114
// scope._activity?.AddEvent(

‎sdk/ai/Azure.AI.Projects/tests/AIProjectsTestEnvironment.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public class AIProjectsTestEnvironment : TestEnvironment
1515
public string EMBEDDINGSMODELDEPLOYMENTNAME => GetRecordedVariable("EMBEDDINGS_MODEL_DEPLOYMENT_NAME");
1616
public string TEXTEMBEDDINGSMODELDEPLOYMENTNAME => GetRecordedVariable("TEXT_EMBEDDINGS_MODEL_DEPLOYMENT_NAME");
1717
public string MODELPUBLISHER => GetRecordedVariable("MODEL_PUBLISHER");
18-
public string INDEXNAME => GetRecordedVariable("INDEX_NAME");
19-
public string INDEXVERSION => GetRecordedVariable("INDEX_VERSION");
20-
public string AISEARCHCONNECTIONNAME => GetRecordedVariable("AI_SEARCH_CONNECTION_NAME");
21-
public string AISEARCHINDEXNAME => GetRecordedVariable("AI_SEARCH_INDEX_NAME");
18+
public string INDEX_NAME => GetRecordedVariable("INDEX_NAME");
19+
public string INDEX_VERSION => GetRecordedVariable("INDEX_VERSION");
20+
public string AI_SEARCH_CONNECTION_NAME => GetRecordedVariable("AI_SEARCH_CONNECTION_NAME");
21+
public string AI_SEARCH_INDEX_NAME => GetRecordedVariable("AI_SEARCH_INDEX_NAME");
2222
public string STORAGECONNECTIONNAME => GetRecordedVariable("STORAGE_CONNECTION_NAME");
2323
public string STORAGECONNECTIONTYPE => GetRecordedVariable("STORAGE_CONNECTION_TYPE");
24-
public string AOAICONNECTIONNAME => GetRecordedVariable("AOAI_CONNECTION_NAME");
24+
public string AOAI_CONNECTION_NAME => GetRecordedVariable("AOAI_CONNECTION_NAME");
2525
public string TESTIMAGEPNGINPUTPATH => GetRecordedVariable("TEST_IMAGE_PNG_INPUT_PATH");
2626
public string SAMPLEFILEPATH => GetRecordedVariable("SAMPLE_FILE_PATH");
2727
public string SAMPLEFOLDERPATH => GetRecordedVariable("SAMPLE_FOLDER_PATH");

‎sdk/ai/Azure.AI.Projects/tests/IndexesTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public IndexesTest(bool isAsync) : base(isAsync) //, RecordedTestMode.Record)
2525
[Ignore("Pending Microsoft.ClientModel.TestFramework migration")]
2626
public async Task SearchIndexesTest()
2727
{
28-
string indexName = TestEnvironment.INDEXNAME;
29-
string indexVersion = TestEnvironment.INDEXVERSION;
30-
string aiSearchConnectionName = TestEnvironment.AISEARCHCONNECTIONNAME;
31-
string aiSearchIndexName = TestEnvironment.AISEARCHINDEXNAME;
28+
string indexName = TestEnvironment.INDEX_NAME;
29+
string indexVersion = TestEnvironment.INDEX_VERSION;
30+
string aiSearchConnectionName = TestEnvironment.AI_SEARCH_CONNECTION_NAME;
31+
string aiSearchIndexName = TestEnvironment.AI_SEARCH_INDEX_NAME;
3232

3333
AIProjectClient projectClient = GetTestClient();
3434

‎sdk/ai/Azure.AI.Projects/tests/Samples/ClassicAgents/Sample_AzureAISearchToolUsingConnections.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public void ConnectionsExample()
2727
#else
2828
var endpoint = TestEnvironment.PROJECTENDPOINT;
2929
var modelDeploymentName = TestEnvironment.MODELDEPLOYMENTNAME;
30-
var indexName = TestEnvironment.INDEXNAME ?? "my-index";
31-
var indexVersion = TestEnvironment.INDEXVERSION ?? "1.0";
32-
var aiSearchIndexName = TestEnvironment.AISEARCHINDEXNAME ?? "my-ai-search-index-name";
30+
var indexName = TestEnvironment.INDEX_NAME ?? "my-index";
31+
var indexVersion = TestEnvironment.INDEX_VERSION ?? "1.0";
32+
var aiSearchIndexName = TestEnvironment.AI_SEARCH_INDEX_NAME ?? "my-ai-search-index-name";
3333
#endif
3434

3535
AIProjectClient projectClient = new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential());

‎sdk/ai/Azure.AI.Projects/tests/Samples/Indexes/Sample_Indexes.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ public void IndexesExample()
6565
AIProjectClient projectClient = new AIProjectClient(new Uri(endpoint), new DefaultAzureCredential());
6666
#else
6767
var endpoint = TestEnvironment.PROJECTENDPOINT;
68-
var indexName = TestEnvironment.INDEXNAME ?? "my-index";
69-
var indexVersion = TestEnvironment.INDEXVERSION ?? "1.0";
70-
var aiSearchConnectionName = TestEnvironment.AISEARCHCONNECTIONNAME ?? "my-ai-search-connection-name";
71-
var aiSearchIndexName = TestEnvironment.AISEARCHINDEXNAME ?? "my-ai-search-index-name";
68+
var indexName = TestEnvironment.INDEX_NAME ?? "my-index";
69+
var indexVersion = TestEnvironment.INDEX_VERSION ?? "1.0";
70+
var aiSearchConnectionName = TestEnvironment.AI_SEARCH_CONNECTION_NAME ?? "my-ai-search-connection-name";
71+
var aiSearchIndexName = TestEnvironment.AI_SEARCH_INDEX_NAME ?? "my-ai-search-index-name";
7272

7373
AIProjectClient projectClient = CreateDebugClient(endpoint);
7474
#endif
@@ -122,10 +122,10 @@ public async Task IndexesExampleAsync()
122122
AIProjectClient projectClient = new(new Uri(endpoint), new DefaultAzureCredential());
123123
#else
124124
var endpoint = TestEnvironment.PROJECTENDPOINT;
125-
var indexName = TestEnvironment.INDEXNAME ?? "my-index";
126-
var indexVersion = TestEnvironment.INDEXVERSION ?? "1.0";
127-
var aiSearchConnectionName = TestEnvironment.AISEARCHCONNECTIONNAME ?? "my-ai-search-connection-name";
128-
var aiSearchIndexName = TestEnvironment.AISEARCHINDEXNAME ?? "my-ai-search-index-name";
125+
var indexName = TestEnvironment.INDEX_NAME ?? "my-index";
126+
var indexVersion = TestEnvironment.INDEX_VERSION ?? "1.0";
127+
var aiSearchConnectionName = TestEnvironment.AI_SEARCH_CONNECTION_NAME ?? "my-ai-search-connection-name";
128+
var aiSearchIndexName = TestEnvironment.AI_SEARCH_INDEX_NAME ?? "my-ai-search-index-name";
129129

130130
AIProjectClient projectClient = CreateDebugClient(endpoint);
131131
#endif

‎sdk/ai/Azure.AI.Projects/tests/Samples/Inference/Sample_AzureOpenAI_Chat.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void AzureOpenAIChatCompletion()
3030
var connectionName = "";
3131
try
3232
{
33-
connectionName = TestEnvironment.AOAICONNECTIONNAME;
33+
connectionName = TestEnvironment.AOAI_CONNECTION_NAME;
3434
}
3535
catch
3636
{
@@ -74,7 +74,7 @@ public async Task AzureOpenAIChatCompletionAsync()
7474
var connectionName = "";
7575
try
7676
{
77-
connectionName = TestEnvironment.AOAICONNECTIONNAME;
77+
connectionName = TestEnvironment.AOAI_CONNECTION_NAME;
7878
}
7979
catch
8080
{

‎sdk/ai/Azure.AI.Projects/tests/Samples/Inference/Sample_AzureOpenAI_Embeddings.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void AzureOpenAIEmbeddings()
3030
var connectionName = "";
3131
try
3232
{
33-
connectionName = TestEnvironment.AOAICONNECTIONNAME;
33+
connectionName = TestEnvironment.AOAI_CONNECTION_NAME;
3434
}
3535
catch
3636
{
@@ -74,7 +74,7 @@ public async Task AzureOpenAIEmbeddingsAsync()
7474
var connectionName = "";
7575
try
7676
{
77-
connectionName = TestEnvironment.AOAICONNECTIONNAME;
77+
connectionName = TestEnvironment.AOAI_CONNECTION_NAME;
7878
}
7979
catch
8080
{

‎sdk/ai/cspell.yaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ dictionaries:
77
- csharp
88
- softwareTerms
99
words:
10+
- aoai
1011
- aiprojects
1112
- ansii
1213
- atbash
1314
- azureai
1415
- bleu
1516
- conv
17+
- CSDL
1618
- genai
1719
- gleu
1820
- includable
@@ -25,4 +27,7 @@ words:
2527
- PNAS
2628
- praepotens
2729
- ubinary
28-
- wfresp
30+
- UPIA
31+
- wfresp
32+
ignorePaths:
33+
- "**/*jsonl"

0 commit comments

Comments
 (0)