Merge branch 'dev' into release

Dockerfile

@@ -119,6 +119,7 @@ ENV PATH="/root/.local/bin:$PATH"
 # END of POC
 
 ## Build Time Args ##
+# not available at run time, like ENV vars
 
 ARG VGG_NAME="imagenet-vgg-verydeep-19.mat"
 
@@ -157,8 +158,8 @@ FROM prod_ready AS prod_demo
 
 ARG REPO_DEMO_IMAGES_LOCATION="tests/data"
 
-ARG DEMO_CONTENT_IMAGE="${REPO_DEMO_IMAGES_LOCATION}/blue-red_w300-h225.jpg"
-ARG DEMO_STYLE_IMAGE="${REPO_DEMO_IMAGES_LOCATION}/canoe_water_w300-h225.jpg"
+ARG DEMO_CONTENT_IMAGE="${REPO_DEMO_IMAGES_LOCATION}/canoe_water_w300-h225.jpg"
+ARG DEMO_STYLE_IMAGE="${REPO_DEMO_IMAGES_LOCATION}/blue-red_w300-h225.jpg"
 
 WORKDIR /app
 
@@ -178,10 +179,14 @@ ENV STYLE_IMAGE_DEMO="/app/${DEMO_STYLE_IMAGE}"
 CMD ["nst", "demo"]
 
 
+FROM prod_ready as default
+
+CMD [ "nst" ]
+
 ### Stage: Default Target (for Production)
 # Just to allow `docker buil` use this as target if not specified
 
-FROM prod_ready as default
+FROM prod_demo as default_with_demo
 
 # Define ENTRYPOINT, so that this is the default 
 # runs the NST Algorithm on the Demo Content and Style Images for a few iterations

README.rst

@@ -34,7 +34,7 @@ This Python package runs a Neural Style Tranfer algorithm on input `content` and
     * - code quality
       - |codacy| |code_climate| |maintainability| |scrutinizer|
 
-
+| **Docs**: https://boromir674.github.io/neural-style-transfer/
 
 Overview
 ========
@@ -50,112 +50,67 @@ Key features of the package:
 * Persisting of generated images
 
 
+Quick-start
+-----------
 
-Installation
-------------
-| The Neural Style Transfer - CLI heavely depends on Tensorflow (tf) and therefore it is crucial that tf is installed correctly in your Python environment.
-
-Sample commands to install the NST CLI from source, using a terminal:
+| Run a demo NST, on sample `Content` and `Style` Images:
 
 ::
 
-    # Get the Code
-    git clone https://github.com/boromir674/neural-style-transfer.git
-    cd neural-style-transfer
-
-    # Activate a python virtual environment
-    virtualenv env --python=python3
-    source env/bin/activate
+    mkdir art
+    export NST_HOST_MOUNT="$PWD/art"
 
-    # Install dependencies
-    pip install -r requirements/dex.txt
+    docker-compose up
 
-    # Install NST CLI (in virtual environment)
-    pip install -e .
+    # Process runs, in containerized environment, and exits.
 
 
-Alternative command to install the NST CLI by downloading the `artificial_artwork` python package from pypi:
+| Check out your **Generated Image**!
+| Artificial Artwork: **art/canoe_water_w300-h225.jpg+blue-red_w300-h225.jpg-100.png**
 
 ::
 
-    pip install artificial_artwork
-
-
-Make the cli available for your host system:
-
-::
-
-    # Setup a symbolic link (in your host system) in a location in your PATH
-    # Assuming ~/.local/bin is in your PATH
-    ln -s $PWD/env/bin/neural-style-transfer ~/.local/bin/neural-style-transfer
-
-    # Deactivate environment since the symbolic link is available in "global scope" by now
-    deactivate
+    xdg-open art/canoe_water_w300-h225.jpg+blue-red_w300-h225.jpg-100.png
 
 
 Usage
 -----
 
-Download the Vgg-Verydeep-19 pretrained `model` from https://drive.protonmail.com/urls/7RXGN23ZRR#hsw4STil0Hgc.
-
-Exctract the model (weights and layer architecture).
-
-For example use `tar -xvf imagenet-vgg-verydeep-19.tar` to extract in the current directory.
-
-Indicate to the program where to find the model:
+Run the `nst` CLI with the `--help` option to see the available options.
 
 ::
 
-    export AA_VGG_19=$PWD/imagenet-vgg-verydeep-19.mat
+    docker run boromir674/neural-style-transfer:1.0.2 --help
 
-We have included one 'content' and one 'style' image in the source repository, to facilitate testing.
-You can use these images to quickly try running the program.
 
-For example, you can get the code with `git clone git@github.com:boromir674/neural-style-transfer.git`,
-then `cd neural-style-transfer`.
+Development
+-----------
 
-Assuming you have installed using a symbolic link in your PATH (as shown above), or if you are still
-operating withing your virtual environment, then you can create artificial artwork with the following command.
+Installation
+""""""""""""
 
