openai: stores AI.ID instead of AI.name in message

chatmastermind/ai.py

@@ -66,3 +66,9 @@ class AI(Protocol):
         and is not implemented for all AIs.
         """
         raise NotImplementedError
+
+    def print(self) -> None:
+        """
+        Print some info about the current AI, like system message.
+        """
+        pass

chatmastermind/ais/openai.py

@@ -43,16 +43,20 @@ class OpenAI(AI):
             n=num_answers,
             frequency_penalty=self.config.frequency_penalty,
             presence_penalty=self.config.presence_penalty)
-        answers: list[Message] = []
+        question.answer = Answer(response['choices'][0]['message']['content'])
-        for choice in response['choices']:  # type: ignore
+        question.tags = otags
+        question.ai = self.ID
+        question.model = self.config.model
+        answers: list[Message] = [question]
+        for choice in response['choices'][1:]:  # type: ignore
             answers.append(Message(question=question.question,
                                    answer=Answer(choice['message']['content']),
                                    tags=otags,
-                                   ai=self.name,
+                                   ai=self.ID,
                                    model=self.config.model))
-        return AIResponse(answers, Tokens(response['usage']['prompt'],
+        return AIResponse(answers, Tokens(response['usage']['prompt_tokens'],
-                                          response['usage']['completion'],
+                                          response['usage']['completion_tokens'],
-                                          response['usage']['total']))
+                                          response['usage']['total_tokens']))
 
     def models(self) -> list[str]:
         """
@@ -95,3 +99,8 @@ class OpenAI(AI):
 
     def tokens(self, data: Union[Message, Chat]) -> int:
         raise NotImplementedError
+
+    def print(self) -> None:
+        print(f"MODEL: {self.config.model}")
+        print("=== SYSTEM ===")
+        print(self.config.system)

chatmastermind/commands/question.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from itertools import zip_longest
 from ..configuration import Config
 from ..chat import ChatDB
-from ..message import Message, Question, source_code
+from ..message import Message, MessageFilter, Question, source_code
 from ..ai_factory import create_ai
 from ..ai import AI, AIResponse
 
@@ -52,8 +52,12 @@ def question_cmd(args: argparse.Namespace, config: Config) -> None:
     """
     Handler for the 'question' command.
     """
+    mfilter = MessageFilter(tags_or=args.or_tags,
+                            tags_and=args.and_tags,
+                            tags_not=args.exclude_tags)
     chat = ChatDB.from_dir(cache_path=Path('.'),
-                           db_path=Path(config.db))
+                           db_path=Path(config.db),
+                           mfilter=mfilter)
     # if it's a new question, create and store it immediately
     if args.ask or args.create:
         message = create_message(chat, args)
@@ -63,23 +67,28 @@ def question_cmd(args: argparse.Namespace, config: Config) -> None:
     # create the correct AI instance
     ai: AI = create_ai(args, config)
     if args.ask:
+        ai.print()
+        chat.print(paged=False)
         response: AIResponse = ai.request(message,
                                           chat,
                                           args.num_answers,  # FIXME
                                           args.output_tags)  # FIXME
-        assert response
+        chat.update_messages([response.messages[0]])
-        # TODO:
+        chat.add_to_cache(response.messages[1:])
-        # * add answer to the message above (and create
+        for idx, msg in enumerate(response.messages):
-        #   more messages for any additional answers)
+            print(f"=== ANSWER {idx+1} ===")
-        pass
+            print(msg.answer)
-    elif args.repeat:
+        if response.tokens:
+            print("===============")
+            print(response.tokens)
+    elif args.repeat is not None:
         lmessage = chat.latest_message()
         assert lmessage
         # TODO: repeat either the last question or the
         # one(s) given in 'args.repeat' (overwrite
         # existing ones if 'args.overwrite' is True)
         pass
-    elif args.process:
+    elif args.process is not None:
         # TODO: process either all questions without an
         # answer or the one(s) given in 'args.process'
         pass