diff --git a/README.md b/README.md index 0d81c23..c88c2ec 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ if __name__ == "__main__": ## Release Notes +- 24.07.11 Upgrade minimum tritonclient version to 2.34.0 - 23.08.30 Support `optional` with model input, `parameters` on config.pbtxt - 23.06.16 Support tritonclient>=2.34.0 - Loosely modified the requirements related to tritonclient diff --git a/pyproject.toml b/pyproject.toml index 92fd22f..1ffaf18 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,4 +3,18 @@ requires = [ "setuptools >= 48", "wheel >= 0.29.0", ] -build-backend = 'setuptools.build_meta' \ No newline at end of file +build-backend = 'setuptools.build_meta' + +[tool.isort] +profile = "black" +line_length = 120 + +[tool.ruff] +target-version = "py310" +line-length = 120 + +[tool.ruff.lint] +ignore = ["F811","F841","E203","E402","E501","E712","B019"] + +[tool.lint.isort] +forced-separate = ["tests"] \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index b1edf1b..3e872f2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,7 +46,7 @@ packages = find: package_dir = =. install_requires = - tritonclient[all]>=2.21.0 + tritonclient[all]>=2.34.0 protobuf>=3.5.0 orjson>=3.6.8 reretry>=0.11.1 diff --git a/tritony/helpers.py b/tritony/helpers.py index a28f736..5c8f15f 100644 --- a/tritony/helpers.py +++ b/tritony/helpers.py @@ -91,7 +91,7 @@ def init_triton_client( flag: TritonClientFlag, ) -> grpcclient.InferenceServerClient | httpclient.InferenceServerClient: assert not ( - flag.streaming and not (flag.protocol is TritonProtocol.grpc) + flag.streaming and flag.protocol is not TritonProtocol.grpc ), "Streaming is only allowed with gRPC protocol" if flag.protocol is TritonProtocol.grpc: diff --git a/tritony/tools.py b/tritony/tools.py index 3dd43bb..edaea80 100644 --- a/tritony/tools.py +++ b/tritony/tools.py @@ -16,13 +16,7 @@ from tritonclient import grpc as grpcclient from tritonclient import http as httpclient from tritonclient.grpc import InferResult - -try: - from tritonclient.grpc import _get_inference_request as grpc_get_inference_request -except ImportError: - warnings.warn(UserWarning("tritonclient[all]>=2.34.0")) - from tritonclient.grpc._utils import _get_inference_request as grpc_get_inference_request - +from tritonclient.grpc._utils import _get_inference_request as grpc_get_inference_request from tritonclient.utils import InferenceServerException from tritony import ASYNC_TASKS