Various updates (#158)

* - Update to later version of the protobuf tool chain
- Update protobuf generation to produce .pyi files (this resolves some of the missing dependency errors seen in the IDE)
- Re-generate the stubs from the latest protobuf files (exposes new features from the proxy)
- Fix issues found by latest mypy refresh

Author: rlubke

.pre-commit-config.yaml

@@ -16,17 +16,17 @@ repos:
     -   id: check-added-large-files
 
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
         - id: flake8
 
 -   repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
         - id: black
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+    rev: v1.11.2
     hooks:
         - id: mypy
 

Makefile

@@ -112,7 +112,7 @@ generate-proto:  ## Generate Proto Files
 	mkdir -p $(PROTO_DIR) || true
 	curl -o $(PROTO_DIR)/services.proto https://raw.githubusercontent.com/oracle/coherence/$(COHERENCE_VERSION)/prj/coherence-grpc/src/main/proto/services.proto
 	curl -o $(PROTO_DIR)/messages.proto https://raw.githubusercontent.com/oracle/coherence/$(COHERENCE_VERSION)/prj/coherence-grpc/src/main/proto/messages.proto
-	python -m grpc_tools.protoc --proto_path=$(CURRDIR)/etc/proto --python_out=$(CURRDIR)/src/coherence --grpc_python_out=$(CURRDIR)/src/coherence $(CURRDIR)/etc/proto/messages.proto $(CURRDIR)/etc/proto/services.proto
+	python -m grpc_tools.protoc --proto_path=$(CURRDIR)/etc/proto --pyi_out=$(CURRDIR)/src/coherence --python_out=$(CURRDIR)/src/coherence --grpc_python_out=$(CURRDIR)/src/coherence $(CURRDIR)/etc/proto/messages.proto $(CURRDIR)/etc/proto/services.proto
 	sed -e 's/import messages_pb2 as messages__pb2/import coherence.messages_pb2 as messages__pb2/' \
 		< $(CURRDIR)/src/coherence/services_pb2_grpc.py > $(CURRDIR)/src/coherence/services_pb2_grpc.py.out
 	mv $(CURRDIR)/src/coherence/services_pb2_grpc.py.out $(CURRDIR)/src/coherence/services_pb2_grpc.py

pyproject.toml

@@ -22,9 +22,9 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-protobuf = ">=4.23,<4.26"
-grpcio = ">=1.54,<1.67"
-grpcio-tools = ">=1.54,<1.63"
+protobuf = "5.28.0"
+grpcio = "1.66.1"
+grpcio-tools = "1.66.1"
 jsonpickle = ">=3.0,<3.4"
 pymitter = ">=0.4,<0.6"
 typing-extensions = ">=4.11,<4.13"

src/coherence/client.py

@@ -38,7 +38,7 @@
 from .event import MapLifecycleEvent, MapListener, SessionLifecycleEvent
 from .extractor import ValueExtractor
 from .filter import Filter
-from .messages_pb2 import PageRequest  # type: ignore
+from .messages_pb2 import PageRequest
 from .processor import EntryProcessor
 from .serialization import Serializer, SerializerRegistry
 from .services_pb2_grpc import NamedCacheServiceStub

src/coherence/event.py

@@ -17,7 +17,7 @@
 import coherence.client
 
 from .filter import Filter, Filters, MapEventFilter
-from .messages_pb2 import MapEventResponse, MapListenerRequest, MapListenerResponse  # type: ignore
+from .messages_pb2 import MapEventResponse, MapListenerRequest, MapListenerResponse
 from .serialization import Serializer
 from .services_pb2_grpc import NamedCacheServiceStub
 from .util import RequestFactory
@@ -104,9 +104,9 @@ def __init__(
         self._name: str = source.name
         self._source: coherence.client.NamedMap[K, V] = source
         self._serializer: Serializer = serializer
-        self._key_bytes: bytearray = response.key
-        self._new_value_bytes: bytearray = response.newValue
-        self._old_value_bytes: bytearray = response.oldValue
+        self._key_bytes: bytes = response.key
+        self._new_value_bytes: bytes = response.newValue
+        self._old_value_bytes: bytes = response.oldValue
 
     @property
     def source(self) -> coherence.client.NamedMap[K, V]: