Merge branch 'development' into development

backend/invoke_ai_web_server.py

@@ -799,9 +799,6 @@ class InvokeAIWebServer:
                 rfc_dict['init_image_path'] = parameters[
                     'init_img'
                 ]  # TODO: Noncompliant
-                rfc_dict[
-                    'sampler'
-                ] = 'ddim'  # TODO: FIX ME WHEN IMG2IMG SUPPORTS ALL SAMPLERS
                 if 'init_mask' in parameters:
                     rfc_dict['mask_hash'] = calculate_init_img_hash(
                         self.get_image_path_from_url(parameters['init_mask'])

frontend/README.md

@@ -2,24 +2,22 @@
 
 ## Run
 
-- `python backend/server.py` serves both frontend and backend at http://localhost:9090
+- `python scripts/dream.py --web` serves both frontend and backend at
+  http://localhost:9090
 
 ## Evironment
 
 Install [node](https://nodejs.org/en/download/) (includes npm) and optionally
 [yarn](https://yarnpkg.com/getting-started/install).
 
-From `frontend/` run `npm install` / `yarn install` to install the frontend packages.
+From `frontend/` run `npm install` / `yarn install` to install the frontend
+packages.
 
 ## Dev
 
 1. From `frontend/`, run `npm dev` / `yarn dev` to start the dev server.
-2. Note the address it starts up on (probably `http://localhost:5173/`).
+2. Run `python scripts/dream.py --web`.
-3. Edit `backend/server.py`'s `additional_allowed_origins` to include this address, e.g.
+3. Navigate to the dev server address e.g. `http://localhost:5173/`.
-   `additional_allowed_origins = ['http://localhost:5173']`.
-4. Leaving the dev server running, open a new terminal and go to the project root.
-5. Run `python backend/server.py`.
-6. Navigate to the dev server address e.g. `http://localhost:5173/`.
 
 To build for dev: `npm build-dev` / `yarn build-dev`
 
@@ -28,10 +26,3 @@ To build for production: `npm build` / `yarn build`
 ## TODO
 
 - Search repo for "TODO"
-- My one gripe with Chakra: no way to disable all animations right now and drop the dependence on
-  `framer-motion`. I would prefer to save the ~30kb on bundle and have zero animations. This is on
-  the Chakra roadmap. See https://github.com/chakra-ui/chakra-ui/pull/6368 for last discussion on
-  this. Need to check in on this issue periodically.
-- Mobile friendly layout
-- Proper image gallery/viewer/manager
-- Help tooltips and such