Merge branch 'external-models' into alibabacloud/dashscope

# Conflicts:
#	invokeai/backend/model_manager/starter_models.py

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Project-Documentation
-    url: https://invoke.ai/
+    url: https://invoke-ai.github.io/InvokeAI/
     about: Should be your first place to go when looking for manuals/FAQs regarding our InvokeAI Toolkit
   - name: Discord
     url: https://discord.gg/ZmtBAhwWhy

.github/workflows/deploy-docs.yml

@@ -1,141 +0,0 @@
-name: 'docs'
-
-on:
-  push:
-    branches:
-      - 'main'
-  pull_request:
-    types:
-      - 'ready_for_review'
-      - 'opened'
-      - 'synchronize'
-  workflow_dispatch:
-    inputs:
-      deploy_target:
-        description: 'Deploy target (custom = invoke.ai, ghpages = invoke-ai.github.io/InvokeAI)'
-        type: choice
-        options:
-          - custom
-          - ghpages
-        default: custom
-
-permissions:
-  contents: read
-  pull-requests: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  changes:
-    runs-on: ubuntu-latest
-    outputs:
-      docs: ${{ steps.manual.outputs.docs || steps.filter.outputs.docs }}
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: mark manual run
-        if: github.event_name == 'workflow_dispatch'
-        id: manual
-        run: echo "docs=true" >> "$GITHUB_OUTPUT"
-
-      - name: detect docs-related changes
-        if: github.event_name != 'workflow_dispatch'
-        id: filter
-        uses: dorny/paths-filter@v3
-        with:
-          filters: |
-            docs:
-              - '.github/workflows/deploy-docs.yml'
-              - 'docs/**'
-              - 'scripts/generate_docs_json.py'
-              - 'invokeai/app/**'
-              - 'invokeai/backend/**'
-              - 'pyproject.toml'
-              - 'uv.lock'
-
-  check-and-build:
-    needs: changes
-    if: |
-      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'pull_request' &&
-        github.event.pull_request.draft == false &&
-        needs.changes.outputs.docs == 'true') ||
-      (github.event_name == 'push' && needs.changes.outputs.docs == 'true')
-    runs-on: ubuntu-22.04
-    timeout-minutes: 20
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      # Python (needed for generate-docs-data)
-      - name: setup uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          version: '0.6.10'
-          enable-cache: true
-          python-version: '3.11'
-
-      - name: setup python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      # generate_docs_json.py only needs the invokeai package importable
-      # (pydantic + invokeai.app/backend). Skip the [test] extra to keep CI fast.
-      - name: install python dependencies
-        run: uv pip install --editable .
-
-      # Node (needed for docs build)
-      - name: setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22.12.0'
-
-      - name: setup pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-          run_install: false
-
-      - name: install docs dependencies
-        run: pnpm install --prefer-frozen-lockfile
-        working-directory: docs
-
-      # Checks
-      - name: verify generated docs data
-        run: pnpm run check-docs-data
-        working-directory: docs
-
-      - name: build docs
-        run: pnpm build
-        working-directory: docs
-        env:
-          DEPLOY_TARGET: ${{ github.event_name == 'workflow_dispatch' && inputs.deploy_target || github.ref == 'refs/heads/main' && 'ghpages' || 'custom' }}
-
-      # Upload artifact for deploy (main branch only)
-      - name: upload pages artifact
-        if: github.ref == 'refs/heads/main'
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: docs/dist
-
-  deploy:
-    if: github.ref == 'refs/heads/main'
-    needs: check-and-build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pages: write
-      id-token: write
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

.github/workflows/mkdocs-material.yml

@@ -0,0 +1,49 @@
+# This is a mostly a copy-paste from https://github.com/squidfunk/mkdocs-material/blob/master/docs/publishing-your-site.md
+
+name: mkdocs
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  deploy:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    env:
+      REPO_URL: '${{ github.server_url }}/${{ github.repository }}'
+      REPO_NAME: '${{ github.repository }}'
+      SITE_URL: 'https://${{ github.repository_owner }}.github.io/InvokeAI'
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+
+      - name: setup python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.12'
+          cache: pip
+          cache-dependency-path: pyproject.toml
+
+      - name: set cache id
+        run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
+
+      - name: use cache
+        uses: actions/cache@v4
+        with:
+          key: mkdocs-material-${{ env.cache_id }}
+          path: .cache
+          restore-keys: |
+            mkdocs-material-
+
+      - name: install dependencies
+        run: python -m pip install ".[docs]"
+
+      - name: build & deploy
+        run: mkdocs gh-deploy --force

.github/workflows/translations.yml

