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.

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

Added dependency upgrades for python3.12 support #1951

Merged
merged 64 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
ee80e85
Python3.12 changes
shivakrishnaah Nov 7, 2024
e551dc6
Added the python3.12 version
shivakrishnaah Nov 8, 2024
9843c05
Code changes for the inner pyproject.toml
shivakrishnaah Nov 8, 2024
19fd7c3
Fixes for the scikit-learn
shivakrishnaah Nov 8, 2024
03e7fd0
Added the missign git repository url
shivakrishnaah Nov 8, 2024
459ad22
Added the custom github repo url
shivakrishnaah Nov 8, 2024
cf2bbe1
Added the gcc linux as well
shivakrishnaah Nov 9, 2024
3995029
Added the new gcc environment as well
shivakrishnaah Nov 9, 2024
d97527a
Upgraded the alibi-detct to remove creme dependency
shivakrishnaah Nov 9, 2024
dafe854
Added alibi as well to the restriction
shivakrishnaah Nov 9, 2024
b1f8aa3
Commiting the changes for the gcc and alibi
shivakrishnaah Nov 9, 2024
a8925fa
Changes for the scikit-learn
shivakrishnaah Nov 9, 2024
0562014
Merge remote-tracking branch 'seldonio/master'
shivakrishnaah Nov 15, 2024
564fa10
#1951 resolved the comments and rebased with master
shivakrishnaah Nov 15, 2024
6b9959a
#1951 reverted the code to address the comments
shivakrishnaah Nov 15, 2024
c5cf030
#1951 Fixed the issues
shivakrishnaah Nov 15, 2024
bcf9de0
#1951 Rebased with master and addressed the comments for python3.12 u…
shivakrishnaah Nov 15, 2024
3b02cc7
Merge branch 'master' of https://github.com/shivakrishnaah/MLServer
shivakrishnaah Nov 15, 2024
b5ab9b1
#1951 Upgraded the tensorflow for compatibility with python version
shivakrishnaah Nov 15, 2024
814cfc5
update alibi libraries TF versions
sakoush Nov 18, 2024
3ff5740
add min torch and tf versions for python 3.12 support
sakoush Nov 18, 2024
8304a74
update torch min version in mlflow runtime to support python 2.12
sakoush Nov 18, 2024
30c41bf
update lockfiles by running `make lock`
sakoush Nov 18, 2024
a7d3ae7
Updated the Mlserver version to 1.6.1
shivakrishnaah Nov 19, 2024
8e3495a
Update tests.yml
shivakrishnaah Nov 19, 2024
5effbe0
Revert the version changes testing
shivakrishnaah Nov 19, 2024
bd44691
Merge branch 'master' into master
shivakrishnaah Nov 19, 2024
3f4f101
Updated the lock files using make lock command
shivakrishnaah Nov 20, 2024
3f2c043
build(deps): bump mlflow from 2.17.2 to 2.18.0 in /runtimes/mlflow (#…
dependabot[bot] Nov 26, 2024
3265ecf
Python3.12 changes
shivakrishnaah Nov 7, 2024
e28a4d0
Added the python3.12 version
shivakrishnaah Nov 8, 2024
d840230
Code changes for the inner pyproject.toml
shivakrishnaah Nov 8, 2024
7e18de3
Fixes for the scikit-learn
shivakrishnaah Nov 8, 2024
7bee1ae
Added the missign git repository url
shivakrishnaah Nov 8, 2024
d0013be
Added the custom github repo url
shivakrishnaah Nov 8, 2024
fe77245
Added the gcc linux as well
shivakrishnaah Nov 9, 2024
d985879
Added the new gcc environment as well
shivakrishnaah Nov 9, 2024
ffb9be7
Upgraded the alibi-detct to remove creme dependency
shivakrishnaah Nov 9, 2024
6139675
Added alibi as well to the restriction
shivakrishnaah Nov 9, 2024
6a216e8
Commiting the changes for the gcc and alibi
shivakrishnaah Nov 9, 2024
70bb275
Changes for the scikit-learn
shivakrishnaah Nov 9, 2024
e8315d5
#1951 Rebased with master and addressed the comments for python3.12 u…
shivakrishnaah Nov 15, 2024
7e4db87
#1951 Upgraded the tensorflow for compatibility with python version
shivakrishnaah Nov 15, 2024
d24bc80
update alibi libraries TF versions
sakoush Nov 18, 2024
faf1d4e
add min torch and tf versions for python 3.12 support
sakoush Nov 18, 2024
c549a3c
update torch min version in mlflow runtime to support python 2.12
sakoush Nov 18, 2024
e798cfa
update lockfiles by running `make lock`
sakoush Nov 18, 2024
d3561c4
Updated the Mlserver version to 1.6.1
shivakrishnaah Nov 19, 2024
2e043c2
Update tests.yml
shivakrishnaah Nov 19, 2024
cee539c
Revert the version changes testing
shivakrishnaah Nov 19, 2024
477e291
Updated the lock files using make lock command
shivakrishnaah Nov 20, 2024
c8ca49f
upgrade alibi libraries to point to master
sakoush Dec 13, 2024
92e84ee
upgrade tf version as dev deps
sakoush Dec 13, 2024
35859e5
update lock files
sakoush Dec 13, 2024
4d021cd
Merge branch 'master' of ssh.github.com:shivakrishnaah/MLServer into …
sakoush Dec 13, 2024
0041c88
update lock
sakoush Dec 13, 2024
d16c33b
add tests for py3.11 and py3.12
sakoush Dec 13, 2024
c73e426
generate grpc protos
sakoush Dec 13, 2024
1d73c5c
add tf-keras dep
sakoush Dec 16, 2024
3d85db5
update lockfile for hf runtime
sakoush Dec 16, 2024
c44db3f
revert back mlflow deps list
sakoush Dec 16, 2024
89cb4c6
use legacy keras in alibi-detect / alibi-explain tests
sakoush Dec 17, 2024
7480c4c
Add docs about supported python versions
sakoush Dec 17, 2024
6a5d465
adjust test to use python 3.10
sakoush Dec 17, 2024
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
18 changes: 5 additions & 13 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.9", "3.10"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
target: ["dataplane", "model-repository"]
runs-on: ubuntu-22.04
steps:
Expand All @@ -36,9 +36,7 @@ jobs:
lint:
strategy:
matrix:
python-version:
- "3.9"
- "3.10"
python-version: ["3.9", "3.10", "3.11", "3.12"]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand All @@ -64,9 +62,7 @@ jobs:
- macos-13
# NOTE: There's no pre-built `grpcio` wheel for Python 3.11 yet
# https://github.com/grpc/grpc/issues/32454
python-version:
- "3.9"
- "3.10"
python-version: ["3.9", "3.10", "3.11", "3.12"]
is-pr:
- ${{ github.event_name == 'pull_request' }}
exclude:
Expand Down Expand Up @@ -111,9 +107,7 @@ jobs:
os:
- ubuntu-22.04
- macos-13
python-version:
- "3.9"
- "3.10"
python-version: ["3.9", "3.10", "3.11", "3.12"]
tox-environment:
- sklearn
- xgboost
Expand Down Expand Up @@ -166,9 +160,7 @@ jobs:
os:
- ubuntu-22.04
- macos-12
python-version:
- "3.9"
- "3.10"
python-version: ["3.9", "3.10", "3.11", "3.12"]
runs-on: ${{ matrix.os }}
steps:
- name: Maximize build space
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ MLServer is licensed under the Apache License, Version 2.0. However please note
| 3.8 | 🔴 |
| 3.9 | 🟢 |
| 3.10 | 🟢 |
| 3.11 | 🔵 |
| 3.12 | 🔵 |
| 3.11 | 🟢 |
| 3.12 | 🟢 |
| 3.13 | 🔴 |

## Examples

Expand Down
5 changes: 3 additions & 2 deletions docs-gb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ Out of the box, MLServer provides support for:
| 3.8 | 🔴 |
| 3.9 | 🟢 |
| 3.10 | 🟢 |
| 3.11 | 🔵 |
| 3.12 | 🔵 |
| 3.11 | 🟢 |
| 3.12 | 🟢 |
| 3.13 | 🔴 |

## Examples

Expand Down
35 changes: 23 additions & 12 deletions mlserver/grpc/dataplane_pb2.py

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

46 changes: 46 additions & 0 deletions mlserver/grpc/dataplane_pb2_grpc.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,32 @@
# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
import warnings

from . import dataplane_pb2 as dataplane__pb2

GRPC_GENERATED_VERSION = "1.67.1"
GRPC_VERSION = grpc.__version__
_version_not_supported = False

try:
from grpc._utilities import first_version_is_lower

_version_not_supported = first_version_is_lower(
GRPC_VERSION, GRPC_GENERATED_VERSION
)
except ImportError:
_version_not_supported = True

if _version_not_supported:
raise RuntimeError(
f"The grpc package installed is at version {GRPC_VERSION},"
+ f" but the generated code in dataplane_pb2_grpc.py depends on"
+ f" grpcio>={GRPC_GENERATED_VERSION}."
+ f" Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}"
+ f" or downgrade your generated code using grpcio-tools<={GRPC_VERSION}."
)


class GRPCInferenceServiceStub(object):
"""
Expand All @@ -21,51 +44,61 @@ def __init__(self, channel):
"/inference.GRPCInferenceService/ServerLive",
request_serializer=dataplane__pb2.ServerLiveRequest.SerializeToString,
response_deserializer=dataplane__pb2.ServerLiveResponse.FromString,
_registered_method=True,
)
self.ServerReady = channel.unary_unary(
"/inference.GRPCInferenceService/ServerReady",
request_serializer=dataplane__pb2.ServerReadyRequest.SerializeToString,
response_deserializer=dataplane__pb2.ServerReadyResponse.FromString,
_registered_method=True,
)
self.ModelReady = channel.unary_unary(
"/inference.GRPCInferenceService/ModelReady",
request_serializer=dataplane__pb2.ModelReadyRequest.SerializeToString,
response_deserializer=dataplane__pb2.ModelReadyResponse.FromString,
_registered_method=True,
)
self.ServerMetadata = channel.unary_unary(
"/inference.GRPCInferenceService/ServerMetadata",
request_serializer=dataplane__pb2.ServerMetadataRequest.SerializeToString,
response_deserializer=dataplane__pb2.ServerMetadataResponse.FromString,
_registered_method=True,
)
self.ModelMetadata = channel.unary_unary(
"/inference.GRPCInferenceService/ModelMetadata",
request_serializer=dataplane__pb2.ModelMetadataRequest.SerializeToString,
response_deserializer=dataplane__pb2.ModelMetadataResponse.FromString,
_registered_method=True,
)
self.ModelInfer = channel.unary_unary(
"/inference.GRPCInferenceService/ModelInfer",
request_serializer=dataplane__pb2.ModelInferRequest.SerializeToString,
response_deserializer=dataplane__pb2.ModelInferResponse.FromString,
_registered_method=True,
)
self.ModelStreamInfer = channel.stream_stream(
"/inference.GRPCInferenceService/ModelStreamInfer",
request_serializer=dataplane__pb2.ModelInferRequest.SerializeToString,
response_deserializer=dataplane__pb2.ModelInferResponse.FromString,
_registered_method=True,
)
self.RepositoryIndex = channel.unary_unary(
"/inference.GRPCInferenceService/RepositoryIndex",
request_serializer=dataplane__pb2.RepositoryIndexRequest.SerializeToString,
response_deserializer=dataplane__pb2.RepositoryIndexResponse.FromString,
_registered_method=True,
)
self.RepositoryModelLoad = channel.unary_unary(
"/inference.GRPCInferenceService/RepositoryModelLoad",
request_serializer=dataplane__pb2.RepositoryModelLoadRequest.SerializeToString,
response_deserializer=dataplane__pb2.RepositoryModelLoadResponse.FromString,
_registered_method=True,
)
self.RepositoryModelUnload = channel.unary_unary(
"/inference.GRPCInferenceService/RepositoryModelUnload",
request_serializer=dataplane__pb2.RepositoryModelUnloadRequest.SerializeToString,
response_deserializer=dataplane__pb2.RepositoryModelUnloadResponse.FromString,
_registered_method=True,
)


Expand Down Expand Up @@ -193,6 +226,9 @@ def add_GRPCInferenceServiceServicer_to_server(servicer, server):
"inference.GRPCInferenceService", rpc_method_handlers
)
server.add_generic_rpc_handlers((generic_handler,))
server.add_registered_method_handlers(
"inference.GRPCInferenceService", rpc_method_handlers
)


# This class is part of an EXPERIMENTAL API.
Expand Down Expand Up @@ -229,6 +265,7 @@ def ServerLive(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)

@staticmethod
Expand Down Expand Up @@ -258,6 +295,7 @@ def ServerReady(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)

@staticmethod
Expand Down Expand Up @@ -287,6 +325,7 @@ def ModelReady(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)

@staticmethod
Expand Down Expand Up @@ -316,6 +355,7 @@ def ServerMetadata(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)

@staticmethod
Expand Down Expand Up @@ -345,6 +385,7 @@ def ModelMetadata(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)

@staticmethod
Expand Down Expand Up @@ -374,6 +415,7 @@ def ModelInfer(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)

@staticmethod
Expand Down Expand Up @@ -403,6 +445,7 @@ def ModelStreamInfer(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)

@staticmethod
Expand Down Expand Up @@ -432,6 +475,7 @@ def RepositoryIndex(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)

@staticmethod
Expand Down Expand Up @@ -461,6 +505,7 @@ def RepositoryModelLoad(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)

@staticmethod
Expand Down Expand Up @@ -490,4 +535,5 @@ def RepositoryModelUnload(
wait_for_ready,
timeout,
metadata,
_registered_method=True,
)
11 changes: 8 additions & 3 deletions mlserver/grpc/model_repository_pb2.py

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

Loading
Loading