Dev

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs

@@ -14,5 +14,14 @@ public class ApplicationAnalysisRequest
 
         [JsonPropertyName("attachments")]
         public List<AIAttachmentItem> Attachments { get; set; } = new();
+
+        [JsonPropertyName("promptVersion")]
+        public string? PromptVersion { get; set; }
+
+        [JsonPropertyName("capturePromptIo")]
+        public bool CapturePromptIo { get; set; }
+
+        [JsonPropertyName("captureContextId")]
+        public string? CaptureContextId { get; set; }
     }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs

@@ -12,5 +12,14 @@ public class AttachmentSummaryRequest
 
         [JsonPropertyName("contentType")]
         public string ContentType { get; set; } = "application/octet-stream";
+
+        [JsonPropertyName("promptVersion")]
+        public string? PromptVersion { get; set; }
+
+        [JsonPropertyName("capturePromptIo")]
+        public bool CapturePromptIo { get; set; }
+
+        [JsonPropertyName("captureContextId")]
+        public string? CaptureContextId { get; set; }
     }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ScoresheetSectionRequest.cs

@@ -17,5 +17,14 @@ public class ScoresheetSectionRequest
 
         [JsonPropertyName("sectionSchema")]
         public JsonElement SectionSchema { get; set; }
+
+        [JsonPropertyName("promptVersion")]
+        public string? PromptVersion { get; set; }
+
+        [JsonPropertyName("capturePromptIo")]
+        public bool CapturePromptIo { get; set; }
+
+        [JsonPropertyName("captureContextId")]
+        public string? CaptureContextId { get; set; }
     }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AIPromptCaptureResponse.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Text.Json.Serialization;
