From c493f6f4bae6881bf1665547702e9eddef42107c Mon Sep 17 00:00:00 2001
From: Johnny Chavez <64660690+calderjo@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:33:53 -0700
Subject: [PATCH] Remove duplicate aiohttp (#1404)

We seem to be downloading multiple aiohttp version, we which is causing
pip error out when installing some packages. we will remove and install
again.

added small refactor

proof of concept:

https://screencast.googleplex.com/cast/NDkzOTIxMTcwNTY3OTg3Mnw2Zjc5MjBkYy0wYg
---
 Dockerfile.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index 3489e7c3..2b4cd33d 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -424,10 +424,7 @@ RUN pip install annoy \
 
 # b/273059949 The pre-installed nbconvert is slow on html conversions and has to be force-uninstalled.
 # b/274619697 learntools also requires a specific nbconvert right now
-RUN rm -rf /opt/conda/lib/python3.10/site-packages/nbconvert*
-RUN rm -rf /opt/conda/lib/python3.10/site-packages/nbclient*
-RUN rm -rf /opt/conda/lib/python3.10/site-packages/mistune*
-RUN rm -rf /opt/conda/lib/python3.10/site-packages/platformdirs*
+RUN rm -rf /opt/conda/lib/python3.10/site-packages/{nbconvert,nbclient,mistune,platformdirs}*
 
 # Fix qgrid by pinning ipywidgets https://github.com/quantopian/qgrid/issues/376
 #        allennlp \
@@ -573,6 +570,9 @@ RUN pip install pytorch-ignite \
         timm \
         torchinfo && \
         pip install git+https://github.com/facebookresearch/segment-anything.git && \
+    # b/343971718: remove duplicate aiohttp installs, and reinstall it
+    rm -rf /opt/conda/lib/python3.10/site-packages/aiohttp* && \
+    mamba install --force-reinstall -y aiohttp && \
     /tmp/clean-layer.sh
 
 # Download base easyocr models.