Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/switch to reolink cam #78

Merged

Conversation

MateoLostanlen
Copy link
Member

The purpose of this PR is to adapt pyro-engine to our camera change. We are now going to use reolink ip cameras.

Previously the central raspberry pi was behaving like a server with an api, the ip cameras sent every 30s an image to this api for analysis.

Now the cameras are passive and it's the central pi that will fetch the images for analysis.

@MateoLostanlen MateoLostanlen added the type: enhancement New feature or request label Jul 14, 2022
@MateoLostanlen MateoLostanlen requested review from frgfm and fe51 July 14, 2022 07:11
@MateoLostanlen MateoLostanlen self-assigned this Jul 14, 2022
Copy link
Member

@frgfm frgfm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the refactor !

Would you mind:

  • moving server/data out of this empty folder
  • moving runner/docker-compose.yml to root
  • moving runner/src to src
  • updating / fixing the unittests

That will give us a much cleaner project :)

Comment on lines +1 to +12
version: '3.8'

services:
pyro-engine:
build:
context: ..
dockerfile: ./runner/src/Dockerfile
command: python runner.py
volumes:
- ./data:/usr/src/app/data

restart: always
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Considering the simplicity of this, we might consider in the future to run it as a simple docker (not a docker compose)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can leave it as it is for know and discuss it soon :)

runner/src/Dockerfile Outdated Show resolved Hide resolved
runner/src/requirements.txt Outdated Show resolved Hide resolved
pyroengine/engine/engine.py Outdated Show resolved Hide resolved
@MateoLostanlen MateoLostanlen removed the request for review from fe51 July 14, 2022 14:17
@MateoLostanlen MateoLostanlen force-pushed the feature/switch_to_reolink_cam branch from 14f4dde to a067b94 Compare July 18, 2022 13:22
@codecov
Copy link

codecov bot commented Jul 18, 2022

Codecov Report

Merging #78 (afde321) into develop (6565aaa) will decrease coverage by 0.44%.
The diff coverage is 31.57%.

@@             Coverage Diff             @@
##           develop      #78      +/-   ##
===========================================
- Coverage    68.12%   67.67%   -0.45%     
===========================================
  Files            7        7              
  Lines          229      232       +3     
===========================================
+ Hits           156      157       +1     
- Misses          73       75       +2     
Flag Coverage Δ
unittests 67.67% <31.57%> (-0.45%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pyroengine/engine/engine.py 53.03% <31.57%> (-0.46%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6565aaa...afde321. Read the comment docs.

@MateoLostanlen MateoLostanlen requested a review from frgfm July 18, 2022 14:18
@MateoLostanlen
Copy link
Member Author

I will improve coverage when #83 will be merge

@MateoLostanlen
Copy link
Member Author

The loss of coverage here is on engine but you would have to simulate an api or create test creds to test it. I propose to do it in a next PR

@MateoLostanlen
Copy link
Member Author

Let's merge this

@frgfm
Copy link
Member

frgfm commented Jul 19, 2022

I will improve coverage when #83 will be merge

oops sorry, I thought you were saying we should wait for #83 to review!

Copy link
Member

@frgfm frgfm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cheers!

@MateoLostanlen MateoLostanlen merged commit 273c3de into pyronear:develop Jul 19, 2022
@MateoLostanlen MateoLostanlen deleted the feature/switch_to_reolink_cam branch July 24, 2022 17:21
@frgfm frgfm added this to the 0.2.0 milestone Aug 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants