From e6d32dc1c840402b49d020f7132de51e9e58ff5e Mon Sep 17 00:00:00 2001
From: Harsha <harshamidadhala.k@syncfusion.com>
Date: Fri, 20 Jun 2025 18:18:53 +0530
Subject: [PATCH 01/10] Added ImagePickerHelper class

---
 .../ChartGenerator/ChartGenerator.csproj      |   1 +
 .../Helper/ImagePickerHelper.cs               |  74 ++++++++
 .../ChartGenerator/Models/ContextMenus.cs     |  65 +++++++
 .../ChartGenerator/View/ChartView.xaml        |  45 +++--
 .../ChartGenerator/View/ChartView.xaml.cs     |  50 ++++++
 .../ChartGenerator/View/DesktopUI.xaml        |  68 +++++--
 .../ChartGenerator/View/DesktopUI.xaml.cs     |  24 +++
 .../ViewModel/ChartViewModel.cs               | 170 +++++++++++++++++-
 8 files changed, 467 insertions(+), 30 deletions(-)
 create mode 100644 ChartGeneratorAISample/ChartGenerator/Helper/ImagePickerHelper.cs
 create mode 100644 ChartGeneratorAISample/ChartGenerator/Models/ContextMenus.cs

diff --git a/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj b/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj
index 753a6b3..07a6ff0 100644
--- a/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj
+++ b/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj
@@ -68,6 +68,7 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="SampleBrowser.Maui.Base" Version="*" />
 		<PackageReference Include="Syncfusion.Maui.AIAssistView" Version="*" />
+		<PackageReference Include="Syncfusion.Maui.PdfViewer" Version="*" />
 		<PackageReference Include="Syncfusion.Maui.Toolkit" Version="*" />
 	</ItemGroup>
 