@@ -1,78 +0,0 @@
-name: Crowdin Translations
-
-on:
-  # Allow manual runs from the Actions tab
-  workflow_dispatch:
-    inputs:
-      upload_sources:
-        description: 'Upload source strings to Crowdin'
-        type: boolean
-        default: true
-      download_translations:
-        description: 'Download translations from Crowdin'
-        type: boolean
-        default: true
-
-  # Upload sources & download translations when source files change on main
-  push:
-    branches:
-      - main
-    paths:
-      - 'invokeai/frontend/web/public/locales/en.json'
-      - 'docs/src/content/i18n/en.json'
-      - 'docs/src/content/docs/**/*.md'
-      - 'docs/src/content/docs/**/*.mdx'
-      - '!docs/src/content/docs/[a-z][a-z]/**'
-      - '!docs/src/content/docs/[a-z][a-z]-*/**'
-      - 'crowdin.yml'
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  crowdin-sync:
-    name: Sync with Crowdin
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Crowdin Sync
-        uses: crowdin/github-action@v2
-        with:
-          # Upload sources on push to main or when manually requested
-          upload_sources: ${{ github.event_name != 'workflow_dispatch' || inputs.upload_sources }}
-          upload_translations: false
-
-          # Download translations on push to main or when manually requested
-          download_translations: ${{ github.event_name != 'workflow_dispatch' || inputs.download_translations }}
-
-          # PR settings for downloaded translations
-          create_pull_request: true
-          pull_request_title: 'i18n: update translations from Crowdin'
-          pull_request_body: |
-            Automated pull request from [Crowdin](https://crowdin.com).
-
-            This PR updates translations for:
-            - **Web App UI** (`invokeai/frontend/web/public/locales/`)
-            - **Documentation UI Strings** (`docs/src/content/i18n/`)
-            - **Documentation Content** (`docs/src/content/docs/<locale>/`)
-          pull_request_base_branch_name: main
-          pull_request_labels: 'i18n'
-
-          # Commit settings
-          localization_branch_name: crowdin/translations
-          commit_message: 'i18n: update translations from Crowdin'
-
-          # Use the config file at the repo root
-          config: crowdin.yml
-
-          # Skip untranslated strings/files to keep partial translations clean
-          download_translations_args: '--skip-untranslated-strings'
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.gitignore

@@ -179,7 +179,6 @@ cython_debug/
 
 # Scratch folder
 .scratch/
-worktrees/
 .vscode/
 .zed/
 

README.md

@@ -59,7 +59,7 @@ Invoke offers a fully featured workflow management solution, enabling users to c
 Invoke features an organized gallery system for easily storing, accessing, and remixing your content in the Invoke workspace. Images can be dragged/dropped onto any Image-base UI element in the application, and rich metadata within the Image allows for easy recall of key prompts or settings used in your workflow.
 
 ### Model Support
-- SD 1.5
+- SD 1.5 
 - SD 2.0
 - SDXL
 - SD 3.5 Medium
@@ -106,14 +106,14 @@ Invoke is a combined effort of [passionate and talented people from across the w
 
 Original portions of the software are Copyright © 2024 by respective contributors.
 
-[features docs]: https://invoke.ai/
-[faq]: https://invoke.ai/troubleshooting/faq/
-[contributors]: https://invoke.ai/contributing/contributors/
+[features docs]: https://invoke-ai.github.io/InvokeAI/features/database/
+[faq]: https://invoke-ai.github.io/InvokeAI/faq/
+[contributors]: https://invoke-ai.github.io/InvokeAI/contributing/contributors/
 [github issues]: https://github.com/invoke-ai/InvokeAI/issues
-[docs home]: https://invoke.ai
-[installation docs]: https://invoke.ai/start-here/installation/
+[docs home]: https://invoke-ai.github.io/InvokeAI
+[installation docs]: https://invoke-ai.github.io/InvokeAI/installation/
 [#dev-chat]: https://discord.com/channels/1020123559063990373/1049495067846524939
-[contributing docs]: https://invoke.ai/contributing/
+[contributing docs]: https://invoke-ai.github.io/InvokeAI/contributing/
 [CI checks on main badge]: https://flat.badgen.net/github/checks/invoke-ai/InvokeAI/main?label=CI%20status%20on%20main&cache=900&icon=github
 [CI checks on main link]: https://github.com/invoke-ai/InvokeAI/actions?query=branch%3Amain
 [discord badge]: https://flat.badgen.net/discord/members/ZmtBAhwWhy?icon=discord

docker/README.md

@@ -109,7 +109,7 @@ CONTAINER_UID=1000
 GPU_DRIVER=cuda
 ```
 
-Any environment variables supported by InvokeAI can be set here. See the [Configuration docs](https://invoke.ai/configuration/invokeai-yaml/) for further detail.
+Any environment variables supported by InvokeAI can be set here. See the [Configuration docs](https://invoke-ai.github.io/InvokeAI/features/CONFIGURATION/) for further detail.
 
 ---
 

docs/.gitignore

@@ -1,21 +0,0 @@
-# build output
-dist/
-# generated types
-.astro/
-
-# dependencies
-node_modules/
-
-# logs
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-
-# environment variables
-.env
-.env.production
-
-# macOS-specific files
-.DS_Store

docs/README.md

@@ -1 +0,0 @@
-# Invoke AI Documentation