diff --git a/chatmastermind/main.py b/chatmastermind/main.py index 951d3cf..65731e7 100755 --- a/chatmastermind/main.py +++ b/chatmastermind/main.py @@ -11,7 +11,7 @@ from .storage import save_answers, create_chat_hist from .api_client import ai, openai_api_key, print_models from .configuration import Config from .chat import ChatDB -from .message import Message, MessageFilter, MessageError +from .message import Message, MessageFilter, MessageError, Question from itertools import zip_longest from typing import Any @@ -31,11 +31,11 @@ def create_question_with_hist(args: argparse.Namespace, by the specified tags. """ tags = args.tags or [] - etags = args.etags or [] + xtags = args.xtags or [] otags = args.output_tags or [] if not args.source_code_only: - print_tag_args(tags, etags, otags) + print_tag_args(tags, xtags, otags) question_parts = [] question_list = args.question if args.question is not None else [] @@ -52,7 +52,7 @@ def create_question_with_hist(args: argparse.Namespace, question_parts.append(f"```\n{r.read().strip()}\n```") full_question = '\n\n'.join(question_parts) - chat = create_chat_hist(full_question, tags, etags, config, + chat = create_chat_hist(full_question, tags, xtags, config, match_all_tags=True if args.atags else False, # FIXME with_tags=False, with_file=False) @@ -85,6 +85,29 @@ def config_cmd(args: argparse.Namespace, config: Config) -> None: config.to_file(args.config) +def question_cmd(args: argparse.Namespace, config: Config) -> None: + """ + Handler for the 'question' command. + """ + chat = ChatDB.from_dir(cache_path=Path('.'), + db_path=Path(config.db)) + # if it's a new question, create and store it immediately + if args.ask or args.create: + message = Message(question=Question(args.question), + tags=args.tags, + ai=args.ai, + model=args.model) + chat.add_to_cache([message]) + if args.create: + return + elif args.ask: + pass # TODO + elif args.repeat: + pass # TODO + elif args.process: + pass # TODO + + def ask_cmd(args: argparse.Namespace, config: Config) -> None: """ Handler for the 'ask' command. @@ -139,7 +162,7 @@ def print_cmd(args: argparse.Namespace, config: Config) -> None: def create_parser() -> argparse.ArgumentParser: parser = argparse.ArgumentParser( description="ChatMastermind is a Python application that automates conversation with AI") - parser.add_argument('-c', '--config', help='Config file name.', default=default_config) + parser.add_argument('-C', '--config', help='Config file name.', default=default_config) # subcommand-parser cmdparser = parser.add_subparsers(dest='command', @@ -152,16 +175,38 @@ def create_parser() -> argparse.ArgumentParser: tag_arg = tag_parser.add_argument('-t', '--tags', nargs='+', help='List of tag names (one must match)', metavar='TAGS') tag_arg.completer = tags_completer # type: ignore - atag_arg = tag_parser.add_argument('-a', '--atags', nargs='+', + atag_arg = tag_parser.add_argument('-k', '--atags', nargs='+', help='List of tag names (all must match)', metavar='TAGS') atag_arg.completer = tags_completer # type: ignore - etag_arg = tag_parser.add_argument('-e', '--etags', nargs='+', - help='List of tag names to exclude', metavar='ETAGS') + etag_arg = tag_parser.add_argument('-x', '--xtags', nargs='+', + help='List of tag names to exclude', metavar='XTAGS') etag_arg.completer = tags_completer # type: ignore otag_arg = tag_parser.add_argument('-o', '--output-tags', nargs='+', help='List of output tag names, default is input', metavar='OTAGS') otag_arg.completer = tags_completer # type: ignore + # 'question' command parser + question_cmd_parser = cmdparser.add_parser('question', parents=[tag_parser], + help="ask, create and process questions.", + aliases=['q']) + question_cmd_parser.set_defaults(func=question_cmd) + question_group = question_cmd_parser.add_mutually_exclusive_group(required=True) + question_group.add_argument('-a', '--ask', help='Ask a question') + question_group.add_argument('-r', '--repeat', help='Repeat a question') + question_group.add_argument('-c', '--create', help='Create a question') + question_group.add_argument('-p', '--process', help='Process existing questions') + question_cmd_parser.add_argument('-q', '--question', nargs='+', help='Question to ask or create', type=int) + question_cmd_parser.add_argument('-f', '--file', nargs='+', help='Message file(s) to repeat or process') + question_cmd_parser.add_argument('-m', '--max-tokens', help='Max tokens to use', type=int) + question_cmd_parser.add_argument('-T', '--temperature', help='Temperature to use', type=float) + question_cmd_parser.add_argument('-A', '--AI', help='AI to use') + question_cmd_parser.add_argument('-M', '--model', help='Model to use') + question_cmd_parser.add_argument('-n', '--number', help='Number of answers to produce', type=int, + default=1) + question_cmd_parser.add_argument('-s', '--source', nargs='+', help='Source add content of a file to the query') + question_cmd_parser.add_argument('-S', '--source-code-only', help='Add pure source code to the chat history', + action='store_true') + # 'ask' command parser ask_cmd_parser = cmdparser.add_parser('ask', parents=[tag_parser], help="Ask a question.", diff --git a/tests/test_main.py b/tests/test_main.py index bb9aa2a..cc32884 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -116,7 +116,7 @@ class TestHandleQuestion(CmmTestCase): self.args = argparse.Namespace( tags=['tag1'], atags=None, - etags=['etag1'], + xtags=['xtag1'], output_tags=None, question=[self.question], source=None, @@ -144,11 +144,11 @@ class TestHandleQuestion(CmmTestCase): with patch("chatmastermind.storage.open", open_mock): ask_cmd(self.args, self.config) mock_print_tag_args.assert_called_once_with(self.args.tags, - self.args.etags, + self.args.xtags, []) mock_create_chat_hist.assert_called_once_with(self.question, self.args.tags, - self.args.etags, + self.args.xtags, self.config, match_all_tags=False, with_tags=False,