merge with main

scripts/invoke.py

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

scripts/invokeai-cli.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
+
+import logging
+logging.getLogger("xformers").addFilter(lambda record: 'A matching Triton is not available' not in record.getMessage())
+
+import os
+import sys
+
+def main():
+    # Change working directory to the repo root
+    os.chdir(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+
+    # TODO: Parse some top-level args here.
+    from invokeai.app.cli_app import invoke_cli
+    invoke_cli()
+
+if __name__ == '__main__':
+    main()

scripts/invokeai-web.py

@@ -12,14 +12,8 @@ def main():
     # Change working directory to the repo root
     os.chdir(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 
-    if '--web' in sys.argv:
-        sys.argv.remove('--web')
-        from invokeai.app.api_app import invoke_api
-        invoke_api()
-    else:
-        # TODO: Parse some top-level args here.
-        from invokeai.app.cli_app import invoke_cli
-        invoke_cli()
+    from invokeai.app.api_app import invoke_api
+    invoke_api()
 
 
 if __name__ == '__main__':