v2.1 - Small improvement

alfred/app/services/admin_console.py

@@ -65,6 +65,28 @@ DEFAULTS = {
 }
 
 
+# ALFRED_ADMIN_SURVEILLANCE_V2 : champs du moteur STT existant.
+FIELDS.update({
+    'STT_ENGINE': ('general', 'stt_engine'),
+    'WYOMING_WHISPER_HOST': ('general', 'stt_host'),
+    'WYOMING_WHISPER_PORT': ('general', 'stt_port'),
+    'WYOMING_WHISPER_LANGUAGE': ('general', 'stt_language'),
+    'WYOMING_WHISPER_TIMEOUT': ('general', 'stt_timeout'),
+    'WYOMING_WHISPER_CONNECT_TIMEOUT': ('general', 'stt_connect_timeout'),
+    'STT_MAX_AUDIO_SECONDS': ('general', 'stt_max_audio'),
+})
+DEFAULTS.update({
+    'STT_ENGINE': 'vosk',
+    'WYOMING_WHISPER_HOST': '192.168.1.13',
+    'WYOMING_WHISPER_PORT': '10300',
+    'WYOMING_WHISPER_LANGUAGE': 'fr',
+    'WYOMING_WHISPER_TIMEOUT': '20',
+    'WYOMING_WHISPER_CONNECT_TIMEOUT': '3',
+    'STT_MAX_AUDIO_SECONDS': '30',
+})
+from services.admin_extensions_v2 import extend_health as _admin_v2_extend_health
+
+
 def _auth_config():
     try:
         return json.loads(AUTH_FILE.read_text(encoding='utf-8'))
@@ -124,7 +146,35 @@ def _validate(key, value):
     value = str(value).strip()
     if any(c in value for c in ('\r', '\n', '\x00', '"', "'", '\\', '$', '`')):
         raise ValueError(f'Caractères interdits pour {key}.')
-    if kind == 'text':
+    # ALFRED_ADMIN_SURVEILLANCE_V2: stricte validation des paramètres Whisper.
+    if kind == 'stt_engine':
+        if value not in ('vosk', 'wyoming'):
+            raise ValueError('Moteur STT attendu : vosk ou wyoming.')
+    elif kind == 'stt_host':
+        if not re.fullmatch(r'[A-Za-z0-9][A-Za-z0-9.\-]{0,252}', value):
+            raise ValueError('Hôte Whisper invalide : indiquer une IP ou un nom DNS, sans protocole.')
+    elif kind == 'stt_port':
+        if not value.isdecimal() or not 1 <= int(value) <= 65535:
+            raise ValueError('Port Whisper invalide (1 à 65535).')
+        value = str(int(value))
+    elif kind == 'stt_language':
+        if not re.fullmatch(r'[a-z]{2}', value.lower()):
+            raise ValueError('Langue Whisper invalide (exemple : fr).')
+        value = value.lower()
+    elif kind in ('stt_timeout', 'stt_connect_timeout'):
+        try:
+            number = float(value)
+        except ValueError:
+            raise ValueError('Délai Whisper non numérique.')
+        bounds = (5, 90) if kind == 'stt_timeout' else (1, 15)
+        if not bounds[0] <= number <= bounds[1]:
+            raise ValueError(f'Délai Whisper entre {bounds[0]} et {bounds[1]} secondes.')
+        value = str(number).rstrip('0').rstrip('.') if '.' in str(number) else str(number)
+    elif kind == 'stt_max_audio':
+        if not value.isdecimal() or not 5 <= int(value) <= 60:
+            raise ValueError('Enregistrement entre 5 et 60 secondes.')
+        value = str(int(value))
+    elif kind == 'text':
         if not 2 <= len(value) <= 30:
             raise ValueError('Le nom doit contenir entre 2 et 30 caractères.')
     elif kind == 'wake':
@@ -299,10 +349,11 @@ def _health(wake, audio_settings):
             mem = {'total': info['MemTotal'], 'used': info['MemTotal'] - info.get('MemAvailable', 0)}
     except (OSError, ValueError):
         pass
-    return {'time': now, 'audio':audio, 'wake':wake_state, 'camera':camera,
+    result = {'time': now, 'audio':audio, 'wake':wake_state, 'camera':camera,
             'microphone':microphone, 'speaker':loudspeaker, 'services':services, 'mcps':mcps,
             'system':{'disk_total':disk.total,'disk_used':disk.used, 'memory':mem,
                       'load_1m':round(os.getloadavg()[0], 2) if hasattr(os,'getloadavg') else None}}
+    return _admin_v2_extend_health(result, _read_config)
 
 
 def register_admin_console(app, wake, audio_settings):