[model-gateway] change rust package name to sgl-model-gateway instead (#14283)
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
[package]
|
||||
name = "sglang-router-golang"
|
||||
version = "0.2.2"
|
||||
name = "sgl-model-gateway-golang"
|
||||
version = "0.2.3"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
name = "sglang_router_rs"
|
||||
name = "sgl_model_gateway_go"
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
[dependencies]
|
||||
@@ -18,14 +18,13 @@ once_cell = "1.21.3"
|
||||
futures-util = "0.3"
|
||||
tracing = "0.1"
|
||||
|
||||
[dependencies.sglang-router]
|
||||
[dependencies.sgl-model-gateway]
|
||||
path = "../.."
|
||||
default-features = true
|
||||
package = "sglang-router"
|
||||
|
||||
[features]
|
||||
default = []
|
||||
vendored-openssl = ["sglang-router/vendored-openssl"]
|
||||
vendored-openssl = ["sgl-model-gateway/vendored-openssl"]
|
||||
|
||||
[profile.release]
|
||||
opt-level = "z" # Optimize for size
|
||||
|
||||
@@ -8,11 +8,11 @@ use tokio::runtime::Runtime;
|
||||
use once_cell::sync::Lazy;
|
||||
use uuid::Uuid;
|
||||
|
||||
use sglang_router::tokenizer::create_tokenizer_from_file;
|
||||
use sglang_router::tokenizer::traits::Tokenizer;
|
||||
use sglang_router::grpc_client::sglang_scheduler::SglangSchedulerClient;
|
||||
use sglang_router::protocols::chat::ChatCompletionRequest;
|
||||
use sglang_router::routers::grpc::utils::{process_chat_messages, generate_tool_constraints};
|
||||
use sgl_model_gateway::tokenizer::create_tokenizer_from_file;
|
||||
use sgl_model_gateway::tokenizer::traits::Tokenizer;
|
||||
use sgl_model_gateway::grpc_client::sglang_scheduler::SglangSchedulerClient;
|
||||
use sgl_model_gateway::protocols::chat::ChatCompletionRequest;
|
||||
use sgl_model_gateway::routers::grpc::utils::{process_chat_messages, generate_tool_constraints};
|
||||
|
||||
use super::error::{SglErrorCode, set_error_message};
|
||||
use super::grpc_converter::sgl_grpc_response_converter_create;
|
||||
|
||||
@@ -9,12 +9,12 @@ use serde_json::Value;
|
||||
use tokio::runtime::Runtime;
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
use sglang_router::tokenizer::traits::Tokenizer;
|
||||
use sglang_router::tokenizer::stream::DecodeStream;
|
||||
use sglang_router::tool_parser::ToolParser;
|
||||
use sglang_router::protocols::common::{Tool, ToolChoice, ToolChoiceValue, ToolCallDelta, FunctionCallDelta, Usage, StringOrArray};
|
||||
use sglang_router::tokenizer::stop::StopSequenceDecoder;
|
||||
use sglang_router::grpc_client::sglang_proto as proto;
|
||||
use sgl_model_gateway::tokenizer::traits::Tokenizer;
|
||||
use sgl_model_gateway::tokenizer::stream::DecodeStream;
|
||||
use sgl_model_gateway::tool_parser::ToolParser;
|
||||
use sgl_model_gateway::protocols::common::{Tool, ToolChoice, ToolChoiceValue, ToolCallDelta, FunctionCallDelta, Usage, StringOrArray};
|
||||
use sgl_model_gateway::tokenizer::stop::StopSequenceDecoder;
|
||||
use sgl_model_gateway::grpc_client::sglang_proto as proto;
|
||||
|
||||
use super::error::{SglErrorCode, set_error_message, clear_error_message};
|
||||
use super::tokenizer::TokenizerHandle;
|
||||
@@ -22,9 +22,9 @@ use super::utils::generate_tool_call_id;
|
||||
|
||||
/// Global parser factory (initialized once)
|
||||
// Use the re-exported ParserFactory from tool_parser module
|
||||
static PARSER_FACTORY: Lazy<sglang_router::tool_parser::ParserFactory> = Lazy::new(|| {
|
||||
static PARSER_FACTORY: Lazy<sgl_model_gateway::tool_parser::ParserFactory> = Lazy::new(|| {
|
||||
// ParserFactory is re-exported from tool_parser::factory, so we can use it directly
|
||||
sglang_router::tool_parser::ParserFactory::default()
|
||||
sgl_model_gateway::tool_parser::ParserFactory::default()
|
||||
});
|
||||
|
||||
/// Global tokio runtime for async operations
|
||||
@@ -151,7 +151,7 @@ pub unsafe extern "C" fn sgl_grpc_response_converter_create(
|
||||
// Create stop decoder if needed
|
||||
let stop_decoder = if stop.is_some() || stop_token_ids.is_some() {
|
||||
Some(Arc::new(tokio::sync::Mutex::new(
|
||||
sglang_router::routers::grpc::utils::create_stop_decoder(
|
||||
sgl_model_gateway::routers::grpc::utils::create_stop_decoder(
|
||||
&tokenizer,
|
||||
stop.as_ref(),
|
||||
stop_token_ids.as_ref(),
|
||||
@@ -389,9 +389,9 @@ pub(crate) async fn convert_proto_chunk_to_openai(
|
||||
request_id: &str,
|
||||
created: u64,
|
||||
system_fingerprint: Option<&str>,
|
||||
) -> Result<Option<sglang_router::protocols::chat::ChatCompletionStreamResponse>, String> {
|
||||
use sglang_router::grpc_client::sglang_proto::generate_response::Response::*;
|
||||
use sglang_router::protocols::chat::{ChatCompletionStreamResponse, ChatMessageDelta, ChatStreamChoice};
|
||||
) -> Result<Option<sgl_model_gateway::protocols::chat::ChatCompletionStreamResponse>, String> {
|
||||
use sgl_model_gateway::grpc_client::sglang_proto::generate_response::Response::*;
|
||||
use sgl_model_gateway::protocols::chat::{ChatCompletionStreamResponse, ChatMessageDelta, ChatStreamChoice};
|
||||
|
||||
match proto_response.response {
|
||||
Some(Chunk(chunk)) => {
|
||||
@@ -427,19 +427,19 @@ pub(crate) async fn convert_proto_chunk_to_openai(
|
||||
let mut text = String::new();
|
||||
for &token_id in &chunk.token_ids {
|
||||
match decoder_guard.process_token(token_id).unwrap_or_else(|_| {
|
||||
sglang_router::tokenizer::stop::SequenceDecoderOutput::Held
|
||||
sgl_model_gateway::tokenizer::stop::SequenceDecoderOutput::Held
|
||||
}) {
|
||||
sglang_router::tokenizer::stop::SequenceDecoderOutput::Text(t) => {
|
||||
sgl_model_gateway::tokenizer::stop::SequenceDecoderOutput::Text(t) => {
|
||||
text.push_str(&t);
|
||||
}
|
||||
sglang_router::tokenizer::stop::SequenceDecoderOutput::StoppedWithText(t) => {
|
||||
sgl_model_gateway::tokenizer::stop::SequenceDecoderOutput::StoppedWithText(t) => {
|
||||
text.push_str(&t);
|
||||
break;
|
||||
}
|
||||
sglang_router::tokenizer::stop::SequenceDecoderOutput::Stopped => {
|
||||
sgl_model_gateway::tokenizer::stop::SequenceDecoderOutput::Stopped => {
|
||||
break;
|
||||
}
|
||||
sglang_router::tokenizer::stop::SequenceDecoderOutput::Held => {}
|
||||
sgl_model_gateway::tokenizer::stop::SequenceDecoderOutput::Held => {}
|
||||
}
|
||||
}
|
||||
text
|
||||
|
||||
@@ -23,7 +23,7 @@ use tokio::runtime::Runtime;
|
||||
use once_cell::sync::Lazy;
|
||||
use futures_util::StreamExt;
|
||||
|
||||
use sglang_router::grpc_client::{sglang_proto as proto, sglang_scheduler::{SglangSchedulerClient, AbortOnDropStream}};
|
||||
use sgl_model_gateway::grpc_client::{sglang_proto as proto, sglang_scheduler::{SglangSchedulerClient, AbortOnDropStream}};
|
||||
|
||||
use super::error::{SglErrorCode, set_error_message};
|
||||
use super::grpc_converter::{GrpcResponseConverterHandle, convert_proto_chunk_to_openai};
|
||||
|
||||
@@ -6,7 +6,7 @@ use std::ptr;
|
||||
use std::sync::Arc;
|
||||
use serde_json::Value;
|
||||
|
||||
use sglang_router::tokenizer::{
|
||||
use sgl_model_gateway::tokenizer::{
|
||||
create_tokenizer_from_file,
|
||||
traits::Tokenizer as TokenizerTrait,
|
||||
chat_template::ChatTemplateParams,
|
||||
|
||||
@@ -9,8 +9,8 @@ use serde_json::{json, Value};
|
||||
use tokio::runtime::Runtime;
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
use sglang_router::tool_parser::{ParserFactory, ToolParser};
|
||||
use sglang_router::protocols::common::Tool;
|
||||
use sgl_model_gateway::tool_parser::{ParserFactory, ToolParser};
|
||||
use sgl_model_gateway::protocols::common::Tool;
|
||||
|
||||
use super::error::{SglErrorCode, set_error_message, clear_error_message};
|
||||
use super::utils::generate_tool_call_id;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "sglang-router-python"
|
||||
version = "0.2.2"
|
||||
name = "sgl-model-gateway-python"
|
||||
version = "0.2.3"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
@@ -11,14 +11,13 @@ crate-type = ["cdylib"]
|
||||
pyo3 = { version = "0.27.1", features = ["extension-module", "abi3-py38"] }
|
||||
tokio = { version = "1.42.0", features = ["full"] }
|
||||
|
||||
[dependencies.sglang-router]
|
||||
[dependencies.sgl-model-gateway]
|
||||
path = "../.."
|
||||
default-features = true
|
||||
package = "sglang-router"
|
||||
|
||||
[features]
|
||||
default = ["pyo3/extension-module"]
|
||||
vendored-openssl = ["sglang-router/vendored-openssl"]
|
||||
vendored-openssl = ["sgl-model-gateway/vendored-openssl"]
|
||||
|
||||
[profile.ci]
|
||||
inherits = "release"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use pyo3::prelude::*;
|
||||
use sglang_router::*;
|
||||
use sgl_model_gateway::*;
|
||||
use std::collections::HashMap;
|
||||
|
||||
// Define the enums with PyO3 bindings
|
||||
|
||||
Reference in New Issue
Block a user