improved oas

.github/workflows/gh-pages.yml

@@ -33,12 +33,9 @@ jobs:
       - name: Build mkdocs
         run: |
           export OAS_FILE=https://aws-gcr-solutions.s3.amazonaws.com/extension-for-stable-diffusion-on-aws/oas.json
-          mkdir -p ./docs/zh/developer-guide/api/
-          wget -qO ./docs/zh/developer-guide/api/esd-oas.json $OAS_FILE
-          mkdir -p ./docs/jp/developer-guide/api/
-          wget -qO ./docs/jp/developer-guide/api/esd-oas.json $OAS_FILE
-          mkdir -p ./docs/en/developer-guide/api/
-          wget -qO ./docs/en/developer-guide/api/esd-oas.json $OAS_FILE
+          wget -qO ./docs/zh/developer-guide/oas.json $OAS_FILE
+          wget -qO ./docs/jp/developer-guide/oas.json $OAS_FILE
+          wget -qO ./docs/en/developer-guide/oas.json $OAS_FILE
           mkdocs build -f ./docs/mkdocs.en.yml
           mkdocs build -f ./docs/mkdocs.zh.yml
           mkdocs build -f ./docs/mkdocs.ja.yml

.gitignore

@@ -51,3 +51,4 @@ test/**/.env
 /container/
 /.env
 supervisord.*
+oas.json

.viperlightignore

@@ -6,6 +6,6 @@ README.md
 .github/workflows/
 infrastructure/.github/workflows/
 infrastructure/src/main.ts
-docs/zh/developer-guide/api/esd-oas.json
+docs/zh/developer-guide/api/oas.json
 middleware_api/service/oas.py
 test/buildspec_build.sh

buildspec.yml

@@ -68,17 +68,16 @@ phases:
       - cat ../infrastructure/src/shared/version.ts
       - sed -i "s/client_api_version = \"[0-9.]*\"/client_api_version = \"$TAG_NUMBER\"/" ../aws_extension/cloud_api_manager/api.py
       - echo ""
+      - sed -i "s/sd_dev/sd_$BUILD_VERSION/" ../workshop/ec2.yaml
       - sed -i "s/ESD_VERSION=dev/ESD_VERSION=$BUILD_VERSION/" ../workshop/ec2.yaml
       - sed -i "s/WebUiEC2Instance/WebUiEC2Instance${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7}/" ../workshop/ec2.yaml
-      - sed -i "s/sd_dev/sd_$BUILD_VERSION/" ../workshop/ec2.yaml
-      - aws s3 cp --region us-east-1 ../workshop/ec2.yaml s3://aws-gcr-solutions-us-east-1/extension-for-stable-diffusion-on-aws/ec2.yaml --content-type text/yaml --acl public-read
       - aws s3 cp --region us-east-1 ../workshop/ec2.yaml s3://aws-gcr-solutions/extension-for-stable-diffusion-on-aws/sd_dev.yaml --content-type text/yaml --acl public-read
       - aws s3 cp --region us-east-1 ../workshop/ec2.yaml s3://aws-gcr-solutions/extension-for-stable-diffusion-on-aws/sd_$BUILD_VERSION.yaml --content-type text/yaml --acl public-read
       - echo ""
+      - sed -i "s/comfy_dev/comfy_$BUILD_VERSION/" ../workshop/comfy.yaml
       - sed -i "s/ESD_VERSION=dev/ESD_VERSION=$BUILD_VERSION/" ../workshop/comfy.yaml
       - sed -i "s/ComfyEC2Dev/ComfyEC2${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7}/" ../workshop/comfy.yaml
       - sed -i "s/ApiGwResource/ApiGwResource${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7}/" ../workshop/comfy.yaml
-      - sed -i "s/comfy_dev/comfy_$BUILD_VERSION/" ../workshop/comfy.yaml
       - aws s3 cp --region us-east-1 ../workshop/comfy.yaml s3://aws-gcr-solutions/extension-for-stable-diffusion-on-aws/comfy_dev.yaml --content-type text/yaml --acl public-read
       - aws s3 cp --region us-east-1 ../workshop/comfy.yaml s3://aws-gcr-solutions/extension-for-stable-diffusion-on-aws/comfy_$BUILD_VERSION.yaml --content-type text/yaml --acl public-read
       - echo ""

docs/en/developer-guide/api.md

@@ -0,0 +1,3 @@
+# ESD API
+
+!!swagger oas.json!!

docs/en/developer-guide/api/1.6.0.md

@@ -1,3 +0,0 @@
-# ESD 1.6.0
-
-!!swagger esd-oas.json!!

docs/ja/developer-guide/api.md

@@ -0,0 +1,3 @@
+# ESD API
+
+!!swagger oas.json!!

docs/ja/developer-guide/api/1.6.0.md

@@ -1,3 +0,0 @@
-# ESD 1.6.0
-
-!!swagger esd-oas.json!!

docs/mkdocs.en.yml

@@ -44,8 +44,7 @@ nav:
         - API Inference Process: developer-guide/api_inference_process.md
         - API Inference Debugger: developer-guide/api_debugger.md
         - API Authentication: developer-guide/api_authentication.md
-        - API Version & Details:
-            - 1.6.0: developer-guide/api/1.6.0.md
+        - API Details: developer-guide/api.md
         - Custom Container: developer-guide/byoc.md
     - Troubleshooting: troubleshooting.md
     - FAQ: faq.md

docs/mkdocs.ja.yml

@@ -43,8 +43,7 @@ nav:
         - API推論プロセス: developer-guide/api_inference_process.md
         - API推論デバッガー: developer-guide/api_debugger.md
         - API認証: developer-guide/api_authentication.md
-        - APIバージョンと詳細:
-            - 1.6.0: developer-guide/api/1.6.0.md
+        - API詳細: developer-guide/api.md
         - カスタムコンテナ: developer-guide/byoc.md
     - トラブルシューティング: troubleshooting.md
     - FAQ: faq.md

docs/mkdocs.zh.yml

@@ -51,8 +51,7 @@ nav:
         - API 推理流程: developer-guide/api_inference_process.md
         - API 推理调试器: developer-guide/api_debugger.md
         - API 验证: developer-guide/api_authentication.md
-        - API 版本和详情:
-            - 1.6.0: developer-guide/api/1.6.0.md
+        - API 详情: developer-guide/api.md
         - 自定义容器镜像: developer-guide/byoc.md
     - 故障排除: troubleshooting.md
     - 常见问题解答: faq.md

docs/zh/developer-guide/api.md

@@ -0,0 +1,3 @@
+# ESD API
+
+!!swagger oas.json!!

docs/zh/developer-guide/api/1.6.0.md

@@ -1,3 +0,0 @@
-# ESD 1.6.0
-
-!!swagger esd-oas.json!!