Added Makefile and automatic tests (#11)

Author: rafie

.circleci/config.yml

@@ -0,0 +1,31 @@
+version: 2.1
+
+jobs:
+  test:
+    machine:
+      enabled: true
+      image: ubuntu-1604:201903-01
+    steps:
+      - checkout
+      - run:
+          name: System Setup
+          command: |
+            sudo apt-get -qq update -y
+            sudo apt-get -q install -y curl ca-certificates wget make
+            (cd ..; git clone https://github.com/antirez/redis.git; cd redis; git checkout 5.0.8; make -j$(nproc); sudo make install)
+            SUDO=sudo make setup
+      - run:
+          name: Test
+          command: |
+            make test VERBOSE=1
+
+workflows:
+  version: 2
+  build_and_package:
+    jobs:
+      - test:
+          filters:
+            tags:
+              only: /.*/
+            branches:
+              only: /.*/

Makefile

@@ -0,0 +1,34 @@
+
+start:
+	@docker-compose up -d
+
+stop:
+	@docker-compose down
+
+build:
+	@docker-compose build
+
+test:
+	@./tests/cats-n-dogs.sh
+
+ifdef REDIS
+CAMERA_ARG=-u $(REDIS)
+endif
+
+camera:
+ifneq ($(VENV),0)
+	python2 -m virtualenv venv
+	. ./venv/bin/activate; pip install -r camera/requirements.txt
+	. ./venv/bin/activate; python camera/read_camera.py $(CAMERA_ARG)
+else
+	python2 camera/read_camera.py $(CAMERA_ARG)
+endif
+
+setup:
+	@$(SUDO) curl -s -L https://github.com/docker/compose/releases/download/1.25.4/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose ;\
+	$(SUDO) chmod +x /usr/local/bin/docker-compose
+	@wget -q https://github.com/git-lfs/git-lfs/releases/download/v2.10.0/git-lfs-linux-amd64-v2.10.0.tar.gz -O /tmp/git-lfs.tar.gz ;\
+    cd /tmp; tar xf git-lfs.tar.gz; $(SUDO) ./install.sh
+	@git lfs pull
+
+.PHONY: start stop build test camera setup

README.md

@@ -1,3 +1,5 @@
+[![CircleCI](https://circleci.com/gh/RedisGears/AnimalRecognitionDemo/tree/master.svg?style=svg)](https://circleci.com/gh/RedisGears/AnimalRecognitionDemo/tree/master) 
+
 # AnimalRecognitionDemo
 
 This demo combines several [Redis](https://redis.io) data structures and [Redis Modules](https://redis.io/topics/modules-intro)

app/Dockerfile

@@ -1,15 +1,21 @@
-# FROM python:3.7.3
-FROM debian:buster
+# OSNICK=stretch|bionic|buster
+ARG OSNICK=buster
+
+#----------------------------------------------------------------------------------------------
+FROM redisfab/redisedgevision-${OSNICK}:0.2.0
+
+# This is due on the following error on ARMv8:
+# /usr/lib/aarch64-linux-gnu/libgomp.so.1: cannot allocate memory in static TLS block 
+# Something is exausting TLS, causing libgomp to fail. Preloading it as a workaround helps.
+# ENV LD_PRELOAD /usr/lib/aarch64-linux-gnu/libgomp.so.1
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV RUNTIME_DEPS "python3 python3-setuptools ca-certificates curl python3-opencv"
 
-RUN set -ex ;\
-    apt-get -qq update ;\
-    apt-get -q install -y --no-install-recommends $RUNTIME_DEPS
+RUN apt-get -qq update
 
 RUN set -ex ;\
-	curl -q -s https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py ;\
+	apt-get install -y wget python3-distutils ;\
+	wget -q https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py ;\
 	python3 /tmp/get-pip.py
 
 WORKDIR /app

app/gear.py

@@ -1,11 +1,28 @@
-FROM python:2
+# OSNICK=stretch|bionic|buster
+ARG OSNICK=buster
 
-RUN set -ex;\
-    apt-get -qq update;\
-    apt-get install -y python-opencv
+#----------------------------------------------------------------------------------------------
+FROM redisfab/redisedgevision-${OSNICK}:0.2.0
+
+# This is due on the following error on ARMv8:
+# /usr/lib/aarch64-linux-gnu/libgomp.so.1: cannot allocate memory in static TLS block 
+# Something is exausting TLS, causing libgomp to fail. Preloading it as a workaround helps.
+# ENV LD_PRELOAD /usr/lib/aarch64-linux-gnu/libgomp.so.1
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -qq update
+
+RUN set -x; \
+	apt-get install -y wget python3-distutils ;\
+    wget -q https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py ;\
+	python3 /tmp/get-pip.py
+
+RUN pip install redis==3.2.1
 
 WORKDIR /usr/src/app
+
 ADD read_camera.py ./
-RUN pip install redis
+ADD *.jpg ./
 
-CMD [ "python", "./read_camera.py" ]
+CMD [ "python3", "./read_camera.py" ]

camera/Dockerfile

@@ -1,17 +1,27 @@
+
 import argparse
 import cv2
 import redis
+import time
+import sys
+import os
+
 try:
     import urllib.parse
 except ImportError:
     import urllib.parse as urlparse
 
+IMAGE_WIDTH = 640
+IMAGE_HEIGHT = 480
+
+MAX_IMAGES = 1000 # 5
+
 class Webcam:
     def __init__(self, infile=0, fps=15.0):
         self.cam = cv2.VideoCapture(infile)
         self.cam.set(cv2.CAP_PROP_FPS, fps)
-        self.cam.set(cv2.CAP_PROP_FRAME_WIDTH, 640)
-        self.cam.set(cv2.CAP_PROP_FRAME_HEIGHT, 480)
+        self.cam.set(cv2.CAP_PROP_FRAME_WIDTH, IMAGE_WIDTH)
+        self.cam.set(cv2.CAP_PROP_FRAME_HEIGHT, IMAGE_HEIGHT)
 
     def __iter__(self):
         self.count = -1
@@ -41,24 +51,49 @@ def __len__(self):
     parser.add_argument('--fmt', help='Frame storage format', type=str, default='.jpg')
     parser.add_argument('--fps', help='Frames per second (webcam)', type=float, default=15.0)
     parser.add_argument('--maxlen', help='Maximum length of output stream', type=int, default=1000)
+    parser.add_argument('--test', help='transmit image instead of reading webcam', action="store_true")
     args = parser.parse_args()
 
     # Set up Redis connection
     url = urllib.parse.urlparse(args.url)
     conn = redis.Redis(host=url.hostname, port=url.port)
     if not conn.ping():
         raise Exception('Redis unavailable')
+    print('Connected to Redis')
+    sys.stdout.flush()
 
-    if args.infile is None:
-        loader = Webcam(infile=0, fps=args.fps)
-    else:
-        loader = Webcam(infile=int(args.infile), fps=args.fps)
+    if args.test is None:
+        print('Operating in camera mode')
+        sys.stdout.flush()
+        if args.infile is None:
+            loader = Webcam(infile=0, fps=args.fps)
+        else:
+            loader = Webcam(infile=int(args.infile), fps=args.fps)
 
-    for (count, img) in loader:
+        for (count, img) in loader:
+            _, data = cv2.imencode(args.fmt, img)
+            msg = {
+                'count': count,
+                'image': data.tobytes()
+            }
+            _id = conn.execute_command('xadd', args.output, 'MAXLEN', '~', str(MAX_IMAGES), '*', 'count', msg['count'], 'img', msg['image'])
+            print('count: {} id: {}'.format(count, _id))
+            sys.stdout.flush()
+    else:
+        image_file = os.environ['ANIMAL'] + '.jpg'
+        print('Operating in test mode with image ' + image_file)
+        sys.stdout.flush()
+        img0 = cv2.imread(image_file)
+        img = cv2.resize(img0, (IMAGE_WIDTH, IMAGE_HEIGHT))
         _, data = cv2.imencode(args.fmt, img)
-        msg = {
-            'count': count,
-            'image': data.tobytes()
-        }
-        _id = conn.execute_command('xadd', args.output, 'MAXLEN', '~', '1000', '*', 'count', msg['count'], 'img', msg['image'])
-        print(('count: {} id: {}'.format(count, _id)))
+        count = 1
+        while True:
+            msg = {
+                'count': count,
+                'image': data.tobytes()
+            }
+            _id = conn.execute_command('xadd', args.output, 'MAXLEN', '~', str(MAX_IMAGES), '*', 'count', msg['count'], 'img', msg['image'])
+            # print('count: {} rc: {} id: {}'.format(count, rc, _id))
+            # sys.stdout.flush()
+            count += 1
+            time.sleep(0.1)