diff --git a/ChartGeneratorAISample/ChartGenerator/Helper/ImagePickerHelper.cs b/ChartGeneratorAISample/ChartGenerator/Helper/ImagePickerHelper.cs
new file mode 100644
index 0000000..7353edd
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/Helper/ImagePickerHelper.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ChartGenerator
+{
+    public class ImagePickerHelper
+    {
+        internal async Task<byte[]> PickImageAsync()
+        {
+            try
+            {
+                var result = await MediaPicker.PickPhotoAsync();
+
+                if (result != null)
+                {
+                    // Open the file stream
+                    using (Stream stream = await result.OpenReadAsync())
+                    {
+                        // Copy the stream into a memory stream to avoid object disposed exception.
+                        using (MemoryStream memoryStream = new MemoryStream())
+                        {
+                            await stream.CopyToAsync(memoryStream);
+                            return memoryStream.ToArray();
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // Handle exceptions
+                Console.WriteLine($"Error picking image: {ex.Message}");
+            }
+
+            return null;
+        }
+
+        internal async Task SaveImageAsync(string filePath)
+        {
+            try
+            {
+                if (File.Exists(filePath))
+                {
+                    File.Delete(filePath);
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error deleting image: {ex.Message}");
+            }
+
+            try
+            {
+                // Get the image from Gallery.
+                byte[] imageBytes = await PickImageAsync();
+
+                if (imageBytes != null)
+                {
+                    // Save the image bytes to a file, database, etc.
+                    File.WriteAllBytes(filePath, imageBytes);
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error saving image: {ex.Message}");
+            }
+        }
+
+
+    }
+}
diff --git a/ChartGeneratorAISample/ChartGenerator/Models/ContextMenus.cs b/ChartGeneratorAISample/ChartGenerator/Models/ContextMenus.cs
new file mode 100644
index 0000000..7c994fb
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/Models/ContextMenus.cs
@@ -0,0 +1,65 @@
+using System.ComponentModel;
+
+namespace ChartGenerator
+{
+    public class Option : INotifyPropertyChanged
+    {
+        #region Private Fields
+
+        private bool isEnabled;
+        private bool isOpen;
+
+        #endregion
+
+        #region Public APIs
+
+        public string Name { get; set; }
+        public string Icon { get; set; }
+        public bool CanShowSeparator { get; set; }
+
+        public bool IsEnabled
+        {
+            get { return isEnabled; }
+            set
+            {
+                isEnabled = value;
+                RaisePropertyChanged(nameof(IsEnabled));
+            }
+        }
+        public bool IsOpen
+        {
+            get { return isOpen; }
+            set
+            {
+                isOpen = value;
+                RaisePropertyChanged(nameof(IsOpen));
+            }
+        }
+
+        #endregion
+
+        #region Constructor
+        public Option()
+        {
+            IsEnabled = true;
+        }
+
+        #endregion
+
+        #region Property Changed
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+        /// <summary>
+        /// Occurs when property is changed.
+        /// </summary>
+        /// <param name="propName">changed property name</param>
+        public void RaisePropertyChanged(string propName)
+        {
+            if (PropertyChanged != null)
+            {
+                PropertyChanged(this, new PropertyChangedEventArgs(propName));
+            }
+        }
+        #endregion
+    }
+}
diff --git a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
index 403c16d..e56d560 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
@@ -192,22 +192,35 @@
                             Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
                             VerticalOptions="Center"
                             HorizontalOptions="Center"/>
-            
-            <buttons:SfButton
-                Grid.Row="0"
-                Margin="0,0,20,0"
-                Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
-                x:Name="aibutton"
-                Text="&#xe7e1;" 
-                FontFamily="MauiSampleFontIcon" 
-                CornerRadius="5" 
-                BackgroundColor="#CAC4D0"
-                FontSize="{OnPlatform WinUI=20, Android=15, MacCatalyst=20, iOS=20}" WidthRequest="30" HeightRequest="30"
-                ToolTipProperties.Text="Click to open AI assistant"  
-                FontAttributes="Bold" 
-                VerticalOptions="Start"
-                HorizontalOptions="End"/>
-        </Grid>
+                <buttons:SfButton  Grid.Row="0"
+                                     Margin="0,0,60,0"
+                                     Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
+                                     x:Name="exportchartbutton"
+                                     Text="Export Chart" 
+                                     Clicked="Exportchartbutton_Clicked"
+                                     FontFamily="MauiSampleFontIcon" 
+                                     CornerRadius="5" 
+                                     TextColor="White"
+                                     BackgroundColor="#6750a4"
+                                     FontSize="{OnPlatform WinUI=17, Android=15, MacCatalyst=17, iOS=17}" WidthRequest="120" HeightRequest="30"
+                                     ToolTipProperties.Text="Click to Export the Chart"  
+                                     FontAttributes="Bold"                                      VerticalOptions="Start"
+                                     HorizontalOptions="End"/>
+                <buttons:SfButton
+                                Grid.Row="0"
+                                Margin="0,0,20,0"
+                                Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
+                                x:Name="aibutton"
+                                Text="&#xe7e1;" 
+                                FontFamily="MauiSampleFontIcon" 
+                                CornerRadius="5" 
+                                BackgroundColor="#CAC4D0"
+                                FontSize="{OnPlatform WinUI=20, Android=15, MacCatalyst=20, iOS=20}" WidthRequest="30" HeightRequest="30"
+                                ToolTipProperties.Text="Click to open AI assistant"  
+                                FontAttributes="Bold" 
+                                VerticalOptions="Start"
+                                HorizontalOptions="End"/>
+            </Grid>
     </Grid>
     </ContentPage.Content>
 
diff --git a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
index 96f6713..7f390a1 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
+++ b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
@@ -1,9 +1,18 @@
+using Syncfusion.Maui.PdfViewer;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Graphics;
 using Syncfusion.Maui.AIAssistView;
+using System.Drawing;
+using Syncfusion.Pdf;
+using Syncfusion.Pdf.Graphics;
+using Syncfusion.Maui.Core;
+using Syncfusion.Maui.Core.Internals;
 
 namespace ChartGenerator;
 
 public partial class ChartView : ContentPage
 {
+    int count = 0;
     ChartViewModel ViewModel;
     public ChartView(ChartViewModel viewModel)
     {
@@ -28,6 +37,47 @@ private void close_Clicked(object sender, EventArgs e)
             headerView.IsVisible = false;
         }
     }
+
+    private async void Exportchartbutton_Clicked(object sender, EventArgs e)
+    {
+        PdfDocument document = new PdfDocument();
+        PdfPage page = document.Pages.Add();
+        PdfGraphics graphics = page.Graphics;
+
+        float width = (float)templatedItemView.Width + 75;
+        float height = (float)templatedItemView.Height + 125;
+
+        //To reduce the width and height of the Windows and MAC platform
+#if !IOS && !ANDROID
+        width = (float)templatedItemView.Width / 2.5f;
+        height = (float)templatedItemView.Height / 1.5f;
+#endif
+
+        PdfImage img = new PdfBitmap((await templatedItemView.GetStreamAsync(ImageFileFormat.Png)));
+        graphics.DrawImage(img, 0, 0, width, height);
+        MemoryStream stream = new MemoryStream();
+        document.Save(stream);
+        document.Close(true);
+        stream.Position = 0;
+        SavePDF("ChartAsPDF.pdf", stream);
+        stream.Flush();
+        stream.Dispose();
+    }
+    private async void SavePDF(string fileName, Stream stream)
+    {
+        fileName = Path.GetFileNameWithoutExtension(fileName) + ".pdf";
+
+#if ANDROID
+        string path = Android.OS.Environment.GetExternalStoragePublicDirectory(Android.OS.Environment.DirectoryDocuments).ToString();
+#else
+        string path = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+#endif
+        string filePath = Path.Combine(path, fileName);
+        using FileStream fileStream = new(filePath, FileMode.Create, FileAccess.ReadWrite);
+        await stream.CopyToAsync(fileStream);
+        fileStream.Flush();
+        fileStream.Dispose();
+    }
 }
 
 public class ChartTemplateSelector : DataTemplateSelector
diff --git a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
index 67cfb16..d8c82ea 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
@@ -33,24 +33,72 @@
 
             <Grid ColumnDefinitions="500,auto" HorizontalOptions="Center" ColumnSpacing="5" Padding="5">
 
-                    <Grid ColumnDefinitions="*" HorizontalOptions="FillAndExpand" Grid.Column="0">
-                        <Editor Grid.Column="1" IsEnabled="{Binding IsDisable}"
+                    <Grid RowDefinitions="Auto,*,Auto" HorizontalOptions="FillAndExpand" Grid.Column="0">
+                    <core:SfChip  
+                                  Text="&#xe7CD;" 
+                                  FontFamily="MauiSampleFontIcon"
+                                  VerticalOptions="Start"
+                                  HorizontalOptions="Center"
+                                  VerticalTextAlignment="Center"
+                                  HorizontalTextAlignment="Center"
+                                  CornerRadius="20"
+                                  Stroke="Transparent"
+                                  StrokeThickness="0"
+                                  HeightRequest="30"
+                                  WidthRequest="30"
+                                  Margin="10"
+                                  Grid.Row="1"
+                                  Command="{Binding EditorExpandCollapseCommand}"
+                                  CommandParameter="{x:Reference editor}"
+                                  />
+                    <Editor Grid.Row="2" IsEnabled="{Binding IsDisable}"  x:Name="editor"
                                 BackgroundColor="Transparent"
                                 HeightRequest="100"
                                 PlaceholderColor="Gray"
                                 Text="{Binding EntryText}"
                                 Placeholder="Describe what you want to create.."
                                 HorizontalOptions="FillAndExpand"
-                                FontSize="14"
-                                TextColor="Black"
-                             >
-                        </Editor>
+                                FontSize="14"  
+                                TextColor="Black">
+                       
+                    </Editor>
 
-                        <core:SfBusyIndicator IsRunning="{Binding IsLoading}"
+                    <core:SfChipGroup ItemHeight="40" Margin="5,50,5,5" 
+                                    ChipCornerRadius="20" 
+                                    ChipBackground="Transparent" 
+                                    ChipStrokeThickness="0"  
+                                    Grid.Row="3"
+                                    ChipPadding="0"
+                                    ChipClicked="OnChipClicked"
+                                    ItemsSource="{Binding Path=EditorOptions}">         
+                        <core:SfChipGroup.ItemTemplate>
+                            <DataTemplate>
+                                <Grid x:Name="editorOptionGrid" ColumnDefinitions="Auto,Auto">
+                                    <Label x:Name="editorOptions"
+                                         Text="{Binding Icon}"
+                                         VerticalTextAlignment="Center" 
+                                         HorizontalTextAlignment="Center" 
+                                         HorizontalOptions="Center" 
+                                         FontFamily="MauiSampleFontIcon" 
+                                         TextColor="#611C1B1F"
+                                         FontSize="20"
+                                         WidthRequest="40"   >
+                                        <Label.GestureRecognizers>
+                                            <TapGestureRecognizer Command="{Binding Source={x:Reference editor}, Path=BindingContext.AttachmentContextMenuCommand}" CommandParameter="{Binding .}" />
+                                        </Label.GestureRecognizers>
+
+                                    </Label>
+                                    
+                                
+                                </Grid>
+                            </DataTemplate>
+                        </core:SfChipGroup.ItemTemplate>
+                    </core:SfChipGroup>
+                    <core:SfBusyIndicator IsRunning="{Binding IsLoading}"
                                               IsVisible="{Binding IsLoading}"
-                                              AnimationType="SingleCircle"
-    />
-                    </Grid>
+                                              AnimationType="SingleCircle"/>
+                   
+                </Grid>
 
                 <buttons:SfButton Text="&#xe76f;" 
                          FontFamily="MauiSampleFontIcon" 
diff --git a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml.cs b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml.cs
index 643f494..28c2b43 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml.cs
+++ b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml.cs
@@ -1,3 +1,5 @@
+using Syncfusion.Maui.Core; 
+
 namespace ChartGenerator;
 
 public partial class DesktopUI : ContentPage
@@ -6,4 +8,26 @@ public DesktopUI()
     {
         InitializeComponent();
     }
+    private void OnChipClicked(object sender, EventArgs e)
+    {
+        var viewmodel = this.BindingContext as ChartViewModel;
+        var chip = (sender as SfChip);
+        var layout = chip.Children[0] as HorizontalStackLayout;
+
+        Option option;
+        if (layout != null)
+        {
+            option = layout.BindingContext as Option;
+        }
+        else
+        {
+            var label = chip.Children[0] as Grid;
+            option = label.BindingContext as Option;
+        }
+
+        if (string.IsNullOrEmpty(option.Name) || !option.IsEnabled)
+            return;
+
+        viewmodel.EditorOptionsComamnd.Execute(option);  
+    }
 }
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
index b1e73e3..4a78844 100644
--- a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
@@ -10,6 +10,12 @@ public class ChartViewModel : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler? PropertyChanged;
 
+        private string sendIconText;
+        private bool autoSuggestionPopupIsOpen;
+        private string inputText;
+        private ObservableCollection<ImageSource> imageSourceCollection;
+        private readonly ImagePickerHelper _imagePickerHelper;
+        private int imageNo;
         private string? entryText;
         private bool showAssistView;
         private bool showHeader = true;
@@ -21,7 +27,43 @@ public class ChartViewModel : INotifyPropertyChanged
         private bool isLoading;
         private ObservableCollection<IAssistItem> messages = new();
 
+        private bool isSendIconEnabled;
+        internal bool isResponseStreaming;
+        private double sendIconWidth;
         private ChartAIService openAIService = new();
+        public double SendIconWidth
+        {
+            get { return sendIconWidth; }
+            set
+            {
+                sendIconWidth = value;
+                OnPropertyChanged(nameof(SendIconWidth));
+            }
+        }
+        public bool IsSendIconEnabled
+        {
+            get
+            {
+                return isSendIconEnabled;
+            }
+            set
+            {
+                isSendIconEnabled = value;
+                OnPropertyChanged(nameof(IsSendIconEnabled));
+            }
+        }
+        public string SendIconText
+        {
+            get
+            {
+                return sendIconText;
+            }
+            set
+            {
+                sendIconText = value;
+                OnPropertyChanged(nameof(SendIconText));
+            }
+        }
 
         public string? EntryText
         {
@@ -137,8 +179,36 @@ public ObservableCollection<String>? ModelPrompts
         public ICommand AiButtonClicked { get; }
         public ICommand CloseButtonClicked { get; }
         public ICommand RefreshButtonClicked { get; }
-        public ICommand RequestCommand { get; }
-
+        public ICommand RequestCommand { get; } 
+        public Command<object> EditorOptionsComamnd { get; set; }
+        public ObservableCollection<Option> EditorOptions { get; set; }
+        public Command<object> AttachmentContextMenuCommand { get; set; } 
+        public Command<object> EditorExpandCollapseCommand { get; set; }
+        public ObservableCollection<ImageSource> ImageSourceCollection
+        {
+            get
+            {
+                return imageSourceCollection;
+            }
+            set
+            {
+                imageSourceCollection = value;
+                OnPropertyChanged(nameof(ImageSourceCollection));
+            }
+        }
+        public bool AutoSuggestionPopupIsOpen
+        {
+            get { return autoSuggestionPopupIsOpen; }
+            set
+            {
+                autoSuggestionPopupIsOpen = value;
+                OnPropertyChanged(nameof(AutoSuggestionPopupIsOpen));
+            }
+        }
+        public bool HasImageUploaded
+        {
+            get { return this.ImageSourceCollection.Count > 0; }
+        }
         public ChartViewModel()
         {
             ButtonClicked = new Command<string>(OnButtonClicked);
@@ -146,8 +216,15 @@ public ChartViewModel()
             AiButtonClicked = new Command(OnAiButtonClicked);
             RequestCommand = new Command<object>(OnRequest);
             CloseButtonClicked = new Command(OnCloseButtonClicked);
-            RefreshButtonClicked = new Command(OnRefreshButtonClicked);
-
+            RefreshButtonClicked = new Command(OnRefreshButtonClicked); 
+            EditorOptionsComamnd = new Command<object>(ExecuteEditorOptionsCommand);
+
+            EditorExpandCollapseCommand = new Command<object>(ExecuteEditorExpandCollapseCommand);
+            _imagePickerHelper = new ImagePickerHelper(); 
+            this.ImageSourceCollection = new ObservableCollection<ImageSource>();
+            AttachmentContextMenuCommand = new Command<object>(OnAttachmentContextMenuTapCommand);
+            EditorOptions = new ObservableCollection<Option>();
+            EditorOptions.Add(new Option() { Name = "Attachment", Icon = "\ue754" });
             modelPrompts = new ObservableCollection<String>()
             {
                 "Remove legends from the chart",
@@ -155,6 +232,91 @@ public ChartViewModel()
             };
         }
 
+        private void ExecuteEditorExpandCollapseCommand(object obj)
+        {
+          
+        }
+
+        private void OnAttachmentContextMenuTapCommand(object eventArgs)
+        {
+            var chipText = eventArgs as Option;
+
+            EditorOptions[0].IsOpen = false;
+            ShowImagePicker();
+
+        } 
+
+        private async void ShowImagePicker()
+        {
+#if ANDROID || WINDOWS || (IOS && !MACCATALYST)
+            string filePath = Path.Combine(FileSystem.AppDataDirectory, "image" + ++imageNo + ".jpg");
+
+            // Get and store the image from gallery
+            await _imagePickerHelper.SaveImageAsync(filePath);
+
+            var imageSource = ImageSource.FromFile(filePath);
+
+            this.ImageSourceCollection.Add(imageSource);
+
+            OnPropertyChanged(nameof(this.HasImageUploaded));
+
+            this.UpdateSendIcon(this.InputText);
+            //#elif MACCATALYST
+
+            //            // TODO: The file picker is not supported in Mac Catalyst. So, we have used the custom file picker.
+            //            // https://github.com/dotnet/maui/issues/11088
+            //            var result = await NativeHelper.ImagePickAsync();
+            //            if (string.IsNullOrEmpty(result))
+            //            {
+            //                return;
+            //            }
+
+            //            var imageSource = ImageSource.FromFile(result);            
+            //#else
+            await Task.Delay(1);
+#endif
+        }
+        public string InputText
+        {
+            get { return inputText; }
+            set
+            {
+                inputText = value;
+                UpdateSendIcon(inputText);
+                OnPropertyChanged(nameof(InputText));
+                //UpdateFilter();
+                AutoSuggestionPopupIsOpen = !string.IsNullOrEmpty(InputText) && this.Messages.Count == 0;
+            }
+        }
+        private void UpdateSendIcon(string input)
+        {
+            if (string.IsNullOrWhiteSpace(input) && !this.HasImageUploaded)
+            {
+                //SendIconText = "\ue7E8" + " Voice"; // TODO:Need to add voice input support
+                SendIconText = "\ue710";
+                SendIconWidth = 40;
+                if (!this.isResponseStreaming)
+                {
+                    this.IsSendIconEnabled = false;
+                }
+
+            }
+            else if (!isResponseStreaming)
+            {
+                SendIconText = "\ue710";
+                SendIconWidth = 40;
+                this.IsSendIconEnabled = true;
+            }
+        }
+        private void ExecuteEditorOptionsCommand(object obj)
+        {
+            var chipText = obj as Option;
+
+            if (chipText.Name == "Attachment")
+            {
+                chipText.IsOpen = true;
+            } 
+        }
         private void OnButtonClicked(string buttonText)
         {
             EntryText = buttonText.Replace("\"", "").Replace("&quot;", "");

From 380f9de225d32afed368e0d0c7219f841de6058e Mon Sep 17 00:00:00 2001
From: Harsha <harshamidadhala.k@syncfusion.com>
Date: Fri, 20 Jun 2025 22:24:27 +0530
Subject: [PATCH 02/10] Added helper classes

---
 .../ChartGenerator/ChartGenerator.csproj      |   1 +
 .../ChartGenerator/ChartGenerator.csproj.user |   8 +
 .../ChartGenerator/Helper/CustomEditor.cs     |  82 +++++++
 .../ChartGenerator/Helper/HtmlConverter.cs    | 231 ++++++++++++++++++
 .../ChartGenerator/View/DesktopUI.xaml        |  67 +++--
 .../ViewModel/ChartViewModel.cs               | 206 +++++++++++++++-
 6 files changed, 574 insertions(+), 21 deletions(-)
 create mode 100644 ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj.user
 create mode 100644 ChartGeneratorAISample/ChartGenerator/Helper/CustomEditor.cs
 create mode 100644 ChartGeneratorAISample/ChartGenerator/Helper/HtmlConverter.cs

diff --git a/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj b/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj
index 07a6ff0..213db47 100644
--- a/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj
+++ b/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj
@@ -69,6 +69,7 @@
 		<PackageReference Include="SampleBrowser.Maui.Base" Version="*" />
 		<PackageReference Include="Syncfusion.Maui.AIAssistView" Version="*" />
 		<PackageReference Include="Syncfusion.Maui.PdfViewer" Version="*" />
+		<PackageReference Include="Syncfusion.Maui.Popup" Version="*" />
 		<PackageReference Include="Syncfusion.Maui.Toolkit" Version="*" />
 	</ItemGroup>
 
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj.user b/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj.user
new file mode 100644
index 0000000..8700ea2
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj.user
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
+    <ActiveDebugFramework>net9.0-windows10.0.19041.0</ActiveDebugFramework>
+    <ActiveDebugProfile>Windows Machine</ActiveDebugProfile>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/Helper/CustomEditor.cs b/ChartGeneratorAISample/ChartGenerator/Helper/CustomEditor.cs
new file mode 100644
index 0000000..c31c008
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/Helper/CustomEditor.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Syncfusion.Maui.Core.Internals;
+using Syncfusion.Maui.Toolkit.Charts;
+
+#if ANDROID
+using PlatformView = Android.Widget.EditText;
+#elif WINDOWS
+using PlatformView = Microsoft.UI.Xaml.Controls.TextBox;
+#endif
+using PointerEventArgs = Syncfusion.Maui.Core.Internals.PointerEventArgs;
+namespace ChartGenerator
+{
+    public class CustomEditor : Editor, IKeyboardListener
+    {
+        public CustomEditor()
+        {
+            this.AddKeyboardListener(this);
+        }
+#if WINDOWS || ANDROID
+        protected override void OnHandlerChanged()
+        {
+#if WINDOWS
+            // Hide editor border and underline.
+            var platformView = this.Handler?.PlatformView as PlatformView;
+            if (platformView != null)
+            {
+                this.ApplyTextBoxStyle(platformView);
+            }
+#else
+            var platformView = this.Handler?.PlatformView as PlatformView;
+            if (platformView != null)
+            {
+                this.ApplyTextBoxStyle(platformView);
+            }
+#endif
+            base.OnHandlerChanged();
+        }
+#endif
+#if WINDOWS || ANDROID
+        private void ApplyTextBoxStyle(PlatformView? platformView)
+        {
+            if (platformView != null)
+            {
+#if WINDOWS
+                var textBoxStyle = new Microsoft.UI.Xaml.Style(typeof(Microsoft.UI.Xaml.Controls.TextBox));
+                textBoxStyle.Setters.Add(new Microsoft.UI.Xaml.Setter() { Property = Microsoft.UI.Xaml.Controls.Control.BorderBrushProperty, Value = new Microsoft.UI.Xaml.Media.SolidColorBrush(Windows.UI.Color.FromArgb(0, 0, 0, 0)) });
+                textBoxStyle.Setters.Add(new Microsoft.UI.Xaml.Setter() { Property = Microsoft.UI.Xaml.Controls.Control.BorderThicknessProperty, Value = new Thickness(0) });
+
+                platformView.Resources.Add(typeof(Microsoft.UI.Xaml.Controls.TextBox), textBoxStyle);
+#else
+                platformView.Background = null;
+                platformView.SetPadding(0, 0, 0, 0);
+#endif
+            }
+        }
+#endif
+        public void OnKeyDown(KeyEventArgs args)
+        {
+        }
+
+        public void OnKeyUp(KeyEventArgs args)
+        {
+        }
+
+        public void OnPreviewKeyDown(KeyEventArgs args)
+        {
+            if (args.Key == KeyboardKey.Enter && !args.IsShiftKeyPressed)
+            {
+                var bindingContext = this.BindingContext as ChartViewModel;
+                args.Handled = true;
+                if (!string.IsNullOrWhiteSpace(bindingContext.InputText))
+                {
+                    bindingContext.SendButtonCommand.Execute(null);
+                }
+            }
+        }
+    }
+}
diff --git a/ChartGeneratorAISample/ChartGenerator/Helper/HtmlConverter.cs b/ChartGeneratorAISample/ChartGenerator/Helper/HtmlConverter.cs
new file mode 100644
index 0000000..da847a0
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/Helper/HtmlConverter.cs
@@ -0,0 +1,231 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace ChartGenerator
+{
+    public class HtmlConverter
+    {
+        public string ConvertToHTML(string aiResponse)
+        {
+            StringBuilder htmlBuilder = new StringBuilder();
+            htmlBuilder.AppendLine("<html>");
+            htmlBuilder.AppendLine("<head>");
+            htmlBuilder.AppendLine("<title>AI Response</title>");
+            htmlBuilder.AppendLine("<style>");
+            htmlBuilder.AppendLine("body { font-family: Arial, sans-serif; line-height:1.6;}");
+            htmlBuilder.AppendLine("h1, h2 { color: #33, margin-bottom: 10px; }");
+            htmlBuilder.AppendLine("p, li { margin-bottom: 5px;}");
+            htmlBuilder.AppendLine("blockquote { border-left: 3px solid #ccc; margin: 10; padding-left: 10px; color: #555; }");
+            htmlBuilder.AppendLine("span {display: inline-block; padding: 5px 10px; background-color: #f0f0f0; border-radius: 8px; font-size: 14px; font-family: Consolas, monospace; }");
+            htmlBuilder.AppendLine("</style>");
+            //htmlBuilder.AppendLine("<script type=\"text/javascript\">");
+            //htmlBuilder.AppendLine("function reportHeight() {");
+            //htmlBuilder.AppendLine("  var height = document.body.scrollHeight;");
+            //htmlBuilder.AppendLine(" window.dispatchEvent(new CustomEvent('reportHeight', { detail: height })); ");
+            //htmlBuilder.AppendLine("  window.location.href = 'autofit://' + height;");
+            //htmlBuilder.AppendLine("}");
+            //htmlBuilder.AppendLine("window.onload = reportHeight;");
+            //htmlBuilder.AppendLine("window.onresize = reportHeight;");
+            //htmlBuilder.AppendLine("</script>");
+            htmlBuilder.AppendLine("</head>");
+            htmlBuilder.AppendLine("<body>");
+
+            var paragraphs = aiResponse.Split(new[] { "<br>", "\n\n" }, StringSplitOptions.RemoveEmptyEntries);
+            for (int i = 0; i < paragraphs.Count(); i++)
+            {
+                var paragraph = paragraphs[i];
+                if (IsHeading(paragraph))
+                {
+                    int level = 0;
+                    var title = TrimHashFromTitle(paragraph, out level);
+                    title = ConvertToHtmlBold(title);
+                    if (level == 1)
+                        htmlBuilder.AppendLine($"<h1>{title}</h1>");
+                    else if (level == 2)
+                        htmlBuilder.AppendLine($"<h2>{title}</h2>");
+                    else if (level == 3)
+                        htmlBuilder.AppendLine($"<h3>{title}</h3>");
+                    else if (level == 4)
+                        htmlBuilder.AppendLine($"<h4>{title}</h4>");
+                    else if (level == 5)
+                        htmlBuilder.AppendLine($"<h5>{title}</h5>");
+                    else if (level == 6)
+                        htmlBuilder.AppendLine($"<h6>{title}</h6>");
+                }
+                // Implement list parsing here
+                // else if (IsList(paragraph))
+                // {
+                //     ConvertToHtmlList(paragraph, htmlBuilder);
+                // }
+                else if (IsQuote(paragraph))
+                {
+                    htmlBuilder.AppendLine($"<blockquote>{paragraph.Trim()}</blockquote>");
+                }
+                else if (IsURL(paragraph))
+                {
+                    htmlBuilder.AppendLine($"<a href=\"{paragraph.Trim()}\">{paragraph.Trim()}</a>");
+                }
+                else if (HasURLText(paragraph))
+                {
+                    ConvertMarkdownToHtml(paragraph, htmlBuilder);
+                }
+                else if (ContainsBoldPattern(paragraph))
+                {
+                    htmlBuilder.AppendLine($"<p>{ConvertToHtmlBold(paragraph)}</p>");
+                }
+                else if (paragraph.Contains("```"))
+                {
+                    htmlBuilder.AppendLine("<table style='border: 1px solid black; border-collapse: collapse; width:100%; '>");
+                    htmlBuilder.AppendLine("<tr><td>");
+                    htmlBuilder.AppendLine("<pre style='margin:10px !important; font-size: 14px; line-height: 1.5; font-family: Consolas, monospace;'>");
+                    htmlBuilder.AppendLine("<code>");
+                    var codeSnippetIndex = 0;
+                    for (codeSnippetIndex = i + 1; codeSnippetIndex < paragraphs.Count(); codeSnippetIndex++)
+                    {
+                        var codeSnippet = paragraphs[codeSnippetIndex];
+                        if (codeSnippet.Contains("```"))
+                            break;
+                        htmlBuilder.AppendLine(codeSnippet);
+                    }
+                    htmlBuilder.AppendLine("</code></pre>");
+                    htmlBuilder.AppendLine("</td></tr></table>");
+                    i = codeSnippetIndex;
+                }
+                else if (HasBackticks(paragraph))
+                {
+                    FormatBackTicks(htmlBuilder, paragraph);
+                }
+                else
+                {
+                    htmlBuilder.AppendLine($"<p>{paragraph.Trim()}</p>");
+                }
+            }
+
+            htmlBuilder.AppendLine("</body>");
+            htmlBuilder.AppendLine("</html>");
+            return htmlBuilder.ToString();
+        }
+        public string TrimHashFromTitle(string title, out int headingLevel)
+        {
+            headingLevel = 0;
+
+            // Loop from 4 to 1 to check for "####", "###", "##", and "#"
+            for (int i = 4; i > 0; i--)
+            {
+                string hashes = new string('#', i);
+                int index = title.IndexOf(hashes);
+                if (index != -1)
+                {
+                    headingLevel = i;
+                    // Trim the found hashes from the title and any leading/trailing spaces
+                    return title.Substring(0, index).Trim() + title.Substring(index + i).Trim();
+                }
+            }
+
+            // If no hashes are found, return the original title
+            return title;
+        }
+        private bool IsHeading(string text)
+        {
+            // Detect headings, e.g., all caps or specific prefixes
+            return text == text.ToUpper() || Regex.IsMatch(text, @"^#");
+        }
+
+        private bool IsList(string text)
+        {
+            // Detect bullet points or ordered lists
+            return text.StartsWith("- ");// || Regex.IsMatch(text, @"^\d+\.");
+        }
+
+        private bool IsQuote(string text)
+        {
+            // Simplistic quote detection
+            return text.StartsWith("\"") && text.EndsWith("\"");
+        }
+
+        private bool HasBackticks(string text)
+        {
+            var backtickPattern = @"`[^`]*`";
+            return Regex.IsMatch(text, backtickPattern);
+        }
+
+        private void FormatBackTicks(StringBuilder htmlBuilder, string text)
+        {
+            var backtickPattern = @"`([^`]*)`";
+            var formattedText = Regex.Replace(text, backtickPattern, "<span>$1</span>");
+            htmlBuilder.AppendLine($"<p>{formattedText}</p>");
+        }
+
+        private bool IsURL(string text)
+        {
+            // URL detection based on simple regex
+            var directURLPattern = @"^(http|https):\/\/[^\s$.?#].[^\s]*$";
+            return Regex.IsMatch(text, directURLPattern);
+        }
+        private bool HasURLText(string markdown)
+        {
+            // Define the regex pattern to extract URLs from Markdown links.
+            string pattern = @"\[(.*?)\]\((http[s]?:\/\/[^\s\)]+)\)";
+
+            // Create a match to extract the text and URL from the Markdown link.
+            Match match = Regex.Match(markdown, pattern, RegexOptions.IgnoreCase);
+            if (match.Success)
+            {
+                return IsURL(match.Groups[2].Value);
+            }
+            return false;
+        }
+        private static string ConvertMarkdownToHtml(string markdown, StringBuilder htmlBuilder)
+        {
+            // Define the regex pattern to extract URLs from Markdown links.
+            string pattern = @"\[(.*?)\]\((http[s]?:\/\/[^\s\)]+)\)";
+
+            // Create a match to extract the text and URL from the Markdown link.
+            Match match = Regex.Match(markdown, pattern, RegexOptions.IgnoreCase);
+            if (match.Success)
+            {
+                string linkText = match.Groups[1].Value; // Group 1 contains the link text.
+                string url = match.Groups[2].Value; // Group 2 contains the URL.        
+
+                htmlBuilder.AppendLine($"<p><a href=\"{url.Trim()}\">{linkText.Trim()}</a></p>");
+            }
+
+            // Return original text if no Markdown link is found.
+            return markdown;
+        }
+
+        private string ConvertToHtmlBold(string input)
+        {
+            string pattern = @"\*\*(.*?)\*\*";
+            string result = Regex.Replace(input, pattern, "<strong>$1</strong>");
+            if (HasBackticks(result))
+            {
+                var backtickPattern = @"`([^`]*)`";
+                var formattedText = Regex.Replace(result, backtickPattern, "<span>$1</span>");
+                return formattedText;
+            }
+            return result;
+        }
+
+        private bool ContainsBoldPattern(string input)
+        {
+            string pattern = @"\*\*.+?\*\*";
+            return Regex.IsMatch(input, pattern);
+        }
+
+        private void ConvertToHtmlList(string paragraph, StringBuilder htmlBuilder)
+        {
+            var items = paragraph.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            htmlBuilder.AppendLine("<ol>");
+            foreach (var item in items)
+            {
+                htmlBuilder.AppendLine($"<li>{item.Trim().TrimStart('-').Trim()}</li>");
+            }
+            htmlBuilder.AppendLine("</ol>");
+        }
+    }
+}
diff --git a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
index d8c82ea..4a96cbd 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
@@ -34,23 +34,55 @@
             <Grid ColumnDefinitions="500,auto" HorizontalOptions="Center" ColumnSpacing="5" Padding="5">
 
                     <Grid RowDefinitions="Auto,*,Auto" HorizontalOptions="FillAndExpand" Grid.Column="0">
-                    <core:SfChip  
-                                  Text="&#xe7CD;" 
-                                  FontFamily="MauiSampleFontIcon"
-                                  VerticalOptions="Start"
-                                  HorizontalOptions="Center"
-                                  VerticalTextAlignment="Center"
-                                  HorizontalTextAlignment="Center"
-                                  CornerRadius="20"
-                                  Stroke="Transparent"
-                                  StrokeThickness="0"
-                                  HeightRequest="30"
-                                  WidthRequest="30"
-                                  Margin="10"
-                                  Grid.Row="1"
-                                  Command="{Binding EditorExpandCollapseCommand}"
-                                  CommandParameter="{x:Reference editor}"
-                                  />
+                    <StackLayout BindableLayout.ItemsSource="{Binding ImageSourceCollection}"
+              Grid.Row="1"
+             Margin="5,5,5,0"
+             IsVisible="{Binding HasImageUploaded}" 
+             Orientation="Horizontal">
+                        <BindableLayout.ItemTemplate>
+                            <DataTemplate>
+                                <Grid HeightRequest="60"
+                  WidthRequest="60" x:Name="border"
+                  ColumnDefinitions="Auto"
+                  HorizontalOptions="Start">
+                                    <Border Stroke="Transparent"
+                        StrokeThickness="0"
+                        WidthRequest="50"
+                        HeightRequest="50"
+                        HorizontalOptions="Center"
+                        VerticalOptions="Center">
+                                        <Border.StrokeShape>
+                                            <RoundRectangle CornerRadius="10"/>
+                                        </Border.StrokeShape>
+
+                                        <Image Source="{Binding .}"
+                           WidthRequest="50" 
+                           HeightRequest="50"
+                           Aspect="Fill"/>
+                                    </Border>
+                                    <core:SfBadgeView HorizontalOptions="End"
+                                      WidthRequest="60" 
+                                      VerticalOptions="Start">
+                                        <core:SfBadgeView.Content>
+                                            <StackLayout HorizontalOptions="End" 
+                                     HeightRequest="16" 
+                                     WidthRequest="16">
+                                                <StackLayout.GestureRecognizers>
+                                                    <TapGestureRecognizer Command="{Binding Source={x:Reference editor}, Path=BindingContext.CancelImageSelected}"
+                      CommandParameter="{Binding .}"/>
+                                                </StackLayout.GestureRecognizers>
+                                            </StackLayout>
+                                        </core:SfBadgeView.Content>
+                                        <core:SfBadgeView.BadgeSettings>
+                                            <core:BadgeSettings Position="TopRight" 
+                                            FontSize="10" 
+                                            Icon="Delete"/>
+                                        </core:SfBadgeView.BadgeSettings>
+                                    </core:SfBadgeView>
+                                </Grid>
+                            </DataTemplate>
+                        </BindableLayout.ItemTemplate>
+                    </StackLayout>
                     <Editor Grid.Row="2" IsEnabled="{Binding IsDisable}"  x:Name="editor"
                                 BackgroundColor="Transparent"
                                 HeightRequest="100"
@@ -62,6 +94,7 @@
                                 TextColor="Black">
                        
                     </Editor>
+                   
 
                     <core:SfChipGroup ItemHeight="40" Margin="5,50,5,5" 
                                     ChipCornerRadius="20" 
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
index 4a78844..60a87f6 100644
--- a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
@@ -2,14 +2,15 @@
 using Syncfusion.Maui.AIAssistView;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Windows.Input;
-
+using System.Windows.Input; 
+using Syncfusion.Maui.Popup;
 namespace ChartGenerator
 {
     public class ChartViewModel : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler? PropertyChanged;
 
+        private bool canStopResponse;
         private string sendIconText;
         private bool autoSuggestionPopupIsOpen;
         private string inputText;
@@ -174,6 +175,7 @@ public ObservableCollection<String>? ModelPrompts
             }
         }
 
+        public Command<object> SendButtonCommand { get; set; }
         public ICommand ButtonClicked { get; }
         public ICommand CreateButtonClicked { get; }
         public ICommand AiButtonClicked { get; }
@@ -183,7 +185,8 @@ public ObservableCollection<String>? ModelPrompts
         public Command<object> EditorOptionsComamnd { get; set; }
         public ObservableCollection<Option> EditorOptions { get; set; }
         public Command<object> AttachmentContextMenuCommand { get; set; } 
-        public Command<object> EditorExpandCollapseCommand { get; set; }
+        public Command<object> EditorExpandCollapseCommand { get; set; } 
+        public Command<object> CancelImageSelected { get; set; }
         public ObservableCollection<ImageSource> ImageSourceCollection
         {
             get
@@ -205,6 +208,19 @@ public bool AutoSuggestionPopupIsOpen
                 OnPropertyChanged(nameof(AutoSuggestionPopupIsOpen));
             }
         }
+        public bool CanStopResponse
+        {
+            get
+            {
+                return canStopResponse;
+            }
+            set
+            {
+                canStopResponse = value;
+                OnPropertyChanged(nameof(CanStopResponse));
+            }
+        }
+
         public bool HasImageUploaded
         {
             get { return this.ImageSourceCollection.Count > 0; }
@@ -219,6 +235,8 @@ public ChartViewModel()
             RefreshButtonClicked = new Command(OnRefreshButtonClicked); 
             EditorOptionsComamnd = new Command<object>(ExecuteEditorOptionsCommand);
 
+            CancelImageSelected = new Command<object>(ExecuteCancelImageSelectedCommand);
+            SendButtonCommand = new Command<object>(ExecuteSendButtonCommand);
             EditorExpandCollapseCommand = new Command<object>(ExecuteEditorExpandCollapseCommand);
             _imagePickerHelper = new ImagePickerHelper(); 
             this.ImageSourceCollection = new ObservableCollection<ImageSource>();
@@ -231,10 +249,190 @@ public ChartViewModel()
                 "Change the chart title to 'Sales by Region'",
             };
         }
+        public void ExecuteCancelImageSelectedCommand(object obj)
+        {
+            this.ImageSourceCollection.Remove(obj as ImageSource);
+            OnPropertyChanged(nameof(this.HasImageUploaded));
+            this.UpdateSendIcon(this.InputText);
+        }
+        private SfPopup ExpandedEditorPopup;
+        private void ExecuteSendButtonCommand(object obj)
+        {
+            var text = this.InputText;
+            if (this.isResponseStreaming)
+            {
+                this.CanStopResponse = true;
+            }
+            else
+            {
+                this.CanStopResponse = false;
+            }
+            if (string.IsNullOrWhiteSpace(text) && !HasImageUploaded)
+            {
+                return;
+            }
+
+            if (this.ExpandedEditorPopup != null && this.ExpandedEditorPopup.IsOpen)
+            {
+                this.ExpandedEditorPopup.Dismiss();
+            }
+
+            if (!HasImageUploaded)
+            {
+                var requestItem = new AssistItem()
+                {
+                    Text = text,
+                    IsRequested = true
+                };
+                this.SendRequest(requestItem, obj);
+            }
+            else
+            {
+                foreach (var imageSource in this.ImageSourceCollection)
+                {
+                    var requestItem = new AssistImageItem()
+                    {
+                        Source = imageSource,
+                        IsRequested = true,
+                        Text = text
+                    };
+                    this.SendRequest(requestItem, obj);
+                }
+                this.ImageSourceCollection.Clear();
+            }
+        }
 
+        private ObservableCollection<Option> optionsContextMenu;
+        public ObservableCollection<Option> OptionsContextMenu
+        {
+            get
+            {
+                return optionsContextMenu;
+            }
+            set
+            {
+                optionsContextMenu = value;
+                OnPropertyChanged(nameof(OptionsContextMenu));
+            }
+        }
+        private async void SendRequest(AssistItem requestItem, object obj)
+        {
+            if (this.isResponseStreaming)
+            {
+                return;
+            }
+            this.isResponseStreaming = true;
+            this.Messages.Add(requestItem);
+            if (OptionsContextMenu.Count <= 2)
+                PopulateOptionsContextMenu();
+            this.InputText = string.Empty;
+            await this.GetResult(requestItem, obj).ConfigureAwait(true);
+        }
+
+        private bool isNewChatEnabled;
+        private bool isHeaderVisible = true;
+        public bool IsNewChatEnabled
+        {
+            get
+            {
+                return isNewChatEnabled;
+            }
+            set
+            {
+                isNewChatEnabled = value;
+                OnPropertyChanged(nameof(IsNewChatEnabled));
+            }
+        }
+        public bool IsHeaderVisible
+        {
+            get
+            {
+                return isHeaderVisible;
+            }
+            set
+            {
+                isHeaderVisible = value;
+                if (!value)
+                {
+                    this.IsNewChatEnabled = true;
+                }
+                else
+                {
+                    this.IsNewChatEnabled = false;
+                }
+                OnPropertyChanged(nameof(IsHeaderVisible));
+            }
+        }
+        
+        internal async Task GetResult(object inputQuery, object assistView)
+        { 
+        }
+
+        public bool IsTemporaryChatEnabled
+        {
+            get
+            {
+                return isTemporaryChatEnabled;
+            }
+            set
+            {
+                isTemporaryChatEnabled = value;
+                OnPropertyChanged(nameof(IsTemporaryChatEnabled));
+            }
+        }
+        private bool isTemporaryChatEnabled;
+        private SfPopup OptionsPopup;
+        private void PopulateOptionsContextMenu(bool isChatHistoryItemPressed = false)
+        {
+            OptionsContextMenu = new ObservableCollection<Option>();
+            if (isChatHistoryItemPressed)
+            {
+                if (this.OptionsPopup != null)
+                {
+                    this.OptionsPopup.WidthRequest = 130;
+                }
+                OptionsContextMenu.Add(new Option() { Name = "Rename", Icon = "\ue73d" });
+                OptionsContextMenu.Add(new Option() { Name = "Archive", Icon = "\ue777" });
+                OptionsContextMenu.Add(new Option() { Name = "Delete", Icon = "\ue73c" });
+            }
+            else if (Messages != null && Messages.Count > 0 && !IsTemporaryChatEnabled)
+            {
+                if (this.OptionsPopup != null)
+                {
+                    this.OptionsPopup.WidthRequest = 190;
+                }
+                OptionsContextMenu.Add(new Option() { Name = "View Details", Icon = "\ue719" });
+                //OptionsContextMenu.Add(new Option() { Name = "Share", Icon = "\ue770" });
+                OptionsContextMenu.Add(new Option() { Name = "Rename", Icon = "\ue73d", CanShowSeparator = true });
+                OptionsContextMenu.Add(new Option() { Name = "Archive", Icon = "\ue777" });
+                OptionsContextMenu.Add(new Option() { Name = "Delete", Icon = "\ue73c" });
+                //OptionsContextMenu.Add(new Option() { Name = "Move to project", Icon = "\ue72e" });
+                OptionsContextMenu.Add(new Option() { Name = "Temporary Chat", Icon = "\ue7e9", CanShowSeparator = true });
+            }
+            else
+            {
+                if (this.OptionsPopup != null)
+                {
+                    this.OptionsPopup.WidthRequest = 190;
+                }
+                OptionsContextMenu.Add(new Option() { Name = "View Details", Icon = "\ue719" });
+                OptionsContextMenu.Add(new Option() { Name = "Temporary Chat", Icon = "\ue7e9", CanShowSeparator = true });
+            }
+        }
         private void ExecuteEditorExpandCollapseCommand(object obj)
         {
-          
+            var editor = obj as CustomEditor;
+            this.ExpandedEditorPopup = App.Current.Resources["EditorExpandPopup"] as SfPopup;
+            this.ExpandedEditorPopup.BindingContext = this;
+            if (!this.ExpandedEditorPopup.IsOpen)
+            {
+                this.ExpandedEditorPopup.Show(true);
+                editor.Focus();
+            }
+            else
+            {
+                this.ExpandedEditorPopup.Dismiss();
+            }
         }
 
         private void OnAttachmentContextMenuTapCommand(object eventArgs)

From 79c003a69cee3fa7ea0055d2f8d39f543b90218d Mon Sep 17 00:00:00 2001
From: Harsha <harshamidadhala.k@syncfusion.com>
Date: Fri, 20 Jun 2025 22:25:43 +0530
Subject: [PATCH 03/10] removed user file

---
 .../ChartGenerator/ChartGenerator.csproj.user             | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj.user

diff --git a/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj.user b/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj.user
deleted file mode 100644
index 8700ea2..0000000
--- a/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj.user
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
-    <ActiveDebugFramework>net9.0-windows10.0.19041.0</ActiveDebugFramework>
-    <ActiveDebugProfile>Windows Machine</ActiveDebugProfile>
-  </PropertyGroup>
-</Project>
\ No newline at end of file

From ca037fc848c483a469d0612a676738f3fb828044 Mon Sep 17 00:00:00 2001
From: Saravanan Madheswaran <saravanan.madheswaran@syncfusion.com>
Date: Fri, 20 Jun 2025 22:31:26 +0530
Subject: [PATCH 04/10] local

---
 .../ChartGenerator/AppShell.xaml                   | 14 --------------
 .../ChartGenerator/AppShell.xaml.cs                | 10 ----------
 .../ChartGenerator/ChartGenerator.csproj           |  3 +--
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 ChartGeneratorAISample/ChartGenerator/AppShell.xaml
 delete mode 100644 ChartGeneratorAISample/ChartGenerator/AppShell.xaml.cs

diff --git a/ChartGeneratorAISample/ChartGenerator/AppShell.xaml b/ChartGeneratorAISample/ChartGenerator/AppShell.xaml
deleted file mode 100644
index 6333586..0000000
--- a/ChartGeneratorAISample/ChartGenerator/AppShell.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Shell
-    x:Class="ChartGenerator.AppShell"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:ChartGenerator"
-    Shell.FlyoutBehavior="Disabled"
-    Title="ChartGenerator">
-
-    <ShellContent
-        ContentTemplate="{DataTemplate local:MainPage}"
-        Route="MainPage" />
-
-</Shell>
diff --git a/ChartGeneratorAISample/ChartGenerator/AppShell.xaml.cs b/ChartGeneratorAISample/ChartGenerator/AppShell.xaml.cs
deleted file mode 100644
index 48bb3fb..0000000
--- a/ChartGeneratorAISample/ChartGenerator/AppShell.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ChartGenerator
-{
-    public partial class AppShell : Shell
-    {
-        public AppShell()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj b/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj
index 07a6ff0..da1defb 100644
--- a/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj
+++ b/ChartGeneratorAISample/ChartGenerator/ChartGenerator.csproj
@@ -66,8 +66,7 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.1" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="SampleBrowser.Maui.Base" Version="*" />
-		<PackageReference Include="Syncfusion.Maui.AIAssistView" Version="*" />
+		<PackageReference Include="Syncfusion.Maui.AIAssistView" Version="29.2.11" />
 		<PackageReference Include="Syncfusion.Maui.PdfViewer" Version="*" />
 		<PackageReference Include="Syncfusion.Maui.Toolkit" Version="*" />
 	</ItemGroup>

From 8daa34d2f31d01d76f1acc9dbe1ab782d7cc8b3e Mon Sep 17 00:00:00 2001
From: Saravanan Madheswaran <saravanan.madheswaran@syncfusion.com>
Date: Sat, 21 Jun 2025 12:03:55 +0530
Subject: [PATCH 05/10] update.

---
 .../ChartGenerator/AIService/AICredentials.cs |   9 +
 .../AIService/ChartsAIService.cs              |  27 +-
 ...anChartExt.xaml => CartesianCategory.xaml} |  25 +-
 .../ChartExtensions/CartesianCategory.xaml.cs | 188 ++++++++++++
 .../ChartExtensions/CartesianChartExt.xaml.cs |  61 ----
 .../ChartExtensions/ChartResources.xaml       | 170 +++++++++++
 .../ChartExtensions/ChartResources.xaml.cs    |   9 +
 ...larChartExt.xaml => CircularCategory.xaml} |  10 +-
 ...rtExt.xaml.cs => CircularCategory.xaml.cs} |  42 ++-
 .../ChartExtensions/SeriesTemplateSelector.cs |  41 +++
 .../ChartGenerator/Helper/CustomEditor.cs     |  11 +-
 .../ChartGenerator/Helper/JsonConverters.cs   |  95 ++++++
 .../ChartGenerator/MainPage.xaml              | 204 -------------
 .../ChartGenerator/MainPage.xaml.cs           |  11 -
 .../ChartGenerator/Models/ChartConfig.cs      |  36 ++-
 .../ChartGenerator/Models/ChartEnums.cs       |  46 ++-
 .../ChartGenerator/Models/SeriesConfig.cs     |  87 +++++-
 .../Models/SeriesTemplates.xaml               | 165 ----------
 .../Models/SeriesTemplates.xaml.cs            |  47 ---
 .../ChartGenerator/View/ChartView.xaml        |   4 +-
 .../ChartGenerator/View/ChartView.xaml.cs     |  26 +-
 .../ChartGenerator/View/DesktopUI.xaml        | 142 +++++----
 .../ChartGenerator/View/DesktopUI.xaml.cs     |   6 +-
 .../ChartGenerator/View/MobileUI.xaml         |   2 +-
 .../ViewModel/ChartViewModel.cs               | 288 +++++++-----------
 .../ChartGenerator/ViewModel/ChatViewModel.cs | 256 ++++++++++++++++
 26 files changed, 1150 insertions(+), 858 deletions(-)
 create mode 100644 ChartGeneratorAISample/ChartGenerator/AIService/AICredentials.cs
 rename ChartGeneratorAISample/ChartGenerator/ChartExtensions/{CartesianChartExt.xaml => CartesianCategory.xaml} (50%)
 create mode 100644 ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianCategory.xaml.cs
 delete mode 100644 ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianChartExt.xaml.cs
 create mode 100644 ChartGeneratorAISample/ChartGenerator/ChartExtensions/ChartResources.xaml
 create mode 100644 ChartGeneratorAISample/ChartGenerator/ChartExtensions/ChartResources.xaml.cs
 rename ChartGeneratorAISample/ChartGenerator/ChartExtensions/{CircularChartExt.xaml => CircularCategory.xaml} (76%)
 rename ChartGeneratorAISample/ChartGenerator/ChartExtensions/{CircularChartExt.xaml.cs => CircularCategory.xaml.cs} (58%)
 create mode 100644 ChartGeneratorAISample/ChartGenerator/ChartExtensions/SeriesTemplateSelector.cs
 create mode 100644 ChartGeneratorAISample/ChartGenerator/Helper/JsonConverters.cs
 delete mode 100644 ChartGeneratorAISample/ChartGenerator/MainPage.xaml
 delete mode 100644 ChartGeneratorAISample/ChartGenerator/MainPage.xaml.cs
 delete mode 100644 ChartGeneratorAISample/ChartGenerator/Models/SeriesTemplates.xaml
 delete mode 100644 ChartGeneratorAISample/ChartGenerator/Models/SeriesTemplates.xaml.cs
 create mode 100644 ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs

diff --git a/ChartGeneratorAISample/ChartGenerator/AIService/AICredentials.cs b/ChartGeneratorAISample/ChartGenerator/AIService/AICredentials.cs
new file mode 100644
index 0000000..78b9dce
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/AIService/AICredentials.cs
@@ -0,0 +1,9 @@
+namespace ChartGenerator.AIService
+{
+    internal abstract class AICredentials
+    {
+        internal const string endpoint = "https://mobilemaui.openai.azure.com/";
+        internal const string deploymentName = "gpt-4o";
+        internal const string key = "6673b6975f334c79bd0db8a1cd70aa49";
+    }
+}
diff --git a/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs b/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs
index 19bbf65..f73c6e5 100644
--- a/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs
+++ b/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs
@@ -1,33 +1,14 @@
-using Azure.AI.OpenAI;
-using Azure;
+using Azure;
+using Azure.AI.OpenAI;
+using ChartGenerator.AIService;
 using Microsoft.Extensions.AI;
 
 namespace ChartGenerator
 {
-    internal class ChartAIService
+    internal class ChartAIService : AICredentials
     {
         #region Fields
 
-        /// <summary>
-        /// The EndPoint
-        /// </summary>
-        internal const string endpoint = "https://YOUR_ACCOUNT.openai.azure.com/";
-
-        /// <summary>
-        /// The Deployment name
-        /// </summary>
-        internal const string deploymentName = "deployment name";
-
-        /// <summary>
-        /// The Image Deployment name
-        /// </summary>
-        internal const string imageDeploymentName = "IMAGE_MODEL_NAME";
-
-        /// <summary>
-        /// The API key
-        /// </summary>
-        internal const string key = "API key";
-
         /// <summary>
         /// The already credential validated field
         /// </summary>
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianChartExt.xaml b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianCategory.xaml
similarity index 50%
rename from ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianChartExt.xaml
rename to ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianCategory.xaml
index 7ac98b5..41cbe14 100644
--- a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianChartExt.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianCategory.xaml
@@ -3,14 +3,16 @@
                         xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                         xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
                         xmlns:local="clr-namespace:ChartGenerator"
-                        x:Class="ChartGenerator.CartesianChartExt"
-                        Title="{Binding Title}"
-                        Source="{Binding Series}">
+                        x:Class="ChartGenerator.CartesianCategory" x:DataType="local:ChartConfig"
+                        Source="{Binding Series}" XAxis="{Binding XAxis}" YAxis="{Binding YAxis}" EnableSideBySideSeriesPlacement="{Binding SideBySidePlacement}">
 
+    <chart:SfCartesianChart.Title>
+        <Label Text="{Binding Title}" HorizontalOptions="Center" HorizontalTextAlignment="Center"/>
+    </chart:SfCartesianChart.Title>
     <chart:SfCartesianChart.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <local:SeriesTemplates />
+                <local:ChartResources />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </chart:SfCartesianChart.Resources>
@@ -19,20 +21,5 @@
         <chart:ChartLegend IsVisible="{Binding ShowLegend}" Placement="Bottom" ToggleSeriesVisibility="True"/>
     </chart:SfCartesianChart.Legend>
 
-    <chart:SfCartesianChart.XAxes>
-        <chart:CategoryAxis>
-            <chart:CategoryAxis.Title>
-                <chart:ChartAxisTitle Text="{Binding XAxis.Title}"/>
-            </chart:CategoryAxis.Title>
-        </chart:CategoryAxis>
-    </chart:SfCartesianChart.XAxes>
-
-    <chart:SfCartesianChart.YAxes>
-        <chart:NumericalAxis Minimum="{Binding YAxis.Min}" Maximum="{Binding YAxis.Max}">
-            <chart:NumericalAxis.Title>
-                <chart:ChartAxisTitle Text="{Binding YAxis.Title}" />
-            </chart:NumericalAxis.Title>
-        </chart:NumericalAxis>
-    </chart:SfCartesianChart.YAxes>
 
 </chart:SfCartesianChart>
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianCategory.xaml.cs b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianCategory.xaml.cs
new file mode 100644
index 0000000..330d9be
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianCategory.xaml.cs
@@ -0,0 +1,188 @@
+using Syncfusion.Maui.Toolkit.Charts;
+using System.Collections.ObjectModel;
+
+namespace ChartGenerator;
+
+public partial class CartesianCategory : SfCartesianChart
+{
+    public CartesianCategory()
+    {
+        InitializeComponent();
+    }
+
+    // BindableProperty for the series source
+    public static readonly BindableProperty SourceProperty = BindableProperty.Create(
+        nameof(Source),
+        typeof(ObservableCollection<SeriesConfig>),
+        typeof(CartesianCategory),
+        null,
+        BindingMode.Default,
+        propertyChanged: OnPropertyChanged);
+
+    public ObservableCollection<SeriesConfig> Source
+    {
+        get => (ObservableCollection<SeriesConfig>)GetValue(SourceProperty);
+        set => SetValue(SourceProperty, value);
+    }
+
+    public static readonly BindableProperty XAxisProperty = BindableProperty.Create(
+        nameof(XAxis),
+        typeof(ObservableCollection<AxisConfig>),
+        typeof(CartesianCategory),
+        null,
+        BindingMode.Default,
+        propertyChanged: XAxisChanged);
+
+    public ObservableCollection<SeriesConfig> XAxis
+    {
+        get => (ObservableCollection<SeriesConfig>)GetValue(XAxisProperty);
+        set => SetValue(XAxisProperty, value);
+    }
+
+    public static readonly BindableProperty YAxisProperty = BindableProperty.Create(
+        nameof(YAxis),
+        typeof(ObservableCollection<AxisConfig>),
+        typeof(CartesianCategory),
+         null,
+        BindingMode.Default,
+        propertyChanged: YAxisChanged);
+
+    public ObservableCollection<SeriesConfig> YAxis
+    {
+        get => (ObservableCollection<SeriesConfig>)GetValue(YAxisProperty);
+        set => SetValue(YAxisProperty, value);
+    }
+
+    private static void XAxisChanged(BindableObject bindable, object oldValue, object newValue)
+    {
+        if (bindable is SfCartesianChart cartesianChart && newValue is ObservableCollection<AxisConfig> xAxisConfigs)
+        {
+            // Clear current axes
+            cartesianChart.XAxes.Clear();
+
+            // Add new axes based on the new configuration
+            foreach (var axisConfig in xAxisConfigs)
+            {
+                ChartAxis axis = axisConfig.GetXAxis();
+
+                if (axis is CategoryAxis category)
+                {
+                    category.LabelRotation = 45;
+                }
+
+                axis.AxisLineStyle = SetLineStyle();
+                axis.MajorGridLineStyle = SetLineStyle();
+                axis.MajorTickStyle = SetTickStyle();
+                axis.ShowMajorGridLines = false;
+                cartesianChart.XAxes.Add(axis);
+            }
+        }
+    }
+
+    private static void YAxisChanged(BindableObject bindable, object oldValue, object newValue)
+    {
+        if (bindable is SfCartesianChart cartesianChart && newValue is ObservableCollection<AxisConfig> yAxisConfigs)
+        {
+            cartesianChart.YAxes.Clear();
+
+            foreach (var axisConfig in yAxisConfigs)
+            {
+                var axis = axisConfig.GetYAxis();
+                if (axis != null)
+                {
+                    axis.AxisLineStyle = SetLineStyle();
+                    axis.MajorGridLineStyle = SetLineStyle();
+                    axis.MajorTickStyle = SetTickStyle();
+                    axis.ShowMajorGridLines = false;
+                    cartesianChart.YAxes.Add(axis);
+                }
+            }
+        }
+    }
+
+    private static ChartLineStyle SetLineStyle()
+    {
+        ChartLineStyle axisLineStyle = new ChartLineStyle()
+        {
+            Stroke = Colors.Transparent,
+            StrokeWidth = 0,
+        };
+
+        return axisLineStyle;
+    }
+
+    private static ChartAxisTickStyle SetTickStyle()
+    {
+        ChartAxisTickStyle tickStyle = new ChartAxisTickStyle()
+        {
+            TickSize = 0
+        };
+
+        return tickStyle;
+    }
+
+    private static void OnPropertyChanged(BindableObject bindable, object oldValue, object newValue)
+    {
+        if (bindable is CartesianCategory chart)
+        {
+            chart.GenerateSeries(newValue as ObservableCollection<SeriesConfig>);
+        }
+    }
+
+    private void GenerateSeries(ObservableCollection<SeriesConfig> configs)
+    {
+        Series.Clear();
+        if (configs != null)
+        {
+            foreach (var config in configs)
+            {
+                CreateSeriesFromTemplate(config);
+                var paletteBrush = GetPaletteBrushes();
+
+                if (Series.Count == 1 && Series[0] is ColumnSeries series)
+                {
+                    series.PaletteBrushes = paletteBrush;
+                }
+                else
+                {
+                    this.PaletteBrushes = paletteBrush;
+                }
+            }
+        }
+    }
+
+    private Brush[] GetPaletteBrushes()
+    {
+        var random = new Random();
+        switch (random.Next(1, 6))
+        {
+            case 1:
+                return Resources["Pallet1"] as Brush[];
+            case 2:
+                return Resources["Pallet2"] as Brush[];
+            case 3:
+                return Resources["Pallet3"] as Brush[];
+            case 5:
+                return Resources["Pallet5"] as Brush[];
+            default:
+                return Resources["Pallet6"] as Brush[];
+        }
+    }
+
+    private void CreateSeriesFromTemplate(SeriesConfig seriesConfig)
+    {
+        var templateSelector = (SeriesTemplateSelector)Resources["seriesTemplateSelector"];
+        var template = templateSelector.SelectTemplate(seriesConfig, null);
+
+        if (template != null)
+        {
+            ChartSeries series = (ChartSeries)template.CreateContent();
+
+            if (series != null)
+            {
+                series.BindingContext = seriesConfig;
+                this.Series.Add(series);
+            }
+        }
+    }
+}
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianChartExt.xaml.cs b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianChartExt.xaml.cs
deleted file mode 100644
index 43c0f08..0000000
--- a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CartesianChartExt.xaml.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Syncfusion.Maui.Toolkit.Charts;
-using System.Collections.ObjectModel;
-
-namespace ChartGenerator;
-
-public partial class CartesianChartExt : SfCartesianChart
-{
-	public CartesianChartExt()
-	{
-		InitializeComponent();
-	}
-
-    public static readonly BindableProperty SourceProperty = BindableProperty.Create(nameof(Source), typeof(ObservableCollection<SeriesConfig>), typeof(CartesianChartExt), null, BindingMode.Default, null, OnPropertyChanged);
-    public ObservableCollection<SeriesConfig> Source
-    {
-        get => (ObservableCollection<SeriesConfig>)GetValue(SourceProperty);
-        set => SetValue(SourceProperty, value);
-    }
-
-    private static void OnPropertyChanged(BindableObject bindable, object oldValue, object newValue)
-    {
-        if (Equals(oldValue, newValue))
-        {
-            return;
-        }
-
-        if (bindable is CartesianChartExt chart)
-        {
-            chart.GenerateSeries(newValue as ObservableCollection<SeriesConfig>);
-        }
-    }
-
-    private void GenerateSeries(ObservableCollection<SeriesConfig> configs)
-    {
-        if (configs != null)
-        {
-            this.Series.Clear();
-            foreach (var config in configs)
-            {
-                CreateSeriesFromTemplate(config);
-            }
-        }
-    }
-
-    private void CreateSeriesFromTemplate(SeriesConfig seriesConfig)
-    {
-        var templateSelector = (SeriesTemplateSelector)Resources["seriesTemplateSelector"];
-        var template = templateSelector.SelectTemplate(seriesConfig, null);
-
-        if (template != null)
-        {
-            ChartSeries series = (ChartSeries)template.CreateContent();
-
-            if (series != null)
-            {
-                series.BindingContext = seriesConfig;
-                this.Series.Add(series);
-            }        
-        }
-    }
-}
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/ChartResources.xaml b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/ChartResources.xaml
new file mode 100644
index 0000000..a94c60f
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/ChartResources.xaml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
+             xmlns:local="clr-namespace:ChartGenerator"
+             x:Class="ChartGenerator.ChartResources">
+
+    <x:Array x:Key="Pallet1" Type="{x:Type Brush}">
+        <SolidColorBrush Color="#1089E9" />
+        <SolidColorBrush Color="#08CDAA" />
+        <SolidColorBrush Color="#F58400" />
+        <SolidColorBrush Color="#9656FF" />
+        <SolidColorBrush Color="#F9C200" />
+        <SolidColorBrush Color="#F954A3" />
+        <SolidColorBrush Color="#05BB3D" />
+        <SolidColorBrush Color="#06B1E2" />
+        <SolidColorBrush Color="#FF4E4E" />
+    </x:Array>
+
+
+    <x:Array x:Key="Pallet2" Type="{x:Type Brush}">
+        <SolidColorBrush Color="#4A9D63" />
+        <SolidColorBrush Color="#FFCB3E" />
+        <SolidColorBrush Color="#69CAF5" />
+        <SolidColorBrush Color="#F2872B" />
+        <SolidColorBrush Color="#2D61E3" />
+        <SolidColorBrush Color="#8EC911" />
+        <SolidColorBrush Color="#A63BE8" />
+        <SolidColorBrush Color="#602EF0" />
+    </x:Array>
+
+
+    <x:Array x:Key="Pallet3" Type="{x:Type Brush}">
+        <SolidColorBrush Color="#01A8B5" />
+        <SolidColorBrush Color="#5F3BC3" />
+        <SolidColorBrush Color="#DE4383" />
+        <SolidColorBrush Color="#F2AE3D" />
+        <SolidColorBrush Color="#EB664B" />
+        <SolidColorBrush Color="#D82591" />
+        <SolidColorBrush Color="#A32FFF" />
+        <SolidColorBrush Color="#4176FF" />
+        <SolidColorBrush Color="#047D43" />
+    </x:Array>
+
+
+    <x:Array x:Key="Pallet4" Type="{x:Type Brush}">
+        <SolidColorBrush Color="#314A6E" />
+        <SolidColorBrush Color="#48988B" />
+        <SolidColorBrush Color="#5E498C" />
+        <SolidColorBrush Color="#74BD6F" />
+        <SolidColorBrush Color="#597FCA" />
+    </x:Array>
+
+
+    <x:Array x:Key="Pallet5" Type="{x:Type Brush}">
+        <SolidColorBrush Color="#95DB9C" />
+        <SolidColorBrush Color="#B95375" />
+        <SolidColorBrush Color="#56BBAF" />
+        <SolidColorBrush Color="#606D7F" />
+        <SolidColorBrush Color="#E99941" />
+        <SolidColorBrush Color="#327DBE" />
+        <SolidColorBrush Color="#E7695A" />
+        <SolidColorBrush Color="#2D4552" />
+    </x:Array>
+
+
+    <x:Array x:Key="Pallet6" Type="{x:Type Brush}">
+        <SolidColorBrush Color="#2EC4B6" />
+        <SolidColorBrush Color="#E75A6E" />
+        <SolidColorBrush Color="#FDCD25" />
+        <SolidColorBrush Color="#0DC920" />
+    </x:Array>
+
+    <DataTemplate x:Key="lineSeriesTemplate">
+        <chart:LineSeries ItemsSource="{Binding DataSource}"
+                      XBindingPath="xvalue"
+                      YBindingPath="yvalue"
+                      EnableTooltip="{Binding Tooltip}"
+                      Label="{Binding Name}"
+                      StrokeWidth="2.5"
+                      ShowMarkers="True"
+                      EnableAnimation="True">
+            <chart:LineSeries.MarkerSettings>
+                <chart:ChartMarkerSettings Fill="SkyBlue" 
+                                       Stroke="RoyalBlue" 
+                                       StrokeWidth="2" />
+            </chart:LineSeries.MarkerSettings>
+        </chart:LineSeries>
+    </DataTemplate>
+
+    <DataTemplate x:Key="splineSeriesTemplate">
+        <chart:SplineSeries ItemsSource="{Binding DataSource}"
+                      XBindingPath="xvalue"
+                      YBindingPath="yvalue"
+                      EnableTooltip="{Binding Tooltip}"
+                      Label="{Binding Name}"
+                      StrokeWidth="2.5"
+                      ShowMarkers="True"
+                      EnableAnimation="True">
+            <chart:SplineSeries.MarkerSettings>
+                <chart:ChartMarkerSettings Fill="#9370DB" 
+                                       Stroke="#663399" 
+                                       StrokeWidth="2" />
+            </chart:SplineSeries.MarkerSettings>
+        </chart:SplineSeries>
+    </DataTemplate>
+
+    <DataTemplate x:Key="columnSeriesTemplate">
+        <chart:ColumnSeries ItemsSource="{Binding DataSource}"
+                        XBindingPath="xvalue"
+                        YBindingPath="yvalue"
+                        CornerRadius="15"
+                        Label="{Binding Name}"
+                        EnableTooltip="{Binding Tooltip}"
+                        EnableAnimation="True">
+        </chart:ColumnSeries>
+    </DataTemplate>
+
+    <DataTemplate x:Key="areaSeriesTemplate">
+        <chart:AreaSeries ItemsSource="{Binding DataSource}"
+                      XBindingPath="xvalue"
+                      YBindingPath="yvalue"
+                      Opacity=".8"
+                      Label="{Binding Name}"
+                      EnableTooltip="{Binding Tooltip}"
+                      EnableAnimation="True">
+        </chart:AreaSeries>
+    </DataTemplate>
+
+    <DataTemplate x:Key="pieSeriesTemplate">
+        <chart:PieSeries ItemsSource="{Binding DataSource}"
+                     XBindingPath="xvalue"
+                     YBindingPath="yvalue"
+                     EnableTooltip="{Binding Tooltip}"
+                     PaletteBrushes="{StaticResource PaletteBrushesCollection}"
+                     EnableAnimation="True">
+        </chart:PieSeries>
+    </DataTemplate>
+
+    <DataTemplate x:Key="doughnutSeriesTemplate">
+        <chart:DoughnutSeries ItemsSource="{Binding DataSource}"
+                          XBindingPath="xvalue"
+                          YBindingPath="yvalue"
+                          ExplodeAll="True"
+                          EnableTooltip="{Binding Tooltip}"
+                          PaletteBrushes="{StaticResource PaletteBrushesCollection}"
+                          EnableAnimation="True"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="radialBarSeriesTemplate">
+        <chart:RadialBarSeries ItemsSource="{Binding DataSource}"
+                           XBindingPath="xvalue"
+                           YBindingPath="yvalue"
+                           CapStyle="BothCurve"
+                           EnableTooltip="{Binding Tooltip}" 
+                           PaletteBrushes="{StaticResource RadialbarCollection}"
+                           EnableAnimation="True" />
+    </DataTemplate>
+
+    <local:SeriesTemplateSelector x:Key="seriesTemplateSelector"
+                              LineSeriesTemplate="{StaticResource lineSeriesTemplate}"
+                              SplineSeriesTemplate="{StaticResource splineSeriesTemplate}"
+                              ColumnSeriesTemplate="{StaticResource columnSeriesTemplate}"
+                              AreaSeriesTemplate="{StaticResource areaSeriesTemplate}"
+                              PieSeriesTemplate="{StaticResource pieSeriesTemplate}"
+                              DoughnutSeriesTemplate="{StaticResource doughnutSeriesTemplate}"
+                              RadialBarSeriesTemplate="{StaticResource radialBarSeriesTemplate}" />
+
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/ChartResources.xaml.cs b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/ChartResources.xaml.cs
new file mode 100644
index 0000000..91e1568
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/ChartResources.xaml.cs
@@ -0,0 +1,9 @@
+namespace ChartGenerator;
+
+public partial class ChartResources : ResourceDictionary
+{
+    public ChartResources()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularChartExt.xaml b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularCategory.xaml
similarity index 76%
rename from ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularChartExt.xaml
rename to ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularCategory.xaml
index aac3863..608576f 100644
--- a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularChartExt.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularCategory.xaml
@@ -3,18 +3,20 @@
                        xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                        xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
                        xmlns:local="clr-namespace:ChartGenerator"
-                       x:Class="ChartGenerator.CircularChartExt"
-                       Title="{Binding Title}"
+                       x:Class="ChartGenerator.CircularCategory"
                        Source="{Binding Series}" >
 
+    <chart:SfCircularChart.Title>
+        <Label Text="{Binding Title}" HorizontalOptions="Center" HorizontalTextAlignment="Center"/>
+    </chart:SfCircularChart.Title>
+
     <chart:SfCircularChart.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <local:SeriesTemplates />
+                <local:ChartResources/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </chart:SfCircularChart.Resources>
-
     <chart:SfCircularChart.Legend>
         <chart:ChartLegend IsVisible="{Binding ShowLegend}" Placement="Left" ToggleSeriesVisibility="True"/>
     </chart:SfCircularChart.Legend>
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularChartExt.xaml.cs b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularCategory.xaml.cs
similarity index 58%
rename from ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularChartExt.xaml.cs
rename to ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularCategory.xaml.cs
index ad313ab..5c61547 100644
--- a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularChartExt.xaml.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/CircularCategory.xaml.cs
@@ -3,14 +3,14 @@
 
 namespace ChartGenerator;
 
-public partial class CircularChartExt : SfCircularChart
+public partial class CircularCategory : SfCircularChart
 {
-	public CircularChartExt()
-	{
-		InitializeComponent();
-	}
+    public CircularCategory()
+    {
+        InitializeComponent();
+    }
 
-    public static readonly BindableProperty SourceProperty = BindableProperty.Create(nameof(Source), typeof(ObservableCollection<SeriesConfig>), typeof(CircularChartExt), null, BindingMode.Default, null, OnPropertyChanged);
+    public static readonly BindableProperty SourceProperty = BindableProperty.Create(nameof(Source), typeof(ObservableCollection<SeriesConfig>), typeof(CircularCategory), null, BindingMode.Default, null, OnPropertyChanged);
     public ObservableCollection<SeriesConfig> Source
     {
         get => (ObservableCollection<SeriesConfig>)GetValue(SourceProperty);
@@ -19,7 +19,7 @@ public ObservableCollection<SeriesConfig> Source
 
     private static void OnPropertyChanged(BindableObject bindable, object oldValue, object newValue)
     {
-        if (bindable is CircularChartExt chart)
+        if (bindable is CircularCategory chart)
         {
             chart.GenerateSeries(newValue as ObservableCollection<SeriesConfig>);
         }
@@ -34,6 +34,34 @@ private void GenerateSeries(ObservableCollection<SeriesConfig> configs)
             {
                 CreateSeriesFromTemplate(config);
             }
+
+            var paletteBrush = GetPaletteBrushes();
+
+            if (Series.Count == 1)
+            {
+                if (Series[0] is CircularSeries series)
+                {
+                    series.PaletteBrushes = paletteBrush;
+                }
+            }
+        }
+    }
+
+    private Brush[] GetPaletteBrushes()
+    {
+        var random = new Random();
+        switch (random.Next(1, 6))
+        {
+            case 1:
+                return Resources["Pallet1"] as Brush[];
+            case 2:
+                return Resources["Pallet2"] as Brush[];
+            case 3:
+                return Resources["Pallet3"] as Brush[];
+            case 5:
+                return Resources["Pallet5"] as Brush[];
+            default:
+                return Resources["Pallet6"] as Brush[];
         }
     }
 
diff --git a/ChartGeneratorAISample/ChartGenerator/ChartExtensions/SeriesTemplateSelector.cs b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/SeriesTemplateSelector.cs
new file mode 100644
index 0000000..a3451bf
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/ChartExtensions/SeriesTemplateSelector.cs
@@ -0,0 +1,41 @@
+
+namespace ChartGenerator
+{
+    public class SeriesTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate LineSeriesTemplate { get; set; }
+        public DataTemplate SplineSeriesTemplate { get; set; }
+        public DataTemplate ColumnSeriesTemplate { get; set; }
+        public DataTemplate AreaSeriesTemplate { get; set; }
+        public DataTemplate PieSeriesTemplate { get; set; }
+        public DataTemplate DoughnutSeriesTemplate { get; set; }
+        public DataTemplate RadialBarSeriesTemplate { get; set; }
+
+        protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+        {
+            if (item is SeriesConfig config)
+            {
+                switch (config.Type)
+                {
+                    case SeriesType.Line:
+                        return LineSeriesTemplate;
+                    case SeriesType.Spline:
+                        return SplineSeriesTemplate;
+                    case SeriesType.Column:
+                        return ColumnSeriesTemplate;
+                    case SeriesType.Area:
+                        return AreaSeriesTemplate;
+                    case SeriesType.Pie:
+                        return PieSeriesTemplate;
+                    case SeriesType.Doughnut:
+                        return DoughnutSeriesTemplate;
+                    case SeriesType.RadialBar:
+                        return RadialBarSeriesTemplate;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/ChartGeneratorAISample/ChartGenerator/Helper/CustomEditor.cs b/ChartGeneratorAISample/ChartGenerator/Helper/CustomEditor.cs
index c31c008..569e39f 100644
--- a/ChartGeneratorAISample/ChartGenerator/Helper/CustomEditor.cs
+++ b/ChartGeneratorAISample/ChartGenerator/Helper/CustomEditor.cs
@@ -1,17 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Syncfusion.Maui.Core.Internals;
-using Syncfusion.Maui.Toolkit.Charts;
+using Syncfusion.Maui.Core.Internals;
 
 #if ANDROID
 using PlatformView = Android.Widget.EditText;
 #elif WINDOWS
 using PlatformView = Microsoft.UI.Xaml.Controls.TextBox;
 #endif
-using PointerEventArgs = Syncfusion.Maui.Core.Internals.PointerEventArgs;
 namespace ChartGenerator
 {
     public class CustomEditor : Editor, IKeyboardListener
@@ -70,7 +63,7 @@ public void OnPreviewKeyDown(KeyEventArgs args)
         {
             if (args.Key == KeyboardKey.Enter && !args.IsShiftKeyPressed)
             {
-                var bindingContext = this.BindingContext as ChartViewModel;
+                var bindingContext = this.BindingContext as ChatViewModel;
                 args.Handled = true;
                 if (!string.IsNullOrWhiteSpace(bindingContext.InputText))
                 {
diff --git a/ChartGeneratorAISample/ChartGenerator/Helper/JsonConverters.cs b/ChartGeneratorAISample/ChartGenerator/Helper/JsonConverters.cs
new file mode 100644
index 0000000..da6d1ea
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/Helper/JsonConverters.cs
@@ -0,0 +1,95 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ChartGenerator
+{
+    /// <summary>
+    /// Converter for handling ChartTypeEnum values from string
+    /// </summary>
+    public class ChartTypeEnumConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(ChartTypeEnum) || objectType == typeof(string);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.String)
+            {
+                string value = reader.Value.ToString().ToLower();
+                
+                if (value == "cartesian")
+                    return ChartTypeEnum.Cartesian;
+                else if (value == "circular")
+                    return ChartTypeEnum.Circular;
+            }
+            else if (reader.TokenType == JsonToken.Integer)
+            {
+                int value = Convert.ToInt32(reader.Value);
+                if (Enum.IsDefined(typeof(ChartTypeEnum), value))
+                    return (ChartTypeEnum)value;
+            }
+
+            // Default to Cartesian if can't convert
+            return ChartTypeEnum.Cartesian;
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            ChartTypeEnum chartType = (ChartTypeEnum)value;
+            writer.WriteValue(chartType.ToString().ToLower());
+        }
+    }
+
+    /// <summary>
+    /// Converter for handling SeriesType values from string
+    /// </summary>
+    public class SeriesTypeConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(SeriesType) || objectType == typeof(string);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.String)
+            {
+                string value = reader.Value.ToString().ToLower();
+                
+                switch (value)
+                {
+                    case "line": return SeriesType.Line;
+                    case "column": return SeriesType.Column;
+                    case "spline": return SeriesType.Spline;
+                    case "area": return SeriesType.Area;
+                    case "pie": return SeriesType.Pie;
+                    case "doughnut": return SeriesType.Doughnut;
+                    case "radialbar": return SeriesType.RadialBar;
+                    default: return SeriesType.Column; // Default to column
+                }
+            }
+            else if (reader.TokenType == JsonToken.Integer)
+            {
+                int value = Convert.ToInt32(reader.Value);
+                if (Enum.IsDefined(typeof(SeriesType), value))
+                    return (SeriesType)value;
+            }
+
+            // Default to Column if can't convert
+            return SeriesType.Column;
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            SeriesType seriesType = (SeriesType)value;
+            writer.WriteValue(seriesType.ToString().ToLower());
+        }
+    }
+}
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/MainPage.xaml b/ChartGeneratorAISample/ChartGenerator/MainPage.xaml
deleted file mode 100644
index a651caa..0000000
--- a/ChartGeneratorAISample/ChartGenerator/MainPage.xaml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:ChartGenerator"
-             xmlns:button="clr-namespace:Syncfusion.Maui.Toolkit.Buttons;assembly=Syncfusion.Maui.Toolkit"
-             xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
-             x:Class="ChartGenerator.MainPage">
-
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <LinearGradientBrush x:Key="backgroundGradient">
-                <GradientStop Color="#FFFFFF" Offset="0"/>
-                <GradientStop Color="#FFCCE6" Offset="1"/>
-            </LinearGradientBrush>
-
-            <LinearGradientBrush x:Key="gradient">
-                <GradientStop Color="#FFFFFF" Offset="0"/>
-                <GradientStop Color="#F5CAE7" Offset="1"/>
-            </LinearGradientBrush>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-    <ContentPage.BindingContext>
-        <local:ChartViewModel/>
-    </ContentPage.BindingContext>
-
-    <Grid Background="{StaticResource backgroundGradient}">
-
-        <VerticalStackLayout VerticalOptions="Center" Padding="20" Spacing="40">
-            <Grid ColumnDefinitions="Auto,Auto" Margin="0,20,0,0" ColumnSpacing="5" HorizontalOptions="Center">
-                <Label Text="Chart Generator" 
-                       FontSize="32" 
-                       HorizontalOptions="Center" 
-                       Margin="0,0,0,200"
-                       FontFamily="Lucida Sans Unicode"/>
-
-                <Editor AutoSize="TextChanges" 
-                        x:Name="entry"  
-                        Grid.Column="0"  
-                        Background="White"
-                        PlaceholderColor="#9582C2"
-                        VerticalOptions="Center" 
-                        HorizontalOptions="Center" 
-                        VerticalTextAlignment="Center"
-                        FontSize="14"
-                        WidthRequest="300" 
-                        Text="{Binding EntryText}"
-                        IsEnabled="{Binding IsDisable}"
-                        Placeholder="Create your own chart..">
-
-                    
-                </Editor>
-
-                <Button x:Name="createButton"  
-                        Grid.Column="1"  
-                        CornerRadius="15" 
-                        Text="Create"  
-                        VerticalOptions="Center" 
-                        HorizontalOptions="End" 
-                        Background="#6750A4"
-                        IsEnabled="{Binding IsDisable}"
-                        Command="{Binding CreateButtonClicked}">
-                 
-                </Button>
-
-                <core:SfBusyIndicator IsVisible="{Binding IsLoading}"
-                                      IsRunning="True"
-                                      AnimationType="SingleCircle"
-                                      Margin="0, 200, 0, 0"/>
-                
-            </Grid>
-
-            <Grid ColumnSpacing="20" Padding="80,0,80,0" RowSpacing="20">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <button:SfButton x:Name="barButton"
-                                 Text="Show a column chart of revenue by region."
-                                 Background="#FCE1EC"
-                                 Grid.Row="0" Grid.Column="0"
-                                 FontSize="17"
-                                 TextColor="Black"
-                                 CornerRadius="10"
-                                 ShowIcon="True"
-                                 ImageAlignment="Left"
-                                 ImageSource="column.png"
-                                 ImageSize="25"
-                                 Padding="10,0"
-                                 HorizontalTextAlignment="Center"
-                                 LineBreakMode="WordWrap"
-                                 Stroke="#E2227E"
-                                 StrokeThickness="3"
-                                 Command="{Binding ButtonClicked}"
-                                 CommandParameter="{Binding Text, Source={x:Reference barButton}}"/>
-                
-                <button:SfButton x:Name="lineButton"
-                                 Text="Display a line chart of product sales over six months."
-                                 Grid.Row="0" Grid.Column="1"
-                                 FontAutoScalingEnabled="True"
-                                 Background="#D7E4FF"
-                                 FontSize="17"
-                                 TextColor="Black"
-                                 CornerRadius="10"
-                                 ShowIcon="True"
-                                 ImageAlignment="Left"
-                                 ImageSource="line.png"
-                                 ImageSize="25"
-                                 Padding="10,0"
-                                 HorizontalTextAlignment="Center"
-                                 LineBreakMode="WordWrap"
-                                 Stroke="#116DF9"
-                                 StrokeThickness="3"
-                                 HeightRequest="70"
-                                 Command="{Binding ButtonClicked}"
-                                 CommandParameter="{Binding Text, Source={x:Reference lineButton}}"/>
-
-                <button:SfButton x:Name="areaButton"
-                                 Text="Generate an area chart of farm productivity over different seasons."           
-                                 Background="#B3F5CF"
-                                 Grid.Row="0" Grid.Column="2"
-                                 FontSize="17"
-                                 TextColor="Black"
-                                 CornerRadius="10"
-                                 ShowIcon="True"
-                                 ImageAlignment="Left"
-                                 ImageSource="area.png"
-                                 ImageSize="25"
-                                 HorizontalTextAlignment="Center"
-                                 LineBreakMode="WordWrap"
-                                 Stroke="#00A968"
-                                 StrokeThickness="3"
-                                 Command="{Binding ButtonClicked}"
-                                 CommandParameter="{Binding Text, Source={x:Reference areaButton}}"/>
-
-                <button:SfButton x:Name="pieButton"
-                                 Text="Create a pie chart of monthly sales data."
-                                 Grid.Row="1" Grid.Column="0"
-                                 Background="#E8CFFF"
-                                 TextColor="Black"
-                                 FontSize="17"
-                                 CornerRadius="10"
-                                 ShowIcon="True"
-                                 ImageAlignment="Left"
-                                 ImageSource="pie.png"
-                                 ImageSize="25"
-                                 Padding="10,0"
-                                 HorizontalTextAlignment="Center"
-                                 LineBreakMode="WordWrap"
-                                 Stroke="#9215F3"
-                                 StrokeThickness="3"
-                                 Command="{Binding ButtonClicked}"
-                                 CommandParameter="{Binding Text, Source={x:Reference pieButton}}"/>
-
-                <button:SfButton x:Name="doughnutButton"
-                                 Text="Prepare a doughnut chart for task completion."
-                                 Grid.Row="1" Grid.Column="1"
-                                 Background="#FFD7D7"
-                                 FontSize="17"
-                                 TextColor="Black"
-                                 CornerRadius="10"
-                                 ShowIcon="True"
-                                 ImageAlignment="Left"
-                                 ImageSource="doughnut.png"
-                                 ImageSize="25"
-                                 Padding="10,0"
-                                 HorizontalTextAlignment="Center"
-                                 LineBreakMode="WordWrap"
-                                 Stroke="#FF4E4E"
-                                 StrokeThickness="3"
-                                 HeightRequest="70"
-                                 Command="{Binding ButtonClicked}"
-                                 CommandParameter="{Binding Text, Source={x:Reference doughnutButton}}"/>
-
-                <button:SfButton x:Name="splineButton"
-                                 Text="Show a spline chart of daily average temperature for the past week."
-                                 Background="#FFF7C1"
-                                 Grid.Row="1" Grid.Column="2"
-                                 FontSize="17"
-                                 TextColor="Black"
-                                 CornerRadius="10"
-                                 ShowIcon="True"
-                                 ImageAlignment="Left"
-                                 ImageSource="spline.png"
-                                 ImageSize="25"
-                                 Padding="10,0"
-                                 HorizontalTextAlignment="Center"
-                                 LineBreakMode="WordWrap"
-                                 Stroke="#E6BE02"
-                                 StrokeThickness="3"
-                                 Command="{Binding ButtonClicked}"
-                                 CommandParameter="{Binding Text, Source={x:Reference splineButton}}"/>
-            </Grid>
-        </VerticalStackLayout>
-
-    </Grid>
-
-</ContentPage>
diff --git a/ChartGeneratorAISample/ChartGenerator/MainPage.xaml.cs b/ChartGeneratorAISample/ChartGenerator/MainPage.xaml.cs
deleted file mode 100644
index 4dfea24..0000000
--- a/ChartGeneratorAISample/ChartGenerator/MainPage.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace ChartGenerator
-{
-    public partial class MainPage : ContentPage
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-    }
-
-}
diff --git a/ChartGeneratorAISample/ChartGenerator/Models/ChartConfig.cs b/ChartGeneratorAISample/ChartGenerator/Models/ChartConfig.cs
index 124d06c..647da2e 100644
--- a/ChartGeneratorAISample/ChartGenerator/Models/ChartConfig.cs
+++ b/ChartGeneratorAISample/ChartGenerator/Models/ChartConfig.cs
@@ -6,14 +6,14 @@ namespace ChartGenerator;
 
 public class ChartConfig : INotifyPropertyChanged
 {
-    private ChartEnums.ChartTypeEnum chartType;
+    private ChartTypeEnum chartType;
     private string title;
-    private Axes xAxis;
-    private Axes yAxis;
     private ObservableCollection<SeriesConfig> series;
+    private ObservableCollection<AxisConfig> xAxis;
+    private ObservableCollection<AxisConfig> yAxis;
     private bool showLegend;
 
-    public ChartEnums.ChartTypeEnum ChartType
+    public ChartTypeEnum ChartType
     {
         get => chartType;
         set
@@ -25,7 +25,20 @@ public ChartEnums.ChartTypeEnum ChartType
             }
         }
     }
+    private bool sideBySidePlacement = true;
 
+    public bool SideBySidePlacement
+    {
+        get => sideBySidePlacement;
+        set
+        {
+            if (sideBySidePlacement != value)
+            {
+                sideBySidePlacement = value;
+                OnPropertyChanged();
+            }
+        }
+    }
     public string Title
     {
         get => title;
@@ -39,7 +52,7 @@ public string Title
         }
     }
 
-    public Axes XAxis
+    public ObservableCollection<AxisConfig> XAxis
     {
         get => xAxis;
         set
@@ -52,7 +65,7 @@ public Axes XAxis
         }
     }
 
-    public Axes YAxis
+    public ObservableCollection<AxisConfig> YAxis
     {
         get => yAxis;
         set
@@ -91,6 +104,12 @@ public ObservableCollection<SeriesConfig> Series
         }
     }
 
+    public ChartConfig()
+    {
+        XAxis = new ObservableCollection<AxisConfig>();
+        YAxis = new ObservableCollection<AxisConfig>();
+    }
+
     public event PropertyChangedEventHandler PropertyChanged;
     protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
     {
@@ -117,7 +136,7 @@ public string? Title
         }
     }
 
-    public ChartEnums.AxisType Type
+    public AxisType Type
     {
         get;
         set;
@@ -155,5 +174,4 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
-}
-
+}
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/Models/ChartEnums.cs b/ChartGeneratorAISample/ChartGenerator/Models/ChartEnums.cs
index a4c42be..ee5358c 100644
--- a/ChartGeneratorAISample/ChartGenerator/Models/ChartEnums.cs
+++ b/ChartGeneratorAISample/ChartGenerator/Models/ChartEnums.cs
@@ -1,29 +1,27 @@
 namespace ChartGenerator;
 
