Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update grpc to new v1 proto schema #574

Merged
merged 8 commits into from
Oct 17, 2023
Merged

Update grpc to new v1 proto schema #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c43cd3
refactor codebase for new grpc protos
tsmith023 Oct 16, 2023
374d3b2
remove unused v0, fix imports in v1
tsmith023 Oct 16, 2023
6cd2b15
fix cluster
tsmith023 Oct 16, 2023
eb83109
update ci images
tsmith023 Oct 16, 2023
026f519
remove refs to proto.v0
tsmith023 Oct 16, 2023
030d109
fix grpc import
tsmith023 Oct 16, 2023
db37f72
add proto to packages
tsmith023 Oct 16, 2023
8d9f4ba
fix importing grpc stubs
tsmith023 Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: ^weaviate_grpc/
exclude: ^proto/
repos:
- repo: https://github.com/psf/black
rev: 22.10.0
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-compose-azure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- --scheme
- http
- --write-timeout=600s
image: semitechnologies/weaviate:preview-nested-objects-4dc2c30
image: semitechnologies/weaviate:preview-split-protos-into-v0-and-v1-packages-for-clear-api-break-b4b08ad
ports:
- 8081:8081
restart: on-failure:0
Expand Down
4 changes: 2 additions & 2 deletions ci/docker-compose-cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '3.4'
services:
weaviate-node-1:
image: semitechnologies/weaviate:preview-nested-objects-4dc2c30
image: semitechnologies/weaviate:preview-split-protos-into-v0-and-v1-packages-for-clear-api-break-b4b08ad
restart: on-failure:0
ports:
- "8087:8080"
Expand All @@ -25,7 +25,7 @@ services:
- '8080'
- --scheme
- http
image: semitechnologies/weaviate:preview-nested-objects-4dc2c30
image: semitechnologies/weaviate:preview-split-protos-into-v0-and-v1-packages-for-clear-api-break-b4b08ad
ports:
- 8088:8080
- 6061:6060
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-compose-okta-cc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- --scheme
- http
- --write-timeout=600s
image: semitechnologies/weaviate:preview-nested-objects-4dc2c30
image: semitechnologies/weaviate:preview-split-protos-into-v0-and-v1-packages-for-clear-api-break-b4b08ad
ports:
- 8082:8082
restart: on-failure:0
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-compose-okta-users.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- --scheme
- http
- --write-timeout=600s
image: semitechnologies/weaviate:preview-nested-objects-4dc2c30
image: semitechnologies/weaviate:preview-split-protos-into-v0-and-v1-packages-for-clear-api-break-b4b08ad
ports:
- 8083:8083
restart: on-failure:0
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-compose-openai.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- '8086'
- --scheme
- http
image: semitechnologies/weaviate:preview-nested-objects-4dc2c30
image: semitechnologies/weaviate:preview-split-protos-into-v0-and-v1-packages-for-clear-api-break-b4b08ad
ports:
- 8086:8086
restart: on-failure:0
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-compose-wcs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- --scheme
- http
- --write-timeout=600s
image: semitechnologies/weaviate:preview-nested-objects-4dc2c30
image: semitechnologies/weaviate:preview-split-protos-into-v0-and-v1-packages-for-clear-api-break-b4b08ad
ports:
- 8085:8085
restart: on-failure:0
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- --scheme
- http
- --write-timeout=600s
image: semitechnologies/weaviate:preview-nested-objects-4dc2c30
image: semitechnologies/weaviate:preview-split-protos-into-v0-and-v1-packages-for-clear-api-break-b4b08ad
ports:
- "8080:8080"
- "50051:50051"
Expand Down
4 changes: 2 additions & 2 deletions integration/test_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import weaviate

GIT_HASH = "4dc2c30"
SERVER_VERSION = "1.21.4"
GIT_HASH = "b4b08ad"
SERVER_VERSION = "1.21.6"
NODE_NAME = "node1"
NUM_OBJECT = 10

Expand Down
Empty file added proto/__init__.py
View file
Open in desktop
Empty file.
Empty file added proto/v1/__init__.py
View file
Open in desktop
Empty file.
35 changes: 35 additions & 0 deletions proto/v1/base_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 weaviate_grpc/base_pb2.pyi → proto/v1/base_pb2.pyi
View file
Open in desktop
File renamed without changes.
0 weaviate_grpc/base_pb2_grpc.py → proto/v1/base_pb2_grpc.py
View file
Open in desktop
File renamed without changes.
41 changes: 41 additions & 0 deletions proto/v1/batch_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion weaviate_grpc/batch_pb2.pyi → proto/v1/batch_pb2.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import base_pb2 as _base_pb2
from google.protobuf import struct_pb2 as _struct_pb2
from v1 import base_pb2 as _base_pb2
from google.protobuf.internal import containers as _containers
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
Expand Down
0 weaviate_grpc/batch_pb2_grpc.py → proto/v1/batch_pb2_grpc.py
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions proto/v1/regen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

echo "this script assumes that you have checked out weaviate next to the client"
cd "${0%/*}/.."


python3 -m grpc_tools.protoc -I ../../weaviate/grpc/proto --python_out=./ --pyi_out=./ --grpc_python_out=./ ../../weaviate/grpc/proto/v1/*.proto


sed -i '' 's/from v1/from proto.v1/g' v1/*.py

echo "done"

Loading