Implemented image tagging using TensorFlow InceptionV3 (#28)

* Refactor docker-compose to its own folder
* Added FastAPI development environment
* Added support for GPU in docker file
* Added image classification
* creating endpoint for smart Image info
* added logo with white background on ios
* Added endpoint and trigger for image tagging
* Classify image and save into database
* Update readme

Makefile

@@ -1,8 +1,8 @@
 dev:
-	docker-compose -f ./server/docker-compose.yml up
+	docker-compose -f ./docker/docker-compose.yml up
 
 dev-update:
-	docker-compose -f ./server/docker-compose.yml up --build -V 
+	docker-compose -f ./docker/docker-compose.yml up --build -V 
 
 dev-scale:
-	docker-compose -f ./server/docker-compose.yml up --build -V  --scale immich_server=3 --remove-orphans 
+	docker-compose -f ./docker/docker-compose.yml up --build -V  --scale immich_server=3 --remove-orphans 

README.md

@@ -44,13 +44,15 @@ You can use docker compose for development, there are several services that comp
 2. PostgreSQL
 3. Redis
 4. Nginx
+5. TensorFlow and Keras
 
 ## Populate .env file
 
-Navigate to `server` directory and run
+Navigate to `docker` directory and run
 
-````
+```
 cp .env.example .env
+```
 
 Then populate the value in there.
 
@@ -59,13 +61,13 @@ Pay attention to the key `UPLOAD_LOCATION`, this directory must exist and is own
 To start, run
 
 ```bash
-docker-compose -f ./server/docker-compose.yml up
-````
+docker-compose -f ./docker/docker-compose.yml up
+```
 
 To force rebuild node modules after installing new packages
 
 ```bash
-docker-compose -f ./server/docker-compose.yml up --build -V
+docker-compose -f ./docker/docker-compose.yml up --build -V
 ```
 
 The server will be running at `http://your-ip:2283` through `Nginx`

docker/.gitignore

@@ -0,0 +1 @@
+.env

docker/docker-compose.gpu.yml

@@ -0,0 +1,95 @@
+version: "3.8"
+
+services:
+  immich_server:
+    image: immich-server-dev:1.0.0
+    build:
+      context: ../server
+      target: development
+      dockerfile: ../server/Dockerfile
+    command: npm run start:dev
+    expose:
+      - "3000"
+    volumes:
+      - ../server:/usr/src/app
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - /usr/src/app/node_modules
+    env_file:
+      - .env
+    depends_on:
+      - redis
+      - database
+    networks:
+      - immich_network
+
+  redis:
+    container_name: immich_redis
+    image: redis:6.2
+    networks:
+      - immich_network
+
+  database:
+    container_name: immich_postgres
+    image: postgres:14
+    env_file:
+      - .env
+    environment:
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_DB: ${DB_DATABASE_NAME}
+      PG_DATA: /var/lib/postgresql/data
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    networks:
+      - immich_network
+
+  nginx:
+    container_name: proxy_nginx
+    image: nginx:latest
+    volumes:
+      - ./settings/nginx-conf:/etc/nginx/conf.d
+    ports:
+      - 2283:80
+      - 2284:443
+    logging:
+      driver: none
+    networks:
+      - immich_network
+    depends_on:
+      - immich_server
+
+  immich_tf_fastapi:
+    container_name: immich_tf_fastapi
+    image: tensor_flow_fastapi:1.0.0
+    restart: always
+    command: uvicorn app.main:app --proxy-headers --host 0.0.0.0 --port 8000 --reload
+    build:
+      context: ../machine_learning
+      target: gpu
+      dockerfile: ../machine_learning/Dockerfile
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: 1
+              capabilities: [gpu]
+    volumes:
+      - ../machine_learning/app:/code/app
+      - ${UPLOAD_LOCATION}:/code/app/upload
+    ports:
+      - 2285:8000
+    expose:
+      - "8000"
+    depends_on:
+      - database
+    networks:
+      - immich_network
+
+      
+networks:
+  immich_network:
+volumes:
+  pgdata:

docker/docker-compose.yml

@@ -1,18 +1,18 @@
-version: '3.8'
-
+version: "3.8"
 
 services:
   immich_server:
     image: immich-server-dev:1.0.0
     build:
-      context: .
+      context: ../server
       target: development
-      dockerfile: ./Dockerfile
-    command: npm run start:dev
-    expose: 
+      dockerfile: ../server/Dockerfile
+    entrypoint: ["/bin/sh", "./entrypoint.sh"]
+    # command: npm run start:dev
+    expose:
       - "3000"
     volumes:
-      - .:/usr/src/app
+      - ../server:/usr/src/app
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /usr/src/app/node_modules
     env_file:
@@ -27,7 +27,7 @@ services:
     container_name: immich_redis
     image: redis:6.2
     networks:
-      - immich_network  
+      - immich_network
 
   database:
     container_name: immich_postgres
@@ -44,7 +44,7 @@ services:
     ports:
       - 5432:5432
     networks:
-      - immich_network  
+      - immich_network
 
   nginx:
     container_name: proxy_nginx
@@ -61,7 +61,28 @@ services:
     depends_on:
       - immich_server
 
+  immich_tf_fastapi:
+    container_name: immich_tf_fastapi
+    image: tensor_flow_fastapi:1.0.0
+    restart: always
+    command: uvicorn app.main:app --proxy-headers --host 0.0.0.0 --port 8000 --reload
+    build:
+      context: ../machine_learning
+      target: cpu
+      dockerfile: ../machine_learning/Dockerfile
+    volumes:
+      - ../machine_learning/app:/code/app
+      - ${UPLOAD_LOCATION}:/code/app/upload
+    ports:
+      - 2285:8000
+    expose:
+      - "8000"
+    depends_on:
+      - database
+    networks:
+      - immich_network
+
 networks:
   immich_network:
 volumes:
-  pgdata:
+  pgdata:

docker/settings/nginx-conf/nginx.conf

@@ -0,0 +1,35 @@
+
+map $http_upgrade $connection_upgrade {
+  default upgrade;
+  '' close;
+}
+
+# events {
+#   worker_connections 1000;
+# }
+
+server {
+
+  client_max_body_size 50000M;
+
+  listen 80;
+
+  location / {
+    proxy_buffering off;
+    proxy_buffer_size 16k;
+    proxy_busy_buffers_size 24k;
+    proxy_buffers 64 4k;
+    proxy_force_ranges on;
+
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+
+    proxy_pass http://immich_server:3000;
+  }
+}

machine_learning/.dockerignore

@@ -0,0 +1 @@
+devenv/

machine_learning/.gitignore

@@ -0,0 +1,2 @@
+app/__pycache__
+/devenv

machine_learning/Dockerfile

@@ -0,0 +1,22 @@
+## GPU Build
+FROM tensorflow/tensorflow:latest-gpu as gpu
+
+WORKDIR /code
+
+COPY ./requirements.txt /code/requirements.txt
+
+RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+
+COPY ./app /code/app
+
+
+## CPU BUILD
+FROM python:3.8 as cpu
+
+WORKDIR /code
+
+COPY ./requirements.txt /code/requirements.txt
+
+RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+
+COPY ./app /code/app

machine_learning/Pipfile

@@ -0,0 +1,17 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+fastapi = "<0.69.0,>=0.68.0"
+pydantic = "<2.0.0,>=1.8.0"
+uvicorn = "<0.16.0,>=0.15.0"
+tensorflow = "~=2.8.0"
+numpy = "==1.22.2"
+pillow = "==9.0.1"
+
+[dev-packages]
+
+[requires]
+python_version = "3.8"

machine_learning/app/main.py

@@ -0,0 +1,51 @@
+from typing import Optional
+from pydantic import BaseModel
+import numpy as np
+from fastapi import FastAPI
+import tensorflow as tf
+from tensorflow.keras.applications import InceptionV3
+from tensorflow.keras.applications.inception_v3 import preprocess_input, decode_predictions
+from tensorflow.keras.preprocessing import image
+
+IMG_SIZE = 299
+PREDICTION_MODEL = InceptionV3(weights='imagenet')
+
+
+def warm_up():
+    img_path = f'./app/test.png'
+    img = image.load_img(img_path, target_size=(IMG_SIZE, IMG_SIZE))
+    x = image.img_to_array(img)
+    x = np.expand_dims(x, axis=0)
+    x = preprocess_input(x)
+    PREDICTION_MODEL.predict(x)
+
+
+# Warm up model
+warm_up()
+app = FastAPI()
+
+
+class TagImagePayload(BaseModel):
+    thumbnail_path: str
+
+
+@app.post("/tagImage")
+async def post_root(payload: TagImagePayload):
+    imagePath = payload.thumbnail_path
+
+    if imagePath[0] == '.':
+        imagePath = imagePath[2:]
+
+    img_path = f'./app/{imagePath}'
+    img = image.load_img(img_path, target_size=(IMG_SIZE, IMG_SIZE))
+    x = image.img_to_array(img)
+    x = np.expand_dims(x, axis=0)
+    x = preprocess_input(x)
+
+    preds = PREDICTION_MODEL.predict(x)
+    result = decode_predictions(preds, top=3)[0]
+    payload = []
+    for _, value, _ in result:
+        payload.append(value)
+
+    return payload

machine_learning/requirements.txt

@@ -0,0 +1,6 @@
+fastapi>=0.68.0,<0.69.0
+pydantic>=1.8.0,<2.0.0
+uvicorn>=0.15.0,<0.16.0
+tensorflow==2.8.0
+numpy==1.22.2
+pillow==9.0.1

mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1,158 @@
 {
   "images" : [
     {
-      "size" : "20x20",
+      "filename" : "immich-logo-1024-20@2x.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "immich-logo-1024-20@3x.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "immich-logo-1024-29.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "immich-logo-1024-29@2x.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "immich-logo-1024-29@3x.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "immich-logo-1024-40@2x.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
+      "filename" : "immich-logo-1024-40@3x.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "immich-logo-1024-60@2x.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size" : "60x60",
+      "filename" : "immich-logo-1024-60@3x.png",
       "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
       "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
       "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
       "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
       "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
       "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
       "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
       "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
       "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
       "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    },
+    {
+      "filename" : "immich-logo-1024-20.png",
+      "idiom" : "universal",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "immich-logo-1024-40.png",
+      "idiom" : "universal",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "immich-logo-1024-76.png",
+      "idiom" : "universal",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "immich-logo-1024-76@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "immich-logo-1024-83.5@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "immich-logo-1024-1024.png",
+      "idiom" : "universal",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }