Merge branch 'main' of github.com:painebenjamin/app.enfugue.ai

painebenjamin · Aug 12, 2023 · 139ea8e · 139ea8e
2 parents 009591f + f256b4c
commit 139ea8e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/compile-all.yml b/.github/workflows/compile-all.yml
@@ -13,20 +13,16 @@ jobs:
         include:
           - os: ubuntu-latest
             api: tensorrt
-            release: ${{ inputs.release }}
           - os: ubuntu-latest
             api: cuda
-            release: ${{ inputs.release }}
           - os: windows-latest
             api: tensorrt
-            release: ${{ inputs.release }}
           - os: windows-latest
             api: cuda
-            release: ${{ inputs.release }}
           - os: macos-13
-            api: mps
-            release: ${{ inputs.release }}
+            api: mps            
     uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
     with:
       os: ${{ matrix.os }}
       api: ${{ matrix.api }}
+      release: ${{ inputs.release }}
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -16,6 +16,7 @@ jobs:
     runs-on: ${{ inputs.os }}
     env:
       ARTIFACT_SUFFIX: ${{ inputs.api }}-
+      GH_TOKEN: ${{ github.token }}
       MINIMAL_BUILD: 1
       RUN_INTEGRATION_TEST: 0
     steps:
@@ -86,7 +87,7 @@ jobs:
     - name: Release Linux Artifact
       if: ${{ contains(inputs.os, 'ubuntu') && inputs.release }}
       run: |
-        gh release ${{ steps.version.outputs.version }} --clobber ./enfugue-server*tar.gz*
+        gh release upload ${{ steps.version.outputs.version }} --clobber ./enfugue-server*tar.gz*
     - name: Upload Linux artifact
       if: ${{ contains(inputs.os, 'ubuntu') && !inputs.release }}
       uses: actions/upload-artifact@v3.1.2
@@ -96,7 +97,7 @@ jobs:
     - name: Release Windows Artifact
       if: ${{ contains(inputs.os, 'windows') && inputs.release }}
       run: |
-        gh release ${{ steps.version.outputs.version }} --clobber ./build/enfugue-server*zip*
+        gh release upload ${{ steps.version.outputs.version }} --clobber ./build/enfugue-server*zip*
     - name: Upload Windows artifact
       if: ${{ contains(inputs.os, 'windows') && !inputs.release }} 
       uses: actions/upload-artifact@v3.1.2
@@ -106,7 +107,7 @@ jobs:
     - name: Release MacOS Artifact
       if: ${{ contains(inputs.os, 'mac') && inputs.release }}
       run: |
-        gh release ${{ steps.version.outputs.version }} --clobber ./build/enfugue-server*tar.gz*
+        gh release upload ${{ steps.version.outputs.version }} --clobber ./build/enfugue-server*tar.gz*
     - name: Upload MacOS artifact
       if: ${{ contains(inputs.os, 'mac') && !inputs.release }} 
       uses: actions/upload-artifact@v3.1.2

diff --git a/README.md b/README.md
@@ -273,6 +273,10 @@ Additional resources will be made available as they are needed, so don't hesitat
 
 Enfugue uses an extension of `diffusers.StableDiffusionPipeline` that provides a number of additional arguments over the typical signature, weaving between `txt2img`, `img2img`, `inpaint` and `controlnet` as necessary. It also has TensorRT support for all models in the pipeline. Start [here](https://github.com/painebenjamin/app.enfugue.ai/tree/main/src/python/enfugue) for documentation on how it is used.
 
+## Enfugue JSON API
+
+The entirety of Enfugue's capabilities are available via JSON API. Find the documentation in [the wiki.](https://github.com/painebenjamin/app.enfugue.ai/wiki/JSON-API)
+
 ## Building
 
 For anyone interested in building from source themselves, simply check out this repository and issue a `make` command to build the associated binary release. See below for all make targets.