From ef2d13c342950e0b04bcb6a5e3cafc0adf131254 Mon Sep 17 00:00:00 2001
From: Chris Burroughs <chris.burroughs@gmail.com>
Date: Wed, 24 Jan 2024 15:57:33 -0500
Subject: [PATCH] fix: move gRPC dependencies to an extra

PR #3687 added a spiffy feature to ingest streaming features, but this
came along with a large batch of depdencies.  Notable this induces a
core dependency on `protobuf>=4.21.6` while Feast itself is on
`protobuf<4.23.4,>3.20`.  This is a fiddly narrow range and excludes
all 3.x uses.

Signed-off-by: Chris Burroughs <chris.burroughs@gmail.com>
---
 .../docker-compose/feast10/entrypoint.sh          |  4 ++--
 setup.py                                          | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/java/serving/src/test/resources/docker-compose/feast10/entrypoint.sh b/java/serving/src/test/resources/docker-compose/feast10/entrypoint.sh
index d7dcd03c5f..0690b734c3 100755
--- a/java/serving/src/test/resources/docker-compose/feast10/entrypoint.sh
+++ b/java/serving/src/test/resources/docker-compose/feast10/entrypoint.sh
@@ -4,8 +4,8 @@ set -e
 
 # feast root directory is expected to be mounted (eg, by docker compose)
 cd /mnt/feast
-pip install -e '.[redis]'
+pip install -e '.[grpcio,redis]'
 
 cd /app
 python materialize.py
-feast serve_transformations --port 8080
\ No newline at end of file
+feast serve_transformations --port 8080
diff --git a/setup.py b/setup.py
index 484024b206..355eff14f3 100644
--- a/setup.py
+++ b/setup.py
@@ -44,10 +44,6 @@
     "click>=7.0.0,<9.0.0",
     "colorama>=0.3.9,<1",
     "dill~=0.3.0",
-    "grpcio>=1.56.2,<2",
-    "grpcio-tools>=1.56.2,<2",
-    "grpcio-reflection>=1.56.2,<2",
-    "grpcio-health-checking>=1.56.2,<2",
     "mypy-protobuf==3.1",
     "Jinja2>=2,<4",
     "jsonschema",
@@ -143,7 +139,14 @@
 
 IBIS_REQUIRED = [
     "ibis-framework",
-    "ibis-substrait"
+    "ibis-substrait",
+]
+
+GRPCIO_REQUIRED = [
+    "grpcio>=1.56.2,<2",
+    "grpcio-tools>=1.56.2,<2",
+    "grpcio-reflection>=1.56.2,<2",
+    "grpcio-health-checking>=1.56.2,<2",
 ]
 
 CI_REQUIRED = (
@@ -205,6 +208,7 @@
     + ROCKSET_REQUIRED
     + HAZELCAST_REQUIRED
     + IBIS_REQUIRED
+    + GRPCIO_REQUIRED
 )
 
 
@@ -371,6 +375,7 @@ def run(self):
         "docs": DOCS_REQUIRED,
         "cassandra": CASSANDRA_REQUIRED,
         "hazelcast": HAZELCAST_REQUIRED,
+        "grpcio": GRPCIO_REQUIRED,
         "rockset": ROCKSET_REQUIRED,
         "ibis": IBIS_REQUIRED
     },