Changes to support agents

Author: jplotts

Dockerfile.tmpl

@@ -23,10 +23,7 @@ RUN uv pip install --system -r /requirements.txt
 RUN uv pip uninstall --system google-cloud-bigquery-storage
 
 # b/394382016: sigstore (dependency of kagglehub) requires a prerelease packages, installing separate.
-# b/408284143: google-cloud-automl 2.0.0 introduced incompatible API changes, need to pin to 1.0.1,
-# installed outside of kaggle_requirements.txt due to requiring an incompatibile version of protobuf.
-RUN uv pip install --system --force-reinstall --prerelease=allow "kagglehub[pandas-datasets,hf-datasets,signing]>=0.3.12" \
-    "google-cloud-automl==1.0.1"
+RUN uv pip install --system --force-reinstall --prerelease=allow "kagglehub[pandas-datasets,hf-datasets,signing]>=0.3.12"
 
 # uv cannot install this in requirements.txt without --no-build-isolation
 # to avoid affecting the larger build, we'll post-install it.
@@ -146,16 +143,6 @@ RUN mkdir -p /root/.jupyter && touch /root/.jupyter/jupyter_nbconvert_config.py
     mkdir -p /etc/ipython/ && echo "c = get_config(); c.IPKernelApp.matplotlib = 'inline'" > /etc/ipython/ipython_config.py && \
     /tmp/clean-layer.sh
 
-# Fix to import bq_helper library without downgrading setuptools and upgrading protobuf
-RUN mkdir -p ~/src && git clone https://github.com/SohierDane/BigQuery_Helper ~/src/BigQuery_Helper && \
-    mkdir -p ~/src/BigQuery_Helper/bq_helper && \
-    mv ~/src/BigQuery_Helper/bq_helper.py ~/src/BigQuery_Helper/bq_helper/__init__.py && \
-    mv ~/src/BigQuery_Helper/test_helper.py ~/src/BigQuery_Helper/bq_helper/ && \
-    sed -i 's/)/packages=["bq_helper"])/g' ~/src/BigQuery_Helper/setup.py && \
-    uv pip install --system -e ~/src/BigQuery_Helper "protobuf<3.21"&& \
-    /tmp/clean-layer.sh
-
-
 # install imagemagick for wand
 # https://docs.wand-py.org/en/latest/guide/install.html#install-imagemagick-on-debian-ubuntu
 RUN apt-get install libmagickwand-dev

kaggle_requirements.txt

@@ -45,8 +45,8 @@ geojson
 # geopandas > v0.14.4 breaks learn tools
 geopandas==v0.14.4
 gensim
-# b/443054743
-google-adk
+# b/443054743,b/455550872
+google-adk[a2a,eval]
 google-cloud-aiplatform
 # b/315753846: Unpin translate package.
 google-cloud-translate==3.12.1
@@ -152,5 +152,4 @@ wavio
 xgboost==2.0.3
 xvfbwrapper
 ydata-profiling
-# b/443054743: pinned as newer versions requires protobuf > 3.20.3
-ydf==0.9.0
+ydf

patches/kaggle_gcp.py

@@ -253,37 +253,6 @@ def init_gcs():
         KaggleKernelCredentials(target=GcpTarget.GCS))
     return storage
 
-def init_automl():
-    from google.cloud import automl, automl_v1beta1
-    if not is_user_secrets_token_set():
-        return
-
-    from kaggle_gcp import get_integrations
-    if not get_integrations().has_cloudai():
-        return
-
-    from kaggle_secrets import GcpTarget
-    from kaggle_gcp import KaggleKernelCredentials
-    kaggle_kernel_credentials = KaggleKernelCredentials(target=GcpTarget.CLOUDAI)
-
-    # Patch the 2 GA clients: AutoMlClient and PreditionServiceClient
-    monkeypatch_client(automl.AutoMlClient, kaggle_kernel_credentials)
-    monkeypatch_client(automl.PredictionServiceClient, kaggle_kernel_credentials)
-
-    # The AutoML client library exposes 3 different client classes (AutoMlClient,
-    # TablesClient, PredictionServiceClient), so patch each of them.
-    # The same KaggleKernelCredentials are passed to all of them.
-    # The GcsClient class is only used internally by TablesClient.
-
-    # The beta version of the clients that are now GA are included here for now.
-    # They are deprecated and will be removed by 1 May 2020.
-    monkeypatch_client(automl_v1beta1.AutoMlClient, kaggle_kernel_credentials)
-    monkeypatch_client(automl_v1beta1.PredictionServiceClient, kaggle_kernel_credentials)
-
-    # The TablesClient is still in beta, so this will not be deprecated until
-    # the TablesClient is GA.
-    monkeypatch_client(automl_v1beta1.TablesClient, kaggle_kernel_credentials)
-
 def init_translation_v2():
     from google.cloud import translate_v2
     if not is_user_secrets_token_set():
@@ -379,7 +348,6 @@ def init_vision():
 def init():
     init_bigquery()
     init_gcs()
-    init_automl()
     init_translation_v2()
     init_translation_v3()
     init_natural_language()