kaizenkodo/ChatMastermind
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

cmm: the 'print' command now uses 'Message.from_file()'

Browse Source
This commit is contained in:
juk0de 2023-09-04 22:07:02 +02:00
parent f93a57c00d
commit bf1cbff6a2
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
chatmastermind/main.py
View File

@ -2,17 +2,16 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: set fileencoding=utf-8 : # vim: set fileencoding=utf-8 :
import yaml
import sys import sys
import argcomplete import argcomplete
import argparse import argparse
from pathlib import Path from pathlib import Path
from .utils import terminal_width, print_tag_args, print_chat_hist, display_source_code, ChatType from .utils import terminal_width, print_tag_args, print_chat_hist, ChatType
from .storage import save_answers, create_chat_hist, read_file, dump_data from .storage import save_answers, create_chat_hist
from .api_client import ai, openai_api_key, print_models from .api_client import ai, openai_api_key, print_models
from .configuration import Config from .configuration import Config
from .chat import ChatDB from .chat import ChatDB
from .message import Message, MessageFilter from .message import Message, MessageFilter, MessageError
from itertools import zip_longest from itertools import zip_longest
from typing import Any from typing import Any
@ -128,18 +127,13 @@ def print_cmd(args: argparse.Namespace, config: Config) -> None:
Handler for the 'print' command. Handler for the 'print' command.
""" """
fname = Path(args.file) fname = Path(args.file)
if fname.suffix == '.yaml': try:
with open(args.file, 'r') as f: message = Message.from_file(fname)
data = yaml.load(f, Loader=yaml.FullLoader) if message:
elif fname.suffix == '.txt': print(message.to_str(source_code_only=args.source_code_only))
data = read_file(fname) except MessageError:
else: print(f"File is not a valid message: {args.file}")
print(f"Unknown file type: {args.file}")
sys.exit(1) sys.exit(1)
if args.source_code_only:
display_source_code(data['answer'])
else:
print(dump_data(data).strip())
def create_parser() -> argparse.ArgumentParser: def create_parser() -> argparse.ArgumentParser:
@ -223,11 +217,11 @@ def create_parser() -> argparse.ArgumentParser:
# 'print' command parser # 'print' command parser
print_cmd_parser = cmdparser.add_parser('print', print_cmd_parser = cmdparser.add_parser('print',
help="Print files.", help="Print message files.",
aliases=['p']) aliases=['p'])
print_cmd_parser.set_defaults(func=print_cmd) print_cmd_parser.set_defaults(func=print_cmd)
print_cmd_parser.add_argument('-f', '--file', help='File to print', required=True) print_cmd_parser.add_argument('-f', '--file', help='File to print', required=True)
print_cmd_parser.add_argument('-S', '--source-code-only', help='Print only source code', print_cmd_parser.add_argument('-S', '--source-code-only', help='Print source code only (from the answer, if available)',
action='store_true') action='store_true')
argcomplete.autocomplete(parser) argcomplete.autocomplete(parser)