added new module 'openai.py'

chatmastermind/main.py

@@ -30,8 +30,8 @@ def create_question_with_hist(args: argparse.Namespace,
     Creates the "AI request", including the question and chat history as determined
     by the specified tags.
     """
-    tags = args.or_tags or []
+    tags = args.tags or []
-    xtags = args.exclude_tags or []
+    xtags = args.xtags or []
     otags = args.output_tags or []
 
     if not args.source_code_only:
@@ -53,7 +53,7 @@ def create_question_with_hist(args: argparse.Namespace,
 
     full_question = '\n\n'.join(question_parts)
     chat = create_chat_hist(full_question, tags, xtags, config,
-                            match_all_tags=True if args.and_tags else False,  # FIXME
+                            match_all_tags=True if args.atags else False,  # FIXME
                             with_tags=False,
                             with_file=False)
     return chat, full_question, tags
@@ -94,7 +94,7 @@ def question_cmd(args: argparse.Namespace, config: Config) -> None:
     # 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.ouput_tags,  # FIXME
+                          tags=args.tags,
                           ai=args.ai,
                           model=args.model)
         chat.add_to_cache([message])
@@ -132,9 +132,9 @@ def hist_cmd(args: argparse.Namespace, config: Config) -> None:
     Handler for the 'hist' command.
     """
 
-    mfilter = MessageFilter(tags_or=args.or_tags,
+    mfilter = MessageFilter(tags_or=args.tags,
-                            tags_and=args.and_tags,
+                            tags_and=args.atags,
-                            tags_not=args.exclude_tags,
+                            tags_not=args.etags,
                             question_contains=args.question,
                             answer_contains=args.answer)
     chat = ChatDB.from_dir(Path('.'),
@@ -172,17 +172,17 @@ def create_parser() -> argparse.ArgumentParser:
 
     # a parent parser for all commands that support tag selection
     tag_parser = argparse.ArgumentParser(add_help=False)
-    tag_arg = tag_parser.add_argument('-t', '--or-tags', nargs='+',
+    tag_arg = tag_parser.add_argument('-t', '--tags', nargs='+',
-                                      help='List of tag names (one must match)', metavar='OTAGS')
+                                      help='List of tag names (one must match)', metavar='TAGS')
     tag_arg.completer = tags_completer  # type: ignore
-    atag_arg = tag_parser.add_argument('-k', '--and-tags', nargs='+',
+    atag_arg = tag_parser.add_argument('-k', '--atags', nargs='+',
-                                       help='List of tag names (all must match)', metavar='ATAGS')
+                                       help='List of tag names (all must match)', metavar='TAGS')
     atag_arg.completer = tags_completer  # type: ignore
-    etag_arg = tag_parser.add_argument('-x', '--exclude-tags', nargs='+',
+    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='OUTTAGS')
+                                       help='List of output tag names, default is input', metavar='OTAGS')
     otag_arg.completer = tags_completer  # type: ignore
 
     # 'question' command parser
@@ -191,10 +191,12 @@ def create_parser() -> argparse.ArgumentParser:
                                                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', nargs='+', help='Ask a question')
+    question_group.add_argument('-a', '--ask', help='Ask a question')
-    question_group.add_argument('-c', '--create', nargs='+', help='Create a question')
+    question_group.add_argument('-r', '--repeat', help='Repeat a question')
-    question_group.add_argument('-r', '--repeat', nargs='*', help='Repeat a question')
+    question_group.add_argument('-c', '--create', help='Create a question')
-    question_group.add_argument('-p', '--process', nargs='*', help='Process existing questions')
+    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')

tests/test_main.py

@@ -114,9 +114,9 @@ class TestHandleQuestion(CmmTestCase):
     def setUp(self) -> None:
         self.question = "test question"
         self.args = argparse.Namespace(
-            or_tags=['tag1'],
+            tags=['tag1'],
-            and_tags=None,
+            atags=None,
-            exclude_tags=['xtag1'],
+            xtags=['xtag1'],
             output_tags=None,
             question=[self.question],
             source=None,
@@ -143,12 +143,12 @@ class TestHandleQuestion(CmmTestCase):
         open_mock = MagicMock()
         with patch("chatmastermind.storage.open", open_mock):
             ask_cmd(self.args, self.config)
-            mock_print_tag_args.assert_called_once_with(self.args.or_tags,
+            mock_print_tag_args.assert_called_once_with(self.args.tags,
-                                                        self.args.exclude_tags,
+                                                        self.args.xtags,
                                                         [])
             mock_create_chat_hist.assert_called_once_with(self.question,
-                                                          self.args.or_tags,
+                                                          self.args.tags,
-                                                          self.args.exclude_tags,
+                                                          self.args.xtags,
                                                           self.config,
                                                           match_all_tags=False,
                                                           with_tags=False,