Use flops-utils from the same repo

oakestra · Oct 4, 2024 · cc73591 · cc73591
1 parent 4072970
commit cc73591
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 13 deletions.
diff --git a/flops_manager_package/Dockerfile b/flops_manager_package/Dockerfile
@@ -35,11 +35,6 @@ ENV FLOPS_MQTT_BROKER_URL=flops_mqtt
 
 ENV SYSTEM_MANAGER_PORT=10000
 
-RUN poetry add git+https://github.com/Malyuk-A/tmp_flops_utils.git@main
-#RUN poetry add git+https://github.com/oakestra/addon-FLOps.git@main#subdirectory=utils_library/flops_utils
-# !!!!!!!!!!!!!! TODO test if this is infact working as expected, if so, continue with migrating futher places wher flops_utils is used 
-# Do not forget the CLI
-# Once this is confirmed to be working, put the legacy project in private mode,
-# once this is also working maybe even delete the legacy project
+RUN poetry add git+https://github.com/oakestra/addon-FLOps.git@main#subdirectory=utils_library
 
 CMD ["poetry", "run", "python", "main.py"]
diff --git a/image_builder_package/Dockerfile b/image_builder_package/Dockerfile
@@ -20,6 +20,6 @@ RUN conda install -y \
         gitpython>=3.1.42 \
         mlflow>=2.12.1
 
-RUN pip install --no-cache-dir git+https://github.com/Malyuk-A/tmp_flops_utils.git@main
+RUN pip install --no-cache-dir git+https://github.com/oakestra/addon-FLOps.git@main#subdirectory=utils_library
 
 COPY /fl_image_builder /image_builder
diff --git a/image_builder_package/fl_image_builder/build_plans/fl_actors/images/fl_base/requirements.txt b/image_builder_package/fl_image_builder/build_plans/fl_actors/images/fl_base/requirements.txt
@@ -1,2 +1,2 @@
 flwr_datasets == 0.1.0
-git+https://github.com/Malyuk-A/tmp_flops_utils.git@main
+git+https://github.com/oakestra/addon-FLOps.git@main#subdirectory=utils_library
diff --git a/image_builder_package/requirements.txt b/image_builder_package/requirements.txt
@@ -5,7 +5,7 @@ gitpython ~= 3.1.42
 # Might be worth investigating as FUTURE WORK.
 #mlflow-skinny ~= 2.12.1
 mlflow ~= 2.12.1
-git+https://github.com/Malyuk-A/tmp_flops_utils.git@main
+git+https://github.com/oakestra/addon-FLOps.git@main#subdirectory=utils_library
 
 # Not used because pydantic needs rust and other tooling which would further bload the current slim base image.
 # pydantic ~= 2.6.4 
diff --git a/ml_data_server_package/Dockerfile b/ml_data_server_package/Dockerfile
@@ -15,6 +15,6 @@ ENV FLASK_DEBUG=TRUE
 ENV ML_DATA_SERVER_PORT=11027
 EXPOSE $ML_DATA_SERVER_PORT
 
-RUN poetry add git+https://github.com/Malyuk-A/tmp_flops_utils.git@main
+RUN poetry add git+https://github.com/oakestra/addon-FLOps.git@main#subdirectory=utils_library
 
 CMD ["poetry", "run", "python", "main.py"]
diff --git a/mock_data_provider_package/Dockerfile b/mock_data_provider_package/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /mock_data_provider
 COPY mock_data_provider /mock_data_provider
 RUN poetry install
 
-RUN poetry add git+https://github.com/Malyuk-A/tmp_flops_utils.git@main
+RUN poetry add git+https://github.com/oakestra/addon-FLOps.git@main#subdirectory=utils_library
 
 ENV ML_DATA_SERVER_COMMUNICATION_CHANNEL_PORT=11027
 EXPOSE $ML_DATA_SERVER_COMMUNICATION_CHANNEL_PORT
diff --git a/project_observer_package/Dockerfile b/project_observer_package/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /project_observer
 COPY project_observer /project_observer
 RUN poetry install
 
-RUN poetry add git+https://github.com/Malyuk-A/tmp_flops_utils.git@main
+RUN poetry add git+https://github.com/oakestra/addon-FLOps.git@main#subdirectory=utils_library
 
 ENV PROJECT_OBSERVER_PORT=2727
 EXPOSE $PROJECT_OBSERVER_PORT
diff --git a/trained_model_image_inference_testers/mnist_sklearn/Dockerfile b/trained_model_image_inference_testers/mnist_sklearn/Dockerfile
@@ -7,6 +7,6 @@ WORKDIR /inference_tester
 COPY inference_tester /inference_tester
 RUN poetry install
 
-RUN poetry add git+https://github.com/Malyuk-A/tmp_flops_utils.git@main
+RUN poetry add git+https://github.com/oakestra/addon-FLOps.git@main#subdirectory=utils_library
 
 CMD poetry run python main.py