Upload 10 files

Dockerfile

@@ -0,0 +1,18 @@
+FROM python:3.11
+
+# making app folder
+WORKDIR /app
+
+# copying files
+COPY . .
+
+# installing requirements
+RUN apt-get update 
+RUN apt-get install ffmpeg -y
+RUN pip install --upgrade pip 
+RUN pip install -r ./requirements.txt 
+
+# launching gradio app 
+ENV GRADIO_SERVER_NAME="0.0.0.0"
+EXPOSE 7860
+ENTRYPOINT python ./run.py

README.md

@@ -1,9 +1,3 @@
----
-title: roop-unleashed
-app_file: run.py
-sdk: gradio
-sdk_version: 4.32.1
----
 # roop-unleashed
 
 [Changelog](#changelog) • [Usage](#usage) • [Wiki](https://github.com/C0untFloyd/roop-unleashed/wiki)
@@ -43,6 +37,10 @@ In the event of violation of the legal and ethical requirements of the user's co
 
 Please refer to the [wiki](https://github.com/C0untFloyd/roop-unleashed/wiki).
 
+#### macOS Installation
+Simply run the following command. It will check and install all dependencies if necessary.
+
+`/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/PJF16/roop-unleashed/master/installer/macOSinstaller.sh)"`
 
 
 
@@ -50,6 +48,17 @@ Please refer to the [wiki](https://github.com/C0untFloyd/roop-unleashed/wiki).
 
 - Windows: run the `windows_run.bat` from the Installer.
 - Linux: `python run.py`
+- macOS: `sh runMacOS.sh`
+- Dockerfile:
+  ```shell
+  docker build -t roop-unleashed . && docker run -t \
+    -p 7860:7860 \
+    -v ./config.yaml:/app/config.yaml \
+    -v ./models:/app/models \
+    -v ./temp:/app/temp \
+    -v ./output:/app/output \
+    roop-unleashed
+  ```
 
 <a target="_blank" href="https://colab.research.google.com/github/C0untFloyd/roop-unleashed/blob/main/roop-unleashed.ipynb">
   <img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Open In Colab"/>
@@ -65,6 +74,70 @@ Additional commandline arguments are currently unsupported and settings should b
 
 ### Changelog
 
+**28.9.2024** v4.3.1
+
+- Bugfix: Several possible memory leaks
+- Added different output modes, e.g. to virtual cam stream
+- New swapping mode "All input faces"
+- Average total fps displayed and setting for autorun
+
+
+**16.9.2024** v4.2.8
+
+- Bugfix: Starting roop-unleashed without NVIDIA gpu but cuda option enabled
+- Bugfix: Target Faces couldn't be moved left/right
+- Bugfix: Enhancement and upscaling working again in virtual cam
+- Corrupt videos caught when adding to target files, displaying warning msg
+- Source Files Component cleared after face detection to release temp files
+- Added masking and mouth restore options to virtual cam
+
+
+**9.9.2024** v4.2.3
+
+- Hotfix for gradio pydantic issue with fastapi
+- Upgraded to Gradio 4.43 hoping it will fix remaining issues
+- Added new action when no face detected -> use last swapped
+- Specified image format for image controls - opening new tabs on preview images possible again!
+- Hardcoded image output format for livecam to jpeg - might be faster than previous webp
+- Chain events to be only executed if previous was a success
+
+
+**5.9.2024** v4.2.0
+
+- Added ability to move input & target faces order
+- New CLI Arguments override settings
+- Small UI changes to faceswapping tab
+- Added mask option and code for restoration of original mouth area
+- Updated gradio to v4.42.0
+- Added CLI Arguments --server_share and --cuda_device_id
+- Added webp image support
+
+
+**15.07.2024** v4.1.1
+
+- Bugfix: Post-processing after swapping
+
+
+**14.07.2024** v4.1.0
+
+- Added subsample upscaling to increase swap resolution
+- Upgraded gradio
+
+
+**12.05.2024** v4.0.0
+
+- Bugfix: Unnecessary init every frame in live-cam
+- Bugfix: Installer downloading insightface package each run
+- Added xseg masking to live-cam
+- Added realesrganx2 to frame processors
+- Upgraded some requirements
+- Added subtypes and different model support to frame processors
+- Allow frame processors to change resolutions of videos
+- Different OpenCV Cap for MacOS Virtual Cam
+- Added complete frame processing to extras tab
+- Colorize, upscale and misc filters added
+
+
 **22.04.2024** v3.9.0
 
 - Bugfix: Face detection bounding box corrupt values at weird angles

config_colab.yaml

@@ -0,0 +1,14 @@
+clear_output: true
+force_cpu: false
+max_threads: 3
+memory_limit: 0
+output_image_format: png
+output_template: '{file}_{time}'
+output_video_codec: libx264
+output_video_format: mp4
+provider: cuda
+selected_theme: Default
+server_name: ''
+server_port: 0
+server_share: true
+video_quality: 14

requirements.txt

@@ -1,10 +1,12 @@
 --extra-index-url https://download.pytorch.org/whl/cu118
 
 numpy==1.26.4
-gradio==4.32.1
-opencv-python==4.9.0.80
+gradio==4.44.0
+fastapi<0.113.0
+opencv-python-headless==4.9.0.80
 onnx==1.16.0
 insightface==0.7.3
+albucore==0.0.16
 psutil==5.9.6
 torch==2.1.2+cu118; sys_platform != 'darwin'
 torch==2.1.2; sys_platform == 'darwin'

roop-unleashed.ipynb

@@ -1,66 +1,47 @@
 {
-  "nbformat": 4,
-  "nbformat_minor": 0,
-  "metadata": {
-    "colab": {
-      "provenance": [],
-      "gpuType": "T4",
-      "collapsed_sections": [
-        "UdQ1VHdI8lCf"
-      ]
-    },
-    "kernelspec": {
-      "name": "python3",
-      "display_name": "Python 3"
-    },
-    "language_info": {
-      "name": "python"
-    },
-    "accelerator": "GPU"
-  },
   "cells": [
     {
       "cell_type": "markdown",
+      "metadata": {
+        "id": "G9BdiCppV6AS"
+      },
       "source": [
         "# Colab for roop-unleashed - Gradio version\n",
         "https://github.com/C0untFloyd/roop-unleashed\n"
-      ],
-      "metadata": {
-        "id": "G9BdiCppV6AS"
-      }
+      ]
     },
     {
       "cell_type": "markdown",
-      "source": [
-        "Install CUDA V11.8 on Google Cloud Compute"
-      ],
       "metadata": {
         "id": "CanIXgLJgaOj"
-      }
+      },
+      "source": [
+        "Install CUDA V11.8 on Google Cloud Compute"
+      ]
     },
     {
       "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "96GE4UgYg3Ej"
+      },
+      "outputs": [],
       "source": [
         "!apt-get -y update\n",
         "!apt-get -y install cuda-toolkit-11-8\n",
         "import os\n",
         "os.environ[\"LD_LIBRARY_PATH\"] += \":\" + \"/usr/local/cuda-11/lib64\"\n",
         "os.environ[\"LD_LIBRARY_PATH\"] += \":\" + \"/usr/local/cuda-11.8/lib64\""
-      ],
-      "metadata": {
-        "id": "96GE4UgYg3Ej"
-      },
-      "execution_count": null,
-      "outputs": []
+      ]
     },
     {
       "cell_type": "markdown",
-      "source": [
-        "Installing & preparing requirements"
-      ],
       "metadata": {
         "id": "0ZYRNb0AWLLW"
-      }
+      },
+      "source": [
+        "Installing & preparing requirements"
+      ]
     },
     {
       "cell_type": "code",
@@ -73,61 +54,42 @@
         "!git clone https://github.com/C0untFloyd/roop-unleashed.git\n",
         "%cd roop-unleashed\n",
         "!mv config_colab.yaml config.yaml\n",
-        "!pip install pip install -r requirements.txt"
+        "!pip install -r requirements.txt"
       ]
     },
     {
       "cell_type": "markdown",
-      "source": [
-        "Running roop-unleashed with default config"
-      ],
       "metadata": {
         "id": "u_4JQiSlV9Fi"
-      }
+      },
+      "source": [
+        "Running roop-unleashed with default config"
+      ]
     },
     {
       "cell_type": "code",
-      "source": [
-        "!python run.py"
-      ],
+      "execution_count": null,
       "metadata": {
         "id": "Is6U2huqSzLE"
       },
-      "execution_count": null,
-      "outputs": []
+      "outputs": [],
+      "source": [
+        "!python run.py"
+      ]
     },
     {
       "cell_type": "markdown",
+      "metadata": {
+        "id": "UdQ1VHdI8lCf"
+      },
       "source": [
         "### Download generated images folder\n",
         "(only needed if you want to zip the generated output)"
-      ],
-      "metadata": {
-        "id": "UdQ1VHdI8lCf"
-      }
+      ]
     },
     {
       "cell_type": "code",
-      "source": [
-        "import shutil\n",
-        "import os\n",
-        "from google.colab import files\n",
-        "\n",
-        "def zip_directory(directory_path, zip_path):\n",
-        "    shutil.make_archive(zip_path, 'zip', directory_path)\n",
-        "\n",
-        "# Set the directory path you want to download\n",
-        "directory_path = '/content/roop-unleashed/output'\n",
-        "\n",
-        "# Set the zip file name\n",
-        "zip_filename = 'fake_output.zip'\n",
-        "\n",
-        "# Zip the directory\n",
-        "zip_directory(directory_path, zip_filename)\n",
-        "\n",
-        "# Download the zip file\n",
-        "files.download(zip_filename+'.zip')\n"
-      ],
+      "execution_count": null,
       "metadata": {
         "colab": {
           "base_uri": "https://localhost:8080/",
@@ -136,73 +98,67 @@
         "id": "oYjWveAmw10X",
         "outputId": "5b4c3650-f951-434a-c650-5525a8a70c1e"
       },
-      "execution_count": null,
       "outputs": [
         {
-          "output_type": "display_data",
           "data": {
+            "application/javascript": "\n    async function download(id, filename, size) {\n      if (!google.colab.kernel.accessAllowed) {\n        return;\n      }\n      const div = document.createElement('div');\n      const label = document.createElement('label');\n      label.textContent = `Downloading \"${filename}\": `;\n      div.appendChild(label);\n      const progress = document.createElement('progress');\n      progress.max = size;\n      div.appendChild(progress);\n      document.body.appendChild(div);\n\n      const buffers = [];\n      let downloaded = 0;\n\n      const channel = await google.colab.kernel.comms.open(id);\n      // Send a message to notify the kernel that we're ready.\n      channel.send({})\n\n      for await (const message of channel.messages) {\n        // Send a message to notify the kernel that we're ready.\n        channel.send({})\n        if (message.buffers) {\n          for (const buffer of message.buffers) {\n            buffers.push(buffer);\n            downloaded += buffer.byteLength;\n            progress.value = downloaded;\n          }\n        }\n      }\n      const blob = new Blob(buffers, {type: 'application/binary'});\n      const a = document.createElement('a');\n      a.href = window.URL.createObjectURL(blob);\n      a.download = filename;\n      div.appendChild(a);\n      a.click();\n      div.remove();\n    }\n  ",
             "text/plain": [
               "<IPython.core.display.Javascript object>"
-            ],
-            "application/javascript": [
-              "\n",
-              "    async function download(id, filename, size) {\n",
-              "      if (!google.colab.kernel.accessAllowed) {\n",
-              "        return;\n",
-              "      }\n",
-              "      const div = document.createElement('div');\n",
-              "      const label = document.createElement('label');\n",
-              "      label.textContent = `Downloading \"${filename}\": `;\n",
-              "      div.appendChild(label);\n",
-              "      const progress = document.createElement('progress');\n",
-              "      progress.max = size;\n",
-              "      div.appendChild(progress);\n",
-              "      document.body.appendChild(div);\n",
-              "\n",
-              "      const buffers = [];\n",
-              "      let downloaded = 0;\n",
-              "\n",
-              "      const channel = await google.colab.kernel.comms.open(id);\n",
-              "      // Send a message to notify the kernel that we're ready.\n",
-              "      channel.send({})\n",
-              "\n",
-              "      for await (const message of channel.messages) {\n",
-              "        // Send a message to notify the kernel that we're ready.\n",
-              "        channel.send({})\n",
-              "        if (message.buffers) {\n",
-              "          for (const buffer of message.buffers) {\n",
-              "            buffers.push(buffer);\n",
-              "            downloaded += buffer.byteLength;\n",
-              "            progress.value = downloaded;\n",
-              "          }\n",
-              "        }\n",
-              "      }\n",
-              "      const blob = new Blob(buffers, {type: 'application/binary'});\n",
-              "      const a = document.createElement('a');\n",
-              "      a.href = window.URL.createObjectURL(blob);\n",
-              "      a.download = filename;\n",
-              "      div.appendChild(a);\n",
-              "      a.click();\n",
-              "      div.remove();\n",
-              "    }\n",
-              "  "
             ]
           },
-          "metadata": {}
+          "metadata": {},
+          "output_type": "display_data"
         },
         {
-          "output_type": "display_data",
           "data": {
+            "application/javascript": "download(\"download_789eab11-93d2-4880-adf3-6aceee0cc5f9\", \"fake_output.zip.zip\", 80125)",
             "text/plain": [
               "<IPython.core.display.Javascript object>"
-            ],
-            "application/javascript": [
-              "download(\"download_789eab11-93d2-4880-adf3-6aceee0cc5f9\", \"fake_output.zip.zip\", 80125)"
             ]
           },
-          "metadata": {}
+          "metadata": {},
+          "output_type": "display_data"
         }
+      ],
+      "source": [
+        "import shutil\n",
+        "import os\n",
+        "from google.colab import files\n",
+        "\n",
+        "def zip_directory(directory_path, zip_path):\n",
+        "    shutil.make_archive(zip_path, 'zip', directory_path)\n",
+        "\n",
+        "# Set the directory path you want to download\n",
+        "directory_path = '/content/roop-unleashed/output'\n",
+        "\n",
+        "# Set the zip file name\n",
+        "zip_filename = 'fake_output.zip'\n",
+        "\n",
+        "# Zip the directory\n",
+        "zip_directory(directory_path, zip_filename)\n",
+        "\n",
+        "# Download the zip file\n",
+        "files.download(zip_filename+'.zip')\n"
       ]
     }
-  ]
+  ],
+  "metadata": {
+    "accelerator": "GPU",
+    "colab": {
+      "collapsed_sections": [
+        "UdQ1VHdI8lCf"
+      ],
+      "gpuType": "T4",
+      "provenance": []
+    },
+    "kernelspec": {
+      "display_name": "Python 3",
+      "name": "python3"
+    },
+    "language_info": {
+      "name": "python"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 0
 }

runMacOS.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Check if we are in the correct repository directory
+if [ ! -f "run.py" ]; then
+    echo "run.py not found!"
+    exit 1
+fi
+
+# Create a hidden Python 3.11 virtual environment in the .venv folder
+VENV_DIR=".venv"
+
+# Check if Python 3.11 is installed
+if ! brew list --versions python@3.11 >/dev/null; then
+    echo "Python 3.11 is not installed. Please install it first."
+    exit 1
+fi
+
+# Use Python 3.11 to create the virtual environment
+echo "Creating a virtual environment using Python 3.11..."
+python3.11 -m venv $VENV_DIR
+
+# Activate the virtual environment
+echo "Activating the virtual environment..."
+source "$VENV_DIR/bin/activate"
+
+# Check if the activation was successful
+if [ "$VIRTUAL_ENV" != "" ]; then
+    echo "Virtual environment activated successfully."
+else
+    echo "Failed to activate the virtual environment."
+    exit 1
+fi
+
+# Install dependencies from requirements.txt
+if [ -f "requirements.txt" ]; then
+    echo "Installing dependencies from requirements.txt..."
+    pip install -r requirements.txt
+else
+    echo "requirements.txt not found. Skipping dependency installation."
+fi
+
+# Run roop-unleashed. This can take a while - especially at first startup...
+echo "Running the run.py script..."
+python run.py
+
+# Deactivate the virtual environment after execution
+echo "Deactivating the virtual environment..."
+deactivate

settings.py

@@ -37,6 +37,7 @@ class Settings:
         self.output_template = self.default_get(data, 'output_template', '{file}_{time}')
         self.use_os_temp_folder = self.default_get(data, 'use_os_temp_folder', False)
         self.output_show_video = self.default_get(data, 'output_show_video', True)
+        self.launch_browser = self.default_get(data, 'launch_browser', True)