From 4a8fc1dd717223e74235a86fa53cb3923d2401b5 Mon Sep 17 00:00:00 2001
From: PassiveLemon <lemonl3mn@protonmail.com>
Date: Mon, 17 Apr 2023 16:22:56 -0400
Subject: [PATCH] Revert "Merge + update"

This reverts commit 4d05480e640f3e9f3a92ae77e6c8c8e41e6559b4.
---
 data/.gitignore                      |  2 -
 docker-compose.yml                   | 10 ++--
 services/AUTOMATIC1111/Dockerfile    | 52 ++++++++++++---------
 services/AUTOMATIC1111/clone.sh      | 11 -----
 services/AUTOMATIC1111/entrypoint.sh |  2 -
 services/comfy/Dockerfile            | 35 +++++++-------
 services/download/download.sh        |  2 +-
 services/invoke/Dockerfile           | 68 ++++++++++++++++------------
 services/invoke/entrypoint.sh        | 17 ++++---
 services/invoke/models.yaml          | 23 ++++++++++
 services/sygil/Dockerfile            | 42 +++++++++--------
 11 files changed, 147 insertions(+), 117 deletions(-)
 delete mode 100644 services/AUTOMATIC1111/clone.sh
 create mode 100644 services/invoke/models.yaml

diff --git a/data/.gitignore b/data/.gitignore
index 5194313..cb0a526 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -20,5 +20,3 @@
 /VAE
 /embeddings
 /Lora
-/ControlNet
-/openpose
diff --git a/docker-compose.yml b/docker-compose.yml
index 7864f45..1b7a9aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
-    image: sd-auto:51
+    image: sd-auto:49
     environment:
       - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
@@ -43,10 +43,10 @@ services:
     <<: *base_service
     profiles: ["invoke"]
     build: ./services/invoke/
-    image: sd-invoke:27
+    image: sd-invoke:26
     environment:
       - PRELOAD=true
-      - CLI_ARGS=--no-nsfw_checker --no-safety_checker --xformers
+      - CLI_ARGS=
 
   sygil: &sygil
     <<: *base_service
@@ -67,8 +67,8 @@ services:
     <<: *base_service
     profiles: ["comfy"]
     build: ./services/comfy/
-    image: sd-comfy:6
+    image: sd-comfy:1
     volumes:
       - *v2
     environment:
-      - CLI_ARGS=
\ No newline at end of file
+      - CLI_ARGS=
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index a610d0c..b2d44d8 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -1,6 +1,14 @@
+# syntax=docker/dockerfile:1
+
 FROM alpine/git:2.36.2 as download
 
