Skip to content

Update protobuf to include control plane #616

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

Merged
adriangonz merged 7 commits into from
Jun 6, 2022
Merged

Update protobuf to include control plane #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
628cdee
Update inference plane to add model repository endpoints
Jun 1, 2022
79b26ae
Update tests and converters to deal with both versions of the modelre…
Jun 1, 2022
2d2fcb8
Fix linter
Jun 1, 2022
07da453
Move deprecated servicer to diff file
Jun 1, 2022
9b1a64b
Add deprecation note
Jun 1, 2022
5116693
Add new parameters field to proto (although it's not used)
Jun 1, 2022
a5e8add
Fix linter
Jun 1, 2022
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
51 changes: 36 additions & 15 deletions mlserver/grpc/converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def from_types(
class RepositoryIndexRequestConverter:
@classmethod
def to_types(
cls, pb_object: mr_pb.RepositoryIndexRequest
cls, pb_object: Union[pb.RepositoryIndexRequest, mr_pb.RepositoryIndexRequest]
) -> types.RepositoryIndexRequest:
return types.RepositoryIndexRequest(
ready=pb_object.ready,
Expand All @@ -366,46 +366,67 @@ def to_types(
@classmethod
def from_types(
cls, type_object: types.RepositoryIndexRequest
) -> mr_pb.RepositoryIndexRequest:
) -> Union[pb.RepositoryIndexRequest, mr_pb.RepositoryIndexRequest]:
raise NotImplementedError("Implement me")


class RepositoryIndexResponseConverter:
@classmethod
def to_types(
cls, pb_object: mr_pb.RepositoryIndexResponse
cls, pb_object: Union[pb.RepositoryIndexResponse, mr_pb.RepositoryIndexResponse]
) -> types.RepositoryIndexResponse:
raise NotImplementedError("Implement me")

@classmethod
def from_types(
cls, type_object: types.RepositoryIndexResponse
) -> mr_pb.RepositoryIndexResponse:
return mr_pb.RepositoryIndexResponse(
models=[
RepositoryIndexResponseItemConverter.from_types(model)
for model in type_object
]
)
cls,
type_object: types.RepositoryIndexResponse,
use_model_repository: bool = False,
) -> Union[pb.RepositoryIndexResponse, mr_pb.RepositoryIndexResponse]:
models = [
RepositoryIndexResponseItemConverter.from_types(
model, use_model_repository=use_model_repository
)
for model in type_object
]
if use_model_repository:
return mr_pb.RepositoryIndexResponse(models=models) # type: ignore

return pb.RepositoryIndexResponse(models=models) # type: ignore


class RepositoryIndexResponseItemConverter:
@classmethod
def to_types(
cls, pb_object: mr_pb.RepositoryIndexResponse.ModelIndex
cls,
pb_object: Union[
pb.RepositoryIndexResponse.ModelIndex,
mr_pb.RepositoryIndexResponse.ModelIndex,
],
) -> types.RepositoryIndexResponseItem:
raise NotImplementedError("Implement me")

@classmethod
def from_types(
cls, type_object: types.RepositoryIndexResponseItem
) -> mr_pb.RepositoryIndexResponse.ModelIndex:
model_index = mr_pb.RepositoryIndexResponse.ModelIndex(
cls,
type_object: types.RepositoryIndexResponseItem,
use_model_repository: bool = False,
) -> Union[
pb.RepositoryIndexResponse.ModelIndex, mr_pb.RepositoryIndexResponse.ModelIndex
]:
model_index = pb.RepositoryIndexResponse.ModelIndex(
name=type_object.name,
state=type_object.state.value,
reason=type_object.reason,
)

if use_model_repository:
model_index = mr_pb.RepositoryIndexResponse.ModelIndex( # type: ignore
name=type_object.name,
state=type_object.state.value,
reason=type_object.reason,
)

if type_object.version is not None:
model_index.version = type_object.version

Expand Down
161 changes: 158 additions & 3 deletions mlserver/grpc/dataplane_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.

Loading