fix quota period config and other feedback

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

Author: lukasdotcom

lib/AppInfo/Application.php

@@ -55,7 +55,7 @@ class Application extends App implements IBootstrap {
 	public const MIN_CHUNK_SIZE = 500;
 	public const DEFAULT_MAX_NUM_OF_TOKENS = 1000;
 	public const DEFAULT_QUOTA_PERIOD = 30;
-	public const DEFAULT_QUOTA_CONFIG = ['length' => self::DEFAULT_QUOTA_PERIOD, 'unit' => 'day'];
+	public const DEFAULT_QUOTA_CONFIG = ['length' => self::DEFAULT_QUOTA_PERIOD, 'unit' => 'day', 'day' => 1];
 
 	public const DEFAULT_OPENAI_TEXT_GENERATION_TIME = 10; // seconds
 	public const DEFAULT_LOCALAI_TEXT_GENERATION_TIME = 60; // seconds

lib/Service/OpenAiSettingsService.php

@@ -65,6 +65,8 @@ public function __construct(
 	}
 
 	/**
+	 * Gets the timestamp of the beginning of the quota period
+	 *
 	 * @return int
 	 * @throws Exception
 	 */
@@ -93,6 +95,9 @@ public function getQuotaStart(): int {
 	}
 
 	/**
+	 * Gets the timestamp of the end of the quota period
+	 * if the period is floating, then this will be the current time
+	 *
 	 * @return int
 	 * @throws Exception
 	 */
@@ -262,11 +267,14 @@ public function getQuotaPeriod(): array {
 			$this->appConfig->getValueString(Application::APP_ID, 'quota_period', json_encode(Application::DEFAULT_QUOTA_CONFIG)),
 			true
 		) ?: Application::DEFAULT_QUOTA_CONFIG;
+		// Migrate from old quota period to new one
 		if (is_int($value)) {
-			return [
-				'length' => $value,
-				'unit' => 'day',
-			];
+			$value = ['length' => $value];
+		}
+		foreach (Application::DEFAULT_QUOTA_CONFIG as $key => $defaultValue) {
+			if (!isset($value[$key])) {
+				$value[$key] = $defaultValue;
+			}
 		}
 		return $value;
 	}

src/components/PersonalSettings.vue

@@ -168,12 +168,12 @@ export default {
 	computed: {
 		quotaRangeText() {
 			return this.quotaInfo?.period?.unit === 'month'
-				? t('integration_openai', 'This quota period is from {startDate} to {endDate}.', {
+				? t('integration_openai', 'This quota period is from {startDate} to {endDate}', {
 					startDate: formatRelativeTime(this.quotaInfo.start * 1000),
 					endDate: formatRelativeTime(this.quotaInfo.end * 1000),
 				})
-				: n('integration_openai', 'The quota is kept over a floating period of the last %n day.',
-					'The quota is kept over a floating period of the last %n days.', this.quotaInfo.period.length)
+				: n('integration_openai', 'The quota is kept over a floating period of the last %n day',
+					'The quota is kept over a floating period of the last %n days', this.quotaInfo.period.length)
 		},
 	},
 

src/components/QuotaPeriodPicker.vue

@@ -6,7 +6,7 @@
 	<div class="container">
 		<NcNoteCard type="info">
 			{{
-				t('integration_openai', 'Daily quotas are floating quotas while monthly reset on a certain day of the month.')
+				t('integration_openai', 'Daily quotas are floating quotas while monthly reset on a certain day of the month')
 			}}
 		</NcNoteCard>
 		<div class="line">
@@ -85,8 +85,8 @@ export default {
 		},
 		resetText() {
 			return this.floating
-				? n('integration_openai', 'Quota will be enforced based on last %n day of usage.', 'Quota will be enforced based on last %n days of usage.', this.value.length)
-				: n('integration_openai', 'Quota will reset all users every month on day {day}.', 'Quota will reset for all users every %n months on day {day}.', this.value.length, { day: this.value.day })
+				? n('integration_openai', 'Quota will be enforced based on last %n day of usage', 'Quota will be enforced based on last %n days of usage', this.value.length)
+				: n('integration_openai', 'Quota will reset all users every month on day {day}', 'Quota will reset for all users every %n months on day {day}', this.value.length, { day: this.value.day })
 		},
 	},