configuration et al: implemented new Config format

chatmastermind/ai_factory.py

@@ -3,18 +3,32 @@ Creates different AI instances, based on the given configuration.
 """
 
 import argparse
-from .configuration import Config
+from typing import cast
+from .configuration import Config, OpenAIConfig, default_ai_ID
 from .ai import AI, AIError
-from .ais.openai import OpenAI
+from .ais.openai_cmm import OpenAI
 
 
 def create_ai(args: argparse.Namespace, config: Config) -> AI:
     """
-    Creates an AI subclass instance from the given args and configuration.
+    Creates an AI subclass instance from the given arguments
+    and configuration file.
     """
-    if args.ai == 'openai':
-        # FIXME: create actual 'OpenAIConfig' and set values from 'args'
-        # FIXME: use actual name from config
-        return OpenAI("openai", config.openai)
+    if args.ai:
+        ai_conf = config.ais[args.ai]
+    elif default_ai_ID in config.ais:
+        ai_conf = config.ais[default_ai_ID]
+    else:
+        raise AIError("No AI name given and no default exists")
+
+    if ai_conf.name == 'openai':
+        ai = OpenAI(cast(OpenAIConfig, ai_conf))
+        if args.max_tokens:
+            ai.config.max_tokens = args.max_tokens
+        if args.config.temperature:
+            ai.config.temperature = args.temperature
+        if args.model:
+            ai.config.model = args.model
+        return ai
     else:
         raise AIError(f"AI '{args.ai}' is not supported")