configuration is now a TypedDict in its own module

chatmastermind/main.py

@@ -7,9 +7,10 @@ import sys
 import argcomplete
 import argparse
 import pathlib
-from .utils import terminal_width, print_tag_args, print_chat_hist, display_source_code, print_tags_frequency, ConfigType, ChatType
+from .utils import terminal_width, print_tag_args, print_chat_hist, display_source_code, print_tags_frequency, ChatType
 from .storage import save_answers, create_chat_hist, get_tags, get_tags_unique, read_file, read_config, write_config, dump_data
 from .api_client import ai, openai_api_key, print_models
+from .configuration import Config
 from itertools import zip_longest
 from typing import Any
 
@@ -23,7 +24,7 @@ def tags_completer(prefix: str, parsed_args: Any, **kwargs: Any) -> list[str]:
 
 
 def create_question_with_hist(args: argparse.Namespace,
-                              config: ConfigType,
+                              config: Config,
                               ) -> tuple[ChatType, str, list[str]]:
     """
     Creates the "AI request", including the question and chat history as determined
@@ -56,7 +57,7 @@ def create_question_with_hist(args: argparse.Namespace,
     return chat, full_question, tags
 
 
-def tag_cmd(args: argparse.Namespace, config: ConfigType) -> None:
+def tag_cmd(args: argparse.Namespace, config: Config) -> None:
     """
     Handler for the 'tag' command.
     """
@@ -64,13 +65,10 @@ def tag_cmd(args: argparse.Namespace, config: ConfigType) -> None:
         print_tags_frequency(get_tags(config, None))
 
 
-def config_cmd(args: argparse.Namespace, config: ConfigType) -> None:
+def config_cmd(args: argparse.Namespace, config: Config) -> None:
     """
     Handler for the 'config' command.
     """
-    if not isinstance(config['openai'], dict):
-        raise RuntimeError('Configuration openai is not a dict.')
-
     if args.list_models:
         print_models()
     elif args.print_model:
@@ -80,12 +78,10 @@ def config_cmd(args: argparse.Namespace, config: ConfigType) -> None:
         write_config(args.config, config)
 
 
-def ask_cmd(args: argparse.Namespace, config: ConfigType) -> None:
+def ask_cmd(args: argparse.Namespace, config: Config) -> None:
     """
     Handler for the 'ask' command.
     """
-    if not isinstance(config['openai'], dict):
-        raise RuntimeError('Configuration openai is not a dict.')
     if args.max_tokens:
         config['openai']['max_tokens'] = args.max_tokens
     if args.temperature:
@@ -101,7 +97,7 @@ def ask_cmd(args: argparse.Namespace, config: ConfigType) -> None:
     print(f"Usage: {usage}")
 
 
-def hist_cmd(args: argparse.Namespace, config: ConfigType) -> None:
+def hist_cmd(args: argparse.Namespace, config: Config) -> None:
     """
     Handler for the 'hist' command.
     """
@@ -115,7 +111,7 @@ def hist_cmd(args: argparse.Namespace, config: ConfigType) -> None:
     print_chat_hist(chat, args.dump, args.only_source_code)
 
 
-def print_cmd(args: argparse.Namespace, config: ConfigType) -> None:
+def print_cmd(args: argparse.Namespace, config: Config) -> None:
     """
     Handler for the 'print' command.
     """
@@ -231,10 +227,7 @@ def main() -> int:
     command = parser.parse_args()
     config = read_config(args.config)
 
-    if type(config['openai']) is dict and type(config['openai']['api_key']) is str:
-        openai_api_key(config['openai']['api_key'])
-    else:
-        raise RuntimeError("Configuration openai.api_key is wrong.")
+    openai_api_key(config['openai']['api_key'])
 
     command.func(command, config)