Correccion de resultados

compare.sh

@@ -0,0 +1,34 @@
+### Editar el archivo de configuración
+id=$1
+file="fourier-config.json"
+inicio='{\n "device_id":"'
+fin='",\n
+   "basepath":"/var/fourier",\n
+   "bucket": "fourier-6e14d.appspot.com",\n
+   "projectId":"fourier-6e14d",\n
+   "keyFilename":"/etc/Fourier-key.json",\n
+   "installDir":"~/programs",\n
+   "apiSecret": "prueba",\n
+   "firebase": {\n
+    "apiKey": "AIzaSyAH7eXARukgBCLFOfw4-Kl-NatHc-fOA68",\n
+    "authDomain": "fourier-6e14d.firebaseapp.com",\n
+    "databaseURL": "https://fourier-6e14d.firebaseio.com",\n
+    "storageBucket": "fourier-6e14d.appspot.com",\n
+    "messagingSenderId": "1032228035742"\n
+   },\n
+   "receivers_count":16,\n
+   "database": {\n
+    "user": "fourier",\n
+    "password": "Sup3rDuper!",\n
+    "database": "fourier"\n
+   },\n
+   "streamURL": "http://monitor.audiovalid.com:8000"\n
+}'
+json="$inicio$id$fin"
+echo $json > $file
+
+lower_id="$(echo $id | tr '[:upper:]' '[:lower:]' | tr '_' 'x')"
+
+###construir imagen ondemand
+docker build -t ondemand-$lower_id .
+docker run -v /etc/localtime:/etc/localtime ondemand-$lower_id

ondemand/ondemand.py

@@ -1,16 +1,15 @@
 from __future__ import print_function, absolute_import
+import warnings
+warnings.simplefilter("ignore", UserWarning)
+
 from tornado.ioloop import IOLoop
-from client import Client, ConnectionError
 from boxconfig import parse_config
 from dejavu.recognize import FilePerSecondRecognizer
-from dejavu import Dejavu, CouldntDecodeError
+from dejavu import Dejavu
 from endpoint import setup_endpoint
-
-from multiprocessing import Process
 import logging as log
 import requests
-import dateutil
-import math
+import json
 import time
 import os
 
@@ -43,7 +42,6 @@ threshold_mode = THRESHOLD_FIXED
 def obt_siguiente_trabajo():
     url = 'https://api.fourier.audio/na/calendario/pendiente?id=%s' % (config['device_id'],)
     response = requests.get(url)
-    log.info(response.json())
     return response.json()
 
 
@@ -66,8 +64,8 @@ def descargar_anuncio(ad_path):
             return ruta_anuncio
 
     else:
-        print("Error al descargar")
-        print(response)
+        log.info("Error al descargar")
+        log.info(response)
         return None
 
 
@@ -91,8 +89,8 @@ def descargar_media(box, station, media):
             fp.write(response.content)
             return out_file
     else:
-        print("Error al descargar")
-        print(response)
+        log.info("Error al descargar")
+        log.info(response)
         return None
 
 
@@ -116,9 +114,9 @@ def obt_calibracion(calibracion):
     return default
 
 
-def enviar_resultados(item):
-    url = 'https://api.fourier.audio/v1/calendario/resultado'
-    response = requests.post(url, json=item)
+def enviar_resultados(trabajo):
+    url = 'https://api.fourier.audio/na/calendario/resultado'
+    response = requests.post(url, json=trabajo)
     return response
 
 
@@ -127,9 +125,6 @@ def llenar_pila():
     server and add them to a memory queue. """
     try:
         response = obt_siguiente_trabajo()
-        # response = client.get_schedule_pending()
-        # downloaded_counter = len(response['items'])
-        # for item in response['items']:
         if len(response["elementos"]) > 0:
             queue.put(response)
 
@@ -138,10 +133,6 @@ def llenar_pila():
         else:
             loop.add_timeout(time.time() + 30, llenar_pila)
 
-    except ConnectionError as ex:
-        log.error('[feed_queue] cannot feed: {}, retryig later'.format(ex))
-        loop.add_timeout(time.time() + 15, llenar_pila)
-
     except Exception as ex:
         """ Errores desconocidos """
         log.error('[feed_queue] {}'.format(ex))
@@ -173,9 +164,7 @@ def procesar_trabajo(pendiente):
         anuncios = []
         id_by_ad = {}
         item_ids = []
-        x = 0
         for i in pendiente["elementos"]:
-            x = x + 1
             id_by_ad[i['anuncio']] = i['id']
             if i['id'] not in item_ids:
                 item_ids.append(i['id'])
@@ -185,7 +174,7 @@ def procesar_trabajo(pendiente):
                 anuncios.append(anuncio)
 
     except Exception as err:
-        print('[process_segment] [{}] {}'.format(estacion, err))
+        log.info('[process_segment] [{}] {}'.format(estacion, err))
 
     # Descarga de media
     try:
@@ -196,37 +185,38 @@ def procesar_trabajo(pendiente):
                 media.append((archivo, i["fecha"], i["timestamp"]))
 
     except Exception as err:
-        print(err)
+        log.info(err)
 
     dejavu = None
-    resultados = []
-    v = []
     resultados = {}
     try:
         dejavu = Dejavu({"database_type": "mem"})
         try:
             x = 0
             for ruta, fecha, ts in media:
-                print("Huellando %s" % (ruta,))
-                dejavu.fingerprint_file(ruta)
+                log.info("Huellando %s" % (ruta,))
+                dejavu.fingerprint_file(ruta, ts)
         except Exception as ex:
-            print(err)
+            log.info(ex)
 
         for anuncio in anuncios:
+            log.info("Buscando anuncio %s" % (anuncio,))
             for i in dejavu.recognize(recognizer, anuncio, 5):
                 if not "id" in i:
                     continue
 
-                if i["confidence"] < 35:
+                if i["confidence"] < 50:
                     continue
 
-                print(i)
                 obj = i
                 obj["match_time"] = None
+                nombre_anuncio = os.path.split(anuncio)[-1]
+                id = id_by_ad[nombre_anuncio]
                 dict = {
-                    "id": obj["id"],
+                    "id": id,
                     "anuncio": anuncio,
                     "fecha": obj["name"],
+                    "timestamp": obj["name"] + int(obj['offset_seconds']),
                     "confianza": obj["confidence"],
                     "longitud": obj["length"],
                     "desfase_segundos": obj["offset_seconds"]
@@ -239,8 +229,20 @@ def procesar_trabajo(pendiente):
 
                 resultados[i["id"]] = dict
 
+        for id in resultados:
+            e = resultados[id]
+            for i in pendiente['elementos']:
+                anuncio = e['anuncio'].replace('/tmp/ads/', '')
+                if i['id'] == id and i['anuncio'] == anuncio:
+                    if 'encontrados' not in i:
+                        i['encontrados'] = []
+                    i['encontrados'].append(e)
+                    break
+
+        enviar_resultados(pendiente)
+
     except Exception as ex:
-        print(err)
+        log.info(ex)
 
 
 app = setup_endpoint(queue=queue)
@@ -252,4 +254,4 @@ if __name__ == '__main__':
         log.info('Starting ondemand service')
         loop.start()
     except KeyboardInterrupt:
-        log.error('Process killed')
+        log.error('Process killed')