Dev

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.system.txt

@@ -3,7 +3,7 @@ You are a careful grant review assistant for human reviewers. Do not fill gaps,
 
 TASK
 Using SCHEMA, DATA, ATTACHMENTS, RUBRIC, SCORE, OUTPUT, and RULES:
-1. Review the application and attachments for the strongest reviewer-relevant evidence.
+1. Review the application and any provided attachments for the strongest reviewer-relevant evidence.
 2. Determine which conclusions are directly supported by that evidence.
 3. Exclude weak, repetitive, or loosely supported conclusions.
-4. Return only the strongest evidence-backed reviewer conclusions.
+4. Return only the strongest evidence-backed reviewer conclusions.

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-scoring.system.txt

@@ -5,7 +5,7 @@ TASK
 Using DATA, ATTACHMENTS, SECTION, RESPONSE, OUTPUT, and RULES:
 1. Review each question in SECTION one at a time.
 2. Identify the exact condition the question asks about.
-3. Consider only the most relevant evidence in DATA and ATTACHMENTS for that condition.
+3. Consider only the most relevant evidence in DATA and any provided ATTACHMENTS for that condition.
 4. Choose the most conservative valid answer supported by that evidence.
 5. If evidence is incomplete or indirect, explain the uncertainty in the rationale.
-6. Repeat for every question in SECTION.
+6. Repeat for every question in SECTION.

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/common.rules.txt

@@ -1,4 +1,5 @@
 - Any narrative text response must be at least 12 words.
+- If ATTACHMENTS is empty, use DATA only and do not mention missing attachments unless their absence is material to the specific conclusion or question.
 - Return values exactly as specified in OUTPUT.
 - Do not return keys outside OUTPUT.
 - Return valid JSON only.

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs

@@ -198,7 +198,7 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
             {
                 var attachments = attachmentSummaries.Count > 0
                     ? string.Join("\n- ", attachmentSummaries.Select((summary, index) => $"Attachment {index + 1}: {summary}"))
-                    : "No attachments provided.";
+                    : "[]";
 
                 var section = OpenAIPromptRenderer.BuildAliasedApplicationScoringSection(request.SectionName, sectionJson, out var questionIdAliasMap);
                 var response = OpenAIPromptRenderer.BuildApplicationScoringResponseTemplate(section);
@@ -318,14 +318,12 @@ private async Task<AIOperationResult> GenerateWithRetryAsync(
         private async Task LogPromptInputAsync(string promptType, string promptVersion, string? systemPrompt, string userPrompt, CancellationToken cancellationToken = default)
         {
             var formattedInput = FormatPromptInputForLog(systemPrompt, userPrompt);
-            _logger.LogInformation("AI {PromptType} ({PromptVersion}) input payload: {PromptInput}", promptType, promptVersion, formattedInput);
             await WritePromptLogFileAsync(promptType, promptVersion, "INPUT", formattedInput, cancellationToken);
         }
 
         private async Task LogPromptOutputAsync(string promptType, string promptVersion, string output, CancellationToken cancellationToken = default)
         {
             var formattedOutput = FormatPromptOutputForLog(output);
-            _logger.LogInformation("AI {PromptType} ({PromptVersion}) model output payload: {ModelOutput}", promptType, promptVersion, formattedOutput);
             await WritePromptLogFileAsync(promptType, promptVersion, "OUTPUT", formattedOutput, cancellationToken);
         }
 

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs

@@ -278,7 +278,7 @@ OPTIONAL FIELDS (may be left blank):
 
         TASK
         Using SCHEMA, DATA, ATTACHMENTS, RUBRIC, SCORE, OUTPUT, and RULES:
-        1. Review the application and attachments for the strongest reviewer-relevant evidence.
+        1. Review the application and any provided attachments for the strongest reviewer-relevant evidence.
         2. Determine which conclusions are directly supported by that evidence.
         3. Exclude weak, repetitive, or loosely supported conclusions.
         4. Return only the strongest evidence-backed reviewer conclusions.
@@ -520,7 +520,7 @@ 2. A brief rationale (1-2 complete sentences) citing concrete supporting evidenc
         Using DATA, ATTACHMENTS, SECTION, RESPONSE, OUTPUT, and RULES:
         1. Review each question in SECTION one at a time.
         2. Identify the exact condition the question asks about.
-        3. Consider only the most relevant evidence in DATA and ATTACHMENTS for that condition.
+        3. Consider only the most relevant evidence in DATA and any provided ATTACHMENTS for that condition.
         4. Choose the most conservative valid answer supported by that evidence.
         5. If evidence is incomplete or indirect, explain the uncertainty in the rationale.
         6. Repeat for every question in SECTION.
@@ -583,6 +583,7 @@ 4. Choose the most conservative valid answer supported by that evidence.
     // ── v1/common.rules.txt ──────────────────────────────────────────────────
     private const string CommonRules = """
         - Any narrative text response must be at least 12 words.
+        - If ATTACHMENTS is empty, use DATA only and do not mention missing attachments unless their absence is material to the specific conclusion or question.
         - Return values exactly as specified in OUTPUT.
         - Do not return keys outside OUTPUT.
         - Return valid JSON only.

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

@@ -13,4 +13,6 @@ public class AIGenerationRequestDto : EntityDto<Guid>
     public DateTime? CompletedAt { get; set; }
     public string? FailureReason { get; set; }
     public bool IsActive { get; set; }
+    public bool IsGenerating { get; set; }
+    public int RetryAfterSeconds { get; set; }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs

@@ -13,9 +13,10 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Unity.Flex.WorksheetInstances;
-using Unity.Flex.Worksheets;
-using Unity.AI.Models;
-using Unity.AI.Responses;
+using Unity.Flex.Worksheets;
+using Unity.AI.Models;
+using Unity.AI.RateLimit;
+using Unity.AI.Responses;
 using Unity.GrantManager.Applicants;
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.Applications;
@@ -55,10 +56,11 @@ public class GrantApplicationAppService(
     IApplicantAgentRepository applicantAgentRepository,
     IApplicantAddressRepository applicantAddressRepository,
     IApplicantSupplierAppService applicantSupplierService,
-    IPaymentRequestAppService paymentRequestService,
-    IApplicationAIGenerationQueue aiGenerationQueue,
-    IAIGenerationStatusAppService aiGenerationStatusAppService,
-    IFeatureChecker featureChecker)
+    IPaymentRequestAppService paymentRequestService,
+    IApplicationAIGenerationQueue aiGenerationQueue,
+    IAIGenerationStatusAppService aiGenerationStatusAppService,
+    IAIRateLimiter aiRateLimiter,
+    IFeatureChecker featureChecker)
     : GrantManagerAppService, IGrantApplicationAppService
 #pragma warning restore S107 // Methods should not have too many parameters
 {
@@ -1180,7 +1182,8 @@ public async Task<AIGenerationRequestDto> QueueApplicationAnalysisAsync(Guid app
             AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType,
             CurrentTenant.Id);
 
-        return request ?? throw new UserFriendlyException("Unable to queue AI analysis request.");
+        return await ApplyRateLimitStateAsync(
+            request ?? throw new UserFriendlyException("Unable to queue AI analysis request."));
     }
 
     [Authorize(AIPermissions.Analysis.GenerateAttachmentSummaries)]
@@ -1195,7 +1198,8 @@ public async Task<AIGenerationRequestDto> QueueAttachmentSummaryAsync(QueueAttac
             AIGenerationRequestKeyHelper.AttachmentSummaryOperationType,
             CurrentTenant.Id);
 
-        return request ?? throw new UserFriendlyException("Unable to queue AI attachment summary request.");
+        return await ApplyRateLimitStateAsync(
+            request ?? throw new UserFriendlyException("Unable to queue AI attachment summary request."));
     }
 
     [Authorize(AIPermissions.Analysis.GenerateScoring)]
@@ -1209,13 +1213,15 @@ public async Task<AIGenerationRequestDto> QueueApplicationScoringAsync(Guid appl
             AIGenerationRequestKeyHelper.ApplicationScoringOperationType,
             CurrentTenant.Id);
 
-        return request ?? throw new UserFriendlyException("Unable to queue AI scoring request.");
+        return await ApplyRateLimitStateAsync(
+            request ?? throw new UserFriendlyException("Unable to queue AI scoring request."));
     }
 
     public async Task<AIGenerationRequestDto?> GetAIGenerationStatusAsync(Guid applicationId, string operationType, string? promptVersion = null)
     {
-        await EnsureAIGenerationStatusAccessAsync(operationType);
-        return await aiGenerationStatusAppService.GetLatestAsync(applicationId, operationType, CurrentTenant.Id);
+        await EnsureAIGenerationStatusAccessAsync(operationType);
+        return await ApplyRateLimitStateOrDefaultAsync(
+            await aiGenerationStatusAppService.GetLatestAsync(applicationId, operationType, CurrentTenant.Id));
     }
 
     [Authorize(AIPermissions.Analysis.GenerateApplicationAnalysis)]
@@ -1233,8 +1239,27 @@ public async Task<AIGenerationRequestDto> QueueAllAIStagesAsync(Guid application
             AIGenerationRequestKeyHelper.PipelineOperationType,
             CurrentTenant.Id);
 
-        return request ?? throw new UserFriendlyException("Unable to queue AI generation request.");
-    }
+        return await ApplyRateLimitStateAsync(
+            request ?? throw new UserFriendlyException("Unable to queue AI generation request."));
+    }
+
+    private async Task<AIGenerationRequestDto?> ApplyRateLimitStateOrDefaultAsync(AIGenerationRequestDto? request)
+    {
+        if (request is null)
+        {
+            return null;
+        }
+
+        return await ApplyRateLimitStateAsync(request);
+    }
+
+    private async Task<AIGenerationRequestDto> ApplyRateLimitStateAsync(AIGenerationRequestDto request)
+    {
+        var state = await aiRateLimiter.GetStateAsync();
+        request.IsGenerating = state.IsGenerating;
+        request.RetryAfterSeconds = state.RetryAfterSeconds;
+        return request;
+    }
 
     private async Task EnsureAIGenerationStatusAccessAsync(string operationType)
     {

applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs

@@ -536,7 +536,17 @@ public partial class ApplicationActionResultItemToDtoMapper : MapperBase<Applica
 [Mapper] public partial class CommunityToDtoMapper : MapperBase<Community, CommunityDto> { public override partial CommunityDto Map(Community source); public override partial void Map(Community source, CommunityDto destination); }
 [Mapper] public partial class RegionalDistrictToDtoMapper : MapperBase<RegionalDistrict, RegionalDistrictDto> { public override partial RegionalDistrictDto Map(RegionalDistrict source); public override partial void Map(RegionalDistrict source, RegionalDistrictDto destination); }
 [Mapper] public partial class ApplicationTagsToDtoMapper : MapperBase<ApplicationTags, ApplicationTagsDto> { public override partial ApplicationTagsDto Map(ApplicationTags source); public override partial void Map(ApplicationTags source, ApplicationTagsDto destination); }
-[Mapper] public partial class AIGenerationRequestToDtoMapper : MapperBase<AIGenerationRequest, AIGenerationRequestDto> { public override partial AIGenerationRequestDto Map(AIGenerationRequest source); public override partial void Map(AIGenerationRequest source, AIGenerationRequestDto destination); }
+[Mapper]
+public partial class AIGenerationRequestToDtoMapper : MapperBase<AIGenerationRequest, AIGenerationRequestDto>
+{
+    [MapperIgnoreTarget(nameof(AIGenerationRequestDto.IsGenerating))]
+    [MapperIgnoreTarget(nameof(AIGenerationRequestDto.RetryAfterSeconds))]
+    public override partial AIGenerationRequestDto Map(AIGenerationRequest source);
+
+    [MapperIgnoreTarget(nameof(AIGenerationRequestDto.IsGenerating))]
+    [MapperIgnoreTarget(nameof(AIGenerationRequestDto.RetryAfterSeconds))]
+    public override partial void Map(AIGenerationRequest source, AIGenerationRequestDto destination);
+}
 [Mapper(AllowNullPropertyAssignment = true)]
 public partial class ApplicantToGrantApplicationApplicantDtoMapper : MapperBase<Applicant, GrantApplicationApplicantDto>
 {

applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationsAppService.cs

@@ -7,6 +7,7 @@
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Uow;
 
 namespace Unity.GrantManager.Notifications
 {
@@ -24,6 +25,7 @@ public NotificationsAppService(IDynamicUrlRepository dynamicUrlRepository)
             _teamsNotificationService = new TeamsNotificationService();
         }
 
+        [UnitOfWork]
         public async Task<string> InitializeTeamsChannelAsync(string keyName)
         {
             DynamicUrl? teamsChannel = await _dynamicUrlRepository.FirstOrDefaultAsync(q => q.KeyName == keyName);
@@ -50,6 +52,7 @@ public async Task NotifyChefsEventToTeamsAsync(string factName, string factValue
             await _teamsNotificationService.PostFactsToTeamsAsync(teamsChannel, activityTitle, activitySubtitle);
         }
 
+        [UnitOfWork]
         public async Task PostToTeamsAsync(string activityTitle, string activitySubtitle, List<Fact> facts)
         {
             string teamsChannel = await InitializeTeamsChannelAsync(TeamsNotificationService.TEAMS_NOTIFICATION);

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs

@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Services;
-using Unity.GrantManager.Intakes;
+using Newtonsoft.Json.Linq;
+using System.Threading.Tasks;
 using Unity.GrantManager.Events;
+using Unity.GrantManager.Intakes;
 using Volo.Abp.Domain.Repositories;
-using Newtonsoft.Json.Linq;
+using Volo.Abp.Domain.Services;
 
 namespace Unity.GrantManager.Applications
 {
@@ -58,9 +58,14 @@ public ApplicationForm SynchronizePublishedForm(ApplicationForm applicationForm,
                     JObject formObject = JObject.Parse(form.ToString());
                     var formName = formObject.SelectToken("name");
                     var formDescription = formObject.SelectToken("description");
-                    if(formName != null && formDescription != null)
+
+                    if (formName != null)
                     {
                         applicationForm.ApplicationFormName = formName.ToString();
+                    }
+
+                    if (formDescription != null && string.IsNullOrWhiteSpace(applicationForm.ApplicationFormDescription))
+                    {
                         applicationForm.ApplicationFormDescription = formDescription.ToString();
                     }
 

applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css

@@ -272,9 +272,18 @@ select.selected {
     margin-top: 0.8rem;
 }
 
-.details-nav .nav-link {
-    display: flex;
-}
+.details-nav .nav-link {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    height: 42px;
+    line-height: 1.5;
+}
+
+.details-nav .nav-link i {
+    line-height: 1;
+}
 
 .details-nav .nav-link .fl {
     margin-right: 4px;
@@ -338,15 +347,15 @@ select.selected {
     z-index: 999;
 }
 
-#detailsTab .nav-item .nav-link {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.action-bar {
-    display: flex !important;
-}
+#detailsTab .nav-item .nav-link {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.action-bar {
+    display: flex !important;
+}
 
 #DetailsActionBarStart {
     margin-right: 0.5rem;
@@ -677,36 +686,7 @@ form label.error {
     border-color: #f5c2c7;
 }
 
-#ai-analysis-tab {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    gap: 6px;
-}
-
-.ai-analysis-tab-icon-wrap {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.ai-analysis-tab-indicator {
-    width: 8px;
-    height: 8px;
-    border-radius: 999px;
-    background-color: #adb5bd;
-    flex-shrink: 0;
-}
-
-.ai-analysis-tab-indicator.proceed {
-    background-color: #198754;
-}
-
-.ai-analysis-tab-indicator.hold {
-    background-color: #dc3545;
-}
-
-.ai-analysis-action-btn {
+.ai-analysis-action-btn {
     background: #ffffff;
     border: 1px solid #d1d5db;
     padding: 4px 10px;
@@ -728,4 +708,4 @@ form label.error {
 
 .worksheet_AssessmentInfo {
     padding-left: 0.5rem;
-}
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-analysis.js

@@ -456,8 +456,8 @@ globalThis.queueApplicationAnalysis = function(triggerButton = null) {
 
             if (status === 'Completed') {
                 globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
+                globalThis.AIGenerationButtonState?.applyStatusState(request);
                 loadAIAnalysis();
-                globalThis.syncAIRateLimitButtons?.();
                 return;
             }