-public class ChartEnums
-{
-    public enum ChartTypeEnum
-    {
-        Cartesian, 
-        Circular
-    }
 
-    public enum SeriesType
-    {
-        Line, 
-        Column, 
-        Spline, 
-        Area, 
-        Pie, 
-        Doughnut, 
-        RadialBar
-    }
+public enum ChartTypeEnum
+{
+    Cartesian,
+    Circular
+}
 
-    public enum AxisType
-    {
-        Category, 
-        Numerical, 
-        DateTime, 
-        Logarithmic
-    }
+public enum SeriesType
+{
+    Line,
+    Column,
+    Spline,
+    Area,
+    Pie,
+    Doughnut,
+    RadialBar
 }
+
+public enum AxisType
+{
+    Category,
+    Numerical,
+    DateTime,
+    Logarithmic
+}
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/Models/SeriesConfig.cs b/ChartGeneratorAISample/ChartGenerator/Models/SeriesConfig.cs
index e6923c3..9bfe00f 100644
--- a/ChartGeneratorAISample/ChartGenerator/Models/SeriesConfig.cs
+++ b/ChartGeneratorAISample/ChartGenerator/Models/SeriesConfig.cs
@@ -1,24 +1,26 @@
+using Syncfusion.Maui.Toolkit.Charts;
 using System.Collections.ObjectModel;
 
 namespace ChartGenerator;
 
+
 public class SeriesConfig
 {
-    public ChartEnums.SeriesType Type 
+    public SeriesType Type
     {
-        get; 
+        get;
         set;
     }
 
-    public string XPath
+    public string Name
     {
         get;
         set;
     }
 
-    public ObservableCollection<DataModel> DataSource 
+    public ObservableCollection<DataModel> DataSource
     {
-        get; 
+        get;
         set;
     }
 
@@ -29,29 +31,94 @@ public bool Tooltip
     }
 }
 
