refactor drastically edge_orchestrator using Pydantic #66

bojeanson · 2025-01-21T15:13:50Z

No description provided.

edge_orchestrator/pyproject.toml

Arthemide · 2025-02-04T13:57:58Z

edge_orchestrator/pyproject.toml

 [tool.black]
 line-length = 120
-target-version = ["py38", "py39", "py310", "py311"]
+target-version = ["py38", "py39", "py310", "py311", "py312", "py313"]


remove before py312 ?

to be green -> https://devguide.python.org/versions/ ?

Then remove 3.8

edge_orchestrator/Dockerfile

edge_orchestrator/edge_orchestrator.yml

bojeanson

Apply comments

bojeanson · 2025-02-04T17:03:09Z

edge_orchestrator/.python-version

voir la compatibilité sur raspberry

bojeanson · 2025-02-04T17:04:03Z

edge_orchestrator/Dockerfile

-
-COPY pyproject.toml ./pyproject.toml
-COPY edge_orchestrator ./edge_orchestrator
+FROM python:3.12-slim


Dockerfile pour raspberry

bojeanson · 2025-02-04T17:05:03Z

edge_orchestrator/edge_orchestrator.yml

+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ./data:/edge_orchestrator/data


par défaut c'est data_storage

Suggested change

- ./data:/edge_orchestrator/data

- ./data_storage:/edge_orchestrator/data_storage

bojeanson · 2025-02-04T17:06:42Z

edge_orchestrator/edge_orchestrator.yml

+    ports:
+      - 8000:8000
+    environment:
+      EDGE_NAME: vio-edge-1


n'existe plus mais on a station_name dans la StationConfig maintenant -> utile ?

edge_orchestrator/pyproject.toml

bojeanson · 2025-02-05T13:53:37Z

...rchestrator/tests/unit_tests/infrastructure/adapters/camera_rule/test_max_nb_objects_rule.py