-COPY clone.sh /clone.sh
+SHELL ["/bin/sh", "-ceuxo", "pipefail"]
+
+RUN <<EOF
+cat <<'EOE' > /clone.sh
+mkdir -p repositories/"$1" && cd repositories/"$1" && git init && git remote add origin "$2" && git fetch origin "$3" --depth=1 && git reset --hard "$3" && rm -rf .git
+EOE
+EOF
 
 RUN . /clone.sh taming-transformers https://github.com/CompVis/taming-transformers.git 24268930bf1dce879235a7fddd0b2355b84d7ea6 \
   && rm -rf data assets **/*.ipynb
@@ -22,19 +30,21 @@ RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diff
 
 FROM python:3.10.9-slim
 
+SHELL ["/bin/bash", "-ceuxo", "pipefail"]
+
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
-RUN --mount=type=cache,target=/root/.cache/pip \
-  pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117
+RUN PIP_NO_CACHE_DIR=1 pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117
 
 RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean
 
 
-RUN --mount=type=cache,target=/root/.cache/pip \
-  git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
-  cd stable-diffusion-webui && \
-  git reset --hard d7aec59c4eb02f723b3d55c6f927a42e97acd679 && \
-  pip install -r requirements_versions.txt
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
+cd stable-diffusion-webui
+git reset --hard d7aec59c4eb02f723b3d55c6f927a42e97acd679
+pip install -r requirements_versions.txt
+EOF
 
 RUN --mount=type=cache,target=/root/.cache/pip  \
   --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.15-cp310-cp310-linux_x86_64.whl \
@@ -43,7 +53,7 @@ RUN --mount=type=cache,target=/root/.cache/pip  \
 ENV ROOT=/stable-diffusion-webui
 
 
-COPY --from=download /repositories/ ${ROOT}/repositories/
+COPY --from=download /git/ ${ROOT}
 RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
 RUN --mount=type=cache,target=/root/.cache/pip \
   pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
@@ -62,25 +72,25 @@ RUN apt-get -y install libgoogle-perftools-dev && apt-get clean
 ENV LD_PRELOAD=libtcmalloc.so
 
 ARG SHA=a9fed7c364061ae6efb37f797b6b522cb3cf7aa2
-RUN --mount=type=cache,target=/root/.cache/pip \
-  cd stable-diffusion-webui && \
-  git fetch && \
-  git reset --hard ${SHA} && \
-  pip install -r requirements_versions.txt
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+cd stable-diffusion-webui
+git fetch
+git reset --hard ${SHA}
+pip install -r requirements_versions.txt
+EOF
 
 RUN --mount=type=cache,target=/root/.cache/pip  pip install -U opencv-python-headless
 
 COPY . /docker
 
-RUN \
-  python3 /docker/info.py ${ROOT}/modules/ui.py && \
-  mv ${ROOT}/style.css ${ROOT}/user.css && \
-  # one of the ugliest hacks I ever wrote \
-  sed -i 's/in_app_dir = .*/in_app_dir = True/g' /usr/local/lib/python3.10/site-packages/gradio/routes.py
+RUN <<EOF
+python3 /docker/info.py ${ROOT}/modules/ui.py
+mv ${ROOT}/style.css ${ROOT}/user.css
+# one of the ugliest hacks I ever wrote
+sed -i 's/in_app_dir = .*/in_app_dir = True/g' /usr/local/lib/python3.10/site-packages/gradio/routes.py
+EOF
 
 WORKDIR ${ROOT}
-ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
-ENV NVIDIA_VISIBLE_DEVICES=all
 ENV CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
diff --git a/services/AUTOMATIC1111/clone.sh b/services/AUTOMATIC1111/clone.sh
deleted file mode 100644
index cfdf0a2..0000000
--- a/services/AUTOMATIC1111/clone.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -Eeuox pipefail
-
-mkdir -p /repositories/"$1"
-cd /repositories/"$1"
-git init
-git remote add origin "$2"
-git fetch origin "$3" --depth=1
-git reset --hard "$3"
-rm -rf .git
diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh
index c6df995..9463baf 100755
--- a/services/AUTOMATIC1111/entrypoint.sh
+++ b/services/AUTOMATIC1111/entrypoint.sh
@@ -35,8 +35,6 @@ MOUNTS["${ROOT}/models/torch_deepdanbooru"]="/data/Deepdanbooru"
 MOUNTS["${ROOT}/models/BLIP"]="/data/BLIP"
 MOUNTS["${ROOT}/models/midas"]="/data/MiDaS"
 MOUNTS["${ROOT}/models/Lora"]="/data/Lora"
-MOUNTS["${ROOT}/models/ControlNet"]="/data/ControlNet"
-MOUNTS["${ROOT}/models/openpose"]="/data/openpose"
 
 MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
 MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json"
diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile
index 82aa999..f9eca7a 100644
--- a/services/comfy/Dockerfile
+++ b/services/comfy/Dockerfile
@@ -1,38 +1,35 @@
+# syntax=docker/dockerfile:1
+
 FROM python:3.10.9-slim
 
+SHELL ["/bin/bash", "-ceuxo", "pipefail"]
+
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
 RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117
 
 RUN apt-get update && apt-get install -y git && apt-get clean
 
