Fix package dependency issues

.circleci/config.yml

@@ -0,0 +1,127 @@
+version: 2.1
+
+jobs:
+  test_gradient_model_py36:
+    docker:
+      - image: circleci/python:3.6.9
+    working_directory: ~/project/packages/gradient_boosting_model
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Run tests with Python 3.6
+          command: |
+            sudo pip install --upgrade pip
+            pip install --user tox
+            tox -e py36
+  test_gradient_model_py37:
+    docker:
+      - image: circleci/python:3.7.6
+    working_directory: ~/project/packages/gradient_boosting_model
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Run tests with Python 3.7
+          command: |
+            sudo pip install --upgrade pip
+            pip install --user tox
+            tox -e py37
+  test_gradient_model_py38:
+    docker:
+      - image: circleci/python:3.8.0
+    working_directory: ~/project/packages/gradient_boosting_model
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Run tests with Python 3.8
+          command: |
+            sudo pip install --upgrade pip
+            pip install --user tox
+            tox -e py38
+  test_ml_api_py36:
+    docker:
+      - image: circleci/python:3.6.9
+      - image: postgres
+        environment:
+          POSTGRES_USER: test_user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: ml_api_test
+    environment:
+      DB_HOST: localhost
+      DB_PORT: 5432
+      DB_USER: test_user
+      DB_PASSWORD: password
+      DB_NAME: ml_api_test
+      SHADOW_MODE_ACTIVE: true
+    working_directory: ~/project/packages/ml_api
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Run API tests with Python 3.6
+          command: |
+            sudo pip install --upgrade pip
+            pip install --user tox
+            tox -e py36
+  test_ml_api_py37:
+    docker:
+      - image: circleci/python:3.7.6
+      - image: postgres
+        environment:
+          POSTGRES_USER: test_user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: ml_api_test
+    environment:
+      DB_HOST: localhost
+      DB_PORT: 5432
+      DB_USER: test_user
+      DB_PASSWORD: password
+      DB_NAME: ml_api_test
+      SHADOW_MODE_ACTIVE: true
+    working_directory: ~/project/packages/ml_api
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Run API tests with Python 3.7
+          command: |
+            sudo pip install --upgrade pip
+            pip install --user tox
+            tox -e py37
+  test_ml_api_py38:
+    docker:
+      - image: circleci/python:3.8.1
+      - image: postgres
+        environment:
+          POSTGRES_USER: test_user
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: ml_api_test
+    environment:
+      DB_HOST: localhost
+      DB_PORT: 5432
+      DB_USER: test_user
+      DB_PASSWORD: password
+      DB_NAME: ml_api_test
+      SHADOW_MODE_ACTIVE: true
+    working_directory: ~/project/packages/ml_api
+    steps:
+      - checkout:
+          path: ~/project
+      - run:
+          name: Run API tests with Python 3.8
+          command: |
+            sudo pip install --upgrade pip
+            pip install --user tox
+            tox -e py38
+workflows:
+  version: 2
+  test-all:
+    jobs:
+      - test_gradient_model_py36
+      - test_gradient_model_py37
+      - test_gradient_model_py38
+      - test_ml_api_py36
+      - test_ml_api_py37
+      - test_ml_api_py38

.dockerignore

@@ -0,0 +1,18 @@
+exercise_notebooks/*
+*/env*
+*/venv*
+.circleci*
+packages/gradient_boosting_model
+*.env
+*.log
+.git
+.gitignore
+.dockerignore
+*.mypy_cache
+*.pytest_cache
+
+### Python ###
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]

.gitignore

@@ -89,6 +89,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.tox/
 
 # Spyder project settings
 .spyderproject
