-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds TokenizationTaskRequest and InfoService
This includes the TokenizationTaskRequest method for the embeddings models at the NLP interface + implements the InfoService for the watsonx product team requirement to be able to retrieve embeddings models' metadata. Signed-off-by: Flavia Beo <[email protected]>
- Loading branch information
Showing
8 changed files
with
263 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| pub mod generation; | ||
| pub mod nlp; | ||
| pub mod info; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| use std::collections::HashMap; | ||
|
|
||
| use ginepro::LoadBalancedChannel; | ||
| use tonic::{transport::ClientTlsConfig, Code, Request, Response, Status}; | ||
| use tracing::{debug, instrument}; | ||
|
|
||
| use crate::{create_clients, pb::{ | ||
| caikit::runtime::info::{ | ||
| info_service_client::InfoServiceClient, info_service_server::InfoService | ||
| }, | ||
| caikit_data_model::common::runtime::{ | ||
| ModelInfoRequest, ModelInfoResponse, RuntimeInfoRequest, RuntimeInfoResponse | ||
| } | ||
| }, ServiceAddr}; | ||
|
|
||
| const METADATA_NAME_MODEL_ID: &str = "mm-model-id"; | ||
|
|
||
| #[derive(Debug, Default)] | ||
| pub struct InfoServicer { | ||
| clients: HashMap<String, InfoServiceClient<LoadBalancedChannel>>, | ||
| } | ||
|
|
||
| impl InfoServicer { | ||
| pub async fn new( | ||
| default_target_port: u16, | ||
| client_tls: Option<&ClientTlsConfig>, | ||
| model_map: &HashMap<String, ServiceAddr>, | ||
| ) -> Self { | ||
| let clients = create_clients( | ||
| default_target_port, client_tls, model_map, InfoServiceClient::new | ||
| ).await; | ||
| Self { clients } | ||
| } | ||
|
|
||
| async fn client( | ||
| &self, | ||
| model_id: &str, | ||
| ) -> Result<InfoServiceClient<LoadBalancedChannel>, Status> { | ||
| Ok(self | ||
| .clients | ||
| .get(model_id) | ||
| .ok_or_else(|| Status::not_found(format!("Unrecognized model_id: {model_id}")))? | ||
| .clone()) | ||
| } | ||
| } | ||
|
|
||
| #[tonic::async_trait] | ||
| impl InfoService for InfoServicer { | ||
| #[instrument(skip_all)] | ||
| async fn get_models_info( | ||
| &self, | ||
| request: Request<ModelInfoRequest>, | ||
| ) -> Result<Response<ModelInfoResponse>, Status> { | ||
| let model_id = extract_model_id(&request)?; | ||
| let models_ids: &ModelInfoRequest = request.get_ref(); | ||
| if models_ids.model_ids.is_empty() { | ||
| return Ok(Response::new(ModelInfoResponse::default())); | ||
| } | ||
| debug!( | ||
| "Routing get models info request for Model ID {}", | ||
| model_id | ||
| ); | ||
| self.client(model_id) | ||
| .await? | ||
| .get_models_info(request) | ||
| .await | ||
| } | ||
| #[instrument(skip_all)] | ||
| async fn get_runtime_info( | ||
| &self, | ||
| _request: Request<RuntimeInfoRequest>, | ||
| ) -> Result<Response<RuntimeInfoResponse>, Status> { | ||
| Err(Status::unimplemented("not implemented")) | ||
| } | ||
| } | ||
|
|
||
| /// Extracts model_id from [`Request`] metadata. | ||
| fn extract_model_id<T>(request: &Request<T>) -> Result<&str, Status> { | ||
| let metadata = request.metadata(); | ||
| if !metadata.contains_key(METADATA_NAME_MODEL_ID) { | ||
| return Err(Status::new( | ||
| Code::InvalidArgument, | ||
| "Missing required model ID", | ||
| )); | ||
| } | ||
| let model_id = metadata | ||
| .get(METADATA_NAME_MODEL_ID) | ||
| .unwrap() | ||
| .to_str() | ||
| .unwrap(); | ||
| Ok(model_id) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| // Protocol Buffers - Google's data interchange format | ||
| // Copyright 2008 Google Inc. All rights reserved. | ||
| // https://developers.google.com/protocol-buffers/ | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without | ||
| // modification, are permitted provided that the following conditions are | ||
| // met: | ||
| // | ||
| // * Redistributions of source code must retain the above copyright | ||
| // notice, this list of conditions and the following disclaimer. | ||
| // * Redistributions in binary form must reproduce the above | ||
| // copyright notice, this list of conditions and the following disclaimer | ||
| // in the documentation and/or other materials provided with the | ||
| // distribution. | ||
| // * Neither the name of Google Inc. nor the names of its | ||
| // contributors may be used to endorse or promote products derived from | ||
| // this software without specific prior written permission. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| syntax = "proto3"; | ||
|
|
||
| package google.protobuf; | ||
|
|
||
| option cc_enable_arenas = true; | ||
| option go_package = "google.golang.org/protobuf/types/known/structpb"; | ||
| option java_package = "com.google.protobuf"; | ||
| option java_outer_classname = "StructProto"; | ||
| option java_multiple_files = true; | ||
| option objc_class_prefix = "GPB"; | ||
| option csharp_namespace = "Google.Protobuf.WellKnownTypes"; | ||
|
|
||
| // `Struct` represents a structured data value, consisting of fields | ||
| // which map to dynamically typed values. In some languages, `Struct` | ||
| // might be supported by a native representation. For example, in | ||
| // scripting languages like JS a struct is represented as an | ||
| // object. The details of that representation are described together | ||
| // with the proto support for the language. | ||
| // | ||
| // The JSON representation for `Struct` is JSON object. | ||
| message Struct { | ||
| // Unordered map of dynamically typed values. | ||
| map<string, Value> fields = 1; | ||
| } | ||
|
|
||
| // `Value` represents a dynamically typed value which can be either | ||
| // null, a number, a string, a boolean, a recursive struct value, or a | ||
| // list of values. A producer of value is expected to set one of these | ||
| // variants. Absence of any variant indicates an error. | ||
| // | ||
| // The JSON representation for `Value` is JSON value. | ||
| message Value { | ||
| // The kind of value. | ||
| oneof kind { | ||
| // Represents a null value. | ||
| NullValue null_value = 1; | ||
| // Represents a double value. | ||
| double number_value = 2; | ||
| // Represents a string value. | ||
| string string_value = 3; | ||
| // Represents a boolean value. | ||
| bool bool_value = 4; | ||
| // Represents a structured value. | ||
| Struct struct_value = 5; | ||
| // Represents a repeated `Value`. | ||
| ListValue list_value = 6; | ||
| } | ||
| } | ||
|
|
||
| // `NullValue` is a singleton enumeration to represent the null value for the | ||
| // `Value` type union. | ||
| // | ||
| // The JSON representation for `NullValue` is JSON `null`. | ||
| enum NullValue { | ||
| // Null value. | ||
| NULL_VALUE = 0; | ||
| } | ||
|
|
||
| // `ListValue` is a wrapper around a repeated field of values. | ||
| // | ||
| // The JSON representation for `ListValue` is JSON array. | ||
| message ListValue { | ||
| // Repeated field of dynamically typed values. | ||
| repeated Value values = 1; | ||
| } |