+
+    def test_max_nb_objects_rule(self):
+        # Given
+        max_nb_objects_rule = MaxNbObjectsRule(


idem, valider la config : MaxNbObjectsRule avec autre chose que ModelType.object_detection on raise

bojeanson · 2025-02-05T13:54:05Z

...rchestrator/tests/unit_tests/infrastructure/adapters/camera_rule/test_min_nb_objects_rule.py

+
+class TestMinNbObjectsRule:
+
+    def test_min_nb_objects_rule(self):


parametrize OK, KO, NO_DECISION

bojeanson · 2025-02-05T13:54:26Z

...hestrator/tests/unit_tests/infrastructure/adapters/camera_rule/test_unexpected_label_rule.py

+
+class TestUnexpectedLabelRule:
+
+    def test_unexpected_label_rule(self):


idem parametrize

bojeanson · 2025-02-05T13:58:08Z

...estrator/tests/unit_tests/infrastructure/adapters/item_rule/test_min_threshold_ratio_rule.py

+
+class TestMinThresholdRatioRule:
+
+    def test_min_threshold_ratio_rule(


parametrize pour KO et NO_DECISION

bojeanson · 2025-02-05T13:58:36Z

edge_orchestrator/tests/unit_tests/infrastructure/adapters/item_rule/test_min_threshold_rule.py

+
+class TestMinThresholdRule:
+
+    def test_min_threshold_rule(


parametrize pour OK et NO_DECISION

Arthemide · 2025-02-14T16:25:56Z

.github/workflows/ci_edge_model_serving.yml

 jobs:
  lint_and_test_on_edge_model_serving:
    name: Run Python linter and tests (unit > integration > functional)
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python-version: [ "3.8", "3.9" ] # TODO: add 3.10 and 3.11
+        python-version: [ "3.9", "3.10", "3.11" ]


Arthemide · 2025-02-14T16:26:04Z

.github/workflows/ci_edge_orchestrator.yml

 jobs:
  lint_and_test_on_edge_orchestrator:
    name: Run Python linter and tests (unit > integration > functional)
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python-version: [ "3.8", "3.9" ] # TODO: add 3.10 and 3.11
+        python-version: [ "3.9", "3.10", "3.11" ]


Arthemide · 2025-02-14T16:27:00Z

docker-compose.yml

-      - ./edge_orchestrator/emissions:/edge_orchestrator/emissions
+      - ./data_storage:/edge_orchestrator/data_storage
+      - /run/udev:/run/udev:ro
+    devices:


why four devices ?

Arthemide · 2025-02-14T16:34:11Z

docker-compose.yml

Still thinking that we need to merge streamlit and vue asap

Arthemide · 2025-02-14T16:34:56Z

edge_interface/README.md

why removing all of this readme ?

Arthemide · 2025-02-14T17:50:08Z

...hestrator/src/edge_orchestrator/infrastructure/adapters/binary_storage/gcp_binary_storage.py

+        self._storage_config: StorageConfig = storage_config
+        self._logger = logging.getLogger(__name__)
+
+    def save_item_binaries(self, item: Item):


Oui, mais c'était pas existant avant ça ?

Arthemide · 2025-02-14T17:50:20Z

...hestrator/src/edge_orchestrator/infrastructure/adapters/binary_storage/gcp_binary_storage.py

+        self._storage_config: StorageConfig = storage_config
+        self._logger = logging.getLogger(__name__)
+
+    def save_item_binaries(self, item: Item):


Du coup pas mergable en l'état ?

Arthemide · 2025-02-14T17:51:16Z

edge_orchestrator/src/edge_orchestrator/infrastructure/adapters/camera/camera_manager.py

+from edge_orchestrator.domain.ports.camera.i_camera_manager import ICameraManager
+
+
+class NoCameraAvailableError(Exception):


Is it useful is pass ?

Arthemide · 2025-02-14T17:51:39Z

edge_orchestrator/src/edge_orchestrator/infrastructure/adapters/camera/fake_camera.py

+    def __init__(self, camera_config: CameraConfig):
+        self._camera_config = camera_config
+        self._logger = logging.getLogger(__name__)
+        self._supported_image_extensions: List = ["*.jpg", "*.png"]


mettre un enum ?

Arthemide · 2025-02-14T17:52:03Z

edge_orchestrator/src/edge_orchestrator/infrastructure/adapters/camera/usb_camera.py

+        self._camera_config = camera_config
+        self._logger = logging.getLogger(__name__)
+
+    # TODO: implement me


to remove ?

bojeanson added 3 commits February 3, 2025 18:35

refactor drastically edge_orchestrator using Pydantic

c062372

add unit tests

5d379e8

add tests

7bb81a8

bojeanson force-pushed the big-refactor branch from b8822aa to 7bb81a8 Compare February 3, 2025 17:36

bojeanson added 3 commits February 3, 2025 18:42

update dockerfile

aa25214

add unit tests

dad07fe

put back authors in pyproject.toml

54d5157

Arthemide reviewed Feb 4, 2025

View reviewed changes

bojeanson commented Feb 5, 2025

View reviewed changes

bojeanson added 11 commits February 6, 2025 10:52

refactor DOckerfile for multi-platform

d20929c

add unit tests to ConfigManager

da0ef79

add recreation mechanism for all adapters

77c258b

WIP

71a8c9c

put back behave tests

d43a416

put back functional tests

f1421a4

WIP interface

d1e6191

WIP interface

0ef3737

WIP submit from file

fa3acdf

Triggeer view

992bdb6

fix camera manager taking more pictures than what was in the config

6ac1570

bojeanson force-pushed the big-refactor branch from e56139d to 6ac1570 Compare February 12, 2025 16:12

bojeanson added 4 commits February 12, 2025 17:42

AllItems view

8229b25

Active config view

ff7616d

Fix docker images build in multiplatform mode

7d182b4

remove bluenviron/mediamtx image in edge_orchestrator

0db49de

bojeanson force-pushed the big-refactor branch from 689f424 to 0db49de Compare February 13, 2025 08:14

bojeanson added 3 commits February 13, 2025 10:44

fix RaspberryPiCamera in edge_orchestrator

d5bc7f9

fix raspberry Dockerfile

6146d2e

downgrade python to 3.11

5ae2b10

bojeanson force-pushed the big-refactor branch from 384f27a to 5ae2b10 Compare February 13, 2025 13:57

bojeanson and others added 6 commits February 13, 2025 16:38

fix dockerfile

fa031d5

add ci on dispatch for model serving

2be057e

fix ItemDetailView call

98a7b45

remove arm build

46c35ff

make compatible with macos

e445133

fix edge_model_serving dockerfile

bed231e

Arthemide reviewed Feb 14, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor drastically edge_orchestrator using Pydantic #66

refactor drastically edge_orchestrator using Pydantic #66

bojeanson commented Jan 21, 2025

Arthemide Feb 4, 2025

bojeanson Feb 5, 2025

Arthemide Feb 14, 2025

bojeanson left a comment

bojeanson Feb 4, 2025

bojeanson Feb 4, 2025

bojeanson Feb 4, 2025

bojeanson Feb 4, 2025

bojeanson Feb 5, 2025

bojeanson Feb 5, 2025

bojeanson Feb 5, 2025

bojeanson Feb 5, 2025

bojeanson Feb 5, 2025

Arthemide Feb 14, 2025

Arthemide Feb 14, 2025

Arthemide Feb 14, 2025

Arthemide Feb 14, 2025

Arthemide Feb 14, 2025

Arthemide Feb 14, 2025

Arthemide Feb 14, 2025

Arthemide Feb 14, 2025

Arthemide Feb 14, 2025

Arthemide Feb 14, 2025

	- ./data:/edge_orchestrator/data
	- ./data_storage:/edge_orchestrator/data_storage


		class TestMinNbObjectsRule:

		def test_min_nb_objects_rule(self):


		class TestUnexpectedLabelRule:

		def test_unexpected_label_rule(self):


		class TestMinThresholdRatioRule:

		def test_min_threshold_ratio_rule(

		from edge_orchestrator.domain.ports.camera.i_camera_manager import ICameraManager


		class NoCameraAvailableError(Exception):

refactor drastically edge_orchestrator using Pydantic #66

Are you sure you want to change the base?

refactor drastically edge_orchestrator using Pydantic #66

Conversation

bojeanson commented Jan 21, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bojeanson left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment