From 019a9f03292176401c1925a87f58358c5211fb28 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 27 Mar 2023 12:20:24 -0400 Subject: [PATCH] address change requests in PR 1. Prompt has changed to "invoke> ". 2. Function to initialize the autocompleter has been renamed "set_autocompleter()" --- invokeai/app/cli/completer.py | 3 +-- invokeai/app/cli_app.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/invokeai/app/cli/completer.py b/invokeai/app/cli/completer.py index cffff200bf..86d3e100c3 100644 --- a/invokeai/app/cli/completer.py +++ b/invokeai/app/cli/completer.py @@ -6,7 +6,6 @@ completer object. import atexit import readline import shlex -import sys from pathlib import Path from typing import List, Dict, Literal, get_args, get_type_hints, get_origin @@ -131,7 +130,7 @@ class Completer(object): readline.redisplay() self.linebuffer = None -def get_completer(model_manager: ModelManager) -> Completer: +def set_autocompleter(model_manager: ModelManager) -> Completer: global completer if completer: diff --git a/invokeai/app/cli_app.py b/invokeai/app/cli_app.py index 927f1954d9..bf003e5cb1 100644 --- a/invokeai/app/cli_app.py +++ b/invokeai/app/cli_app.py @@ -14,7 +14,7 @@ from pydantic.fields import Field from ..backend import Args from .cli.commands import BaseCommand, CliContext, ExitCli, add_parsers, get_graph_execution_history -from .cli.completer import get_completer +from .cli.completer import set_autocompleter from .invocations import * from .invocations.baseinvocation import BaseInvocation from .services.events import EventServiceBase @@ -130,7 +130,12 @@ def invoke_cli(): config = Args() config.parse_args() model_manager = get_model_manager(config) - completer = get_completer(model_manager) + + # This initializes the autocompleter and returns it. + # Currently nothing is done with the returned Completer + # object, but the object can be used to change autocompletion + # behavior on the fly, if desired. + completer = set_autocompleter(model_manager) events = EventServiceBase() @@ -164,7 +169,7 @@ def invoke_cli(): while True: try: - cmd_input = input(f"{model_manager.current_model or '(no model)'}> ") + cmd_input = input("invoke> ") except (KeyboardInterrupt, EOFError): # Ctrl-c exits break