+public class AxisConfig
+{
+    public string Title { get; set; }
+    public string Type { get; set; } = "Numerical"; // default to Numerical
+    public double? Minimum { get; set; }
+    public double? Maximum { get; set; }
+
+    public ChartAxis GetXAxis()
+    {
+        var title = new ChartAxisTitle() { Text = Title };
+        return Type.ToLower() switch
+        {
+
+            "datetime" => new DateTimeAxis { Title = title },
+            "category" => new CategoryAxis { Title = title },
+            "log" or "logarithmic" => new LogarithmicAxis { Title = title },
+            "numerical" or "linear" => new NumericalAxis { Title = title },
+            _ => new NumericalAxis { Title = title }
+        };
+    }
+    public ChartAxis GetAxis()
+    {
+        var title = new ChartAxisTitle() { Text = Title };
+        switch (Type?.ToLower())
+        {
+            case "category":
+                return new CategoryAxis { Title = title };
+            case "numerical":
+                return new NumericalAxis { Title = title };
+            case "datetime":
+                return new DateTimeAxis { Title = title };
+            case "logarithmic":
+                return new LogarithmicAxis { Title = title };
+            default:
+                return new NumericalAxis(); // fallback
+        }
+    }
+
+    public RangeAxisBase? GetYAxis()
+    {
+        var title = new ChartAxisTitle() { Text = Title };
+        return Type.ToLower() switch
+        {
+            "datetime" => new DateTimeAxis { Title = title },
+            "log" or "logarithmic" => new LogarithmicAxis { Title = title },
+            "numerical" or "linear" => new NumericalAxis { Title = title },
+            _ => null // CategoryAxis is not valid for YAxes (not RangeAxisBase)
+        };
+    }
+
+}
+
+
 public class DataModel
 {
-    public string xvalue
+    public object xvalue
     {
-        get; 
+        get;
         set;
     }
 
     public double yvalue
     {
-        get; 
+        get;
         set;
     }
 
     public DateTime? date
     {
-        get; 
+        get;
         set;
     }
 
     public double? xval
     {
-        get; 
+        get;
+        set;
+    }
+
+    public string Category
+    {
+        get;
+        set;
+    }
+
+    public double Value
+    {
+        get;
         set;
     }
 }
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/Models/SeriesTemplates.xaml b/ChartGeneratorAISample/ChartGenerator/Models/SeriesTemplates.xaml
deleted file mode 100644
index 9e376d5..0000000
--- a/ChartGeneratorAISample/ChartGenerator/Models/SeriesTemplates.xaml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                    xmlns:chart="clr-namespace:Syncfusion.Maui.Toolkit.Charts;assembly=Syncfusion.Maui.Toolkit"
-                    xmlns:local="clr-namespace:ChartGenerator"
-                    x:Class="ChartGenerator.SeriesTemplates">
-
-    <ResourceDictionary>
-        <x:Array x:Key="PaletteBrushesCollection" Type="{x:Type Brush}">
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#30356D" Offset="0.0" />
-                <GradientStop Color="#C0C5FF" Offset="1.0" />
-            </LinearGradientBrush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#4AFBFF" Offset="0.0" />
-                <GradientStop Color="#CFFEFF" Offset="1.0" />
-            </LinearGradientBrush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#0FC6F4" Offset="0.0" />
-                <GradientStop Color="#A9EEFF" Offset="1.0" />
-            </LinearGradientBrush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#2C8BB9" Offset="0.0" />
-                <GradientStop Color="#8AC5E1" Offset="1.0" />
-            </LinearGradientBrush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#2E5F99" Offset="0.0" />
-                <GradientStop Color="#67A6F0" Offset="1.0" />
-            </LinearGradientBrush>
-        </x:Array>
-
-        <x:Array x:Key="RadialbarCollection" Type="{x:Type Brush}">
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#9215F3" Offset="0.0" />
-                <GradientStop Color="#C789F8" Offset="1.0" />
-            </LinearGradientBrush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#E2227E" Offset="0.0" />
-                <GradientStop Color="#FB67AE" Offset="1.0" />
-            </LinearGradientBrush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#FF4E4E" Offset="0.0" />
-                <GradientStop Color="#FF7272" Offset="1.0" />
-            </LinearGradientBrush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#2196F3" Offset="0.0" />
-                <GradientStop Color="#77C2FD" Offset="1.0" />
-            </LinearGradientBrush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#F4890B" Offset="0.0" />
-                <GradientStop Color="#FEC179" Offset="1.0" />
-            </LinearGradientBrush>
-        </x:Array>
-    </ResourceDictionary>
-
-    <DataTemplate x:Key="lineSeriesTemplate">
-        <chart:LineSeries ItemsSource="{Binding DataSource}"
-                          XBindingPath="xvalue"
-                          YBindingPath="yvalue"
-                          EnableTooltip="{Binding Tooltip}"
-                          Label="{Binding Type}"
-                          StrokeWidth="2.5"
-                          ShowMarkers="True"
-                          Fill="#1E90FF"
-                          EnableAnimation="True">
-            <chart:LineSeries.MarkerSettings>
-                <chart:ChartMarkerSettings Fill="SkyBlue" 
-                                           Stroke="RoyalBlue" 
-                                           StrokeWidth="2" />
-            </chart:LineSeries.MarkerSettings>
-        </chart:LineSeries>
-    </DataTemplate>
-
-    <DataTemplate x:Key="splineSeriesTemplate">
-        <chart:SplineSeries ItemsSource="{Binding DataSource}"
-                          XBindingPath="xvalue"
-                          YBindingPath="yvalue"
-                          EnableTooltip="{Binding Tooltip}"
-                          Label="{Binding Type}"
-                          StrokeWidth="2.5"
-                          ShowMarkers="True"
-                          Fill="#8A2BE2"
-                          EnableAnimation="True">
-            <chart:SplineSeries.MarkerSettings>
-                <chart:ChartMarkerSettings Fill="#9370DB" 
-                                           Stroke="#663399" 
-                                           StrokeWidth="2" />
-            </chart:SplineSeries.MarkerSettings>
-        </chart:SplineSeries>
-    </DataTemplate>
-
-    <DataTemplate x:Key="columnSeriesTemplate">
-        <chart:ColumnSeries ItemsSource="{Binding DataSource}"
-                            XBindingPath="xvalue"
-                            YBindingPath="yvalue"
-                            CornerRadius="15"
-                            Label="{Binding Type}"
-                            EnableTooltip="{Binding Tooltip}"
-                            EnableAnimation="True">
-            <chart:ColumnSeries.Fill>
-                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                    <GradientStop Color="#F9465E" Offset="0.0" />
-                    <GradientStop Color="#FFA3AE" Offset="1.0" />
-                </LinearGradientBrush>
-            </chart:ColumnSeries.Fill>
-        </chart:ColumnSeries>
-    </DataTemplate>
-
-    <DataTemplate x:Key="areaSeriesTemplate">
-        <chart:AreaSeries ItemsSource="{Binding DataSource}"
-                          XBindingPath="xvalue"
-                          YBindingPath="yvalue"
-                          Opacity=".8"
-                          Label="{Binding Type}"
-                          EnableTooltip="{Binding Tooltip}"
-                          EnableAnimation="True">
-            <chart:AreaSeries.Fill>
-                <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-                    <GradientStop Color="#7FCEC5" Offset="0.0" />
-                    <GradientStop Color="LightSeaGreen" Offset="1.0" />
-                </LinearGradientBrush>
-            </chart:AreaSeries.Fill>
-        </chart:AreaSeries>
-    </DataTemplate>
-
-    <DataTemplate x:Key="pieSeriesTemplate">
-        <chart:PieSeries ItemsSource="{Binding DataSource}"
-                         XBindingPath="xvalue"
-                         YBindingPath="yvalue"
-                         EnableTooltip="{Binding Tooltip}"
-                         PaletteBrushes="{StaticResource PaletteBrushesCollection}"
-                         EnableAnimation="True">
-        </chart:PieSeries>
-    </DataTemplate>
-
-    <DataTemplate x:Key="doughnutSeriesTemplate">
-        <chart:DoughnutSeries ItemsSource="{Binding DataSource}"
-                              XBindingPath="xvalue"
-                              YBindingPath="yvalue"
-                              ExplodeAll="True"
-                              EnableTooltip="{Binding Tooltip}"
-                              PaletteBrushes="{StaticResource PaletteBrushesCollection}"
-                              EnableAnimation="True"/>
-    </DataTemplate>
-
-    <DataTemplate x:Key="radialBarSeriesTemplate">
-        <chart:RadialBarSeries ItemsSource="{Binding DataSource}"
-                               XBindingPath="xvalue"
-                               YBindingPath="yvalue"
-                               CapStyle="BothCurve"
-                               EnableTooltip="{Binding Tooltip}" 
-                               PaletteBrushes="{StaticResource RadialbarCollection}"
-                               EnableAnimation="True" />
-    </DataTemplate>
-
-    <local:SeriesTemplateSelector x:Key="seriesTemplateSelector"
-                                  LineSeriesTemplate="{StaticResource lineSeriesTemplate}"
-                                  SplineSeriesTemplate="{StaticResource splineSeriesTemplate}"
-                                  ColumnSeriesTemplate="{StaticResource columnSeriesTemplate}"
-                                  AreaSeriesTemplate="{StaticResource areaSeriesTemplate}"
-                                  PieSeriesTemplate="{StaticResource pieSeriesTemplate}"
-                                  DoughnutSeriesTemplate="{StaticResource doughnutSeriesTemplate}"
-                                  RadialBarSeriesTemplate="{StaticResource radialBarSeriesTemplate}" />
-
-</ResourceDictionary>
diff --git a/ChartGeneratorAISample/ChartGenerator/Models/SeriesTemplates.xaml.cs b/ChartGeneratorAISample/ChartGenerator/Models/SeriesTemplates.xaml.cs
deleted file mode 100644
index af93727..0000000
--- a/ChartGeneratorAISample/ChartGenerator/Models/SeriesTemplates.xaml.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace ChartGenerator;
-
-public partial class SeriesTemplates : ResourceDictionary
-{
-	public SeriesTemplates()
-	{
-		InitializeComponent();
-	}
-}
-
-public class SeriesTemplateSelector : DataTemplateSelector
-{
-    public DataTemplate LineSeriesTemplate { get; set; }
-    public DataTemplate SplineSeriesTemplate { get; set; }
-    public DataTemplate ColumnSeriesTemplate { get; set; }
-    public DataTemplate AreaSeriesTemplate { get; set; }
-    public DataTemplate PieSeriesTemplate { get; set; }
-    public DataTemplate DoughnutSeriesTemplate { get; set; }
-    public DataTemplate RadialBarSeriesTemplate { get; set; }
-
-    protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
-    {
-        if (item is SeriesConfig config)
-        {
-            switch (config.Type)
-            {
-                case ChartEnums.SeriesType.Line:
-                    return LineSeriesTemplate;
-                case ChartEnums.SeriesType.Spline:
-                    return SplineSeriesTemplate;
-                case ChartEnums.SeriesType.Column:
-                    return ColumnSeriesTemplate;
-                case ChartEnums.SeriesType.Area:
-                    return AreaSeriesTemplate;
-                case ChartEnums.SeriesType.Pie:
-                    return PieSeriesTemplate;
-                case ChartEnums.SeriesType.Doughnut:
-                    return DoughnutSeriesTemplate;
-                case ChartEnums.SeriesType.RadialBar:
-                    return RadialBarSeriesTemplate;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
-        return null;
-    }
-}
diff --git a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
index e56d560..30f8af0 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
@@ -12,11 +12,11 @@
         <ResourceDictionary>
 
             <DataTemplate x:Key="cartesianChartTemplate">
-                <local:CartesianChartExt />
+                <local:CartesianCategory/>
             </DataTemplate>
 
             <DataTemplate x:Key="circularChartTemplate">
-                <local:CircularChartExt />
+                <local:CircularCategory/>
             </DataTemplate>
 
             <local:ChartTemplateSelector x:Key="chartTemplateSelector" 
diff --git a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
index 7f390a1..c40917d 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
+++ b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
@@ -1,37 +1,33 @@
-using Syncfusion.Maui.PdfViewer;
-using Microsoft.Maui.Controls.Internals;
-using Microsoft.Maui.Graphics;
 using Syncfusion.Maui.AIAssistView;
-using System.Drawing;
-using Syncfusion.Pdf;
-using Syncfusion.Pdf.Graphics;
 using Syncfusion.Maui.Core;
 using Syncfusion.Maui.Core.Internals;
+using Syncfusion.Pdf;
+using Syncfusion.Pdf.Graphics;
 
 namespace ChartGenerator;
 
 public partial class ChartView : ContentPage
 {
     int count = 0;
-    ChartViewModel ViewModel;
-    public ChartView(ChartViewModel viewModel)
+    ChatViewModel ViewModel;
+    public ChartView(ChatViewModel viewModel)
     {
-        InitializeComponent();
         BindingContext = ViewModel = viewModel;
+        InitializeComponent();
     }
 
     private async void TapGestureRecognizer_Tapped(object sender, TappedEventArgs e)
     {
-        var appointmentData = (sender as Border)?.BindingContext as string;
-        AssistItem botMessage = new AssistItem() { Text = appointmentData, IsRequested = true, ShowAssistItemFooter = false };
+        var previousData = (sender as Border)?.BindingContext as string;
+        AssistItem botMessage = new AssistItem() { Text = previousData, IsRequested = true, ShowAssistItemFooter = false };
         ViewModel.Messages.Add(botMessage);
         ViewModel.ShowHeader = false;
-        ViewModel.OnRequest(appointmentData);
+        ViewModel.OnRequest(previousData);
     }
 
     private void close_Clicked(object sender, EventArgs e)
     {
-        if ((sender as Button)?.BindingContext is ChartViewModel model)
+        if ((sender as Button)?.BindingContext is ChatViewModel model)
         {
             model.ShowAssistView = false;
             headerView.IsVisible = false;
@@ -91,8 +87,8 @@ protected override DataTemplate OnSelectTemplate(object item, BindableObject con
         {
             return chartConfig.ChartType switch
             {
-                ChartEnums.ChartTypeEnum.Cartesian => CartesianChartTemplate,
-                ChartEnums.ChartTypeEnum.Circular => CircularChartTemplate,
+                ChartTypeEnum.Cartesian => CartesianChartTemplate,
+                ChartTypeEnum.Circular => CircularChartTemplate,
                 _ => null
             };
         }
diff --git a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
index 4a96cbd..e13e3f2 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
@@ -16,7 +16,7 @@
     </ContentPage.Resources>
     
     <ContentPage.BindingContext>
-        <local:ChartViewModel/>
+        <local:ChatViewModel/>
     </ContentPage.BindingContext>
     
     <ScrollView>
@@ -33,74 +33,86 @@
 
             <Grid ColumnDefinitions="500,auto" HorizontalOptions="Center" ColumnSpacing="5" Padding="5">
 
-                    <Grid RowDefinitions="Auto,*,Auto" HorizontalOptions="FillAndExpand" Grid.Column="0">
-                    <StackLayout BindableLayout.ItemsSource="{Binding ImageSourceCollection}"
-              Grid.Row="1"
-             Margin="5,5,5,0"
-             IsVisible="{Binding HasImageUploaded}" 
-             Orientation="Horizontal">
-                        <BindableLayout.ItemTemplate>
-                            <DataTemplate>
-                                <Grid HeightRequest="60"
-                  WidthRequest="60" x:Name="border"
-                  ColumnDefinitions="Auto"
-                  HorizontalOptions="Start">
-                                    <Border Stroke="Transparent"
-                        StrokeThickness="0"
-                        WidthRequest="50"
-                        HeightRequest="50"
-                        HorizontalOptions="Center"
-                        VerticalOptions="Center">
-                                        <Border.StrokeShape>
-                                            <RoundRectangle CornerRadius="10"/>
-                                        </Border.StrokeShape>
-
-                                        <Image Source="{Binding .}"
-                           WidthRequest="50" 
-                           HeightRequest="50"
-                           Aspect="Fill"/>
-                                    </Border>
-                                    <core:SfBadgeView HorizontalOptions="End"
-                                      WidthRequest="60" 
-                                      VerticalOptions="Start">
-                                        <core:SfBadgeView.Content>
-                                            <StackLayout HorizontalOptions="End" 
-                                     HeightRequest="16" 
-                                     WidthRequest="16">
-                                                <StackLayout.GestureRecognizers>
-                                                    <TapGestureRecognizer Command="{Binding Source={x:Reference editor}, Path=BindingContext.CancelImageSelected}"
-                      CommandParameter="{Binding .}"/>
-                                                </StackLayout.GestureRecognizers>
-                                            </StackLayout>
-                                        </core:SfBadgeView.Content>
-                                        <core:SfBadgeView.BadgeSettings>
-                                            <core:BadgeSettings Position="TopRight" 
-                                            FontSize="10" 
-                                            Icon="Delete"/>
-                                        </core:SfBadgeView.BadgeSettings>
-                                    </core:SfBadgeView>
-                                </Grid>
-                            </DataTemplate>
-                        </BindableLayout.ItemTemplate>
-                    </StackLayout>
-                    <Editor Grid.Row="2" IsEnabled="{Binding IsDisable}"  x:Name="editor"
-                                BackgroundColor="Transparent"
-                                HeightRequest="100"
-                                PlaceholderColor="Gray"
-                                Text="{Binding EntryText}"
-                                Placeholder="Describe what you want to create.."
-                                HorizontalOptions="FillAndExpand"
-                                FontSize="14"  
-                                TextColor="Black">
-                       
-                    </Editor>
-                   
+                    <Grid RowDefinitions="Auto,Auto" HorizontalOptions="FillAndExpand" Grid.Column="0">
+                        <!-- Input Area with Editor and Image Container -->
+                        <Border Grid.Row="0"
+                                BackgroundColor="#F8F8F8"
+                                StrokeThickness="1"
+                                Stroke="LightGray"
+                                Margin="0,0,0,5"
+                                Padding="10">
+                            <Border.StrokeShape>
+                                <RoundRectangle CornerRadius="10"/>
+                            </Border.StrokeShape>
+                            
+                            <Grid RowDefinitions="Auto,Auto" RowSpacing="10">
+                                <!-- Image Display (Visible when there are images) -->
+                                <FlexLayout BindableLayout.ItemsSource="{Binding ImageSourceCollection}"
+                                          Grid.Row="0"
+                                          IsVisible="{Binding HasImageUploaded}"
+                                          Wrap="Wrap"
+                                          JustifyContent="Start"
+                                          AlignItems="Start"
+                                          AlignContent="Start"
+                                          Margin="0,0,0,5">
+                                    <BindableLayout.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Margin="0,0,10,10"
+                                                  HeightRequest="60"
+                                                  WidthRequest="60">
+                                                <Border Stroke="Transparent"
+                                                        StrokeThickness="0"
+                                                        WidthRequest="50"
+                                                        HeightRequest="50"
+                                                        HorizontalOptions="Center"
+                                                        VerticalOptions="Center"
+                                                        BackgroundColor="#F0F0F0">
+                                                    <Border.StrokeShape>
+                                                        <RoundRectangle CornerRadius="8"/>
+                                                    </Border.StrokeShape>
+                                                    <Image Source="{Binding .}"
+                                                           WidthRequest="50" 
+                                                           HeightRequest="50"
+                                                           Aspect="Fill"/>
+                                                </Border>
+                                                <Button Text="✕"
+                                                        FontSize="12"
+                                                        WidthRequest="20"
+                                                        HeightRequest="20"
+                                                        Padding="0"
+                                                        CornerRadius="10"
+                                                        BackgroundColor="#99000000"
+                                                        TextColor="White"
+                                                        HorizontalOptions="End"
+                                                        VerticalOptions="Start"
+                                                        Command="{Binding Source={x:Reference editor}, Path=BindingContext.CancelImageSelected}"
+                                                        CommandParameter="{Binding .}"/>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </BindableLayout.ItemTemplate>
+                                </FlexLayout>
 
-                    <core:SfChipGroup ItemHeight="40" Margin="5,50,5,5" 
+                                <!-- Text Editor -->
+                                <local:CustomEditor Grid.Row="1"
+                                        IsEnabled="{Binding IsDisable}"
+                                        x:Name="editor"
+                                        BackgroundColor="Transparent"
+                                        HeightRequest="100"
+                                        PlaceholderColor="Gray"
+                                        Text="{Binding EntryText}"
+                                        Placeholder="Describe what you want to create.."
+                                        HorizontalOptions="FillAndExpand"
+                                        FontSize="14"  
+                                        TextColor="Black"/>
+                            </Grid>
+                        </Border>
+                        <!-- Editor Options Toolbar -->
+                        <core:SfChipGroup ItemHeight="40" 
+                                    Margin="5,10,5,5" 
                                     ChipCornerRadius="20" 
                                     ChipBackground="Transparent" 
                                     ChipStrokeThickness="0"  
-                                    Grid.Row="3"
+                                    Grid.Row="1"
                                     ChipPadding="0"
                                     ChipClicked="OnChipClicked"
                                     ItemsSource="{Binding Path=EditorOptions}">         
diff --git a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml.cs b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml.cs
index 28c2b43..edfe9da 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml.cs
+++ b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml.cs
@@ -1,4 +1,4 @@
-using Syncfusion.Maui.Core; 
+using Syncfusion.Maui.Core;
 
 namespace ChartGenerator;
 
@@ -10,7 +10,7 @@ public DesktopUI()
     }
     private void OnChipClicked(object sender, EventArgs e)
     {
-        var viewmodel = this.BindingContext as ChartViewModel;
+        var viewmodel = this.BindingContext as ChatViewModel;
         var chip = (sender as SfChip);
         var layout = chip.Children[0] as HorizontalStackLayout;
 
@@ -28,6 +28,6 @@ private void OnChipClicked(object sender, EventArgs e)
         if (string.IsNullOrEmpty(option.Name) || !option.IsEnabled)
             return;
 
-        viewmodel.EditorOptionsComamnd.Execute(option);  
+        viewmodel.EditorOptionsComamnd.Execute(option);
     }
 }
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/View/MobileUI.xaml b/ChartGeneratorAISample/ChartGenerator/View/MobileUI.xaml
index 37a464b..64b3450 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/MobileUI.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/MobileUI.xaml
@@ -14,7 +14,7 @@
     </ContentPage.Resources>
 
     <ContentPage.BindingContext>
-        <local:ChartViewModel/>
+        <local:ChatViewModel/>
     </ContentPage.BindingContext>
 
     <ScrollView>
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
index 60a87f6..0471226 100644
--- a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
@@ -1,15 +1,13 @@
-using Newtonsoft.Json;
 using Syncfusion.Maui.AIAssistView;
+using Syncfusion.Maui.Popup;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Windows.Input; 
-using Syncfusion.Maui.Popup;
+using System.Windows.Input;
 namespace ChartGenerator
 {
-    public class ChartViewModel : INotifyPropertyChanged
+    public partial class ChatViewModel : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler? PropertyChanged;
-
         private bool canStopResponse;
         private string sendIconText;
         private bool autoSuggestionPopupIsOpen;
@@ -21,7 +19,6 @@ public class ChartViewModel : INotifyPropertyChanged
         private bool showAssistView;
         private bool showHeader = true;
         private bool showIndicator = false;
-        private ChartConfig chartData;
         private string oldJson;
         private string newJson;
         private bool enableAssistant;
@@ -31,7 +28,6 @@ public class ChartViewModel : INotifyPropertyChanged
         private bool isSendIconEnabled;
         internal bool isResponseStreaming;
         private double sendIconWidth;
-        private ChartAIService openAIService = new();
         public double SendIconWidth
         {
             get { return sendIconWidth; }
@@ -86,16 +82,6 @@ public bool ShowAssistView
             }
         }
 
-        public ChartConfig ChartData
-        {
-            get => chartData;
-            set
-            {
-                chartData = value;
-                OnPropertyChanged(nameof(ChartData));
-            }
-        }
-
         public ObservableCollection<IAssistItem> Messages
         {
             get => messages;
@@ -181,11 +167,11 @@ public ObservableCollection<String>? ModelPrompts
         public ICommand AiButtonClicked { get; }
         public ICommand CloseButtonClicked { get; }
         public ICommand RefreshButtonClicked { get; }
-        public ICommand RequestCommand { get; } 
+        public ICommand RequestCommand { get; }
         public Command<object> EditorOptionsComamnd { get; set; }
         public ObservableCollection<Option> EditorOptions { get; set; }
-        public Command<object> AttachmentContextMenuCommand { get; set; } 
-        public Command<object> EditorExpandCollapseCommand { get; set; } 
+        public Command<object> AttachmentContextMenuCommand { get; set; }
+        public Command<object> EditorExpandCollapseCommand { get; set; }
         public Command<object> CancelImageSelected { get; set; }
         public ObservableCollection<ImageSource> ImageSourceCollection
         {
@@ -225,20 +211,20 @@ public bool HasImageUploaded
         {
             get { return this.ImageSourceCollection.Count > 0; }
         }
-        public ChartViewModel()
+        public ChatViewModel()
         {
             ButtonClicked = new Command<string>(OnButtonClicked);
             CreateButtonClicked = new Command(OnCreateButtonClicked);
             AiButtonClicked = new Command(OnAiButtonClicked);
             RequestCommand = new Command<object>(OnRequest);
             CloseButtonClicked = new Command(OnCloseButtonClicked);
-            RefreshButtonClicked = new Command(OnRefreshButtonClicked); 
+            RefreshButtonClicked = new Command(OnRefreshButtonClicked);
             EditorOptionsComamnd = new Command<object>(ExecuteEditorOptionsCommand);
 
             CancelImageSelected = new Command<object>(ExecuteCancelImageSelectedCommand);
             SendButtonCommand = new Command<object>(ExecuteSendButtonCommand);
             EditorExpandCollapseCommand = new Command<object>(ExecuteEditorExpandCollapseCommand);
-            _imagePickerHelper = new ImagePickerHelper(); 
+            _imagePickerHelper = new ImagePickerHelper();
             this.ImageSourceCollection = new ObservableCollection<ImageSource>();
             AttachmentContextMenuCommand = new Command<object>(OnAttachmentContextMenuTapCommand);
             EditorOptions = new ObservableCollection<Option>();
@@ -251,9 +237,53 @@ public ChartViewModel()
         }
         public void ExecuteCancelImageSelectedCommand(object obj)
         {
-            this.ImageSourceCollection.Remove(obj as ImageSource);
-            OnPropertyChanged(nameof(this.HasImageUploaded));
-            this.UpdateSendIcon(this.InputText);
+            try
+            {
+                var imageToRemove = obj as ImageSource;
+                if (imageToRemove != null)
+                {
+                    // Remove the image from collection
+                    this.ImageSourceCollection.Remove(imageToRemove);
+
+                    // Notify property changes
+                    OnPropertyChanged(nameof(this.HasImageUploaded));
+
+                    // Update send icon status
+                    this.UpdateSendIcon(this.InputText);
+
+                    // Clean up file if it's a file source
+                    if (imageToRemove is FileImageSource fileSource)
+                    {
+                        try
+                        {
+                            string filePath = fileSource.File;
+                            if (File.Exists(filePath) && filePath.Contains(FileSystem.AppDataDirectory))
+                            {
+                                File.Delete(filePath);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            // Just log and continue if we can't delete the file
+                            Console.WriteLine($"Error deleting image file: {ex.Message}");
+                        }
+                    }
+
+                    // Provide haptic feedback if available
+                    try
+                    {
+                        HapticFeedback.Perform(HapticFeedbackType.Click);
+                    }
+                    catch
+                    {
+                        // Ignore if haptic feedback is not available
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Error removing image: {ex.Message}");
+            }
         }
         private SfPopup ExpandedEditorPopup;
         private void ExecuteSendButtonCommand(object obj)
@@ -363,9 +393,9 @@ public bool IsHeaderVisible
                 OnPropertyChanged(nameof(IsHeaderVisible));
             }
         }
-        
+
         internal async Task GetResult(object inputQuery, object assistView)
-        { 
+        {
         }
 
         public bool IsTemporaryChatEnabled
@@ -442,23 +472,48 @@ private void OnAttachmentContextMenuTapCommand(object eventArgs)
             EditorOptions[0].IsOpen = false;
             ShowImagePicker();
 
-        } 
+        }
 
         private async void ShowImagePicker()
         {
 #if ANDROID || WINDOWS || (IOS && !MACCATALYST)
-            string filePath = Path.Combine(FileSystem.AppDataDirectory, "image" + ++imageNo + ".jpg");
+            try
+            {
+                string filePath = Path.Combine(FileSystem.AppDataDirectory, "image" + ++imageNo + ".jpg");
+
+                // Get and store the image from gallery - the method returns void, not bool
+                await _imagePickerHelper.SaveImageAsync(filePath);
 
-            // Get and store the image from gallery
-            await _imagePickerHelper.SaveImageAsync(filePath);
+                // Check if the file exists after the operation to determine success
+                if (File.Exists(filePath))
+                {
+                    var imageSource = ImageSource.FromFile(filePath);
 
-            var imageSource = ImageSource.FromFile(filePath);
+                    // Add the image to the collection
+                    this.ImageSourceCollection.Add(imageSource);
 
-            this.ImageSourceCollection.Add(imageSource);
+                    // Notify property changes
+                    OnPropertyChanged(nameof(this.HasImageUploaded));
 
-            OnPropertyChanged(nameof(this.HasImageUploaded));
+                    // Update the send icon status based on whether we have images or text
+                    this.UpdateSendIcon(this.InputText);
 
-            this.UpdateSendIcon(this.InputText);
+                    // Provide haptic feedback if available
+                    try
+                    {
+                        HapticFeedback.Perform(HapticFeedbackType.Click);
+                    }
+                    catch
+                    {
+                        // Ignore if haptic feedback is not available
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Error picking image: {ex.Message}");
+                // Could show a toast or notification to user here
+            }
             //#elif MACCATALYST
 
             //            // TODO: The file picker is not supported in Mac Catalyst. So, we have used the custom file picker.
@@ -488,23 +543,38 @@ public string InputText
         }
         private void UpdateSendIcon(string input)
         {
+            // Update the send icon appearance based on input status
             if (string.IsNullOrWhiteSpace(input) && !this.HasImageUploaded)
             {
+                // No text and no images - default state
                 //SendIconText = "\ue7E8" + " Voice"; // TODO:Need to add voice input support
                 SendIconText = "\ue710";
                 SendIconWidth = 40;
+
+                // Only disable the icon if we're not streaming a response
                 if (!this.isResponseStreaming)
                 {
                     this.IsSendIconEnabled = false;
                 }
-
             }
             else if (!isResponseStreaming)
             {
+                // We have either text or images - enable send button
                 SendIconText = "\ue710";
                 SendIconWidth = 40;
                 this.IsSendIconEnabled = true;
+
+                // If we have images, make the send icon more prominent
+                if (this.HasImageUploaded)
+                {
+                    // Could set a different icon or style if desired
+                }
             }
+
+            // Update property notifications
+            OnPropertyChanged(nameof(SendIconText));
+            OnPropertyChanged(nameof(SendIconWidth));
+            OnPropertyChanged(nameof(IsSendIconEnabled));
         }
         private void ExecuteEditorOptionsCommand(object obj)
         {
@@ -513,76 +583,9 @@ private void ExecuteEditorOptionsCommand(object obj)
             if (chipText.Name == "Attachment")
             {
                 chipText.IsOpen = true;
-            } 
-        }
-        private void OnButtonClicked(string buttonText)
-        {
-            EntryText = buttonText.Replace("\"", "").Replace("&quot;", "");
-            OnCreateButtonClicked();
-        }
-
-        private async void OnCreateButtonClicked()
-        {
-            if (!string.IsNullOrEmpty(EntryText))
-            {
-                IsLoading = true;
-                ShowAssistView = false;
-                Messages.Clear();
-                showHeader = true;
-
-                if (ChartAIService.IsCredentialValid)
-                {
-                    EnableAssistant = true;
-                    await GetDataFromAI(EntryText);
-                }
-                else
-                {
-                    await Task.Delay(500);
-                    CreateOfflineChart(EntryText);
-                    AssistItem message = new() { Text = "Currently in offline mode...", ShowAssistItemFooter = false };
-                    Messages.Add(message);
-                }
-
-                Application.Current.MainPage.Navigation.PushAsync(new ChartView(this));
-                IsLoading = false;
             }
         }
 
-        internal void CreateOfflineChart(string entryText)
-        {
-            string response = string.Empty;
-
-            if (entryText.Contains("column"))
-            {
-                response = "{\n  \"chartType\": \"cartesian\",\n  \"title\": \"Revenue by Region\",\n  \"ShowLegend\": \"true\", \n  \"xAxis\": {\n    \"type\": \"category\",\n    \"title\": \"Region\"\n  },\n  \"yAxis\": {\n    \"title\": \"Revenue\",\n    \"type\": \"numerical\",\n    \"min\": 0\n  },\n  \"series\": [\n    {\n      \"type\": \"column\",\n      \"xpath\": \"region\",\n      \"dataSource\": [\n        { \"xvalue\": \"North America\", \"yvalue\": 120000 },\n        { \"xvalue\": \"Europe\", \"yvalue\": 90000 },\n        { \"xvalue\": \"Asia\", \"yvalue\": 70000 },\n        { \"xvalue\": \"South America\", \"yvalue\": 45000 },\n        { \"xvalue\": \"Australia\", \"yvalue\": 30000 }\n      ],\n      \"tooltip\": true\n    }\n  ]\n}";
-            }
-            else if (entryText.Contains("area"))
-            {
-                response = "{\n  \"chartType\": \"cartesian\",\n  \"title\": \"Farm Productivity Over Different Seasons\",\n  \"ShowLegend\": \"true\",\n  \"xAxis\": {\n    \"type\": \"category\",\n    \"title\": \"Seasons\"\n  },\n  \"yAxis\": {\n    \"title\": \"Productivity (tons)\",\n    \"type\": \"numerical\",\n    \"min\": 0\n, \n    \"max\": 200\n   },\n  \"series\": [\n    {\n      \"type\": \"area\",\n      \"xpath\": \"season\",\n      \"dataSource\": [\n        { \"xvalue\": \"Spring\", \"yvalue\": 120 },\n        { \"xvalue\": \"Summer\", \"yvalue\": 150 },\n        { \"xvalue\": \"Autumn\", \"yvalue\": 130 },\n        { \"xvalue\": \"Winter\", \"yvalue\": 80 }\n      ],\n      \"tooltip\": true\n    }\n  ]\n}";
-            }
-            else if (entryText.Contains("pie"))
-            {
-                response = "{\n  \"chartType\": \"circular\",\n  \"title\": \"Monthly Sales Data\",\n  \"ShowLegend\": \"true\",\n  \"series\": [\n    {\n      \"type\": \"pie\",\n      \"xpath\": \"category\",\n      \"dataSource\": [\n        { \"xvalue\": \"January\", \"yvalue\": 5000 },\n        { \"xvalue\": \"February\", \"yvalue\": 6000 },\n        { \"xvalue\": \"March\", \"yvalue\": 7000 },\n        { \"xvalue\": \"April\", \"yvalue\": 8000 },\n        { \"xvalue\": \"May\", \"yvalue\": 9000 },\n        { \"xvalue\": \"June\", \"yvalue\": 10000 },\n        { \"xvalue\": \"July\", \"yvalue\": 11000 },\n        { \"xvalue\": \"August\", \"yvalue\": 12000 },\n        { \"xvalue\": \"September\", \"yvalue\": 13000 },\n        { \"xvalue\": \"October\", \"yvalue\": 14000 },\n        { \"xvalue\": \"November\", \"yvalue\": 15000 },\n        { \"xvalue\": \"December\", \"yvalue\": 16000 }\n      ],\n      \"tooltip\": true\n    }\n  ]\n}";
-            }
-            else if (entryText.Contains("doughnut"))
-            {
-                response = "{\n  \"chartType\": \"circular\",\n  \"title\": \"Task Completion Doughnut Chart\",\n  \"ShowLegend\": \"true\",\n  \"series\": [\n    {\n      \"type\": \"doughnut\",\n      \"xpath\": \"xvalue\",\n      \"dataSource\": [\n        { \"xvalue\": \"Completed\", \"yvalue\": 70 },\n        { \"xvalue\": \"In Progress\", \"yvalue\": 20 },\n        { \"xvalue\": \"Pending\", \"yvalue\": 10 }\n      ],\n      \"tooltip\": true\n    }\n  ],\n  \"xAxis\": {\n    \"type\": \"category\",\n    \"title\": \"Task Status\"\n  },\n  \"yAxis\": {\n    \"title\": \"Percentage\",\n    \"type\": \"numerical\",\n    \"min\": 0,\n    \"max\": 100\n  }\n}";
-            }
-            else if (entryText.Contains("spline"))
-            {
-                response = "{\n  \"chartType\": \"cartesian\",\n  \"title\": \"Daily Average Temperature for the Past Week\",\n  \"ShowLegend\": \"true\",\n  \"series\": [\n    {\n      \"type\": \"spline\",\n      \"xpath\": \"date\",\n      \"dataSource\": [\n        { \"xvalue\": \"2023-10-01\", \"yvalue\": 15 },\n        { \"xvalue\": \"2023-10-02\", \"yvalue\": 17 },\n        { \"xvalue\": \"2023-10-03\", \"yvalue\": 16 },\n        { \"xvalue\": \"2023-10-04\", \"yvalue\": 18 },\n        { \"xvalue\": \"2023-10-05\", \"yvalue\": 20 },\n        { \"xvalue\": \"2023-10-06\", \"yvalue\": 19 },\n        { \"xvalue\": \"2023-10-07\", \"yvalue\": 21 }\n      ],\n      \"tooltip\": true\n    }\n  ],\n  \"xAxis\": {\n    \"type\": \"category\",\n    \"title\": \"Date\"\n  },\n  \"yAxis\": {\n    \"title\": \"Temperature (°C)\",\n    \"type\": \"numerical\",\n    \"min\": 0,\n    \"max\": 30\n  }\n}";
-            }
-            else if (entryText.Contains("line"))
-            {
-                response = "\n{\n  \"chartType\": \"cartesian\",\n  \"title\": \"Product Sales Over Six Months\",\n  \"ShowLegend\": \"true\",\n  \"series\": [\n    {\n      \"type\": \"line\",\n      \"xpath\": \"month\",\n      \"dataSource\": [\n        { \"xvalue\": \"January\", \"yvalue\": 150 },\n        { \"xvalue\": \"February\", \"yvalue\": 200 },\n        { \"xvalue\": \"March\", \"yvalue\": 175 },\n        { \"xvalue\": \"April\", \"yvalue\": 220 },\n        { \"xvalue\": \"May\", \"yvalue\": 240 },\n        { \"xvalue\": \"June\", \"yvalue\": 210 }\n      ],\n      \"tooltip\": true\n    }\n  ],\n  \"xAxis\": {\n    \"type\": \"category\",\n    \"title\": \"Month\"\n  },\n  \"yAxis\": {\n    \"title\": \"Sales (Units)\",\n    \"type\": \"numerical\",\n    \"min\": 0,\n    \"max\": 300\n  }\n}\n";
-            }
-            else
-            {
-                response = "{\n  \"chartType\": \"cartesian\",\n  \"title\": \"Revenue by Region\",\n  \"ShowLegend\": \"true\",\n  \"xAxis\": {\n    \"type\": \"category\",\n    \"title\": \"Region\"\n  },\n  \"yAxis\": {\n    \"title\": \"Revenue\",\n    \"type\": \"numerical\",\n    \"min\": 0\n  },\n  \"series\": [\n    {\n      \"type\": \"column\",\n      \"xpath\": \"region\",\n      \"dataSource\": [\n        { \"xvalue\": \"North America\", \"yvalue\": 120000 },\n        { \"xvalue\": \"Europe\", \"yvalue\": 90000 },\n        { \"xvalue\": \"Asia\", \"yvalue\": 70000 },\n        { \"xvalue\": \"South America\", \"yvalue\": 45000 },\n        { \"xvalue\": \"Australia\", \"yvalue\": 30000 }\n      ],\n      \"tooltip\": true\n    }\n  ]\n}";
-            }
-
-            DecryptJSON(response, false);
-        }
 
         private void OnAiButtonClicked()
         {
@@ -649,7 +652,8 @@ private void OnRefreshButtonClicked()
 
         private async Task GetDataFromAI(string text)
         {
-            string response = await GetAIResponse(text);
+            var request_query = GetChartUserPrompt(text);
+            string response = await openAIService.GetAnswerFromGPT(request_query);
 
             if (response != null)
             {
@@ -658,80 +662,6 @@ private async Task GetDataFromAI(string text)
             }
         }
 
-        public async Task<string> GetAIResponse(string query)
-        {
-            string prompt = "Create a JSON configuration for a cartesian chart using the ChartConfig and SeriesConfig classes, "
-                + $"based on the following query: {query}. The JSON should include: "
-                + "1. The chart type (cartesian or circular). "
-                + "2. Title of the chart. "
-                + "3. X-axis and Y-axis specifications (for cartesian charts). "
-                + "4. Series configurations, including type and data source. "
-                + "5. A setting for whether tooltips are enabled. "
-                + "Use exemplary data relevant to the query to fill in the values. "
-                + "Example JSON Structure: "
-                + "{ "
-                + "  chartType: cartesian, // or circular"
-                + "  title: {Chart Title}, // Replace with an appropriate title"
-                + "  ShowLegend: true "
-                + "  series: [ "
-                + "    { "
-                + "      type: line, // Specify type: line, area, column, pie, doughnut or radialbar etc."
-                + "      xpath: xvalue, "
-                + "      dataSource: [ "
-                + "        { xvalue: {X1}, yvalue: {Y1} },    // Sample data points"
-                + "        { xvalue: {X2}, yvalue: {Y2} },   //  Keys should always be xvalue and yvalue. All other keys are not allowed."
-                + "        { xvalue: {X3}, yvalue: {Y3} }   //   Real-world data is preferred over sample data"
-                + "      ], "
-                + "      tooltip: true "
-                + "    } "
-                + "  ], "
-                + "  xAxis: { "
-                + "    type: category, // For cartesian charts"
-                + "    title: {X Axis Title} // Optional: Replace with an appropriate title"
-                + "  }, "
-                + "  yAxis: { "
-                + "    title: {Y Axis Title}, // Optional: Replace with an appropriate title"
-                + "    type: numerical, // For cartesian charts"
-                + "    min: {Min Value}, // Optional: set minimum value if relevant"
-                + "    max: {Max Value} // Optional: set maximum value if relevant"
-                + "  }, "
-                + "} "
-                + "Instructions: "
-                + "- Replace placeholders such as `{query}`, `{Chart Title}`, `{X1}`, `{Y1}`, `{X Axis Title}`, and `{Y Axis Title}` with actual data relevant to the query. "
-                + "- Choose the appropriate chart and series types based on the data. "
-                + "- Ensure the data format matches the requirements for cartesian charts. "
-                + "- Only plain text should be used; no need to specify 'json' above the data. "
-                + "- No additional content other than json data should be included!";
-
-            // Call the method to get the AI response
-            var response = await openAIService.GetAnswerFromGPT(prompt);
-
-            // Convert the response to a string (assuming the response has a ToString method)
-            return response.ToString();
-        }
-
-        internal void DecryptJSON(string jsonData, bool fromChat)
-        {
-            try
-            {
-                var chartData = JsonConvert.DeserializeObject<ChartConfig>(jsonData);
-
-                ChartData = chartData!;
-
-                if (fromChat)
-                {
-                    AssistItem message = new() { Text = "Chart generated successfully...", ShowAssistItemFooter = false };
-                    Messages.Add(message);
-                }
-            }
-            catch (JsonException ex)
-            {
-                Console.WriteLine(ex.Message);
-                AssistItem assistItem = new() { Text = "An error occurred while processing your request. Please try again later.", ShowAssistItemFooter = false };
-                Messages.Add(assistItem);
-            }
-        }
-
         protected void OnPropertyChanged(string propertyName)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
new file mode 100644
index 0000000..b188558
--- /dev/null
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
@@ -0,0 +1,256 @@
+using Newtonsoft.Json;
+using Syncfusion.Maui.AIAssistView;
+using System.Collections.ObjectModel;
+using System.Text.RegularExpressions;
+
+namespace ChartGenerator
+{
+    public partial class ChatViewModel
+    {
+
+        #region Configure AI
+        private ChartAIService openAIService = new();
+
+        #endregion
+
+        private ChartConfig chartData;
+
+        public ChartConfig ChartData
+        {
+            get => chartData;
+            set
+            {
+                chartData = value;
+                OnPropertyChanged(nameof(ChartData));
+            }
+        }
+
+        private void OnButtonClicked(string buttonText)
+        {
+            EntryText = buttonText.Replace("\"", "").Replace("&quot;", "");
+            OnCreateButtonClicked();
+        }
+
+        private async void OnCreateButtonClicked()
+        {
+            if (!string.IsNullOrEmpty(EntryText))
+            {
+                IsLoading = true;
+                ShowAssistView = false;
+                Messages.Clear();
+                showHeader = true;
+
+                if (ChartAIService.IsCredentialValid)
+                {
+                    EnableAssistant = true;
+                    await GetDataFromAI(EntryText);
+                }
+                else
+                {
+                    await Task.Delay(500);
+                    AssistItem message = new() { Text = "Currently in offline mode...", ShowAssistItemFooter = false };
+                    Messages.Add(message);
+                }
+
+                Application.Current.MainPage.Navigation.PushAsync(new ChartView(this));
+                IsLoading = false;
+            }
+        }
+
+
+        private string GetChartUserPrompt(string userPrompt)
+        {
+            string userQuery = @"
+You are a chart data generator API. Your task is to convert user inputs describing chart specifications into clean, properly formatted JSON strings. Respond ONLY with valid JSON - no explanations, markdown formatting, or code blocks.
+
+Example user input: ""Sales by region column chart.""
+
+Required JSON format:
+{
+  ""chartType"": ""cartesian"",
+  ""title"": ""Revenue by Region"",
+  ""showLegend"": true,
+  ""sideBySidePlacement"": false,
+  ""xAxis"": [
+    {
+      ""type"": ""category"",
+      ""title"": ""Region""
+    }
+  ],
+  ""yAxis"": [
+    {
+      ""title"": ""Revenue"",
+      ""type"": ""numerical"",
+      ""min"": 0
+    }
+  ],
+  ""series"": [
+    {
+      ""type"": ""column"",
+      ""name"": ""Revenue"",
+      ""dataSource"": [
+        { ""xvalue"": ""North America"", ""yvalue"": 120000 },
+        { ""xvalue"": ""Europe"", ""yvalue"": 90000 },
+        { ""xvalue"": ""Asia"", ""yvalue"": 70000 },
+        { ""xvalue"": ""South America"", ""yvalue"": 45000 },
+        { ""xvalue"": ""Australia"", ""yvalue"": 30000 }
+      ],
+      ""tooltip"": true
+    }
+  ]
+}
+
+JSON Requirements:
+1. ""chartType"": Must be either ""cartesian"" or ""circular"" (lowercase)
+2. ""title"": Create an appropriate title based on the query
+3. ""showLegend"": Boolean value, default to true
+4. ""sideBySidePlacement"": Boolean value, default to false for single series
+5. ""xAxis"" and ""yAxis"": Must be arrays of objects, even for single axis
+6. ""xAxis"" can be datetime, category, log or numerical, ""yAxis"" can be only numerical or log, based on the user requested query.
+6. ""series"": Must be an array containing series objects, and can have ""name"" based on its use case, if not have name you can do showlegend false.
+7. ""type"": Must be one of: ""line"", ""column"", ""area"", ""pie"", ""doughnut"", ""radialbar"" (lowercase)
+8. ""dataSource"": Array of objects with x and y values for the series, y value always should double and mention it in ""yvalue"" and x value can be any type mention it ""xvalue"" properties
+9. ""tooltip"": Boolean value, default to true
+
+IMPORTANT:
+- Respond ONLY with valid, properly formatted JSON
+- Use lowercase for all enum values (chartType, series type, axis type)
+- Include all required properties
+- Always format the ""xAxis"" and ""yAxis"" as arrays
+- Do not include any explanations or comments in your response
+- Do not use markdown code blocks - just output raw JSON
+- Ensure all property names are consistent with the format provided
+
+User Request: " + userPrompt;
+            return userQuery;
+        }
+
+        private string ExtractJsonContent(string responseString)
+        {
+            try
+            {
+                // First, check if the content is already valid JSON without code blocks
+                try
+                {
+                    // Try to parse the whole string as JSON
+                    var testJsonObject = JsonConvert.DeserializeObject(responseString);
+                    if (testJsonObject != null)
+                    {
+                        return responseString; // Already valid JSON
+                    }
+                }
+                catch
+                {
+                    // Not valid JSON, continue with extraction
+                }
+
+                // Regex pattern to extract content within <code> tags
+                var codeBlockPattern = @"<code>(.*?)</code>";
+                var regex = new Regex(codeBlockPattern, RegexOptions.IgnoreCase | RegexOptions.Singleline);
+                var match = regex.Match(responseString);
+
+                if (match.Success)
+                {
+                    return match.Groups[1].Value.Trim();
+                }
+
+                // If no code blocks, try to extract JSON from markdown code blocks (```json...```)
+                var markdownPattern = @"```(?:json)?\s*([\s\S]*?)```";
+                regex = new Regex(markdownPattern, RegexOptions.IgnoreCase | RegexOptions.Singleline);
+                match = regex.Match(responseString);
+
+                if (match.Success)
+                {
+                    return match.Groups[1].Value.Trim();
+                }
+
+                // If still no match, look for content that looks like JSON (starts with { and ends with })
+                var jsonObjectPattern = @"\{[\s\S]*\}";
+                regex = new Regex(jsonObjectPattern, RegexOptions.Singleline);
+                match = regex.Match(responseString);
+
+                if (match.Success)
+                {
+                    return match.Value.Trim();
+                }
+
+                // If all extraction attempts fail, return the original string
+                return responseString;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Error extracting JSON content: {ex.Message}");
+                return responseString; // Return original in case of error
+            }
+        }
+
+        internal void DecryptJSON(string jsonData, bool fromChat)
+        {
+            try
+            {
+                // Extract JSON content from possible code blocks or formatted text
+                string extractedJson = ExtractJsonContent(jsonData);
+                Console.WriteLine($"Extracted JSON: {extractedJson}");
+
+                // Create settings for JSON deserialization
+                var settings = new JsonSerializerSettings
+                {
+                    NullValueHandling = NullValueHandling.Ignore,
+                    MissingMemberHandling = MissingMemberHandling.Ignore,
+                    Error = (sender, args) =>
+                    {
+                        Console.WriteLine($"JSON Error: {args.ErrorContext.Error.Message}");
+                        args.ErrorContext.Handled = true;
+                    },
+                    Converters = new List<JsonConverter>
+                    {
+                        new ChartTypeEnumConverter(),
+                        new SeriesTypeConverter()
+                    }
+                };
+
+                // Deserialize the JSON to ChartConfig object
+                var chartData = JsonConvert.DeserializeObject<ChartConfig>(extractedJson, settings);
+
+                // Validate and assign chart data
+                if (chartData != null)
+                {
+                    // Ensure collections are initialized
+                    if (chartData.Series == null)
+                        chartData.Series = new ObservableCollection<SeriesConfig>();
+
+                    if (chartData.XAxis == null)
+                        chartData.XAxis = new ObservableCollection<AxisConfig>();
+
+                    if (chartData.YAxis == null)
+                        chartData.YAxis = new ObservableCollection<AxisConfig>();
+
+                    ChartData = chartData;
+
+                    if (fromChat)
+                    {
+                        AssistItem message = new() { Text = "Chart generated successfully...", ShowAssistItemFooter = false };
+                        Messages.Add(message);
+                    }
+                }
+                else
+                {
+                    throw new JsonException("Failed to deserialize chart data");
+                }
+            }
+            catch (JsonException ex)
+            {
+                Console.WriteLine($"JSON Exception: {ex.Message}");
+                AssistItem assistItem = new() { Text = "An error occurred while processing your JSON data. Please try again with a different request.", ShowAssistItemFooter = false };
+                Messages.Add(assistItem);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"General Exception: {ex.Message}");
+                AssistItem assistItem = new() { Text = "An error occurred while processing your request. Please try again later.", ShowAssistItemFooter = false };
+                Messages.Add(assistItem);
+            }
+        }
+
+    }
+}

From 0135815c957014abd1ae4ff6802db9c7881dadc6 Mon Sep 17 00:00:00 2001
From: Saravanan Madheswaran <saravanan.madheswaran@syncfusion.com>
Date: Sun, 22 Jun 2025 12:05:32 +0530
Subject: [PATCH 06/10] update code.

---
 .../AIService/ChartsAIService.cs              |  63 +++++--
 .../ChartGenerator/Helper/JsonConverters.cs   |  44 +++++
 .../Platforms/Android/AndroidManifest.xml     |   4 +-
 .../ChartGenerator/View/ChartView.xaml        | 112 ++++++------
 .../ChartGenerator/View/ChartView.xaml.cs     | 161 +++++++++++++++---
 .../ChartGenerator/View/DesktopUI.xaml        |  13 +-
 .../ViewModel/ChartViewModel.cs               |   2 +-
 .../ChartGenerator/ViewModel/ChatViewModel.cs |  81 ++++++---
 8 files changed, 349 insertions(+), 131 deletions(-)

diff --git a/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs b/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs
index f73c6e5..1e09800 100644
--- a/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs
+++ b/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs
@@ -1,4 +1,4 @@
-using Azure;
+using Azure;
 using Azure.AI.OpenAI;
 using ChartGenerator.AIService;
 using Microsoft.Extensions.AI;
@@ -9,11 +9,6 @@ internal class ChartAIService : AICredentials
     {
         #region Fields
 
-        /// <summary>
-        /// The already credential validated field
-        /// </summary>
-        private static bool isAlreadyValidated;
-
         /// <summary>
         /// The uri result field
         /// </summary>
@@ -45,11 +40,6 @@ private async void ValidateCredential()
         {
             this.GetAzureOpenAIKernal();
 
-            if (isAlreadyValidated)
-            {
-                return;
-            }
-
             try
             {
                 if (Client != null)
@@ -57,7 +47,6 @@ private async void ValidateCredential()
                     await Client!.CompleteAsync("Hello, Test Check");
                     ChatHistory = string.Empty;
                     IsCredentialValid = true;
-                    isAlreadyValidated = true;
                 }
                 else
                 {
@@ -91,16 +80,27 @@ private void GetAzureOpenAIKernal()
         /// Retrieves an answer from the deployment name model using the provided user prompt.
         /// </summary>
         /// <param name="userPrompt">The user prompt.</param>
+        /// <param name="includeClassContext">Whether to include class structure context.</param>
         /// <returns>The AI response.</returns>
-        internal async Task<string> GetAnswerFromGPT(string userPrompt)
+        internal async Task<string> GetAnswerFromGPT(string userPrompt, bool includeClassContext = false)
         {
             try
             {
                 if (IsCredentialValid && Client != null)
                 {
                     ChatHistory = string.Empty;
-                    // Add the system message and user message to the options
-                    ChatHistory = ChatHistory + userPrompt;
+
+                    // Only include class context if specifically requested
+                    if (includeClassContext)
+                    {
+                        var classContext = GetChartClassStructureContext();
+                        ChatHistory = classContext + "\n\n" + userPrompt;
+                    }
+                    else
+                    {
+                        ChatHistory = userPrompt;
+                    }
+
                     var response = await Client.CompleteAsync(ChatHistory);
                     return response.ToString();
                 }
@@ -122,11 +122,38 @@ private async void ShowAlertAsync()
             var page = Application.Current?.Windows[0].Page;
             if (page != null && !IsCredentialValid)
             {
-                isAlreadyValidated = true;
                 await page.DisplayAlert("Alert", "The Azure API key or endpoint is missing or incorrect. Please verify your credentials. You can also continue with the offline data.", "OK");
             }
         }
-    }
 
+        /// <summary>
+        /// Creates a concise context string that explains the structure of chart-related classes
+        /// </summary>
+        /// <returns>A string containing class structure information</returns>
+        private string GetChartClassStructureContext()
+        {
+            return @"
+            Chart class model reference:
+            ChartConfig{ChartType:enum, Title:string, Series:Collection<SeriesConfig>, XAxis/YAxis:Collection<AxisConfig>, ShowLegend:bool, SideBySidePlacement:bool}
+            SeriesConfig{Type:enum, Name:string, DataSource:Collection<DataModel>, Tooltip:bool}
+            AxisConfig{Title:string, Type:string('Numerical'|'DateTime'|'Category'|'Logarithmic'), Minimum/Maximum:double?}";
+        }
+
+        /// <summary>
+        /// Gets specific context about a particular chart class based on need
+        /// </summary>
+        /// <param name="classType">The class type to get context for ("ChartConfig", "SeriesConfig", or "AxisConfig")</param>
+        /// <returns>Specific context about the requested class</returns>
+        internal string GetSpecificClassContext(string classType)
+        {
+            return classType.ToLower() switch
+            {
+                "chartconfig" => "ChartConfig: Controls overall chart appearance with properties for chart type, title, axis collections, series data, and display options like legends.",
+                "seriesconfig" => "SeriesConfig: Defines a data series with properties for series type, name, data source collection, and tooltip visibility.",
+                "axisconfig" => "AxisConfig: Configures chart axes with title, axis type (Numerical, DateTime, Category, Logarithmic), and optional min/max range values.",
+                _ => "Unknown class type. Available classes: ChartConfig, SeriesConfig, AxisConfig"
+            };
+        }
+    }
     #endregion
-}
+}
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/Helper/JsonConverters.cs b/ChartGeneratorAISample/ChartGenerator/Helper/JsonConverters.cs
index da6d1ea..dad4d27 100644
--- a/ChartGeneratorAISample/ChartGenerator/Helper/JsonConverters.cs
+++ b/ChartGeneratorAISample/ChartGenerator/Helper/JsonConverters.cs
@@ -8,6 +8,50 @@
 
 namespace ChartGenerator
 {
+    /// <summary>
+    /// Converter for handling axis type values from string
+    /// </summary>
+    public class AxisTypeConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(string);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.String)
+            {
+                string value = reader.Value.ToString().ToLower();
+                
+                switch (value)
+                {
+                    case "numerical":
+                    case "linear":
+                        return "Numerical";
+                    case "datetime":
+                        return "DateTime";
+                    case "category":
+                        return "Category";
+                    case "log":
+                    case "logarithmic":
+                        return "Logarithmic";
+                    default:
+                        return "Numerical"; // Default to numerical
+                }
+            }
+            
+            // Default if not a string
+            return "Numerical";
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            string axisType = (string)value;
+            writer.WriteValue(axisType);
+        }
+    }
+
     /// <summary>
     /// Converter for handling ChartTypeEnum values from string
     /// </summary>
diff --git a/ChartGeneratorAISample/ChartGenerator/Platforms/Android/AndroidManifest.xml b/ChartGeneratorAISample/ChartGenerator/Platforms/Android/AndroidManifest.xml
index e9937ad..ba759d3 100644
--- a/ChartGeneratorAISample/ChartGenerator/Platforms/Android/AndroidManifest.xml
+++ b/ChartGeneratorAISample/ChartGenerator/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
index 30f8af0..b7de57e 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
@@ -38,10 +38,10 @@
 
     </ContentPage.Resources>
 
-   
+
     <ContentPage.Content>
-    <Grid>
-        <Grid
+        <Grid>
+            <Grid
        ColumnDefinitions="{OnPlatform WinUI='7*,3*', MacCatalyst='7*,3*'}" 
             RowDefinitions="Auto,*">
 
@@ -127,76 +127,75 @@
              RequestCommand="{Binding RequestCommand}"
              ShowHeader="{Binding ShowHeader}"
              AssistItems="{Binding Messages}">
-                <aiassistview:SfAIAssistView.HeaderTemplate>
-                    <DataTemplate>
-                        <VerticalStackLayout 
+                    <aiassistview:SfAIAssistView.HeaderTemplate>
+                        <DataTemplate>
+                            <VerticalStackLayout 
                          Spacing="12">
-                            <Label Text="How can I assist with generated chart?" Padding="0,20,0,0"  LineBreakMode="WordWrap"
+                                <Label Text="How can I assist with generated chart?" Padding="0,20,0,0"  LineBreakMode="WordWrap"
                             FontSize="Subtitle"
                             HorizontalOptions="Center" />
-                            <HorizontalStackLayout x:Name="listView"
+                                <HorizontalStackLayout x:Name="listView"
                                               HeightRequest="{OnPlatform WinUI=140, Android=160, MacCatalyst=180, iOS=150}"
                                               WidthRequest="{OnPlatform MacCatalyst= 430,Android=335, iOS=310}"
                                               HorizontalOptions="Center" Padding="{OnPlatform MacCatalyst=20}"
                                               BindableLayout.ItemsSource="{Binding Path=ModelPrompts}">
-                                <BindableLayout.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid Padding="4">
-                                            <Border
+                                    <BindableLayout.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Padding="4">
+                                                <Border
                                              WidthRequest="{OnPlatform WinUI=120,Android=150,MacCatalyst= 150 , iOS=140}"
                                              HeightRequest="{OnPlatform WinUI=120,Android=130, MacCatalyst= 100, iOS=120}"
                                              Stroke="Gray"
                                              Padding="4">
-                                                <Border.GestureRecognizers>
-                                                    <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped"/>
-                                                </Border.GestureRecognizers>
-                                                <VisualStateManager.VisualStateGroups>
-                                                    <VisualStateGroup x:Name="CommonStates">
-                                                        <VisualState x:Name="Normal">
-                                                            <VisualState.Setters>
-                                                                <Setter Property="Background" Value="Transparent" />
-                                                            </VisualState.Setters>
-                                                        </VisualState>
-                                                        <VisualState x:Name="PointerOver">
-                                                            <VisualState.Setters>
-                                                                <Setter Property="Background" Value="#14000000" />
-                                                            </VisualState.Setters>
-                                                        </VisualState>
-                                                    </VisualStateGroup>
-                                                </VisualStateManager.VisualStateGroups>
-                                                <Border.StrokeShape>
-                                                    <RoundRectangle CornerRadius="10" />
-                                                </Border.StrokeShape>
-                                                <Grid RowDefinitions="*">
-                                                    <Label Text="{Binding .}"
+                                                    <Border.GestureRecognizers>
+                                                        <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped"/>
+                                                    </Border.GestureRecognizers>
+                                                    <VisualStateManager.VisualStateGroups>
+                                                        <VisualStateGroup x:Name="CommonStates">
+                                                            <VisualState x:Name="Normal">
+                                                                <VisualState.Setters>
+                                                                    <Setter Property="Background" Value="Transparent" />
+                                                                </VisualState.Setters>
+                                                            </VisualState>
+                                                            <VisualState x:Name="PointerOver">
+                                                                <VisualState.Setters>
+                                                                    <Setter Property="Background" Value="#14000000" />
+                                                                </VisualState.Setters>
+                                                            </VisualState>
+                                                        </VisualStateGroup>
+                                                    </VisualStateManager.VisualStateGroups>
+                                                    <Border.StrokeShape>
+                                                        <RoundRectangle CornerRadius="10" />
+                                                    </Border.StrokeShape>
+                                                    <Grid RowDefinitions="*">
+                                                        <Label Text="{Binding .}"
                                                         LineBreakMode="WordWrap"
                                                         VerticalTextAlignment="Center"
                                                         HorizontalTextAlignment="Center" />
-                                                </Grid>
-                                            </Border>
-                                        </Grid>
-                                    </DataTemplate>
-                                </BindableLayout.ItemTemplate>
-                            </HorizontalStackLayout>
-                        </VerticalStackLayout>
-                    </DataTemplate>
-                </aiassistview:SfAIAssistView.HeaderTemplate>
-                <aiassistview:SfAIAssistView.Shadow>
-                    <Shadow Brush="Black" Offset="0,0" Radius="1" Opacity="0.5" />
-                </aiassistview:SfAIAssistView.Shadow>
-            </aiassistview:SfAIAssistView>
-            
-            <ActivityIndicator IsRunning="{Binding ShowIndicator}"
+                                                    </Grid>
+                                                </Border>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </BindableLayout.ItemTemplate>
+                                </HorizontalStackLayout>
+                            </VerticalStackLayout>
+                        </DataTemplate>
+                    </aiassistview:SfAIAssistView.HeaderTemplate>
+                    <aiassistview:SfAIAssistView.Shadow>
+                        <Shadow Brush="Black" Offset="0,0" Radius="1" Opacity="0.5" />
+                    </aiassistview:SfAIAssistView.Shadow>
+                </aiassistview:SfAIAssistView>
+
+                <ActivityIndicator IsRunning="{Binding ShowIndicator}"
                             x:Name="Indicator"
                             Color="{AppThemeBinding Light=#1E201E, Dark=#FEFAF6}"
                             Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
                             VerticalOptions="Center"
                             HorizontalOptions="Center"/>
-                <buttons:SfButton  Grid.Row="0"
-                                     Margin="0,0,60,0"
-                                     Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
-                                     x:Name="exportchartbutton"
-                                     Text="Export Chart" 
+                <buttons:SfButton  Grid.Row="0" Margin="0,0,60,0" 
+                                   Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
+                                   x:Name="exportchartbutton"
+                                   Text="Export Chart" 
                                      Clicked="Exportchartbutton_Clicked"
                                      FontFamily="MauiSampleFontIcon" 
                                      CornerRadius="5" 
@@ -204,7 +203,8 @@
                                      BackgroundColor="#6750a4"
                                      FontSize="{OnPlatform WinUI=17, Android=15, MacCatalyst=17, iOS=17}" WidthRequest="120" HeightRequest="30"
                                      ToolTipProperties.Text="Click to Export the Chart"  
-                                     FontAttributes="Bold"                                      VerticalOptions="Start"
+                                     FontAttributes="Bold" 
+                                     VerticalOptions="Start"
                                      HorizontalOptions="End"/>
                 <buttons:SfButton
                                 Grid.Row="0"
@@ -221,7 +221,7 @@
                                 VerticalOptions="Start"
                                 HorizontalOptions="End"/>
             </Grid>
-    </Grid>
+        </Grid>
     </ContentPage.Content>
 
     <ContentPage.Behaviors>
diff --git a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
index c40917d..d1d2558 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
+++ b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
@@ -36,43 +36,152 @@ private void close_Clicked(object sender, EventArgs e)
 
     private async void Exportchartbutton_Clicked(object sender, EventArgs e)
     {
-        PdfDocument document = new PdfDocument();
-        PdfPage page = document.Pages.Add();
-        PdfGraphics graphics = page.Graphics;
+        ActivityIndicator? indicator = null;
+        PdfDocument? document = null;
+        MemoryStream? stream = null;
+        Stream? imageStream = null;
 
-        float width = (float)templatedItemView.Width + 75;
-        float height = (float)templatedItemView.Height + 125;
+        try
+        {
+            System.Diagnostics.Debug.WriteLine("Starting PDF export process...");
+            
+            // Display activity indicator
+            indicator = new ActivityIndicator
+            {
+                IsRunning = true, 
+                Color = Color.FromArgb("#6750a4"),
+                HorizontalOptions = LayoutOptions.Center,
+                VerticalOptions = LayoutOptions.Center
+            };
+            
+            Grid parentGrid = (Grid)this.Content;
+            parentGrid.Children.Add(indicator);
+            
+            System.Diagnostics.Debug.WriteLine("Creating PDF document...");
+            // Create PDF document
+            document = new PdfDocument();
+            PdfPage page = document.Pages.Add();
+            PdfGraphics graphics = page.Graphics;
 
-        //To reduce the width and height of the Windows and MAC platform
+            // Calculate dimensions
+            float width = (float)templatedItemView.Width + 75;
+            float height = (float)templatedItemView.Height + 125;
+
+            //To reduce the width and height of the Windows and MAC platform
 #if !IOS && !ANDROID
-        width = (float)templatedItemView.Width / 2.5f;
-        height = (float)templatedItemView.Height / 1.5f;
+            width = (float)templatedItemView.Width / 2.5f;
+            height = (float)templatedItemView.Height / 1.5f;
 #endif
+            System.Diagnostics.Debug.WriteLine($"PDF dimensions: {width}x{height}");
 
-        PdfImage img = new PdfBitmap((await templatedItemView.GetStreamAsync(ImageFileFormat.Png)));
-        graphics.DrawImage(img, 0, 0, width, height);
-        MemoryStream stream = new MemoryStream();
-        document.Save(stream);
-        document.Close(true);
-        stream.Position = 0;
-        SavePDF("ChartAsPDF.pdf", stream);
-        stream.Flush();
-        stream.Dispose();
+            // Get the image stream
+            System.Diagnostics.Debug.WriteLine("Getting chart image stream...");
+            imageStream = await templatedItemView.GetStreamAsync(ImageFileFormat.Png);
+            if (imageStream == null)
+            {
+                System.Diagnostics.Debug.WriteLine("Failed to get chart image stream - it's null");
+                await Application.Current.MainPage.DisplayAlert("Error", "Failed to get chart image", "OK");
+                parentGrid.Children.Remove(indicator);
+                return;
+            }
+            
+            System.Diagnostics.Debug.WriteLine($"Chart image stream obtained. Length: {imageStream.Length} bytes");
+            
+            // Create PDF image
+            System.Diagnostics.Debug.WriteLine("Creating PDF image from bitmap...");
+            PdfImage img = new PdfBitmap(imageStream);
+            graphics.DrawImage(img, 0, 0, width, height);
+            
+            // Save to memory stream
+            System.Diagnostics.Debug.WriteLine("Saving PDF to memory stream...");
+            stream = new MemoryStream();
+            document.Save(stream);
+            document.Close(true);
+            stream.Position = 0;
+            
+            System.Diagnostics.Debug.WriteLine($"PDF created in memory. Size: {stream.Length} bytes");
+            
+            // Save to file
+            System.Diagnostics.Debug.WriteLine("Saving PDF to file...");
+            SavePDF("ChartAsPDF.pdf", stream);
+        }
+        catch (Exception ex)
+        {
+            System.Diagnostics.Debug.WriteLine($"PDF Export Exception: {ex}");
+            await Application.Current.MainPage.DisplayAlert("Error", $"Exception during PDF export: {ex.Message}", "OK");
+        }
+        finally
+        {
+            // Clean up resources
+            if (stream != null)
+            {
+                stream.Dispose();
+                System.Diagnostics.Debug.WriteLine("Memory stream disposed");
+            }
+            
+            if (imageStream != null)
+            {
+                imageStream.Dispose();
+                System.Diagnostics.Debug.WriteLine("Image stream disposed");
+            }
+            
+            if (document != null)
+            {
+                document = null;
+                System.Diagnostics.Debug.WriteLine("PDF document nullified");
+            }
+            
+            // Remove activity indicator
+            if (indicator != null && this.Content is Grid parentGrid)
+            {
+                parentGrid.Children.Remove(indicator);
+                System.Diagnostics.Debug.WriteLine("Activity indicator removed");
+            }
+            
+            System.Diagnostics.Debug.WriteLine("PDF export process completed");
+        }
     }
+
     private async void SavePDF(string fileName, Stream stream)
     {
-        fileName = Path.GetFileNameWithoutExtension(fileName) + ".pdf";
+        try 
+        {
+            fileName = Path.GetFileNameWithoutExtension(fileName) + ".pdf";
+            string filePath;
 
-#if ANDROID
-        string path = Android.OS.Environment.GetExternalStoragePublicDirectory(Android.OS.Environment.DirectoryDocuments).ToString();
+#if ANDROID || IOS
+            // For mobile platforms, use the app's cache directory
+            string folderPath = Path.Combine(FileSystem.CacheDirectory, "PDFExports");
+            if (!Directory.Exists(folderPath))
+            {
+                Directory.CreateDirectory(folderPath);
+            }
+            filePath = Path.Combine(folderPath, fileName);
 #else
-        string path = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            // For desktop platforms, save to bin/exports
+            string binPath = AppDomain.CurrentDomain.BaseDirectory;
+            string exportsFolder = Path.Combine(binPath, "exports");
+            if (!Directory.Exists(exportsFolder))
+            {
+                Directory.CreateDirectory(exportsFolder);
+            }
+            filePath = Path.Combine(exportsFolder, fileName);
 #endif
-        string filePath = Path.Combine(path, fileName);
-        using FileStream fileStream = new(filePath, FileMode.Create, FileAccess.ReadWrite);
-        await stream.CopyToAsync(fileStream);
-        fileStream.Flush();
-        fileStream.Dispose();
+            
+            using (FileStream fileStream = new(filePath, FileMode.Create, FileAccess.ReadWrite))
+            {
+                await stream.CopyToAsync(fileStream);
+                fileStream.Flush();
+            }
+            
+            await Application.Current.MainPage.DisplayAlert("Success", $"PDF saved to {filePath}", "OK");
+        }
+        catch (Exception ex)
+        {
+            await Application.Current.MainPage.DisplayAlert("Error", $"Failed to save PDF: {ex.Message}", "OK");
+            // Log more detailed error information
+            System.Diagnostics.Debug.WriteLine($"PDF Export Error: {ex.ToString()}");
+        }
     }
 }
 
diff --git a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
index e13e3f2..d1a291a 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
@@ -33,7 +33,7 @@
 
             <Grid ColumnDefinitions="500,auto" HorizontalOptions="Center" ColumnSpacing="5" Padding="5">
 
-                    <Grid RowDefinitions="Auto,Auto" HorizontalOptions="FillAndExpand" Grid.Column="0">
+                    <Grid RowDefinitions="Auto" HorizontalOptions="FillAndExpand" Grid.Column="0">
                         <!-- Input Area with Editor and Image Container -->
                         <Border Grid.Row="0"
                                 BackgroundColor="#F8F8F8"
@@ -106,13 +106,16 @@
                                         TextColor="Black"/>
                             </Grid>
                         </Border>
+                        
                         <!-- Editor Options Toolbar -->
                         <core:SfChipGroup ItemHeight="40" 
                                     Margin="5,10,5,5" 
                                     ChipCornerRadius="20" 
                                     ChipBackground="Transparent" 
                                     ChipStrokeThickness="0"  
-                                    Grid.Row="1"
+                                    Grid.Row="0"
+                                    VerticalOptions="End"
+                                    HorizontalOptions="Start"
                                     ChipPadding="0"
                                     ChipClicked="OnChipClicked"
                                     ItemsSource="{Binding Path=EditorOptions}">         
@@ -139,11 +142,11 @@
                             </DataTemplate>
                         </core:SfChipGroup.ItemTemplate>
                     </core:SfChipGroup>
-                    <core:SfBusyIndicator IsRunning="{Binding IsLoading}"
+                    
+                        <core:SfBusyIndicator IsRunning="{Binding IsLoading}"
                                               IsVisible="{Binding IsLoading}"
                                               AnimationType="SingleCircle"/>
-                   
-                </Grid>
+                    </Grid>
 
                 <buttons:SfButton Text="&#xe76f;" 
                          FontFamily="MauiSampleFontIcon" 
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
index 0471226..81aa18f 100644
--- a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
@@ -653,7 +653,7 @@ private void OnRefreshButtonClicked()
         private async Task GetDataFromAI(string text)
         {
             var request_query = GetChartUserPrompt(text);
-            string response = await openAIService.GetAnswerFromGPT(request_query);
+            string response = await openAIService.GetAnswerFromGPT(request_query, true);
 
             if (response != null)
             {
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
index b188558..428d0a2 100644
--- a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Syncfusion.Maui.AIAssistView;
 using System.Collections.ObjectModel;
 using System.Text.RegularExpressions;
@@ -106,17 +106,18 @@ private string GetChartUserPrompt(string userPrompt)
 3. ""showLegend"": Boolean value, default to true
 4. ""sideBySidePlacement"": Boolean value, default to false for single series
 5. ""xAxis"" and ""yAxis"": Must be arrays of objects, even for single axis
-6. ""xAxis"" can be datetime, category, log or numerical, ""yAxis"" can be only numerical or log, based on the user requested query.
-6. ""series"": Must be an array containing series objects, and can have ""name"" based on its use case, if not have name you can do showlegend false.
-7. ""type"": Must be one of: ""line"", ""column"", ""area"", ""pie"", ""doughnut"", ""radialbar"" (lowercase)
-8. ""dataSource"": Array of objects with x and y values for the series, y value always should double and mention it in ""yvalue"" and x value can be any type mention it ""xvalue"" properties
-9. ""tooltip"": Boolean value, default to true
+6. ""xAxis"" can be ""datetime"", ""category"", ""logarithmic"" or ""numerical"", ""yAxis"" can only be ""numerical"" or ""logarithmic"", based on the user requested query. Proper capitalization will be handled.
+7. ""series"": Must be an array containing series objects, and can have ""name"" based on its use case, if not have name you can do showlegend false.
+8. ""type"": Must be one of: ""line"", ""column"", ""area"", ""pie"", ""doughnut"", ""radialbar"" (lowercase)
+9. ""dataSource"": Array of objects with x and y values for the series, y value always should double and mention it in ""yvalue"" and x value can be any type mention it ""xvalue"" properties
+10. ""tooltip"": Boolean value, default to true
 
 IMPORTANT:
 - Respond ONLY with valid, properly formatted JSON
 - Use lowercase for all enum values (chartType, series type, axis type)
 - Include all required properties
 - Always format the ""xAxis"" and ""yAxis"" as arrays
+- Always choose correct axis types based on the data points
 - Do not include any explanations or comments in your response
 - Do not use markdown code blocks - just output raw JSON
 - Ensure all property names are consistent with the format provided
@@ -125,6 +126,52 @@ private string GetChartUserPrompt(string userPrompt)
             return userQuery;
         }
 
+        /// <summary>
+        /// Normalizes axis types to ensure they have the proper format
+        /// </summary>
+        /// <param name="chartData">The chart data to normalize</param>
+        private void NormalizeAxisTypes(ChartConfig chartData)
+        {
+            // Normalize X-Axis types
+            foreach (var axis in chartData.XAxis)
+            {
+                axis.Type = NormalizeAxisType(axis.Type);
+            }
+
+            // Normalize Y-Axis types
+            foreach (var axis in chartData.YAxis)
+            {
+                axis.Type = NormalizeAxisType(axis.Type);
+            }
+        }
+
+        /// <summary>
+        /// Normalizes an individual axis type string
+        /// </summary>
+        /// <param name="axisType">The axis type to normalize</param>
+        /// <returns>The normalized axis type string</returns>
+        private string NormalizeAxisType(string axisType)
+        {
+            if (string.IsNullOrEmpty(axisType))
+                return "Numerical"; // Default
+
+            switch (axisType.ToLower())
+            {
+                case "numerical":
+                case "linear":
+                    return "Numerical";
+                case "datetime":
+                    return "DateTime";
+                case "category":
+                    return "Category";
+                case "log":
+                case "logarithmic":
+                    return "Logarithmic";
+                default:
+                    return "Numerical"; // Default
+            }
+        }
+
         private string ExtractJsonContent(string responseString)
         {
             try
@@ -192,25 +239,8 @@ internal void DecryptJSON(string jsonData, bool fromChat)
                 string extractedJson = ExtractJsonContent(jsonData);
                 Console.WriteLine($"Extracted JSON: {extractedJson}");
 
-                // Create settings for JSON deserialization
-                var settings = new JsonSerializerSettings
-                {
-                    NullValueHandling = NullValueHandling.Ignore,
-                    MissingMemberHandling = MissingMemberHandling.Ignore,
-                    Error = (sender, args) =>
-                    {
-                        Console.WriteLine($"JSON Error: {args.ErrorContext.Error.Message}");
-                        args.ErrorContext.Handled = true;
-                    },
-                    Converters = new List<JsonConverter>
-                    {
-                        new ChartTypeEnumConverter(),
-                        new SeriesTypeConverter()
-                    }
-                };
-
                 // Deserialize the JSON to ChartConfig object
-                var chartData = JsonConvert.DeserializeObject<ChartConfig>(extractedJson, settings);
+                var chartData = JsonConvert.DeserializeObject<ChartConfig>(extractedJson);
 
                 // Validate and assign chart data
                 if (chartData != null)
@@ -225,6 +255,9 @@ internal void DecryptJSON(string jsonData, bool fromChat)
                     if (chartData.YAxis == null)
                         chartData.YAxis = new ObservableCollection<AxisConfig>();
 
+                    // Normalize axis types
+                    NormalizeAxisTypes(chartData);
+
                     ChartData = chartData;
 
                     if (fromChat)

From fcbda6f921178195f8e0160f8e46d061b1aae69b Mon Sep 17 00:00:00 2001
From: Saravanan Madheswaran <saravanan.madheswaran@syncfusion.com>
Date: Mon, 23 Jun 2025 10:55:46 +0530
Subject: [PATCH 07/10] update for files changes.

---
 .../AIService/ChartsAIService.cs              | 66 +++++++++++++++++++
 .../ChartGenerator/View/ChartView.xaml        | 10 +--
 .../ChartGenerator/View/DesktopUI.xaml        |  2 +-
 .../ViewModel/ChartViewModel.cs               | 12 ++++
 .../ChartGenerator/ViewModel/ChatViewModel.cs |  2 +-
 5 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs b/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs
index 1e09800..856eb95 100644
--- a/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs
+++ b/ChartGeneratorAISample/ChartGenerator/AIService/ChartsAIService.cs
@@ -154,6 +154,72 @@ internal string GetSpecificClassContext(string classType)
                 _ => "Unknown class type. Available classes: ChartConfig, SeriesConfig, AxisConfig"
             };
         }
+
+        internal async Task<string> AnalyzeImageAzureAsync(ImageSource source, string textInput)
+        {
+            byte[] imageBytes = await ConvertImageSourceToByteArray(source);
+
+            // Convert the byte array to a Base64 string
+            return await InterpretImageBase64(Convert.ToBase64String(imageBytes), textInput);
+        }
+
+        public static async Task<byte[]> ConvertImageSourceToByteArray(ImageSource imageSource)
+        {
+            Stream stream = await ConvertImageSourceToStream(imageSource);
+
+            using (MemoryStream memoryStream = new MemoryStream())
+            {
+                stream.CopyTo(memoryStream);
+                return memoryStream.ToArray();
+            }
+        }
+
+        private static async Task<Stream> ConvertImageSourceToStream(ImageSource imageSource)
+        {
+            if (imageSource is FileImageSource fileImageSource)
+            {
+                return new FileStream(fileImageSource.File, FileMode.Open, FileAccess.Read);
+            }
+            else if (imageSource is UriImageSource uriImageSource)
+            {
+                var httpClient = new System.Net.Http.HttpClient();
+                return await httpClient.GetStreamAsync(uriImageSource.Uri);
+            }
+            else if (imageSource is StreamImageSource streamImageSource)
+            {
+                return await streamImageSource.Stream(default);
+            }
+            else
+            {
+                throw new NotSupportedException("Unsupported ImageSource type");
+            }
+        }
+
+        internal async Task<string> InterpretImageBase64(string base64, string textInput)
+        {
+
+            try
+            {
+                var imageDataUri = $"data:image/jpeg;base64,{base64}";
+                var chatHistory = new Microsoft.Extensions.AI.ChatMessage();
+                chatHistory.Text = "You are an AI assistant that describes images.";
+                chatHistory.Contents = (new List<AIContent>
+                {
+            new TextContent("Describe this image:"),
+            new TextContent($"{textInput}"),
+            new ImageContent(imageDataUri)
+                });
+
+                var result = await Client.CompleteAsync(new[] { chatHistory });
+                return result?.ToString() ?? "No description generated.";
+            }
+            catch (Exception ex)
+            {
+                return $"Error generating OpenAI response: {ex.Message}";
+            }
+        }
+
+
     }
     #endregion
 }
\ No newline at end of file
diff --git a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
index b7de57e..c9b8a0d 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
@@ -195,15 +195,15 @@
                 <buttons:SfButton  Grid.Row="0" Margin="0,0,60,0" 
                                    Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
                                    x:Name="exportchartbutton"
-                                   Text="Export Chart" 
+                                   Text="&#xe799;" 
                                      Clicked="Exportchartbutton_Clicked"
-                                     FontFamily="MauiSampleFontIcon" 
+                                      FontFamily="{OnPlatform Default ='MauiMaterialAssets', WinUI ='MauiMaterialAssets.ttf#MauiMaterialAssets'}"
                                      CornerRadius="5" 
                                      TextColor="White"
                                      BackgroundColor="#6750a4"
-                                     FontSize="{OnPlatform WinUI=17, Android=15, MacCatalyst=17, iOS=17}" WidthRequest="120" HeightRequest="30"
-                                     ToolTipProperties.Text="Click to Export the Chart"  
-                                     FontAttributes="Bold" 
+                                     FontSize="{OnPlatform WinUI=20, Android=15, MacCatalyst=20, iOS=20}"
+                                     WidthRequest="30" HeightRequest="30"
+                                     ToolTipProperties.Text="Export Chart as PDF"  
                                      VerticalOptions="Start"
                                      HorizontalOptions="End"/>
                 <buttons:SfButton
diff --git a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
index d1a291a..b484683 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
@@ -148,7 +148,7 @@
                                               AnimationType="SingleCircle"/>
                     </Grid>
 
-                <buttons:SfButton Text="&#xe76f;" 
+                    <buttons:SfButton Text="&#xe76f;" 
                          FontFamily="MauiSampleFontIcon" 
                             Background="{StaticResource strokeGradient}" 
                             TextColor="White"
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
index 81aa18f..a096241 100644
--- a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
@@ -653,6 +653,18 @@ private void OnRefreshButtonClicked()
         private async Task GetDataFromAI(string text)
         {
             var request_query = GetChartUserPrompt(text);
+
+            if (imageSourceCollection != null && imageSourceCollection.Count > 0)
+            {
+                foreach (var imageSource in imageSourceCollection)
+                {
+                    if (imageSource is FileImageSource fileImageSource)
+                    {
+                        request_query += text + openAIService.AnalyzeImageAzureAsync(fileImageSource.File, string.Empty);
+                    }
+                }
+            }
+
             string response = await openAIService.GetAnswerFromGPT(request_query, true);
 
             if (response != null)
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
index 428d0a2..a2e3b64 100644
--- a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
@@ -33,7 +33,7 @@ private void OnButtonClicked(string buttonText)
 
         private async void OnCreateButtonClicked()
         {
-            if (!string.IsNullOrEmpty(EntryText))
+            if (!string.IsNullOrEmpty(EntryText) || (ImageSourceCollection == null || ImageSourceCollection.Count == 0))
             {
                 IsLoading = true;
                 ShowAssistView = false;

From de0f05b4559c58ee20af356d554cfc8bcf990356 Mon Sep 17 00:00:00 2001
From: Harsha <harshamidadhala.k@syncfusion.com>
Date: Mon, 23 Jun 2025 14:24:55 +0530
Subject: [PATCH 08/10] Added Save as image button.

---
 .../ChartGenerator/Models/SeriesConfig.cs     |   1 +
 .../ChartGenerator/View/ChartView.xaml        |  60 ++---
 .../ChartGenerator/View/ChartView.xaml.cs     |   5 +
 .../ChartGenerator/View/DesktopUI.xaml        |  15 +-
 .../ViewModel/ChartViewModel.cs               | 241 +++++++-----------
 .../ChartGenerator/ViewModel/ChatViewModel.cs |  80 +++---
 6 files changed, 160 insertions(+), 242 deletions(-)

diff --git a/ChartGeneratorAISample/ChartGenerator/Models/SeriesConfig.cs b/ChartGeneratorAISample/ChartGenerator/Models/SeriesConfig.cs
index 9bfe00f..6156d6b 100644
--- a/ChartGeneratorAISample/ChartGenerator/Models/SeriesConfig.cs
+++ b/ChartGeneratorAISample/ChartGenerator/Models/SeriesConfig.cs
@@ -29,6 +29,7 @@ public bool Tooltip
         get;
         set;
     }
+    public string? XPath { get; internal set; }
 }
 
 public class AxisConfig
diff --git a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
index c9b8a0d..733373d 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml
@@ -133,51 +133,7 @@
                          Spacing="12">
                                 <Label Text="How can I assist with generated chart?" Padding="0,20,0,0"  LineBreakMode="WordWrap"
                             FontSize="Subtitle"
-                            HorizontalOptions="Center" />
-                                <HorizontalStackLayout x:Name="listView"
-                                              HeightRequest="{OnPlatform WinUI=140, Android=160, MacCatalyst=180, iOS=150}"
-                                              WidthRequest="{OnPlatform MacCatalyst= 430,Android=335, iOS=310}"
-                                              HorizontalOptions="Center" Padding="{OnPlatform MacCatalyst=20}"
-                                              BindableLayout.ItemsSource="{Binding Path=ModelPrompts}">
-                                    <BindableLayout.ItemTemplate>
-                                        <DataTemplate>
-                                            <Grid Padding="4">
-                                                <Border
-                                             WidthRequest="{OnPlatform WinUI=120,Android=150,MacCatalyst= 150 , iOS=140}"
-                                             HeightRequest="{OnPlatform WinUI=120,Android=130, MacCatalyst= 100, iOS=120}"
-                                             Stroke="Gray"
-                                             Padding="4">
-                                                    <Border.GestureRecognizers>
-                                                        <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped"/>
-                                                    </Border.GestureRecognizers>
-                                                    <VisualStateManager.VisualStateGroups>
-                                                        <VisualStateGroup x:Name="CommonStates">
-                                                            <VisualState x:Name="Normal">
-                                                                <VisualState.Setters>
-                                                                    <Setter Property="Background" Value="Transparent" />
-                                                                </VisualState.Setters>
-                                                            </VisualState>
-                                                            <VisualState x:Name="PointerOver">
-                                                                <VisualState.Setters>
-                                                                    <Setter Property="Background" Value="#14000000" />
-                                                                </VisualState.Setters>
-                                                            </VisualState>
-                                                        </VisualStateGroup>
-                                                    </VisualStateManager.VisualStateGroups>
-                                                    <Border.StrokeShape>
-                                                        <RoundRectangle CornerRadius="10" />
-                                                    </Border.StrokeShape>
-                                                    <Grid RowDefinitions="*">
-                                                        <Label Text="{Binding .}"
-                                                        LineBreakMode="WordWrap"
-                                                        VerticalTextAlignment="Center"
-                                                        HorizontalTextAlignment="Center" />
-                                                    </Grid>
-                                                </Border>
-                                            </Grid>
-                                        </DataTemplate>
-                                    </BindableLayout.ItemTemplate>
-                                </HorizontalStackLayout>
+                            HorizontalOptions="Center" /> 
                             </VerticalStackLayout>
                         </DataTemplate>
                     </aiassistview:SfAIAssistView.HeaderTemplate>
@@ -192,6 +148,20 @@
                             Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
                             VerticalOptions="Center"
                             HorizontalOptions="Center"/>
+                <buttons:SfButton  Grid.Row="0" Margin="0,0,100,0" 
+                                   Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
+                      x:Name="saveasimage"
+                      Text="&#xE76c;" 
+                      Clicked="Saveasimage_Clicked"
+                      FontFamily="{OnPlatform Default ='MauiMaterialAssets', WinUI ='MauiMaterialAssets.ttf#MauiMaterialAssets'}"
+                      CornerRadius="5" 
+                      TextColor="White"
+                      BackgroundColor="#6750a4"
+                      FontSize="{OnPlatform WinUI=20, Android=15, MacCatalyst=20, iOS=20}"
+                      WidthRequest="30" HeightRequest="30"
+                      ToolTipProperties.Text="Save as Image"  
+                      VerticalOptions="Start"
+                      HorizontalOptions="End"/>
                 <buttons:SfButton  Grid.Row="0" Margin="0,0,60,0" 
                                    Grid.Column="{OnPlatform Android='0',iOS='0', Default='1'}"
                                    x:Name="exportchartbutton"
diff --git a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
index d1d2558..7ecccd2 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
+++ b/ChartGeneratorAISample/ChartGenerator/View/ChartView.xaml.cs
@@ -183,6 +183,11 @@ private async void SavePDF(string fileName, Stream stream)
             System.Diagnostics.Debug.WriteLine($"PDF Export Error: {ex.ToString()}");
         }
     }
+
+    private void Saveasimage_Clicked(object sender, EventArgs e)
+    {
+        templatedItemView.SaveAsImage("AiBlog");
+    }
 }
 
 public class ChartTemplateSelector : DataTemplateSelector
diff --git a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
index b484683..39d881a 100644
--- a/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
+++ b/ChartGeneratorAISample/ChartGenerator/View/DesktopUI.xaml
@@ -75,8 +75,8 @@
                                                            HeightRequest="50"
                                                            Aspect="Fill"/>
                                                 </Border>
-                                                <Button Text="✕"
-                                                        FontSize="12"
+                                            <buttons:SfButton Text="✕"
+                                                        FontSize="11"
                                                         WidthRequest="20"
                                                         HeightRequest="20"
                                                         Padding="0"
@@ -108,14 +108,14 @@
                         </Border>
                         
                         <!-- Editor Options Toolbar -->
-                        <core:SfChipGroup ItemHeight="40" 
+                        <core:SfChipGroup ItemHeight="40"
                                     Margin="5,10,5,5" 
                                     ChipCornerRadius="20" 
                                     ChipBackground="Transparent" 
                                     ChipStrokeThickness="0"  
                                     Grid.Row="0"
                                     VerticalOptions="End"
-                                    HorizontalOptions="Start"
+                                    HorizontalOptions="End"
                                     ChipPadding="0"
                                     ChipClicked="OnChipClicked"
                                     ItemsSource="{Binding Path=EditorOptions}">         
@@ -148,18 +148,19 @@
                                               AnimationType="SingleCircle"/>
                     </Grid>
 
-                    <buttons:SfButton Text="&#xe76f;" 
+                    <buttons:SfButton Text="&#xe76f;" Margin="0,0,0,5"
                          FontFamily="MauiSampleFontIcon" 
                             Background="{StaticResource strokeGradient}" 
                             TextColor="White"
                             IsEnabled="{Binding IsDisable}"
                             CornerRadius="10"
+                            CommandParameter="{Binding .}"
                             Command="{Binding CreateButtonClicked}"
                             HorizontalOptions="End"
                             VerticalOptions="End"
                             HeightRequest="40"
-                                  WidthRequest="40"
-                                  FontSize="18"
+                            WidthRequest="40"
+                            FontSize="18"
                             Grid.Column="1">
                     </buttons:SfButton>
                 </Grid>
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
index a096241..85cf46a 100644
--- a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChartViewModel.cs
@@ -1,19 +1,23 @@
+
+using Newtonsoft.Json;
 using Syncfusion.Maui.AIAssistView;
 using Syncfusion.Maui.Popup;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Text.RegularExpressions;
 using System.Windows.Input;
 namespace ChartGenerator
 {
     public partial class ChatViewModel : INotifyPropertyChanged
     {
+
+        private readonly ImagePickerHelper _imagePickerHelper;
         public event PropertyChangedEventHandler? PropertyChanged;
         private bool canStopResponse;
         private string sendIconText;
         private bool autoSuggestionPopupIsOpen;
         private string inputText;
-        private ObservableCollection<ImageSource> imageSourceCollection;
-        private readonly ImagePickerHelper _imagePickerHelper;
+        private ObservableCollection<ImageSource> imageSourceCollection; 
         private int imageNo;
         private string? entryText;
         private bool showAssistView;
@@ -23,11 +27,73 @@ public partial class ChatViewModel : INotifyPropertyChanged
         private string newJson;
         private bool enableAssistant;
         private bool isLoading;
-        private ObservableCollection<IAssistItem> messages = new();
-
+        private ObservableCollection<IAssistItem> messages = new(); 
+        private bool isTemporaryChatEnabled;
+        private SfPopup OptionsPopup; 
         private bool isSendIconEnabled;
         internal bool isResponseStreaming;
-        private double sendIconWidth;
+        private double sendIconWidth;   
+        private SfPopup ExpandedEditorPopup;
+        private ObservableCollection<Option> optionsContextMenu;  
+        private bool isNewChatEnabled;
+        private bool isHeaderVisible = true;
+        public bool IsNewChatEnabled
+        {
+            get
+            {
+                return isNewChatEnabled;
+            }
+            set
+            {
+                isNewChatEnabled = value;
+                OnPropertyChanged(nameof(IsNewChatEnabled));
+            }
+        }
+        public bool IsHeaderVisible
+        {
+            get
+            {
+                return isHeaderVisible;
+            }
+            set
+            {
+                isHeaderVisible = value;
+                if (!value)
+                {
+                    this.IsNewChatEnabled = true;
+                }
+                else
+                {
+                    this.IsNewChatEnabled = false;
+                }
+                OnPropertyChanged(nameof(IsHeaderVisible));
+            }
+        } 
+        public ObservableCollection<Option> OptionsContextMenu
+        {
+            get
+            {
+                return optionsContextMenu;
+            }
+            set
+            {
+                optionsContextMenu = value;
+                OnPropertyChanged(nameof(OptionsContextMenu));
+            }
+        }
+         
+        public bool IsTemporaryChatEnabled
+        {
+            get
+            {
+                return isTemporaryChatEnabled;
+            }
+            set
+            {
+                isTemporaryChatEnabled = value;
+                OnPropertyChanged(nameof(IsTemporaryChatEnabled));
+            }
+        }
         public double SendIconWidth
         {
             get { return sendIconWidth; }
@@ -150,20 +216,9 @@ public bool ShowIndicator
             }
         }
 
-        private ObservableCollection<String>? modelPrompts;
-        public ObservableCollection<String>? ModelPrompts
-        {
-            get { return modelPrompts; }
-            set
-            {
-                this.modelPrompts = value;
-                OnPropertyChanged(nameof(ModelPrompts));
-            }
-        }
-
         public Command<object> SendButtonCommand { get; set; }
         public ICommand ButtonClicked { get; }
-        public ICommand CreateButtonClicked { get; }
+        public Command<object> CreateButtonClicked { get; }
         public ICommand AiButtonClicked { get; }
         public ICommand CloseButtonClicked { get; }
         public ICommand RefreshButtonClicked { get; }
@@ -207,33 +262,40 @@ public bool CanStopResponse
             }
         }
 
