final adjustments

Signed-off-by: bigcat88 <[email protected]>

Author: bigcat88

CHANGELOG.md

@@ -2,18 +2,39 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.0 - 2024-12-18]
+
+The [Visionatrix](https://github.com/Visionatrix/Visionatrix) service has been updated from version `1.4.1` to `1.9.0`.
+The main changes are summarized below:
+
+### Added
+
+- Support for flows that produce `video` files as output.
+- `OpenAPI` specs support, enabling easier development of Nextcloud Apps that can seamlessly use Visionatrix flows.
+- Many new `flows` with updated models.
+- Parallel installation of `flows` and `models`.
+
+### Changed
+
+- Online `flows` and `models` storage has been separated, ensuring the integration remains stable.
+- Added support for both `Ollama` and `Gemini` as providers for `Vision` and `Prompt translation`.
+
+### Fixed
+
+- Numerous bug fixes and significant performance improvements.
+
 ## [1.0.1 - 2024-10-18]
 
 ### Changed
 
-- Bumped bundled Visionatrix from `1.3.0` to `1.4.1` version, changelog can be found [here](https://github.com/Visionatrix/Visionatrix/releases/tag/v1.4.0)
+- Updated the bundled Visionatrix from version `1.3.0` to `1.4.1`. The changelog for this update can be found [here](https://github.com/Visionatrix/Visionatrix/releases/tag/v1.4.0).
 
 ### Fixed
 
-- Warning "sudo: unable to resolve host" during container startup.
+- Resolved the warning "sudo: unable to resolve host" during container startup.
 
 ## [1.0.0 - 2024-09-25]
 
 ### Added
 
-- First release with bundled Visionatrix version `1.3.0`
+- Initial release with the bundled Visionatrix version `1.3.0`.

Dockerfile

@@ -13,7 +13,14 @@ ENV VIX_SERVER_FULL_MODELS="1"
 RUN apt-get update && apt-get install -y git \
 	python3-dev python3-setuptools netcat-traditional \
 	libxml2-dev libxslt1-dev zlib1g-dev g++ \
-	ffmpeg libsm6 libxext6 lsb-release sudo wget procps nano xmlstarlet
+	ffmpeg libsm6 libxext6 lsb-release sudo wget procps nano xmlstarlet && \
+    apt-get autoclean
+
+ADD ex_app_scripts/common_pgsql.sh /ex_app_scripts/
+RUN chmod +x /ex_app_scripts/common_pgsql.sh
+
+ADD ex_app_scripts/install_pgsql.sh /ex_app_scripts/
+RUN chmod +x /ex_app_scripts/install_pgsql.sh && /ex_app_scripts/install_pgsql.sh && rm /ex_app_scripts/install_pgsql.sh
 
 COPY appinfo/info.xml /info.xml
 
@@ -42,8 +49,12 @@ RUN cd /Visionatrix && \
 RUN cd /Visionatrix && \
     venv/bin/python -m pip install "psycopg[binary]" greenlet && \
     venv/bin/python -m pip install . && \
-    AUTO_INIT_CONFIG_MODELS_DIR=$MODELS_DIR venv/bin/python scipts/easy_install.py && \
+	rm -rf ~/.cache/pip
+
+RUN cd /Visionatrix && \
 	venv/bin/python -m visionatrix install && \
+    AUTO_INIT_CONFIG_MODELS_DIR=$MODELS_DIR venv/bin/python scripts/easy_install.py && \
+    rm visionatrix.db && \
 	rm -rf ~/.cache/pip
 
 # Setup nodejs and npm for building the front-end client

README.md

@@ -16,6 +16,9 @@ This is a standalone [Visionatrix](https://github.com/Visionatrix/Visionatrix) s
 
 Each user is authenticated via Nextcloud credentials and has a personal task history.
 
+> [!NOTE]
+> We recommend starting with the "light-weight" flows, such as SDXL Lighting, Remove background (BiRefNet), and Remove background (Bria), to test your hardware.
+
 ## TextToImage Provider
 
 You can use Visionatrix as the TextToImage provider via [Nextcloud Assistant](https://github.com/nextcloud/assistant).

ex_app_scripts/common_pgsql.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# Common environment variables
+PG_VERSION=16
+PG_BIN="/usr/lib/postgresql/${PG_VERSION}/bin"
+PG_SQL="/usr/lib/postgresql/${PG_VERSION}/bin/psql"
+BASE_DIR="${APP_PERSISTENT_STORAGE:-/nc_app_${APP_ID:-visionatrix}_data}"
+DATA_DIR="${BASE_DIR}/pgsql"
+
+# Function to ensure PostgreSQL is installed
+ensure_postgres_installed() {
+    # Check if PostgreSQL is installed by checking for the existence of binary files
+    if [ -d "$PG_BIN" ]; then
+        echo "PostgreSQL binaries found."
+    else
+        echo "PostgreSQL binaries not found."
+        echo "Adding the PostgreSQL APT repository..."
+        apt-get update && apt-get install -y gnupg
+        wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+        echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
+        echo "Installing PostgreSQL..."
+        apt-get update && apt-get install -y postgresql-$PG_VERSION
+    fi
+}
+
+# Function to initialize the database (if needed) and start PostgreSQL
+init_and_start_postgres() {
+    # Ensure the directory exists and has the correct permissions
+    mkdir -p "$DATA_DIR"
+    chown -R postgres:postgres "$DATA_DIR"
+
+    if [ ! -d "$DATA_DIR/base" ]; then
+        echo "Initializing the PostgreSQL database..."
+        sudo -u postgres ${PG_BIN}/initdb -D "$DATA_DIR"
+        PG_CONF="${DATA_DIR}/postgresql.conf"
+        if ! grep -q "^listen_addresses\s*=\s*''" "$PG_CONF"; then
+            echo "Updating PostgreSQL configuration to disable TCP/IP connections..."
+            echo "listen_addresses = ''" >> "$PG_CONF"
+        fi
+    fi
+
+    echo "Starting PostgreSQL..."
+    sudo -u postgres ${PG_BIN}/pg_ctl -D "$DATA_DIR" -l "${DATA_DIR}/logfile" start
+
+    echo "Waiting for PostgreSQL to start..."
+    until sudo -u postgres ${PG_SQL} -c "SELECT 1" > /dev/null 2>&1; do
+        sleep 1
+        echo -n "."
+    done
+    echo "PostgreSQL is up and running."
+}

ex_app_scripts/init_pgsql.sh

@@ -4,7 +4,6 @@
 DB_NAME=${APP_ID:-visionatrix}
 DB_USER=${APP_ID:-visionatrix}
 DB_PASS=${APP_ID:-visionatrix}
-BASE_DIR="${APP_PERSISTENT_STORAGE:-/nc_app_visionatrix_data}"
 
 # Check if EXTERNAL_DATABASE is set
 if [ -n "${EXTERNAL_DATABASE}" ]; then
@@ -21,49 +20,10 @@ if [ -n "${EXTERNAL_DATABASE}" ]; then
     exit 0
 fi
 
-# PostgreSQL version to use
-PG_VERSION=15
-PG_BIN="/usr/lib/postgresql/${PG_VERSION}/bin"
-PG_SQL="/usr/lib/postgresql/${PG_VERSION}/bin/psql"
+source /ex_app_scripts/common_pgsql.sh
 
-# Define the PostgreSQL data directory
-DATA_DIR="${BASE_DIR}/pgsql"
-
-# Check if PostgreSQL is installed by checking for the existence of binary files
-if [ -d "$PG_BIN" ]; then
-    echo "PostgreSQL binaries found."
-else
-    echo "PostgreSQL binaries not found."
-    echo "Adding the PostgreSQL APT repository..."
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-    echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
-    echo "Installing PostgreSQL..."
-    apt-get update && apt-get install -y postgresql-$PG_VERSION
-fi
-
-# Ensure the directory exists and has the correct permissions
-mkdir -p "$DATA_DIR"
-chown -R postgres:postgres "$DATA_DIR"
-
-if [ ! -d "$DATA_DIR/base" ]; then
-    echo "Initializing the PostgreSQL database..."
-    sudo -u postgres ${PG_BIN}/initdb -D "$DATA_DIR"
-    PG_CONF="${DATA_DIR}/postgresql.conf"
-    if ! grep -q "^listen_addresses\s*=\s*''" "$PG_CONF"; then
-        echo "Updating PostgreSQL configuration to disable TCP/IP connections..."
-        echo "listen_addresses = ''" >> "$PG_CONF"
-    fi
-fi
-
-echo "Starting PostgreSQL..."
-sudo -u postgres ${PG_BIN}/pg_ctl -D "$DATA_DIR" -l "${DATA_DIR}/logfile" start
-
-echo "Waiting for PostgreSQL to start..."
-until sudo -u postgres ${PG_SQL} -c "SELECT 1" > /dev/null 2>&1; do
-    sleep 1
-    echo -n "."
-done
-echo "PostgreSQL is up and running."
+ensure_postgres_installed
+init_and_start_postgres
 
 # Check if the user exists and create if not
 sudo -u postgres $PG_SQL -c "SELECT 1 FROM pg_user WHERE usename = '$DB_USER'" | grep -q 1 || \

ex_app_scripts/install_pgsql.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+source /ex_app_scripts/common_pgsql.sh
+
+ensure_postgres_installed
+init_and_start_postgres