-ARG BRANCH=master
-RUN --mount=type=cache,target=/root/.cache/pip \
-  git clone https://github.com/comfyanonymous/ComfyUI.git stable-diffusion && \
-  cd stable-diffusion && \
-  git checkout ${BRANCH} && \
-  git reset --hard ee46bef03a98903831c01d31094a0c30ea411b28 && \
-  pip install -r requirements.txt
-
-ARG SHA=
-RUN --mount=type=cache,target=/root/.cache/pip \
-  cd stable-diffusion && \
-  git fetch && \
-  git checkout ${BRANCH} && \
-  git reset --hard ${SHA} && \
-  pip install -r requirements.txt
+ARG BRANCH=master SHA=ee46bef03a98903831c01d31094a0c30ea411b28
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+git config --global http.postBuffer 1048576000
+git clone https://github.com/comfyanonymous/ComfyUI.git stable-diffusion
+cd stable-diffusion
+git checkout ${BRANCH}
+git reset --hard ${SHA}
+pip install -r requirements.txt
+EOF
 
 RUN --mount=type=cache,target=/root/.cache/pip pip install -U 'transformers>=4.24'
 
 # add info
 COPY . /docker/
-RUN chmod +x /docker/entrypoint.sh
+RUN <<EOF
+chmod +x /docker/entrypoint.sh
+EOF
 
 WORKDIR /stable-diffusion
-ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
-ENV NVIDIA_VISIBLE_DEVICES=all
 ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]
-
 CMD python -u main.py --listen --port 7860 ${CLI_ARGS}
diff --git a/services/download/download.sh b/services/download/download.sh
index 54176d0..6f02f9b 100755
--- a/services/download/download.sh
+++ b/services/download/download.sh
@@ -3,7 +3,7 @@
 set -Eeuo pipefail
 
 # TODO: maybe just use the .gitignore file to create all of these
-mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru /data/MiDaS /data/Lora /data/ControlNet /data/openpose
+mkdir -vp /data/.cache /data/StableDiffusion /data/Codeformer /data/GFPGAN /data/ESRGAN /data/BSRGAN /data/RealESRGAN /data/SwinIR /data/LDSR /data/ScuNET /data/embeddings /data/VAE /data/Deepdanbooru /data/MiDaS /data/Lora
 
 echo "Downloading, this might take a while..."
 
diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile
index 514d525..f19ef93 100644
--- a/services/invoke/Dockerfile
+++ b/services/invoke/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM alpine:3.17 as xformers
 RUN apk add --no-cache aria2
 RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/5.0.0/xformers-0.0.17.dev449-cp310-cp310-manylinux2014_x86_64.whl'
@@ -5,54 +7,62 @@ RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diff
 
 
 FROM python:3.10-slim
+SHELL ["/bin/bash", "-ceuxo", "pipefail"]
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w  PIP_PREFER_BINARY=1
 
 
 RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117
 
+RUN apt-get update && apt-get install git -y && apt-get clean
+
+RUN git clone https://github.com/invoke-ai/InvokeAI.git /stable-diffusion
+
+WORKDIR /stable-diffusion
+
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+git reset --hard f232068ab89bd80e4f5f3133dcdb62ea78f1d0f7
+git config --global http.postBuffer 1048576000
+egrep -v '^-e .' environments-and-requirements/requirements-lin-cuda.txt > req.txt
+pip install -r req.txt
+rm req.txt
+EOF
+
 
 # patch match:
 # https://github.com/invoke-ai/InvokeAI/blob/main/docs/installation/INSTALL_PATCHMATCH.md
-RUN --mount=type=cache,target=/var/cache/apt \
-  apt-get update && \
-  apt-get install make g++ git libopencv-dev -y && \
-  apt-get clean && \
-  cd /usr/lib/x86_64-linux-gnu/pkgconfig/ && \
-  ln -sf opencv4.pc opencv.pc
+RUN <<EOF
+apt-get update
+# apt-get install build-essential python3-opencv libopencv-dev -y
+apt-get install make g++ libopencv-dev -y
+apt-get clean
+cd /usr/lib/x86_64-linux-gnu/pkgconfig/
+ln -sf opencv4.pc opencv.pc
+EOF
 
 
+ARG BRANCH=main SHA=6e0c6d9cc9f6bdbdefc4b9e94bc1ccde1b04aa42
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+git fetch
+git reset --hard
+git checkout ${BRANCH}
+git reset --hard ${SHA}
+pip install .
+EOF
 
-ENV ROOT=/InvokeAI
-RUN git clone https://github.com/invoke-ai/InvokeAI.git ${ROOT}
-WORKDIR ${ROOT}
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-  git reset --hard 4463124bddd221c333d4c70e73aa2949ad35453d && \
-  pip install .
-
-
-ARG BRANCH=main SHA=50eb02f68be912276a9c106d5e8038a5671a0386
-RUN --mount=type=cache,target=/root/.cache/pip \
-  git fetch && \
-  git reset --hard && \
-  git checkout ${BRANCH} && \
-  git reset --hard ${SHA} && \
-  pip install -U .
-
-RUN --mount=type=cache,target=/root/.cache/pip \
-  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.17-cp310-cp310-linux_x86_64.whl \
-  pip install -U opencv-python-headless triton /xformers-0.0.17-cp310-cp310-linux_x86_64.whl && \
+  --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.15-cp310-cp310-linux_x86_64.whl \
+  pip install -U opencv-python-headless huggingface_hub triton /xformers-0.0.15-cp310-cp310-linux_x86_64.whl && \
   python3 -c "from patchmatch import patch_match"
 
 
+RUN touch invokeai.init
 COPY . /docker/
 
-ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
-ENV NVIDIA_VISIBLE_DEVICES=all
-ENV PYTHONUNBUFFERED=1 PRELOAD=false HF_HOME=/root/.cache/huggingface CONFIG_DIR=/data/config/invoke CLI_ARGS=""
+
+ENV PYTHONUNBUFFERED=1 ROOT=/stable-diffusion PYTHONPATH="${PYTHONPATH}:${ROOT}" PRELOAD=false CLI_ARGS="" HF_HOME=/root/.cache/huggingface
 EXPOSE 7860
 
 ENTRYPOINT ["/docker/entrypoint.sh"]
-CMD invokeai --web --host 0.0.0.0 --port 7860 --root_dir ${ROOT} --config ${CONFIG_DIR}/models.yaml --outdir /output/invoke ${CLI_ARGS}
-# TODO: make sure the config is persisted between sessions
+CMD invokeai --web --host 0.0.0.0 --port 7860 --config /docker/models.yaml --root_dir ${ROOT} --outdir /output/invoke ${CLI_ARGS}
diff --git a/services/invoke/entrypoint.sh b/services/invoke/entrypoint.sh
index 3594c85..a0d0410 100755
--- a/services/invoke/entrypoint.sh
+++ b/services/invoke/entrypoint.sh
@@ -4,25 +4,25 @@ set -Eeuo pipefail
 
 declare -A MOUNTS
 
-mkdir -p ${CONFIG_DIR}
-
 # cache
 MOUNTS["/root/.cache"]=/data/.cache/
 
-# this is really just a hack to avoid migrations
-rm -rf ${HF_HOME}/diffusers
-
 # ui specific
 MOUNTS["${ROOT}/models/codeformer"]=/data/Codeformer/
