feat: update personal settings for rules

Signed-off-by: Lukas Schaefer <[email protected]>

Author: lukasdotcom

lib/Service/OpenAiAPIService.php

@@ -315,7 +315,7 @@ public function translatedQuotaUnit(int $type): string {
 	 */
 	public function getUserQuotaInfo(string $userId): array {
 		// Get quota limits (if the user has specified an own OpenAI API key, no quota limit, just supply default values as fillers)
-		$quotas = $this->hasOwnOpenAiApiKey($userId) ? Application::DEFAULT_QUOTAS : $this->openAiSettingsService->getQuotas();
+		$ownApikey = $this->hasOwnOpenAiApiKey($userId);
 		// Get quota period
 		$quotaPeriod = $this->openAiSettingsService->getQuotaPeriod();
 		// Get quota usage for each quota type:
@@ -328,7 +328,15 @@ public function getUserQuotaInfo(string $userId): array {
 				$this->logger->warning('Could not retrieve quota usage for user: ' . $userId . ' and quota type: ' . $quotaType . '. Error: ' . $e->getMessage(), ['app' => Application::APP_ID]);
 				throw new Exception($this->l10n->t('Unknown error while retrieving quota usage.'), Http::STATUS_INTERNAL_SERVER_ERROR);
 			}
-			$quotaInfo[$quotaType]['limit'] = intval($quotas[$quotaType]);
+			if ($ownApikey) {
+				$quotaInfo[$quotaType]['limit'] = Application::DEFAULT_QUOTAS[$quotaType];
+			} else {
+				$rule = $this->quotaRuleService->getRule($quotaType, $userId);
+				$quotaInfo[$quotaType]['limit'] = $rule['amount'];
+				if ($rule['pool']) {
+					$quotaInfo[$quotaType]['used_pool'] = $this->quotaUsageMapper->getQuotaUnitsOfUserInTimePeriod($userId, $quotaType, $quotaPeriod, $rule['id']);
+				}
+			}
 			$quotaInfo[$quotaType]['unit'] = $this->translatedQuotaUnit($quotaType);
 		}
 

lib/Service/QuotaRuleService.php

@@ -43,12 +43,13 @@ public function getRule(int $quotaType, string $userId) {
 			try {
 				$rule = $this->quotaRuleMapper->getRule($quotaType, $userId, $groups)->jsonSerialize();
 			} catch (DoesNotExistException) {
-				$cache->set($cacheKey, [
+				$rule = [
 					'amount' => $this->openAiSettingsService->getQuotas()[$quotaType],
 					'pool' => false,
 					'id' => null,
-				]);
-				return [];
+				];
+				$cache->set($cacheKey, $rule);
+				return $rule;
 			}
 			$cache->set($cacheKey, $rule);
 		}

src/components/PersonalSettings.vue

@@ -95,6 +95,9 @@
 								{{ t('integration_openai', 'Quota type') }}
 							</th>
 							<th>{{ t('integration_openai', 'Usage') }}</th>
+							<th v-if="poolUsed">
+								{{ t('integration_openai', 'Shared Usage') }}
+							</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -106,6 +109,12 @@
 							<td v-else>
 								{{ quota.used + ' ' + quota.unit }}
 							</td>
+							<td v-if="quota.used_pool">
+								{{ Math.round(quota.used_pool / quota.limit * 100) + ' %' }}
+							</td>
+							<td v-else-if="poolUsed">
+								{{ t('integration_openai', 'Not Shared') }}
+							</td>
 						</tr>
 					</tbody>
 				</table>
@@ -162,6 +171,9 @@ export default {
 	},
 
 	computed: {
+		poolUsed() {
+			return this.quotaInfo !== null && this.quotaInfo.quota_usage.some((quota) => quota.used_pool)
+		},
 	},
 
 	watch: {