-The algorithm will apply the style to the content iteratively.
-It will iterate 100 times. 
+Install `nst` CLI and `artificial_artwork` python package from `pypi``:
 
 ::
 
-    # Create a directory where to store the artificial artwork
-    mkdir nst_output
-
-    # Run a Neural Style Algorithm for 100 iterations and store output to nst_output directory
-    neural-style-transfer tests/data/canoe_water.jpg tests/data/blue-red-w400-h300.jpg --location nst_output
-
-
-Note we are using as 'content' and 'style' images jpg files included in the distribution (artificial-artwork package).
-We are using a photo of a canoe on water and an abstract painting with prevalence of blue and red color shades.
-
-Also note that to demonstrate quicker, both images have been already resized to just 400 pixels of width and 300 of height each.
-
-Navigating to `nst_output` you can find multiple image files generated from running the algorithm. Each file corresponds to the
-image generated on a different iteration while running the algorithm. The bigger the iteration the more "style" has been applied.
+    pip install artificial_artwork
 
-Check out your artificial artwork!
 
+Only python3.8 wheel is included atm.
 
-Docker image
-------------
 
-We have included a docker file that we use to build an image where both the `artificial_artwork` package (source code)
-and the pretrained model are present. That way you can immediately start creating artwork!
+Sample commands to install the NST CLI from source, using a terminal:
 
 ::
 
-    docker pull boromir674/neural-style-transfer
+    git clone https://github.com/boromir674/neural-style-transfer.git
+    
+    pip install ./neural-style-transfer
+
 
-    export NST_OUTPUT=/home/$USER/nst-output
+| The Neural Style Transfer - CLI heavely depends on Tensorflow (tf) and therefore it is crucial that tf is installed correctly in your Python environment.
 
-    CONTENT=/path/to/content-image.jpg
-    STYLE=/path/to/style-image.jpg
 
-    docker run -it --rm -v $NST_OUTPUT:/nst-output boromir674/neural-style-transfer $STYLE $CONTENT --iteratins 200 --location /nst-output
 
 .. |ci_pipeline| image:: https://img.shields.io/github/actions/workflow/status/boromir674/neural-style-transfer/test.yaml?branch=master&label=build&logo=github-actions&logoColor=233392FF
     :alt: CI Pipeline Status

docker-compose.yml

@@ -5,15 +5,13 @@ version: '3'
 
 services:
 
+  # mkdir art
+  # NST_HOST_MOUNT="$PWD/art" docker-compose up
   nst_demo:
-    build:
-      context: ./
-      target: prod_demo
-      dockerfile: Dockerfile
-
-  # NST_HOST_MOUNT=/custom/nst-output docker-compose up
+    image: boromir674/neural-style-transfer:1.0.2
     volumes:
       - ${NST_HOST_MOUNT:-./nst-algo-output}:/app/demo-output
+    command: [ "demo" ]
 
 
 ## NST Service, where the Pretrained Model Weights are made available to it (so that
@@ -61,3 +59,15 @@ services:
   #     AA_VGG_19: pretrained_model_bundle/imagenet-vgg-verydeep-19.mat
   #   volumes:
   #     - ./pretrained_model_bundle:/app/pretrained_model_bundle
+
+
+  # mkdir art && NST_HOST_MOUNT="$PWD/art" docker-compose up
+  # nst_demo_dev:
+  #   build:
+  #     context: ./
+  #     # target: default_with_demo
+  #     dockerfile: Dockerfile
+  # # OR just build: .
+
+  #   volumes:
+  #     - ${NST_HOST_MOUNT:-./nst-algo-output}:/app/demo-output

docs/build-process_DAG.md

@@ -4,20 +4,20 @@
 
 Flow Chart, of how exection navigates docker stages (see --target of docker build).
 
-If you run `docker build .` the `target` used by default is the `default` Stage in the Graph.
+If you run `docker build .` the `target` used by default is the `default_with_demo` Stage in the Graph.
 
 **Dockerfile: ./Dockerfile**
 
-Note, The below Graph represents only `FROM first_stage AS second_stage`.
-We will add representation for `COPY --from=other_stage .`, later.
 
 ```mermaid
 graph TB;
   python:3.8.12-slim-bullseye --> base
   base --> source
   source --> prod
   base --> prod_install
+  prod -. "COPY" .-> prod_install
   prod_install --> prod_ready
   prod_ready --> prod_demo
   prod_ready --> default
+  prod_demo --> default_with_demo
 ```

docs/index.md

@@ -0,0 +1,48 @@
+# Artificial Artwork
+
+## Quick-start
+
+Run a demo NST, on sample `Content` and `Style` Images:
+
+```shell
+mkdir art
+export NST_HOST_MOUNT="$PWD/art"
+
+# Run containerized NST, and exit container upon finish
+docker-compose up
+```
+
+Check out your **Generated Image**!  
+Artificial Artwork: **art/canoe_water_w300-h225.jpg+blue-red_w300-h225.jpg-100.png**  
+
+```shell
+xdg-open art/canoe_water_w300-h225.jpg+blue-red_w300-h225.jpg-100.png
+```
+
+## Usage
+
+Run the `nst` CLI with the `--help` option to see the available options.
+
+```shell
+docker run boromir674/neural-style-transfer:1.0.2 --help
+```
+
+## Development
+
+
+### Installation from `pypi`
+
+```shell
+pip install artificial-artwork
+```
+
+Only python3.8 wheel is included atm.
+
+### Installation from `source`:
+
+```shell
+git clone https://github.com/boromir674/neural-style-transfer.git
+pip install ./neural-style-transfer
+```
+
+The Neural Style Transfer - CLI heavely depends on Tensorflow (tf) and therefore it is crucial that tf is installed correctly in your Python environment.

mkdocs.yml

@@ -0,0 +1,24 @@
+site_name: Artificial Artwork
+repo_name: neural-style-transfer
+plugins:
+  - search
+  - mermaid2
+  - mkdocstrings
+  - gen-files:
+      scripts:
+        - scripts/gen_api_refs_pages.py 
+  - literate-nav:
+      nav_file: SUMMARY.md
+  - section-index
+
+markdown_extensions:
+  - mkdocs-click
+  - pymdownx.highlight
+
+nav:
+  - Home:
+    - "Quick Start": index.md  
+    - "CLI": cli.md
+  - Developer:
+    - "Docker": build-process_DAG.md
+  - Code Reference: reference/