+        public string InputText
+        {
+            get { return inputText; }
+            set
+            {
+                inputText = value;
+                UpdateSendIcon(inputText);
+                OnPropertyChanged(nameof(InputText));
+                //UpdateFilter();
+                AutoSuggestionPopupIsOpen = !string.IsNullOrEmpty(InputText) && this.Messages.Count == 0;
+            }
+        }
+
         public bool HasImageUploaded
         {
             get { return this.ImageSourceCollection.Count > 0; }
         }
         public ChatViewModel()
-        {
+        { 
+            _imagePickerHelper = new ImagePickerHelper();
             ButtonClicked = new Command<string>(OnButtonClicked);
-            CreateButtonClicked = new Command(OnCreateButtonClicked);
+            CreateButtonClicked = new Command<object>(OnCreateButtonClicked);
             AiButtonClicked = new Command(OnAiButtonClicked);
             RequestCommand = new Command<object>(OnRequest);
             CloseButtonClicked = new Command(OnCloseButtonClicked);
             RefreshButtonClicked = new Command(OnRefreshButtonClicked);
-            EditorOptionsComamnd = new Command<object>(ExecuteEditorOptionsCommand);
-
+            EditorOptionsComamnd = new Command<object>(ExecuteEditorOptionsCommand);    
             CancelImageSelected = new Command<object>(ExecuteCancelImageSelectedCommand);
             SendButtonCommand = new Command<object>(ExecuteSendButtonCommand);
-            EditorExpandCollapseCommand = new Command<object>(ExecuteEditorExpandCollapseCommand);
-            _imagePickerHelper = new ImagePickerHelper();
+            EditorExpandCollapseCommand = new Command<object>(ExecuteEditorExpandCollapseCommand); 
             this.ImageSourceCollection = new ObservableCollection<ImageSource>();
             AttachmentContextMenuCommand = new Command<object>(OnAttachmentContextMenuTapCommand);
             EditorOptions = new ObservableCollection<Option>();
-            EditorOptions.Add(new Option() { Name = "Attachment", Icon = "\ue754" });
-            modelPrompts = new ObservableCollection<String>()
-            {
-                "Remove legends from the chart",
-                "Change the chart title to 'Sales by Region'",
-            };
+            EditorOptions.Add(new Option() { Name = "Attachment", Icon = "\ue754" }); 
         }
         public void ExecuteCancelImageSelectedCommand(object obj)
         {
@@ -285,7 +347,6 @@ public void ExecuteCancelImageSelectedCommand(object obj)
                 Console.WriteLine($"Error removing image: {ex.Message}");
             }
         }
