fix broken scripts

invokeai/app/api/dependencies.py

@@ -3,7 +3,7 @@
 import os
 from argparse import Namespace
 
-from ...globals import Globals
+from ...backend import Globals
 from ..services.generate_initializer import get_generate
 from ..services.graph import GraphExecutionState
 from ..services.image_storage import DiskImageStorage

invokeai/app/api_app.py

@@ -13,7 +13,7 @@
 from fastapi_events.middleware import EventHandlerASGIMiddleware
 from pydantic.schema import schema
 
-from ..args import Args
+from ..backend import Args
 from .api.dependencies import ApiDependencies
 from .api.routers import images, sessions
 from .api.sockets import SocketIO

invokeai/app/cli_app.py

@@ -18,7 +18,7 @@
 from pydantic import BaseModel
 from pydantic.fields import Field
 
-from ..args import Args
+from ..backend import Args
 from .invocations import *
 from .invocations.baseinvocation import BaseInvocation
 from .invocations.image import ImageField

invokeai/app/services/generate_initializer.py

@@ -6,7 +6,7 @@
 import invokeai.version
 from invokeai.backend import Generate, ModelManager
 
-from ...globals import Globals
+from ...backend import Globals
 
 
 # TODO: most of this code should be split into individual services as the Generate.py code is deprecated

invokeai/backend/__init__.py

@@ -3,3 +3,5 @@
 """
 from .generate import Generate
 from .model_management import ModelManager
+from .args import Args
+from .globals import Globals

invokeai/frontend/CLI/sd_metadata.py

@@ -0,0 +1,30 @@
+'''
+This is a modularized version of the sd-metadata.py script,
+which retrieves and prints the metadata from a series of generated png files.
+'''
+import sys
+import json
+from invokeai.backend.image_util import retrieve_metadata
+
+
+def print_metadata():
+    if len(sys.argv) < 2:
+        print("Usage: file2prompt.py <file1.png> <file2.png> <file3.png>...")
+        print("This script opens up the indicated invoke.py-generated PNG file(s) and prints out their metadata.")
+        exit(-1)
+
+    filenames = sys.argv[1:]
+    for f in filenames:
+        try:
+            metadata = retrieve_metadata(f)
+            print(f'{f}:\n',json.dumps(metadata['sd-metadata'], indent=4))
+        except FileNotFoundError:
+            sys.stderr.write(f'{f} not found\n')
+            continue
+        except PermissionError:
+            sys.stderr.write(f'{f} could not be opened due to inadequate permissions\n')
+            continue
+
+if __name__== '__main__':
+    print_metadata()
+

pyproject.toml

@@ -104,7 +104,7 @@ dependencies = [
 [project.scripts]
 
 # legacy entrypoints; provided for backwards compatibility
-"invoke.py" = "invokeai.frontend.CLI:command_line_interface"
+"invoke.py" = "invokeai.frontend.CLI:invokeai_command_line_interface"
 "configure_invokeai.py" = "invokeai.frontend.install:invokeai_configure"
 "textual_inversion.py" = "invokeai.frontend.training:invokeai_textual_inversion"
 
@@ -115,6 +115,9 @@ dependencies = [
 "invokeai-ti" = "invokeai.frontend.training:invokeai_textual_inversion"
 "invokeai-model-install" = "invokeai.frontend.install:invokeai_model_install"
 "invokeai-update" = "invokeai.frontend.config:invokeai_update"
+"invokeai-metadata" = "invokeai.frontend.CLI.sd_metadata:print_metadata"
+"invokeai-node-cli" = "invokeai.app.cli_app:invoke_cli"
+"invokeai-node-web" = "invokeai.app.api_app:invoke_api"
 
 [project.urls]
 "Homepage" = "https://invoke-ai.github.io/InvokeAI/"

scripts/configure_invokeai.py

@@ -2,8 +2,8 @@
 # Copyright (c) 2022 Lincoln D. Stein (https://github.com/lstein)
 
 import warnings
-from ldm.invoke.config import invokeai_configure
+from invokeai.frontend.install import invokeai_configure as configure
 
 if __name__ == '__main__':
     warnings.warn("configure_invokeai.py is deprecated, running 'invokeai-configure'...", DeprecationWarning)
-    invokeai_configure.main()
+    configure()

scripts/dream.py

@@ -1,10 +1,10 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # Copyright (c) 2022 Lincoln D. Stein (https://github.com/lstein)
 
 import warnings
-import ldm.invoke.CLI
+from invokeai.frontend.CLI import invokeai_command_line_interface as main
 warnings.warn("dream.py is being deprecated, please run invoke.py for the "
               "new UI/API or legacy_api.py for the old API",
               DeprecationWarning)
-ldm.invoke.CLI.main()
+main()
 

scripts/images2prompt.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 '''This script reads the "Invoke" Stable Diffusion prompt embedded in files generated by invoke.py'''
 
 import sys

scripts/invoke-new.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
 
 import os
@@ -8,11 +10,11 @@ def main():
     os.chdir(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 
     if '--web' in sys.argv:
-        from ldm.invoke.app.api_app import invoke_api
+        from invokeai.app.api_app import invoke_api
         invoke_api()
     else:
         # TODO: Parse some top-level args here.
-        from ldm.invoke.app.cli_app import invoke_cli
+        from invokeai.app.cli_app import invoke_cli
         invoke_cli()
 
 

scripts/invoke.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
 
-import ldm.invoke.CLI
-ldm.invoke.CLI.main()
+from invokeai.frontend.CLI import invokeai_command_line_interface as main
+main()
+