+
+namespace Unity.GrantManager.AI
+{
+    public class AIPromptCaptureResponse
+    {
+        [JsonPropertyName("contextId")]
+        public string ContextId { get; set; } = string.Empty;
+
+        [JsonPropertyName("promptType")]
+        public string PromptType { get; set; } = string.Empty;
+
+        [JsonPropertyName("promptVersion")]
+        public string PromptVersion { get; set; } = string.Empty;
+
+        [JsonPropertyName("captureLabel")]
+        public string CaptureLabel { get; set; } = string.Empty;
+
+        [JsonPropertyName("systemPrompt")]
+        public string SystemPrompt { get; set; } = string.Empty;
+
+        [JsonPropertyName("userPrompt")]
+        public string UserPrompt { get; set; } = string.Empty;
+
+        [JsonPropertyName("rawOutput")]
+        public string RawOutput { get; set; } = string.Empty;
+
+        [JsonPropertyName("formattedOutput")]
+        public string FormattedOutput { get; set; } = string.Empty;
+
+        [JsonPropertyName("capturedAt")]
+        public DateTime CapturedAt { get; set; }
+    }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/ApplicantOrgInfoDto.cs

@@ -1,7 +1,11 @@
+using System.Collections.Generic;
+
 namespace Unity.GrantManager.ApplicantProfile.ProfileData
 {
     public class ApplicantOrgInfoDto : ApplicantProfileDataDto
     {
         public override string DataType => "ORGINFO";
+
+        public List<OrgInfoItemDto> Organizations { get; set; } = [];
     }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/ApplicantPaymentInfoDto.cs

@@ -1,7 +1,11 @@
+using System.Collections.Generic;
+
 namespace Unity.GrantManager.ApplicantProfile.ProfileData
 {
     public class ApplicantPaymentInfoDto : ApplicantProfileDataDto
     {
         public override string DataType => "PAYMENTINFO";
+
+        public List<PaymentInfoItemDto> Payments { get; set; } = [];
     }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/OrgInfoItemDto.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace Unity.GrantManager.ApplicantProfile.ProfileData
+{
+    public class OrgInfoItemDto
+    {
+        public Guid Id { get; set; }
+        public string? OrgName { get; set; }
+        public string? OrganizationType { get; set; }
+        public string? OrgNumber { get; set; }
+        public string? OrgStatus { get; set; }
+        public string? NonRegOrgName { get; set; }
+        public string? FiscalMonth { get; set; }
+        public int? FiscalDay { get; set; }
+        public string? OrganizationSize { get; set; }
+        public string? Sector { get; set; }
+        public string? SubSector { get; set; }
+    }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/PaymentInfoItemDto.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Unity.GrantManager.ApplicantProfile.ProfileData
+{
+    public class PaymentInfoItemDto
+    {
+        public Guid Id { get; set; }
+        public string PaymentNumber { get; set; } = string.Empty;
+        public string ReferenceNo { get; set; } = string.Empty;
+        public decimal Amount { get; set; }
+        public string? PaymentDate { get; set; }
+        public string PaymentStatus { get; set; } = string.Empty;
+    }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs

@@ -13,6 +13,6 @@ public interface IAttachmentAppService : IApplicationService
     Task<IList<UnityAttachmentDto>> GetAttachmentsAsync(AttachmentParametersDto attachmentParametersDto);
     Task<AttachmentMetadataDto> GetAttachmentMetadataAsync(AttachmentType attachmentType, Guid attachmentId);
     Task<AttachmentMetadataDto> UpdateAttachmentMetadataAsync(UpdateAttachmentMetadataDto updateAttachment);
-    Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId);
-    Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds);
+    Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, string? promptVersion = null, bool capturePromptIo = false);
+    Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds, string? promptVersion = null, bool capturePromptIo = false);
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs

@@ -6,6 +6,6 @@ namespace Unity.GrantManager.GrantApplications
 {
     public interface IApplicationAIAnalysisAppService : IApplicationService
     {
-        Task<string> GenerateAIAnalysisAsync(Guid applicationId);
+        Task<string> GenerateAIAnalysisAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
     }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIPromptCaptureAppService.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System;
+using System.Threading.Tasks;
+using Unity.GrantManager.AI;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.GrantApplications
+{
+    public interface IApplicationAIPromptCaptureAppService : IApplicationService
+    {
+        Task<List<AIPromptCaptureResponse>> GetRecentAsync(Guid applicationId, string promptType, string? promptVersion = null);
+    }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs

@@ -6,6 +6,6 @@ namespace Unity.GrantManager.GrantApplications
 {
     public interface IApplicationAIScoringAppService : IApplicationService
     {
-        Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId);
+        Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
     }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIPromptCaptureStore.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.GrantManager.AI
+{
+    public class AIPromptCaptureStore : IAIPromptCaptureStore, ISingletonDependency
+    {
+        private const int MaxCapturesPerKey = 50;
+        private readonly ConcurrentDictionary<string, ConcurrentQueue<AIPromptCaptureResponse>> _captures = new(StringComparer.OrdinalIgnoreCase);
+
+        public void Save(AIPromptCaptureResponse capture)
+        {
+            var key = BuildKey(capture.ContextId, capture.PromptType, capture.PromptVersion);
+            var queue = _captures.GetOrAdd(key, _ => new ConcurrentQueue<AIPromptCaptureResponse>());
+            queue.Enqueue(capture);
+
+            while (queue.Count > MaxCapturesPerKey)
+            {
+                queue.TryDequeue(out _);
+            }
+        }
+
+        public IReadOnlyList<AIPromptCaptureResponse> GetRecent(string contextId, string promptType, string? promptVersion = null, int maxResults = 20)
+        {
+            if (!string.IsNullOrWhiteSpace(promptVersion))
+            {
+                var key = BuildKey(contextId, promptType, promptVersion);
+                return _captures.TryGetValue(key, out var captures)
+                    ? captures.OrderByDescending(item => item.CapturedAt).Take(maxResults).ToList()
+                    : Array.Empty<AIPromptCaptureResponse>();
+            }
+
+            return _captures.Values
+                .SelectMany(queue => queue)
+                .Where(item => string.Equals(item.ContextId, contextId, StringComparison.OrdinalIgnoreCase)
+                    && string.Equals(item.PromptType, promptType, StringComparison.OrdinalIgnoreCase))
+                .OrderByDescending(item => item.CapturedAt)
+                .Take(maxResults)
+                .ToList();
+        }
+
+        private static string BuildKey(string contextId, string promptType, string promptVersion)
+        {
+            return $"{contextId.Trim()}::{promptType.Trim()}::{promptVersion.Trim()}";
+        }
+    }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationAnalysisService.cs

@@ -24,12 +24,17 @@ public class ApplicationAnalysisService(
         };
 
         private const string ComponentsKey = "components";
+        private static readonly HashSet<string> ExcludedSchemaKeys = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "applicantAgent"
+        };
 
-        public async Task<string> RegenerateAndSaveAsync(Guid applicationId)
+        public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false)
         {
             var application = await applicationRepository.GetAsync(applicationId);
             var formSubmission = await applicationFormSubmissionRepository.GetByApplicationAsync(applicationId);
             var attachments = await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId);
+            var formSchema = await GetFormSchemaAsync(formSubmission?.ApplicationFormVersionId);
 
             var attachmentSummaries = attachments
                 .Where(a => !string.IsNullOrWhiteSpace(a.AISummary))
@@ -40,24 +45,6 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId)
                 })
                 .ToList();
 