-        private SfPopup ExpandedEditorPopup;
         private void ExecuteSendButtonCommand(object obj)
         {
             var text = this.InputText;
@@ -332,19 +393,7 @@ private void ExecuteSendButtonCommand(object obj)
             }
         }
 
-        private ObservableCollection<Option> optionsContextMenu;
-        public ObservableCollection<Option> OptionsContextMenu
-        {
-            get
-            {
-                return optionsContextMenu;
-            }
-            set
-            {
-                optionsContextMenu = value;
-                OnPropertyChanged(nameof(OptionsContextMenu));
-            }
-        }
+       
         private async void SendRequest(AssistItem requestItem, object obj)
         {
             if (this.isResponseStreaming)
@@ -353,102 +402,14 @@ private async void SendRequest(AssistItem requestItem, object obj)
             }
             this.isResponseStreaming = true;
             this.Messages.Add(requestItem);
-            if (OptionsContextMenu.Count <= 2)
-                PopulateOptionsContextMenu();
-            this.InputText = string.Empty;
+             this.InputText = string.Empty;
             await this.GetResult(requestItem, obj).ConfigureAwait(true);
         }
 
-        private bool isNewChatEnabled;
-        private bool isHeaderVisible = true;
-        public bool IsNewChatEnabled
-        {
-            get
-            {
-                return isNewChatEnabled;
-            }
-            set
-            {
-                isNewChatEnabled = value;
-                OnPropertyChanged(nameof(IsNewChatEnabled));
-            }
-        }
-        public bool IsHeaderVisible
-        {
-            get
-            {
-                return isHeaderVisible;
-            }
-            set
-            {
-                isHeaderVisible = value;
-                if (!value)
-                {
-                    this.IsNewChatEnabled = true;
-                }
-                else
-                {
-                    this.IsNewChatEnabled = false;
-                }
-                OnPropertyChanged(nameof(IsHeaderVisible));
-            }
-        }
-
         internal async Task GetResult(object inputQuery, object assistView)
