Add Jinja2 as preparation for pipes.

.gitignore

@@ -106,6 +106,7 @@ celerybeat.pid
 .venv
 env/
 venv/
+.old/
 ENV/
 env.bak/
 venv.bak/

chatmastermind/chat.py

@@ -256,13 +256,16 @@ class Chat:
 
     def print(self, source_code_only: bool = False,
               with_metadata: bool = False,
-              paged: bool = True) -> None:
+              paged: bool = True,
+              tight: bool = False) -> None:
         output: list[str] = []
         for message in self.messages:
             if source_code_only:
                 output.append(message.to_str(source_code_only=True))
                 continue
             output.append(message.to_str(with_metadata))
+            if not tight:
+                output.append('\n' + ('-' * terminal_width()) + '\n')
         if paged:
             print_paged('\n'.join(output))
         else:

chatmastermind/commands/hist.py

@@ -57,7 +57,9 @@ def print_chat(args: argparse.Namespace, config: Config) -> None:
                            Path(config.db),
                            mfilter=mfilter)
     chat.print(args.source_code_only,
-               args.with_metadata)
+               args.with_metadata,
+               paged=not args.no_paging,
+               tight=args.tight)
 
 
 def hist_cmd(args: argparse.Namespace, config: Config) -> None:

chatmastermind/main.py

@@ -85,6 +85,8 @@ def create_parser() -> argparse.ArgumentParser:
                                  action='store_true')
     hist_cmd_parser.add_argument('-A', '--answer', help='Print only answers with given substring', metavar='SUBSTRING')
     hist_cmd_parser.add_argument('-Q', '--question', help='Print only questions with given substring', metavar='SUBSTRING')
+    hist_cmd_parser.add_argument('-d', '--tight', help='Print without message separators', action='store_true')
+    hist_cmd_parser.add_argument('-P', '--no-paging', help='Print without paging', action='store_true')
 
     # 'tags' command parser
     tags_cmd_parser = cmdparser.add_parser('tags',

requirements.txt

@@ -2,3 +2,4 @@ openai
 PyYAML
 argcomplete
 pytest
+Jinja2

setup.py

@@ -2,6 +2,8 @@ from setuptools import setup, find_packages
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
+with open("requirements.txt", "r") as fh:
+    install_requirements = [line.strip() for line in fh]
 
 setup(
     name="ChatMastermind",
@@ -28,12 +30,7 @@ setup(
         "Topic :: Utilities",
         "Topic :: Text Processing",
     ],
-    install_requires=[
-        "openai",
-        "PyYAML",
-        "argcomplete",
-        "pytest",
-    ],
+    install_requires=install_requirements,
     python_requires=">=3.9",
     test_suite="tests",
     entry_points={

tests/test_chat.py

@@ -147,7 +147,7 @@ class TestChat(TestChatBase):
     @patch('sys.stdout', new_callable=StringIO)
     def test_print(self, mock_stdout: StringIO) -> None:
         self.chat.msg_add([self.message1, self.message2])
-        self.chat.print(paged=False)
+        self.chat.print(paged=False, tight=True)
         expected_output = f"""{Question.txt_header}
 Question 1
 {Answer.txt_header}
@@ -162,7 +162,7 @@ Answer 2
     @patch('sys.stdout', new_callable=StringIO)
     def test_print_with_metadata(self, mock_stdout: StringIO) -> None:
         self.chat.msg_add([self.message1, self.message2])
-        self.chat.print(paged=False, with_metadata=True)
+        self.chat.print(paged=False, with_metadata=True, tight=True)
         expected_output = f"""{TagLine.prefix} atag1 btag2
 FILE: 0001{msg_suffix}
 AI: FakeAI