Skip to content

samples: NotesApp ACS API updates #604

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

Draft
karkarl wants to merge 1 commit into
base: release/experimental
Choose a base branch
from
+53 −75
Draft

samples: NotesApp ACS API updates #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions Samples/AppContentSearch/cs-winui/AI/Provider/FoundryAIProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
// Copyright (c) Microsoft Corporation. All rights reserved.

using Microsoft.AI.Foundry.Local;
using Microsoft.Extensions.AI;
using Notes.ViewModels;
using OpenAI;
using OpenAI.Chat;
using System;
using System.ClientModel;
using System.Collections.Generic;
Expand All @@ -13,6 +8,11 @@
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AI.Foundry.Local;
using Microsoft.Extensions.AI;
using Notes.ViewModels;
using OpenAI;
using OpenAI.Chat;
using Windows.Storage;
using AppChatRole = Notes.ViewModels.ChatRole;
using ExtChatRole = Microsoft.Extensions.AI.ChatRole;
Expand Down Expand Up @@ -143,7 +143,8 @@ public async IAsyncEnumerable<ChatResponseUpdate> SendStreamingRequestAsync(
break;
}

if (!hasNext) break;
if (!hasNext)
break;

if (cancellationToken.IsCancellationRequested)
{
Expand Down Expand Up @@ -175,7 +176,9 @@ private bool HasCachedModels()
{
try
{
#pragma warning disable CA2000 // Dispose objects before losing scope
var foundryManager = new FoundryLocalManager();
#pragma warning restore CA2000 // Dispose objects before losing scope
var cached = foundryManager.ListCachedModelsAsync().GetAwaiter().GetResult();
return cached.Count > 0;
}
Expand All @@ -187,15 +190,18 @@ private bool HasCachedModels()

private async Task EnsureFoundryClientAsync(CancellationToken ct)
{
if (_foundryClient != null && _foundryChatClient != null) return;
if (_foundryClient != null && _foundryChatClient != null)
return;

var settings = ApplicationData.Current.LocalSettings;
string alias = (settings.Values[FoundryModelKey] as string)?.Trim() ?? "";
if (string.IsNullOrWhiteSpace(alias))
{
try
{
#pragma warning disable CA2000 // Dispose objects before losing scope
var foundryManager = new FoundryLocalManager();
#pragma warning restore CA2000 // Dispose objects before losing scope

var cached = await foundryManager.ListCachedModelsAsync();
if (cached.Count != 0)
Expand Down Expand Up @@ -269,4 +275,4 @@ private ChatResponseUpdate Append(SessionEntryViewModel entry, string text, Chat

return list;
}
}
}
6 changes: 3 additions & 3 deletions Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
using Microsoft.Windows.Search.AppContentIndex;
using Notes.Controls;
using Notes.Pages;
using Notes.ViewModels;
Expand Down Expand Up @@ -98,10 +98,10 @@ private async Task InitializeAppContentIndexerAsync()
GetOrCreateIndexResult? getOrCreateResult = null;
await Task.Run(() =>
{
getOrCreateResult = Microsoft.Windows.AI.Search.Experimental.AppContentIndex.AppContentIndexer.GetOrCreateIndex("NotesIndex");
getOrCreateResult = AppContentIndexer.GetOrCreateIndex("NotesIndex");
if (getOrCreateResult == null)
{
throw new Exception("GetOrCreateIndexResult is null");
throw new InvalidOperationException("GetOrCreateIndexResult is null");
}
if (!getOrCreateResult.Succeeded)
{
Expand Down
35 changes: 1 addition & 34 deletions Samples/AppContentSearch/cs-winui/Notes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,13 @@
<Content Remove="Assets\mockText.txt" />
</ItemGroup>

<!-- <ItemGroup>
<ProjectReference Include="..\..\product\APIs\Projection\Microsoft.Windows.AI.Search.Projection\Microsoft.Windows.AI.Search.Projection.csproj" />
<ProjectReference Include="..\..\product\APIs\Projection\Microsoft.Windows.AI.Text.Projection\Microsoft.Windows.AI.Text.Projection.csproj" />
</ItemGroup> -->

<ItemGroup>
<None Remove="Assets\Notes.ico" />
<None Remove="Controls\AttachmentView.xaml" />
<None Remove="Controls\ChatSessionView.xaml" />
<None Remove="Controls\SearchView.xaml" />
</ItemGroup>

<!-- <ItemGroup>
<AdditionalFiles Include="NativeMethods.txt" />
</ItemGroup> -->

<ItemGroup>
<Content Include="Assets\SplashScreen.scale-200.png" />
<Content Include="Assets\LockScreenLogo.scale-200.png" />
Expand Down Expand Up @@ -76,7 +67,7 @@
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25114.11" />
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.0-experimental3" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.0-preview1" />
<PackageReference Include="OpenAI" Version="2.2.0-beta.2" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -119,30 +110,6 @@
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<!-- <ItemGroup>
<Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
</ItemGroup> -->
<ItemGroup>
<PRIResource Remove="Assets\Icon\**" />
</ItemGroup>
Expand Down
16 changes: 7 additions & 9 deletions Samples/AppContentSearch/cs-winui/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,17 @@
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
xmlns:systemai="http://schemas.microsoft.com/appx/manifest/systemai/windows10"
IgnorableNamespaces="uap rescap systemai">

IgnorableNamespaces="uap rescap systemai"
xmlns:systemai="http://schemas.microsoft.com/appx/manifest/systemai/windows10">
<Identity
Name="8e8c755b-914d-4f6c-89b6-95af1fc4fbaa"
Publisher="CN=nikol"
Version="1.0.1.0" />

<mp:PhoneIdentity PhoneProductId="8e8c755b-914d-4f6c-89b6-95af1fc4fbaa" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
Name="ai-powered-notes-winui3-sample"
Publisher="CN=AIFabricTest"
Version="1.0.0.0" />

<Properties>
<DisplayName>Notes</DisplayName>
<PublisherDisplayName>nikol</PublisherDisplayName>
<PublisherDisplayName>AIFabricTest</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>

Expand Down
7 changes: 4 additions & 3 deletions Samples/AppContentSearch/cs-winui/Utils/AttachmentProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.

using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
using Microsoft.Extensions.AI;
using Microsoft.Windows.Search.AppContentIndex;
using Notes.Models;
using System;
using System.Collections.Generic;
Expand All @@ -14,7 +15,7 @@ namespace Notes
{
public static class AttachmentProcessor
{
public static EventHandler<AttachmentProcessedEventArgs>? AttachmentProcessed;
internal static EventHandler<AttachmentProcessedEventArgs>? AttachmentProcessed;

private readonly static List<Attachment> _toBeProcessed = new();
private static bool _isProcessing = false;
Expand Down
8 changes: 4 additions & 4 deletions Samples/AppContentSearch/cs-winui/Utils/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.

using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
using Notes.ViewModels;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Windows.Search.AppContentIndex;
using Notes.ViewModels;
using Windows.Foundation;
using Windows.Storage;

Expand Down Expand Up @@ -266,4 +266,4 @@ public enum ContentSubType
Gif = 3,
Bmp = 4
}
}
}
4 changes: 2 additions & 2 deletions Samples/AppContentSearch/cs-winui/ViewModels/NoteViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.

using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
using Microsoft.Windows.Search.AppContentIndex;
using Notes.Models;
using System;
using System.Collections.ObjectModel;
Expand Down
30 changes: 18 additions & 12 deletions Samples/AppContentSearch/cs-winui/ViewModels/SearchViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.

using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.UI.Xaml;
using System;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel;

namespace Notes.ViewModels
{
public partial class SearchViewModel : ObservableObject
public partial class SearchViewModel : ObservableObject, IDisposable
{
[ObservableProperty]
public bool showResults = false;
Expand All @@ -27,7 +26,7 @@ public partial class SearchViewModel : ObservableObject
public ObservableCollection<SearchResult> ImageResults { get; set; } = new();

private string _searchText = string.Empty;
private CancellationTokenSource? _currentSearchCancellation;
private CancellationTokenSource? currentSearchCancellation;

public SearchViewModel()
{
Expand All @@ -51,15 +50,15 @@ public void Reset()
private async Task Search()
{
Debug.WriteLine("searching");

// Cancel any existing search
_currentSearchCancellation?.Cancel();
_currentSearchCancellation?.Dispose();
currentSearchCancellation?.Cancel();
currentSearchCancellation?.Dispose();

// Create new cancellation token for this search
_currentSearchCancellation = new CancellationTokenSource();
var cancellationToken = _currentSearchCancellation.Token;
currentSearchCancellation = new CancellationTokenSource();
var cancellationToken = currentSearchCancellation.Token;

try
{
Reset();
Expand Down Expand Up @@ -123,5 +122,12 @@ private async Task Search()
// Handle other exceptions as needed
}
}

public void Dispose()
{
currentSearchCancellation?.Cancel();
currentSearchCancellation?.Dispose();
currentSearchCancellation = null;
}
}
}