Revert chat subcommand/arg changes

cli.py

@@ -18,8 +18,7 @@
 def check_args(args, command_name: str):
     global strict
 
-    # chat and generate support the same options
-    if command_name in ["chat", "generate", "gui"]:
+    if command_name in ["generate", "gui"]:
         # examples, can add more. Note that attributes convert dash to _
         disallowed_args = ["output_pte_path", "output_dso_path"]
     elif command_name == "export":
@@ -223,6 +222,11 @@ def _add_arguments_common(parser):
         default=".model-artifacts",
         help="The directory to store downloaded model artifacts",
     )
+    parser.add_argument(
+        "--chat",
+        action="store_true",
+        help="Use torchchat to for an interactive chat session.",
+    )
 
 
 def arg_init(args):

generate.py

@@ -48,12 +48,8 @@ class GeneratorArgs:
     def from_args(cls, args):  # -> GeneratorArgs:
         return cls(
             prompt=args.prompt,
-<<<<<<< HEAD
             encoded_prompt=None,
             chat_mode=args.chat,
-=======
-            chat_mode=hasattr(args, "subcommand") and args.subcommand == "chat",
->>>>>>> 0dc48b0 (Merge GenerateArgs changes)
             gui_mode=args.gui,
             num_samples=args.num_samples,
             max_new_tokens=args.max_new_tokens,

torchchat.py

@@ -22,12 +22,9 @@
     parser = argparse.ArgumentParser(description="Top-level command")
     subparsers = parser.add_subparsers(
         dest="subcommand",
-        help="Use `chat`, `download`, `generate`, `eval` or `export` followed by subcommand specific options.",
+        help="Use `download`, `generate`, `eval` or `export` followed by subcommand specific options.",
     )
 
-    parser_chat = subparsers.add_parser("chat")
-    add_arguments_for_generate(parser_chat)
-
     parser_download = subparsers.add_parser("download")
     add_arguments_for_download(parser_download)
 
@@ -48,8 +45,8 @@
         from download import main as download_main
 
         download_main(args)
-    elif args.subcommand == "generate" or args.subcommand == "chat":
-        check_args(args, args.subcommand)
+    elif args.subcommand == "generate":
+        check_args(args, "generate")
         from generate import main as generate_main
 
         generate_main(args)