diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 794e81dac..ff071ceda 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -37,7 +37,8 @@ RUN pip3 install \ voluptuous\ Flask-Sockets \ gevent \ - gevent-websocket + gevent-websocket \ + debugpy COPY nginx/nginx.conf /etc/nginx/nginx.conf @@ -57,5 +58,6 @@ RUN chmod +x /run.sh EXPOSE 5000 EXPOSE 1935 +EXPOSE 5678 CMD ["/run.sh"] diff --git a/docker/Dockerfile.wheels b/docker/Dockerfile.wheels index 278d989e0..800f59955 100644 --- a/docker/Dockerfile.wheels +++ b/docker/Dockerfile.wheels @@ -35,7 +35,8 @@ RUN pip3 wheel --wheel-dir=/wheels \ click \ setproctitle \ peewee \ - gevent + gevent \ + debugpy FROM scratch diff --git a/frigate/edgetpu.py b/frigate/edgetpu.py index 73916bd19..8e1041351 100644 --- a/frigate/edgetpu.py +++ b/frigate/edgetpu.py @@ -57,6 +57,8 @@ class LocalObjectDetector(ObjectDetector): device_config = {"device": tf_device} edge_tpu_delegate = None + + tf_device = "cpu" if tf_device != "cpu": try: diff --git a/web/src/routes/Event.jsx b/web/src/routes/Event.jsx index d1b2d2bfa..962a8272d 100644 --- a/web/src/routes/Event.jsx +++ b/web/src/routes/Event.jsx @@ -34,8 +34,8 @@ export default function Event({ eventId }) { debugger; const response = await fetch(`${apiHost}/api/events/${eventId}`, { method: 'DELETE' }); debugger; - const deleteEvent = await response.json(); - + const deleteEvent = await getJSON(response) + debugger; success = deleteEvent.success; debugger; setDeleteStatus(success ? FetchStatus.LOADED : FetchStatus.ERROR); @@ -44,6 +44,11 @@ export default function Event({ eventId }) { setDeleteStatus(FetchStatus.ERROR); } + async function getJSON(response) { + if (response.status === 204) return {success: true}; + return response.json(); + } + if (success) { setDeleteStatus(FetchStatus.LOADED); setShowDialog(false);