+
 MOUNTS["${ROOT}/models/gfpgan/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
-MOUNTS["${ROOT}/models/gfpgan/weights"]=/data/GFPGAN/
+MOUNTS["${ROOT}/models/gfpgan/weights"]=/data/.cache/
+
 MOUNTS["${ROOT}/models/realesrgan"]=/data/RealESRGAN/
 
-MOUNTS["${ROOT}/models/ldm"]=/data/.cache/invoke/ldm/
+MOUNTS["${ROOT}/models/bert-base-uncased"]=/data/.cache/huggingface/transformers/
+MOUNTS["${ROOT}/models/openai/clip-vit-large-patch14"]=/data/.cache/huggingface/transformers/
+MOUNTS["${ROOT}/models/CompVis/stable-diffusion-safety-checker"]=/data/.cache/huggingface/transformers/
 
 MOUNTS["${ROOT}/embeddings"]=/data/embeddings/
 
 # hacks
+MOUNTS["${ROOT}/models/clipseg"]=/data/.cache/invoke/clipseg/
 
 for to_path in "${!MOUNTS[@]}"; do
   set -Eeuo pipefail
@@ -40,8 +40,7 @@ done
 
 if "${PRELOAD}" == "true"; then
   set -Eeuo pipefail
-  invokeai-configure --root ${ROOT} --yes
-  cp ${ROOT}/configs/models.yaml ${CONFIG_DIR}/models.yaml
+  invokeai-configure --skip-sd-weights --root ${ROOT} --yes
 fi
 
 exec "$@"
diff --git a/services/invoke/models.yaml b/services/invoke/models.yaml
new file mode 100644
index 0000000..0efe34e
--- /dev/null
+++ b/services/invoke/models.yaml
@@ -0,0 +1,23 @@
+# This file describes the alternative machine learning models
+# available to InvokeAI script.
+#
+# To add a new model, follow the examples below. Each
+# model requires a model config file, a weights file,
+# and the width and height of the images it
+# was trained on.
+stable-diffusion-1.5:
+  description: Stable Diffusion version 1.5
+  weights: /data/StableDiffusion/v1-5-pruned-emaonly.ckpt
+  vae: /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
+  config: ./invokeai/configs/stable-diffusion/v1-inference.yaml
+  width: 512
+  height: 512
+  default: true
+inpainting-1.5:
+  description: RunwayML SD 1.5 model optimized for inpainting
+  weights: /data/StableDiffusion/sd-v1-5-inpainting.ckpt
+  vae: /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt
+  config: ./invokeai/configs/stable-diffusion/v1-inpainting-inference.yaml
+  width: 512
+  height: 512
+  default: false
diff --git a/services/sygil/Dockerfile b/services/sygil/Dockerfile
index 7ed2b5e..056d8da 100644
--- a/services/sygil/Dockerfile
+++ b/services/sygil/Dockerfile
@@ -1,39 +1,45 @@
+# syntax=docker/dockerfile:1
+
 FROM python:3.8-slim
 
+SHELL ["/bin/bash", "-ceuxo", "pipefail"]
+
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
 
 RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.0 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117
 
 RUN apt-get update && apt install gcc libsndfile1 ffmpeg build-essential zip unzip git -y && apt-get clean
 
-RUN --mount=type=cache,target=/root/.cache/pip \
-  git config --global http.postBuffer 1048576000 && \
-  git clone https://github.com/Sygil-Dev/sygil-webui.git stable-diffusion && \
-  cd stable-diffusion && \
-  git reset --hard 5291437085bddd16d752f811b6552419a2044d12 && \
-  pip install -r requirements.txt
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+git config --global http.postBuffer 1048576000
+git clone https://github.com/Sygil-Dev/sygil-webui.git stable-diffusion
+cd stable-diffusion
+git reset --hard 5291437085bddd16d752f811b6552419a2044d12
+pip install -r requirements.txt
+EOF
 
 
 ARG BRANCH=master SHA=571fb897edd58b714bb385dfaa1ad59aecef8bc7
-RUN --mount=type=cache,target=/root/.cache/pip \
-  cd stable-diffusion && \
-  git fetch && \
-  git checkout ${BRANCH} && \
-  git reset --hard ${SHA} && \
-  pip install -r requirements.txt
+RUN --mount=type=cache,target=/root/.cache/pip <<EOF
+cd stable-diffusion
+git fetch
+git checkout ${BRANCH}
+git reset --hard ${SHA}
+pip install -r requirements.txt
+EOF
 
 RUN --mount=type=cache,target=/root/.cache/pip pip install -U 'transformers>=4.24'
 
 # add info
 COPY . /docker/
-RUN python /docker/info.py /stable-diffusion/frontend/frontend.py && \
-  chmod +x /docker/mount.sh /docker/run.sh && \
-  # streamlit \
-  sed -i -- 's/8501/7860/g' /stable-diffusion/.streamlit/config.toml
+RUN <<EOF
+python /docker/info.py /stable-diffusion/frontend/frontend.py
+chmod +x /docker/mount.sh /docker/run.sh
+# streamlit
+sed -i -- 's/8501/7860/g' /stable-diffusion/.streamlit/config.toml
+EOF
 
 WORKDIR /stable-diffusion
-ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
-ENV NVIDIA_VISIBLE_DEVICES=all
 ENV PYTHONPATH="${PYTHONPATH}:${PWD}" STREAMLIT_SERVER_HEADLESS=true USE_STREAMLIT=0 CLI_ARGS=""
 EXPOSE 7860