-        {
-        }
-
-        public bool IsTemporaryChatEnabled
-        {
-            get
-            {
-                return isTemporaryChatEnabled;
-            }
-            set
-            {
-                isTemporaryChatEnabled = value;
-                OnPropertyChanged(nameof(IsTemporaryChatEnabled));
-            }
-        }
-        private bool isTemporaryChatEnabled;
-        private SfPopup OptionsPopup;
-        private void PopulateOptionsContextMenu(bool isChatHistoryItemPressed = false)
-        {
-            OptionsContextMenu = new ObservableCollection<Option>();
-            if (isChatHistoryItemPressed)
-            {
-                if (this.OptionsPopup != null)
-                {
-                    this.OptionsPopup.WidthRequest = 130;
-                }
-                OptionsContextMenu.Add(new Option() { Name = "Rename", Icon = "\ue73d" });
-                OptionsContextMenu.Add(new Option() { Name = "Archive", Icon = "\ue777" });
-                OptionsContextMenu.Add(new Option() { Name = "Delete", Icon = "\ue73c" });
-            }
-            else if (Messages != null && Messages.Count > 0 && !IsTemporaryChatEnabled)
-            {
-                if (this.OptionsPopup != null)
-                {
-                    this.OptionsPopup.WidthRequest = 190;
-                }
-                OptionsContextMenu.Add(new Option() { Name = "View Details", Icon = "\ue719" });
-                //OptionsContextMenu.Add(new Option() { Name = "Share", Icon = "\ue770" });
-                OptionsContextMenu.Add(new Option() { Name = "Rename", Icon = "\ue73d", CanShowSeparator = true });
-                OptionsContextMenu.Add(new Option() { Name = "Archive", Icon = "\ue777" });
-                OptionsContextMenu.Add(new Option() { Name = "Delete", Icon = "\ue73c" });
-                //OptionsContextMenu.Add(new Option() { Name = "Move to project", Icon = "\ue72e" });
-                OptionsContextMenu.Add(new Option() { Name = "Temporary Chat", Icon = "\ue7e9", CanShowSeparator = true });
-            }
-            else
-            {
-                if (this.OptionsPopup != null)
-                {
-                    this.OptionsPopup.WidthRequest = 190;
-                }
-                OptionsContextMenu.Add(new Option() { Name = "View Details", Icon = "\ue719" });
-                OptionsContextMenu.Add(new Option() { Name = "Temporary Chat", Icon = "\ue7e9", CanShowSeparator = true });
-            }
+        { 
         }
+        
         private void ExecuteEditorExpandCollapseCommand(object obj)
         {
             var editor = obj as CustomEditor;
@@ -529,18 +490,6 @@ private async void ShowImagePicker()
             await Task.Delay(1);
 #endif
         }
-        public string InputText
-        {
-            get { return inputText; }
-            set
-            {
-                inputText = value;
-                UpdateSendIcon(inputText);
-                OnPropertyChanged(nameof(InputText));
-                //UpdateFilter();
-                AutoSuggestionPopupIsOpen = !string.IsNullOrEmpty(InputText) && this.Messages.Count == 0;
-            }
-        }
         private void UpdateSendIcon(string input)
         {
             // Update the send icon appearance based on input status
diff --git a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
index a2e3b64..19b2f2f 100644
--- a/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
+++ b/ChartGeneratorAISample/ChartGenerator/ViewModel/ChatViewModel.cs
@@ -2,6 +2,8 @@
 using Syncfusion.Maui.AIAssistView;
 using System.Collections.ObjectModel;
 using System.Text.RegularExpressions;
+using static System.Net.Mime.MediaTypeNames;
+using Application = Microsoft.Maui.Controls.Application;
 
 namespace ChartGenerator
 {
@@ -28,18 +30,16 @@ public ChartConfig ChartData
         private void OnButtonClicked(string buttonText)
         {
             EntryText = buttonText.Replace("\"", "").Replace("&quot;", "");
-            OnCreateButtonClicked();
         }
 
-        private async void OnCreateButtonClicked()
+        private async void OnCreateButtonClicked(object obj)
         {
-            if (!string.IsNullOrEmpty(EntryText) || (ImageSourceCollection == null || ImageSourceCollection.Count == 0))
+            if (!string.IsNullOrEmpty(EntryText) || ImageSourceCollection.Count != 0)
             {
                 IsLoading = true;
                 ShowAssistView = false;
                 Messages.Clear();
                 showHeader = true;
-
                 if (ChartAIService.IsCredentialValid)
                 {
                     EnableAssistant = true;
@@ -57,36 +57,36 @@ private async void OnCreateButtonClicked()
             }
         }
 
-
+        
         private string GetChartUserPrompt(string userPrompt)
         {
             string userQuery = @"
-You are a chart data generator API. Your task is to convert user inputs describing chart specifications into clean, properly formatted JSON strings. Respond ONLY with valid JSON - no explanations, markdown formatting, or code blocks.
+As an AI service, your task is to convert user inputs describing chart specifications into JSON formatted strings. Each user input will describe a specific chart type and its configurations, including axes titles, legend visibility, series configurations, etc. You will structure the output in JSON format accordingly.
 
 Example user input: ""Sales by region column chart.""
-
-Required JSON format:
+Expected JSON output:
 {
   ""chartType"": ""cartesian"",
   ""title"": ""Revenue by Region"",
   ""showLegend"": true,
-  ""sideBySidePlacement"": false,
-  ""xAxis"": [
-    {
-      ""type"": ""category"",
-      ""title"": ""Region""
-    }
-  ],
+""sideBySidePlacement"": ""true/false"",
+  ""xAxis"":[
+{
+    ""type"": ""category"",
+    ""title"": ""Region""
+  }
+],
   ""yAxis"": [
-    {
-      ""title"": ""Revenue"",
-      ""type"": ""numerical"",
-      ""min"": 0
-    }
-  ],
+{
+    ""title"": ""Revenue"",
+    ""type"": ""numerical"",
+    ""min"": 0
+  }
+],
   ""series"": [
     {
       ""type"": ""column"",
+      ""xpath"": ""region"",
       ""name"": ""Revenue"",
       ""dataSource"": [
         { ""xvalue"": ""North America"", ""yvalue"": 120000 },
@@ -100,29 +100,21 @@ private string GetChartUserPrompt(string userPrompt)
   ]
 }
 
-JSON Requirements:
-1. ""chartType"": Must be either ""cartesian"" or ""circular"" (lowercase)
-2. ""title"": Create an appropriate title based on the query
-3. ""showLegend"": Boolean value, default to true
-4. ""sideBySidePlacement"": Boolean value, default to false for single series
-5. ""xAxis"" and ""yAxis"": Must be arrays of objects, even for single axis
-6. ""xAxis"" can be ""datetime"", ""category"", ""logarithmic"" or ""numerical"", ""yAxis"" can only be ""numerical"" or ""logarithmic"", based on the user requested query. Proper capitalization will be handled.
-7. ""series"": Must be an array containing series objects, and can have ""name"" based on its use case, if not have name you can do showlegend false.
-8. ""type"": Must be one of: ""line"", ""column"", ""area"", ""pie"", ""doughnut"", ""radialbar"" (lowercase)
-9. ""dataSource"": Array of objects with x and y values for the series, y value always should double and mention it in ""yvalue"" and x value can be any type mention it ""xvalue"" properties
-10. ""tooltip"": Boolean value, default to true
-
-IMPORTANT:
-- Respond ONLY with valid, properly formatted JSON
-- Use lowercase for all enum values (chartType, series type, axis type)
-- Include all required properties
-- Always format the ""xAxis"" and ""yAxis"" as arrays
-- Always choose correct axis types based on the data points
-- Do not include any explanations or comments in your response
-- Do not use markdown code blocks - just output raw JSON
-- Ensure all property names are consistent with the format provided
-
-User Request: " + userPrompt;
+When generating the JSON output, take into account the following:
+
+1. **Chart Type**: Determine the type of chart based on keywords in the user query. and it should be only circular or cartesian
+2. **Chart Title**: Craft an appropriate title using key elements of the query.
+3. **Axis Information**: Define the x-axis and y-axis with relevant titles and types. Use categories for discrete data and numerical for continuous data.
+4. **Series Configuration**: Include details about the series type and data points as mentioned in the query. it supports only  Line, Column, Spline, Area, Pie, Doughnut, RadialBar.
+5. **Name in the Series**: The name of the series should be represent category of the series.
+6. **Data Source**: Provide a sample data source for the series, it should only name as ""dataSource"" and include ""xvalue"" and ""yvalue"".
+7. **Show Legend**: Default as `true` unless specified otherwise.
+8.  **SideBySidePlacement**: Default to 'false' and return bool value based on multiple column series placement and column placed side by side being true, column back to back being false, or Bottom/Top being false, or one column being positive and another being negative values.
+     
+
+Generate appropriate configurations according to these guidelines, and return the result as a JSON formatted string for any query shared with you." +
+
+  $"User Request: " + userPrompt;
             return userQuery;
         }
 

From 01a7997496d084cb7b114cc7ebb8a59677f20981 Mon Sep 17 00:00:00 2001
From: Harsha <harshamidadhala.k@syncfusion.com>
Date: Mon, 23 Jun 2025 14:33:40 +0530
Subject: [PATCH 09/10] Updated API Details

---
 .../ChartGenerator/AIService/AICredentials.cs               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChartGeneratorAISample/ChartGenerator/AIService/AICredentials.cs b/ChartGeneratorAISample/ChartGenerator/AIService/AICredentials.cs
index 78b9dce..c1e34ed 100644
--- a/ChartGeneratorAISample/ChartGenerator/AIService/AICredentials.cs
+++ b/ChartGeneratorAISample/ChartGenerator/AIService/AICredentials.cs
@@ -2,8 +2,8 @@
 {
     internal abstract class AICredentials
     {
-        internal const string endpoint = "https://mobilemaui.openai.azure.com/";
-        internal const string deploymentName = "gpt-4o";
-        internal const string key = "6673b6975f334c79bd0db8a1cd70aa49";
+        internal const string endpoint = "https://YOUR_ACCOUNT.openai.azure.com/";
+        internal const string deploymentName = "deployment name";
+        internal const string key = "API key";
     }
 }

From 1feb087c1ae76591da928f3fec5100ba782d3b81 Mon Sep 17 00:00:00 2001
From: Saravanan Madheswaran <saravanan.madheswaran@syncfusion.com>
Date: Wed, 25 Jun 2025 11:38:40 +0530
Subject: [PATCH 10/10] committe

---
 README.md | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c9afc42..4eed19c 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,25 @@ In a world where time is of the essence, creating intuitive and visually appeali
 ## Syncfusion .NET MAUI Charts with AI  
 Syncfusion .NET MAUI Charts are a powerful suite of controls for building cross-platform applications on iOS, Android, macOS, and Windows. By integrating AI-powered natural language processing, this brings an intuitive experience for generating charts with minimal effort.  
 
-### Key Features of Natural Language Chart Generation  
-- **Natural Input**: Describe your chart in plain language, and AI will generate it for you.  
-- **Automatic JSON Mapping**: Converts your input into chart configuration JSON for seamless rendering.  
-- **Cross-Platform Support**: Leverages the .NET MAUI framework to ensure charts work across all major platforms.  
-- **Dynamic Modifications**: Adjust chart settings, data, or visuals in real time using AI-assisted tools.  
+This application concept is quite innovative and involves several key functionalities integrated into one cohesive platform. Let's break down each feature and provide some insights or considerations for their implementation:
+
+1. **Convert Natural Language into Chart:**
+   - **Natural Language Processing (NLP):** Utilize advanced NLP models (e.g., OpenAI's GPT or Azure's NLP services) to interpret the user's input and translate that into actionable chart parameters.
+   - **Data Extraction & Validation:** Extract data requirements from the input and validate them against existing datasets or prompt the user for any missing information.
+   - **Chart Generation Logic:** Design a robust system to map interpreted text components into chart configurations, supported by your `ChartsAIService`.
+
+2. **Convert Image into Chart:**
+   - **Image Recognition & Analysis:** Employ image processing techniques to parse and recognize data structures within images. Libraries like OpenCV can assist in extracting data points from charts or data tables in images.
+   - **Data Mapping:** Convert extracted image data into a format that can be seamlessly used to generate charts.
+
+3. **Export the Chart into PDF or Image:**
+   - **Export Functionality:** Utilize libraries such as iTextSharp for PDF generation or System.Drawing for creating image files in formats like PNG or JPEG.
+   - **User Interface:** Offer a simple UI button to export which prompts users for destination and format, and handles backend tasks like file creation and storage.
+
+4. **Real-time Customization with AI Assist:**
+   - **Interactive AI Interface:** Implement a real-time assistive UI component leveraging AI to provide drag-and-drop, click-to-change options, and AI-driven recommendations.
+   - **Customization Options:** Allow users to modify chart elements (e.g., colors, labels, chart type) and reflect these changes immediately on the display.
+   - **Feedback Loop:** Utilize AI to provide suggestions based on user interaction patterns and input, allowing for iterative and informed chart customization.
 
 ### Why Choose AI-Powered Charting?  
 - **Ease of Use**: Removes the technical barrier—anyone can create charts with simple descriptions.