BUGFIX

SkyEye did not work with API keys

Author: karel26

extensions/skyeye/extension.py

@@ -40,8 +40,14 @@ def __init__(self, server, config):
         if self.process:
             self.log.info(f"  => {self.name}: Running SkyEye server detected.")
 
+    def get_config(self) -> str:
+        return os.path.expandvars(utils.format_string(
+            self.config.get('config', f'{self.server.instance.home}\\Config\\SkyEye.yaml'),
+            server=self.server)
+        )
+
     def load_config(self) -> Optional[dict]:
-        path = os.path.expandvars(self.config['config'])
+        path = self.get_config()
         if not os.path.exists(path):
             base_config = os.path.join(os.path.dirname(self.get_exe_path()), "config.yaml")
             if not os.path.exists(base_config):
@@ -137,7 +143,7 @@ async def prepare(self) -> bool:
         if srs:
             srs_port = srs.config.get('port', srs.locals['Server Settings']['SERVER_PORT'])
             dirty |= self._maybe_update_config('srs-server-address', f"localhost:{srs_port}")
-            if self.config['coalition'] == 'blue':
+            if self.config.get('coalition', 'blue') == 'blue':
                 dirty |= self._maybe_update_config(
                     'srs-eam-password',
                     srs.locals['External AWACS Mode Settings']['EXTERNAL_AWACS_MODE_BLUE_PASSWORD']
@@ -163,7 +169,7 @@ async def prepare(self) -> bool:
             # grpc-password is not supported yet
 
         if dirty:
-            with open(os.path.expandvars(self.config['config']), mode='w', encoding='utf-8') as outfile:
+            with open(self.get_config(), mode='w', encoding='utf-8') as outfile:
                 yaml.dump(self.locals, outfile)
         return await super().prepare()
 
@@ -176,9 +182,11 @@ def run_subprocess():
             out = subprocess.PIPE if self.config.get('debug', False) else subprocess.DEVNULL
             args = [
                 self.get_exe_path(),
-                '--config-file', os.path.expandvars(self.config['config']),
-                '--whisper-model', 'whisper.bin'
+                '--config-file', self.get_config()
             ]
+            if self.locals.get('recognizer', 'openai-whisper-local') == 'openai-whisper-local':
+                args.extend(['--whisper-model', 'whisper.bin'])
+
             self.log.debug("Launching {}".format(' '.join(args)))
             proc = subprocess.Popen(
                 args, cwd=os.path.dirname(self.get_exe_path()), stdout=out, stderr=subprocess.STDOUT, close_fds=True