@@ -124,3 +125,7 @@ test.csv
 # trained models
 packages/gradient_boosting_model/gradient_boosting_model/trained_models/*.pkl
 *.h5
+
+# differential test artifacts
+packages/ml_api/differential_tests/expected_results/
+packages/ml_api/differential_tests/actual_results/

README.md

@@ -1,2 +1 @@
-# testing-and-monitoring-ml-deployments
-WIP
+Example project for the course "Testing & Monitoring Machine Learning Model Deployments". For setup instructions, see the course lectures.

exercise_notebooks/docker_exercise/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine
+FROM python:3.9-alpine
 WORKDIR /code
 
 # Set env vars required by Flask

exercise_notebooks/docker_exercise/requirements.txt

@@ -1,2 +1,3 @@
 flask>=1.1.1,<1.2.0
+markupsafe==2.0.1  # https://github.com/aws/aws-sam-cli/issues/3661
 redis>=3.3.11,<3.4

exercise_notebooks/elk_exercise/Dockerfile

@@ -0,0 +1,23 @@
+FROM python:3.7-alpine
+WORKDIR /application
+
+COPY ./requirements.txt requirements.txt
+RUN apk add --no-cache \
+		gcc \
+		libc-dev \
+		linux-headers \
+		bash; \
+	pip install -r requirements.txt;
+
+COPY . /application
+
+
+EXPOSE 5000
+VOLUME /application
+CMD gunicorn --bind 0.0.0.0:5000 \
+             --workers=1 \
+             --log-config gunicorn_logging.conf \
+             --log-level=DEBUG \
+             --access-logfile=- \
+             --error-logfile=- \
+             application:application

exercise_notebooks/elk_exercise/app/flask_app.py

@@ -0,0 +1,18 @@
+import logging
+
+from flask import Flask, current_app
+
+
+def index():
+    current_app.logger.info('home')
+    return 'home'
+
+
+def create_app():
+    main_app = Flask(__name__)
+    main_app.add_url_rule('/', 'index', index)
+    gunicorn_error_logger = logging.getLogger('gunicorn.error')
+    main_app.logger.addHandler(gunicorn_error_logger)
+    main_app.logger.setLevel(logging.DEBUG)
+
+    return main_app

exercise_notebooks/elk_exercise/application.py

@@ -0,0 +1,7 @@
+from app.flask_app import create_app
+
+
+application = create_app()
+
+if __name__ == '__main__':
+    application.run()

exercise_notebooks/elk_exercise/docker-compose.yml

@@ -0,0 +1,91 @@
+version: '3.2'
+
+services:
+  # The environment variable "ELK_VERSION" is used throughout this file to
+  # specify the version of the images to run. The default is set in the
+  # '.env' file in this folder. It can be overridden with any normal
+  # technique for setting environment variables, for example:
+  #
+  #  ELK_VERSION=7.0.0-beta1 docker-compose up
+  #
+  # REF: https://docs.docker.com/compose/compose-file/#variable-substitution
+  webapp:
+    build: .
+    container_name: webapp
+    expose:
+      - 5000
+    ports:
+      - 5000:5000
+    links:
+      - logstash
+    networks:
+      - elk
+    depends_on:
+      - logstash
+      - kibana
+      - elasticsearch
+    volumes:
+      - ./:/application
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION}
+    volumes:
+      - type: bind
+        source: ./elasticsearch/config/elasticsearch.yml
+        target: /usr/share/elasticsearch/config/elasticsearch.yml
+        read_only: true
+      - type: volume
+        source: elasticsearch
+        target: /usr/share/elasticsearch/data
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    environment:
+      ES_JAVA_OPTS: "-Xmx256m -Xms256m"
+      ELASTIC_PASSWORD: changeme
+      # Use single node discovery in order to disable production mode and avoid bootstrap checks
+      # see https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html
+      discovery.type: single-node
+    networks:
+      - elk
+
+  logstash:
+    image: docker.elastic.co/logstash/logstash:${ELK_VERSION}
+    volumes:
+      - type: bind
+        source: ./logstash/config/logstash.yml
+        target: /usr/share/logstash/config/logstash.yml
+        read_only: true
+      - type: bind
+        source: ./logstash/pipeline
+        target: /usr/share/logstash/pipeline
+        read_only: true
+    ports:
+      - "5001:5001"
+      - "9600:9600"
+    environment:
+      LS_JAVA_OPTS: "-Xmx256m -Xms256m"
+    networks:
+      - elk
+    depends_on:
+      - elasticsearch
+
+  kibana:
+    image: docker.elastic.co/kibana/kibana:${ELK_VERSION}
+    volumes:
+      - type: bind
+        source: ./kibana/config/kibana.yml
+        target: /usr/share/kibana/config/kibana.yml
+        read_only: true
+    ports:
+      - "5601:5601"
+    networks:
+      - elk
+    depends_on:
+      - elasticsearch
+
+networks:
+  elk:
+    driver: bridge
+
+volumes:
+  elasticsearch:

exercise_notebooks/elk_exercise/elasticsearch/config/elasticsearch.yml

@@ -0,0 +1,11 @@
+---
+## Default Elasticsearch configuration from Elasticsearch base image.
+## https://github.com/elastic/elasticsearch/blob/master/distribution/docker/src/docker/config/elasticsearch.yml
+cluster.name: "docker-cluster"
+network.host: 0.0.0.0
+
+## X-Pack settings
+## see https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-xpack.html
+xpack.license.self_generated.type: basic
+xpack.security.enabled: true
+xpack.monitoring.collection.enabled: true

exercise_notebooks/elk_exercise/gunicorn_logging.conf

@@ -0,0 +1,46 @@
+[loggers]
+keys=root, logstash.error, logstash.access
+
+[handlers]
+keys=console, logstash
+
+[formatters]
+keys=generic, access, json
+
+[logger_root]
+level=INFO
+handlers=console
+
+[logger_logstash.error]
+level=INFO
+handlers=logstash
+propagate=1
+qualname=gunicorn.error
+
+[logger_logstash.access]
+level=INFO
+handlers=logstash
+propagate=0
+qualname=gunicorn.access
+
+[handler_console]
+class=StreamHandler
+formatter=generic
+args=(sys.stdout, )
+
+[handler_logstash]
+class=logstash.TCPLogstashHandler
+formatter=json
+args=('logstash', 5001)
+
+[formatter_generic]
+format=%(asctime)s [%(process)d] [%(levelname)s] %(message)s
+datefmt=%Y-%m-%d %H:%M:%S
+class=logging.Formatter
+
+[formatter_access]
+format=%(message)s
+class=logging.Formatter
+
+[formatter_json]
+class=pythonjsonlogger.jsonlogger.JsonFormatter

exercise_notebooks/elk_exercise/kibana/config/kibana.yml

@@ -0,0 +1,13 @@
+---
+## Default Kibana configuration from Kibana base image.
+## https://github.com/elastic/kibana/blob/master/src/dev/build/tasks/os_packages/docker_generator/templates/kibana_yml.template.js
+#
+server.name: kibana
+server.host: "0"
+elasticsearch.hosts: [ "http://elasticsearch:9200" ]
+xpack.monitoring.ui.container.elasticsearch.enabled: true
+
+## X-Pack security credentials
+#
+elasticsearch.username: elastic
+elasticsearch.password: changeme