Skip to content

Commit f726c96

Browse files
kevjumbakevjumba
committed
fix: Fix grpc and update protobuf (#2894)
* Test Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix workflow Signed-off-by: Kevin Zhang <[email protected]> * Fix workflow Signed-off-by: Kevin Zhang <[email protected]> * Test Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * test Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * test Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix protobuf pin version and add path variable Signed-off-by: Kevin Zhang <[email protected]> * Revert setup Signed-off-by: Kevin Zhang <[email protected]> * Update 3.8 Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Update 3.10 Signed-off-by: Kevin Zhang <[email protected]> * update Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix test Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Update go with grpc 1.47 Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]> * Fix Signed-off-by: Kevin Zhang <[email protected]>
1 parent a5f68bf commit f726c96

14 files changed

+126
-135
lines changed

‎.github/workflows/build_wheels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ jobs:
186186
env:
187187
COMPILE_GO: "True"
188188
run: |
189-
pip install 'grpcio-tools==1.44.0' 'pybindgen==0.22.0'
189+
pip install 'grpcio-tools==1.47.0' 'pybindgen==0.22.0'
190190
go install google.golang.org/protobuf/cmd/[email protected]
191191
go install google.golang.org/grpc/cmd/[email protected]
192192
pip install dist/*tar.gz
@@ -209,6 +209,7 @@ jobs:
209209
echo "Correct Feast Version Installed"
210210
else
211211
echo "$VERSION_OUTPUT from installed wheel is not in the correct format or doesn't have the right version $VERSION."
212+
exit 1
212213
fi
213214
- name: Smoke test
214215
run: |
@@ -218,7 +219,6 @@ jobs:
218219
echo "$TEST_SCRIPT" > run-and-wait.sh
219220
bash run-and-wait.sh feast serve
220221
bash run-and-wait.sh feast ui
221-
222222
# We disable this test for the Python 3.10 binary since it does not include Go.
223223
- name: Smoke test with go
224224
if: matrix.python-version != '3.10' || matrix.os == 'ubuntu-latest'

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ install-go-ci-dependencies:
180180
python -m pip install pybindgen==0.22.0
181181

182182
install-protoc-dependencies:
183-
pip install grpcio-tools==1.44.0 mypy-protobuf==3.1.0
183+
pip install grpcio-tools==1.47.0 mypy-protobuf==3.1.0
184184

185185
compile-protos-go: install-go-proto-dependencies install-protoc-dependencies
186186
python setup.py build_go_protos

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/pkg/errors v0.9.1
1616
github.com/spaolacci/murmur3 v1.1.0
1717
github.com/stretchr/testify v1.7.0
18-
google.golang.org/grpc v1.45.0
18+
google.golang.org/grpc v1.47.0
1919
google.golang.org/protobuf v1.28.0
2020
)
2121

‎go.sum‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP
5555
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
5656
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
5757
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
58+
github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
5859
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
5960
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
6061
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
@@ -83,6 +84,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
8384
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
8485
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
8586
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
87+
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
8688
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
8789
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
8890
github.com/feast-dev/gopy v0.4.1-0.20220429180328-4257ac71a4d0 h1:Go714ObVP1O+a6qK7haXVL28QNm6WMD8bwnN9EA8PlM=
@@ -588,8 +590,9 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp
588590
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
589591
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
590592
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
591-
google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
592593
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
594+
google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
595+
google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
593596
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
594597
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
595598
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools>=60", "wheel", "setuptools_scm>=6.2", "grpcio", "grpcio-tools==1.44.0", "mypy-protobuf==3.1", "sphinx!=4.0.0"]
2+
requires = ["setuptools>=60", "wheel", "setuptools_scm>=6.2", "grpcio", "grpcio-tools==1.47.0", "mypy-protobuf==3.1", "sphinx!=4.0.0"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.setuptools_scm]

‎sdk/python/feast/proto_json.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def to_json_object(printer: _Printer, message: ProtoMessage) -> JsonObject:
7070
return value
7171

7272
def from_json_object(
73-
parser: _Parser, value: JsonObject, message: ProtoMessage,
73+
parser: _Parser, value: JsonObject, message: ProtoMessage, path: str
7474
) -> None:
7575
if value is None:
7676
message.null_val = 0
@@ -142,11 +142,11 @@ def to_json_object(printer: _Printer, message: ProtoMessage) -> JsonObject:
142142
return [printer._MessageToJsonObject(item) for item in message.val]
143143

144144
def from_json_object(
145-
parser: _Parser, value: JsonObject, message: ProtoMessage,
145+
parser: _Parser, value: JsonObject, message: ProtoMessage, path: str
146146
) -> None:
147147
array = value if isinstance(value, list) else value["val"]
148148
for item in array:
149-
parser.ConvertMessage(item, message.val.add())
149+
parser.ConvertMessage(item, message.val.add(), path)
150150

151151
_patch_proto_json_encoding(RepeatedValue, to_json_object, from_json_object)
152152

@@ -183,7 +183,7 @@ def to_json_object(printer: _Printer, message: ProtoMessage) -> JsonObject:
183183
return list(message.val)
184184

185185
def from_json_object(
186-
parser: _Parser, value: JsonObject, message: ProtoMessage,
186+
parser: _Parser, value: JsonObject, message: ProtoMessage, path: str
187187
) -> None:
188188
array = value if isinstance(value, list) else value["val"]
189189
message.val.extend(array)

‎sdk/python/requirements/py3.10-ci-requirements.txt‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ botocore==1.23.24
9090
bowler==0.9.0
9191
# via feast (setup.py)
9292
build==0.8.0
93-
# via feast (setup.py)
93+
# via
94+
# feast (setup.py)
95+
# pip-tools
9496
cachecontrol==0.12.11
9597
# via firebase-admin
9698
cachetools==4.2.4
@@ -173,7 +175,7 @@ executing==0.8.3
173175
# via stack-data
174176
fastapi==0.78.0
175177
# via feast (setup.py)
176-
fastavro==1.5.1
178+
fastavro==1.5.2
177179
# via
178180
# feast (setup.py)
179181
# pandavro
@@ -209,7 +211,7 @@ google-api-core[grpc]==1.31.6
209211
# google-cloud-core
210212
# google-cloud-datastore
211213
# google-cloud-firestore
212-
google-api-python-client==2.51.0
214+
google-api-python-client==2.52.0
213215
# via firebase-admin
214216
google-auth==1.35.0
215217
# via
@@ -257,8 +259,6 @@ googleapis-common-protos==1.56.3
257259
# tensorflow-metadata
258260
great-expectations==0.14.13
259261
# via feast (setup.py)
260-
greenlet==1.1.2
261-
# via sqlalchemy
262262
grpcio==1.47.0
263263
# via
264264
# feast (setup.py)
@@ -269,9 +269,9 @@ grpcio==1.47.0
269269
# grpcio-tools
270270
grpcio-reflection==1.47.0
271271
# via feast (setup.py)
272-
grpcio-testing==1.44.0
272+
grpcio-testing==1.47.0
273273
# via feast (setup.py)
274-
grpcio-tools==1.44.0
274+
grpcio-tools==1.47.0
275275
# via feast (setup.py)
276276
h11==0.13.0
277277
# via uvicorn
@@ -295,7 +295,7 @@ idna==3.3
295295
# yarl
296296
imagesize==1.3.0
297297
# via sphinx
298-
importlib-metadata==4.11.4
298+
importlib-metadata==4.12.0
299299
# via great-expectations
300300
iniconfig==1.1.1
301301
# via pytest
@@ -322,7 +322,7 @@ jsonpatch==1.32
322322
# via great-expectations
323323
jsonpointer==2.3
324324
# via jsonpatch
325-
jsonschema==4.6.0
325+
jsonschema==4.6.1
326326
# via
327327
# altair
328328
# feast (setup.py)
@@ -342,15 +342,15 @@ mccabe==0.6.1
342342
# via flake8
343343
minio==7.1.0
344344
# via feast (setup.py)
345-
mistune==2.0.2
345+
mistune==2.0.3
346346
# via great-expectations
347347
mmh3==3.0.0
348348
# via feast (setup.py)
349349
mock==2.0.0
350350
# via feast (setup.py)
351351
moreorless==0.4.0
352352
# via bowler
353-
moto==3.1.14
353+
moto==3.1.16
354354
# via feast (setup.py)
355355
msal==1.18.0
356356
# via
@@ -382,7 +382,7 @@ mysqlclient==2.1.1
382382
# via feast (setup.py)
383383
nbformat==5.4.0
384384
# via great-expectations
385-
nodeenv==1.6.0
385+
nodeenv==1.7.0
386386
# via pre-commit
387387
numpy==1.22.0
388388
# via
@@ -426,14 +426,12 @@ pathspec==0.9.0
426426
pbr==5.9.0
427427
# via mock
428428
pep517==0.12.0
429-
# via
430-
# build
431-
# pip-tools
429+
# via build
432430
pexpect==4.8.0
433431
# via ipython
434432
pickleshare==0.7.5
435433
# via ipython
436-
pip-tools==6.6.2
434+
pip-tools==6.7.0
437435
# via feast (setup.py)
438436
platformdirs==2.5.2
439437
# via virtualenv
@@ -445,7 +443,7 @@ portalocker==2.4.0
445443
# via msal-extensions
446444
pre-commit==2.19.0
447445
# via feast (setup.py)
448-
prompt-toolkit==3.0.29
446+
prompt-toolkit==3.0.30
449447
# via ipython
450448
proto-plus==1.20.6
451449
# via
@@ -454,7 +452,7 @@ proto-plus==1.20.6
454452
# google-cloud-bigquery-storage
455453
# google-cloud-datastore
456454
# google-cloud-firestore
457-
protobuf==3.19.4
455+
protobuf==3.20.1
458456
# via
459457
# feast (setup.py)
460458
# google-api-core
@@ -588,7 +586,7 @@ redis==4.2.2
588586
# via feast (setup.py)
589587
regex==2022.6.2
590588
# via black
591-
requests==2.28.0
589+
requests==2.28.1
592590
# via
593591
# adal
594592
# adlfs
@@ -665,7 +663,7 @@ sphinxcontrib-qthelp==1.0.3
665663
# via sphinx
666664
sphinxcontrib-serializinghtml==1.1.5
667665
# via sphinx
668-
sqlalchemy[mypy]==1.4.38
666+
sqlalchemy[mypy]==1.4.39
669667
# via feast (setup.py)
670668
sqlalchemy2-stubs==0.0.2a24
671669
# via sqlalchemy
@@ -724,17 +722,17 @@ types-protobuf==3.19.22
724722
# mypy-protobuf
725723
types-python-dateutil==2.8.18
726724
# via feast (setup.py)
727-
types-pytz==2022.1.0
725+
types-pytz==2022.1.1
728726
# via feast (setup.py)
729-
types-pyyaml==6.0.8
727+
types-pyyaml==6.0.9
730728
# via feast (setup.py)
731-
types-redis==4.3.2
729+
types-redis==4.3.3
732730
# via feast (setup.py)
733-
types-requests==2.27.31
731+
types-requests==2.28.0
734732
# via feast (setup.py)
735-
types-setuptools==57.4.17
733+
types-setuptools==57.4.18
736734
# via feast (setup.py)
737-
types-tabulate==0.8.10
735+
types-tabulate==0.8.11
738736
# via feast (setup.py)
739737
types-urllib3==1.26.15
740738
# via types-requests
@@ -759,11 +757,11 @@ urllib3==1.26.9
759757
# minio
760758
# requests
761759
# responses
762-
uvicorn[standard]==0.18.1
760+
uvicorn[standard]==0.18.2
763761
# via feast (setup.py)
764762
uvloop==0.16.0
765763
# via uvicorn
766-
virtualenv==20.14.1
764+
virtualenv==20.15.1
767765
# via pre-commit
768766
volatile==2.1.0
769767
# via bowler

‎sdk/python/requirements/py3.10-requirements.txt‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cachetools==5.2.0
2222
# via google-auth
2323
certifi==2022.6.15
2424
# via requests
25-
charset-normalizer==2.0.12
25+
charset-normalizer==2.1.0
2626
# via requests
2727
click==8.0.1
2828
# via
@@ -40,7 +40,7 @@ dill==0.3.5.1
4040
# via feast (setup.py)
4141
fastapi==0.78.0
4242
# via feast (setup.py)
43-
fastavro==1.5.1
43+
fastavro==1.5.2
4444
# via
4545
# feast (setup.py)
4646
# pandavro
@@ -50,15 +50,13 @@ fsspec==2022.5.0
5050
# via dask
5151
google-api-core==2.8.2
5252
# via feast (setup.py)
53-
google-auth==2.8.0
53+
google-auth==2.9.0
5454
# via google-api-core
5555
googleapis-common-protos==1.56.3
5656
# via
5757
# feast (setup.py)
5858
# google-api-core
5959
# tensorflow-metadata
60-
greenlet==1.1.2
61-
# via sqlalchemy
6260
grpcio==1.47.0
6361
# via
6462
# feast (setup.py)
@@ -75,7 +73,7 @@ idna==3.3
7573
# requests
7674
jinja2==3.1.2
7775
# via feast (setup.py)
78-
jsonschema==4.6.0
76+
jsonschema==4.6.1
7977
# via feast (setup.py)
8078
locket==1.0.0
8179
# via partd
@@ -107,7 +105,7 @@ partd==1.2.0
107105
# via dask
108106
proto-plus==1.20.6
109107
# via feast (setup.py)
110-
protobuf==3.19.4
108+
protobuf==3.20.1
111109
# via
112110
# feast (setup.py)
113111
# google-api-core
@@ -144,7 +142,7 @@ pyyaml==6.0
144142
# dask
145143
# feast (setup.py)
146144
# uvicorn
147-
requests==2.28.0
145+
requests==2.28.1
148146
# via google-api-core
149147
rsa==4.8
150148
# via google-auth
@@ -156,7 +154,7 @@ six==1.16.0
156154
# python-dateutil
157155
sniffio==1.2.0
158156
# via anyio
159-
sqlalchemy[mypy]==1.4.38
157+
sqlalchemy[mypy]==1.4.39
160158
# via feast (setup.py)
161159
sqlalchemy2-stubs==0.0.2a24
162160
# via sqlalchemy
@@ -187,7 +185,7 @@ typing-extensions==4.2.0
187185
# sqlalchemy2-stubs
188186
urllib3==1.26.9
189187
# via requests
190-
uvicorn[standard]==0.18.1
188+
uvicorn[standard]==0.18.2
191189
# via feast (setup.py)
192190
uvloop==0.16.0
193191
# via uvicorn

0 commit comments

Comments
 (0)