adk as extra

Author: derrickaw

sdks/python/setup.py

@@ -181,6 +181,7 @@ def cythonize(*args, **kwargs):
     'sentence-transformers>=2.2.2',
     'skl2onnx',
     'pyod>=0.7.6',  # 0.7.5 crashes setuptools
+    'contourpy<1.3.0; python_version < "3.11"',
     'tensorflow',
     # tensorflow transitive dep, lower versions not compatible with Python3.10+
     'absl-py>=0.12.0',
@@ -207,7 +208,9 @@ def cythonize(*args, **kwargs):
 ]
 
 ml_adk_dependency = [
-    'google-adk==1.28.1',
+    # google-adk is excluded here because it requires google-genai<2.0.0,
+    # which conflicts with google-genai>=2.0.0 (e.g. 2.6.0) pinned in containers.
+    # 'google-adk==1.28.1',
     # proto-plus<1.24 caps protobuf<5; opentelemetry-proto (via ADK) needs
     # protobuf>=5. Scoped here so the main dependency list stays broader.
     'proto-plus>=1.26.1,<2',
@@ -417,6 +420,7 @@ def get_portability_package_data():
       ext_modules=extensions,
       install_requires=[
           'cryptography>=39.0.0,<48.0.0',
+          'aiohttp<4.0.0',
           'envoy-data-plane>=1.0.3,<2; python_version >= "3.11"',
           # Newer version only work on Python 3.11. Versions 0.3 <= ver < 1.x
           # conflict with other GCP dependencies.
@@ -608,6 +612,8 @@ def get_portability_package_data():
           ] + ml_base_core,
           'p310_ml_test': [
               'datatable',
+              'dill',
+              'tensorflow_transform>=1.14.0,<1.15.0',
           ] + ml_base,
           'p311_ml_test': ml_base,
           'p312_ml_test': ml_base,
@@ -684,7 +690,8 @@ def get_portability_package_data():
           'xgboost': ['xgboost>=1.6.0,<2.1.3', 'datatable==1.0.0'],
           'tensorflow-hub': ['tensorflow-hub>=0.14.0,<0.16.0'],
           'milvus': milvus_dependency,
-          'vllm': ['openai==1.107.1', 'vllm==0.10.1.1', 'triton==3.3.1']
+          'vllm': ['openai==1.107.1', 'vllm==0.10.1.1', 'triton==3.3.1'],
+          'adk': ['google-adk==1.28.1']
       },
       zip_safe=False,
       # PyPI package information.