resolve conflicts

invokeai/app/cli_app.py

@@ -11,19 +11,26 @@ from typing import Union, get_type_hints
 from pydantic import BaseModel, ValidationError
 from pydantic.fields import Field
 
+# This should come early so that the logger can pick up its configuration options
+from .services.config import InvokeAIAppConfig
 from invokeai.backend.util.logging import InvokeAILogger
+config = InvokeAIAppConfig.get_config()
+config.parse_args()
+logger = InvokeAILogger().getLogger(config=config)
+
 from invokeai.app.services.image_record_storage import SqliteImageRecordStorage
 from invokeai.app.services.images import ImageService
 from invokeai.app.services.metadata import CoreMetadataService
 from invokeai.app.services.resource_name import SimpleNameService
 from invokeai.app.services.urls import LocalUrlService
+from .services.default_graphs import (default_text_to_image_graph_id,
+                                      create_system_graphs)
+from .services.latent_storage import DiskLatentsStorage, ForwardCacheLatentsStorage
 
 from .cli.commands import (BaseCommand, CliContext, ExitCli,
                            SortedHelpFormatter, add_graph_parsers, add_parsers)
 from .cli.completer import set_autocompleter
 from .invocations.baseinvocation import BaseInvocation
-from .services.default_graphs import (create_system_graphs,
-                                      default_text_to_image_graph_id)
 from .services.events import EventServiceBase
 from .services.graph import (Edge, EdgeConnection, GraphExecutionState,
                              GraphInvocation, LibraryGraph,
@@ -32,13 +39,11 @@ from .services.image_file_storage import DiskImageFileStorage
 from .services.invocation_queue import MemoryInvocationQueue
 from .services.invocation_services import InvocationServices
 from .services.invoker import Invoker
-from .services.latent_storage import (DiskLatentsStorage,
-                                      ForwardCacheLatentsStorage)
 from .services.model_manager_service import ModelManagerService
 from .services.processor import DefaultInvocationProcessor
 from .services.restoration_services import RestorationServices
 from .services.sqlite import SqliteItemStorage
-from .services.config import InvokeAIAppConfig
+
 
 class CliCommand(BaseModel):
     command: Union[BaseCommand.get_commands() + BaseInvocation.get_invocations()] = Field(discriminator="type")  # type: ignore
@@ -47,7 +52,6 @@ class CliCommand(BaseModel):
 class InvalidArgs(Exception):
     pass
 
-
 def add_invocation_args(command_parser):
     # Add linking capability
     command_parser.add_argument(
@@ -192,11 +196,6 @@ def invoke_all(context: CliContext):
         raise SessionError()
 
 def invoke_cli():
-    # this gets the basic configuration
-    config = InvokeAIAppConfig.get_config()
-    config.parse_args()
-    logger = InvokeAILogger.getLogger()
-
     # get the optional list of invocations to execute on the command line
     parser = config.get_parser()
     parser.add_argument('commands',nargs='*')