-            var notSpecified = "Not specified";
-            var applicationContent = $@"
-Project Name: {application.ProjectName}
-Reference Number: {application.ReferenceNo}
-Requested Amount: ${application.RequestedAmount:N2}
-Total Project Budget: ${application.TotalProjectBudget:N2}
-Project Summary: {application.ProjectSummary ?? "Not provided"}
-City: {application.City ?? notSpecified}
-Economic Region: {application.EconomicRegion ?? notSpecified}
-Community: {application.Community ?? notSpecified}
-Project Start Date: {application.ProjectStartDate?.ToShortDateString() ?? notSpecified}
-Project End Date: {application.ProjectEndDate?.ToShortDateString() ?? notSpecified}
-Submission Date: {application.SubmissionDate.ToShortDateString()}
-
-FULL APPLICATION FORM SUBMISSION:
-{formSubmission?.RenderedHTML ?? "Form submission content not available"}
-";
-
             object formFieldConfiguration = new { message = "Form configuration not available." };
             if (formSubmission?.ApplicationFormVersionId != null)
             {
@@ -67,8 +54,11 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId)
             var analysis = await aiService.GenerateApplicationAnalysisAsync(new ApplicationAnalysisRequest
             {
                 Schema = JsonSerializer.SerializeToElement(formFieldConfiguration),
-                Data = JsonSerializer.SerializeToElement(new { submission_content = applicationContent }),
-                Attachments = attachmentSummaries
+                Data = PromptDataPayloadBuilder.BuildPromptDataPayload(application, formSubmission, formSchema, logger),
+                Attachments = attachmentSummaries,
+                PromptVersion = promptVersion,
+                CapturePromptIo = capturePromptIo,
+                CaptureContextId = applicationId.ToString()
             });
 
             var analysisJson = JsonSerializer.Serialize(analysis, _jsonOptionsIndented);
@@ -77,6 +67,25 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId)
             return analysisJson;
         }
 
+        private async Task<string?> GetFormSchemaAsync(Guid? formVersionId)
+        {
+            if (formVersionId == null)
+            {
+                return null;
+            }
+
+            try
+            {
+                var formVersion = await applicationFormVersionRepository.GetAsync(formVersionId.Value);
+                return string.IsNullOrWhiteSpace(formVersion?.FormSchema) ? null : formVersion.FormSchema;
+            }
+            catch (Exception ex)
+            {
+                logger.LogWarning(ex, "Unable to load form schema for prompt data generation for form version {FormVersionId}.", formVersionId);
+                return null;
+            }
+        }
+
         private async Task<object> ExtractFormFieldConfigurationAsync(Guid formVersionId)
         {
             try
@@ -120,7 +129,7 @@ private static void ExtractFieldRequirements(JArray components, List<string> req
                 var type = component["type"]?.ToString();
                 var skipTypes = new HashSet<string> { "button", "simplebuttonadvanced", "html", "htmlelement", "content", "simpleseparator" };
 
-                if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(type) || skipTypes.Contains(type))
+                if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(type) || skipTypes.Contains(type) || ExcludedSchemaKeys.Contains(key))
                 {
                     ProcessNestedFieldRequirements(component, type, requiredFields, optionalFields, currentPath);
                     continue;