init

opencv-yolo/deployment/docker/edet.Dockerfile

@@ -8,17 +8,17 @@ ENV BIN_PRE=/usr/local/bin/python
 ENV BIN_NAME=web/detect_video.py
 ENV DL_DIR=/data
 #ENV REDIS=
-ENV CFG_DIR=/apps/app/
 ENV BIN_DIR=/apps/app/
+ENV CFG_DIR=edet_model.pth 
 
-COPY opencv-yolo/web/web.py /apps/app/
-COPY opencv-yolo/web/web.py /apps/app/
-COPY opencv-yolo/web/detect_video.py /apps/app/
+COPY web.py /apps/app/
+COPY detect_video.py /apps/app/
+COPY requirement.txt /apps/app/
+COPY edet_model.pth /apps/app/
+COPY src  /apps/app/src
 
-COPY opencv-yolo/web/requirement.txt /apps/app/
 RUN pip install -r requirement.txt
-
-COPY opencv-yolo/web/start.sh /apps/app
+COPY start.sh /apps/app
 
 EXPOSE 5555
 EXPOSE 5000

opencv-yolo/web/start.sh

 #!/bin/sh
 redis-server &
-celery multi start 4 -E -A web.worker -l info --autoscale=4,1 --pidfile=%n.pid
+celery multi start 2 -E -A web.worker -l info -n %n.%%h --autoscale=4,1 --pidfile=%n.pid
 flower -A web.worker --loglevel=info &
 python web.py
\ No newline at end of file

opencv-yolo/web/web.py

@@ -44,11 +44,12 @@ SHARENAME=os.getenv('SHARE','pre-data')
 MQTT_HOST=os.getenv('MQTT_HOST','evcloud.ilabservice.cloud')
 MQTT_PORT=int(os.getenv('MQTT_PORT', 1883))
 REDIS_ADDR = os.getenv('REDIS', 'redis://localhost:6379')
-workd = os.getenv('BIN_DIR', '/Users/blu/work/opencv-projects/opencv-yolo')
+workd = os.getenv('BIN_DIR', '../')
 binName = os.getenv('BIN_NAME', 'detector ')
+binPrefix = os.getenv('BIN_PRE', '')
 configDir = os.getenv('CFG_DIR', workd)
 
-print("CONFIG: \nMQTT: {}:{}\n".format(MQTT_HOST, MQTT_PORT))
+print("CONFIG: \n\tMQTT: {}:{}\n\tBIN_NAME: {}".format(MQTT_HOST, MQTT_PORT, binName))
 
 def downloadFile(ipcSn, dirName, fileName, destDir):
   file_path=ipcSn + '/'+dirName+'/'+fileName
@@ -160,7 +161,8 @@ def video_analysis(data):
       print("downloaded file {} into {}".format(fileName, downloadDir))
       # analyze
       #cmdLine = '/Users/blu/work/opencv-projects/opencv-yolo/detector /Users/blu/work/opencv-projects/opencv-yolo/web/1550143347000-1577267418999.mp4 -c /Users/blu/work/opencv-projects/opencv-yolo/'
-      cmdLine = workd + '/' + binName + ' ' +  downloadDir + fileName + ' -c ' + configDir + ' -o ' + downloadDir + '/detect.jpg'
+      prefix = binPrefix + ' ' if binPrefix else binPrefix
+      cmdLine = prefix + workd + '/' + binName + ' ' +  downloadDir + fileName + ' -c ' + configDir + ' -o ' + downloadDir + '/detect.jpg'
       cmdArgs = shlex.split(cmdLine)
       print(cmdLine, '\n\n', cmdArgs)
       output = subprocess.check_output(cmdArgs)