mirror of
https://github.com/katanemo/plano.git
synced 2026-06-17 15:25:17 +02:00
upgrade rust to 1.93.0 and fix pre-commit
This commit is contained in:
parent
28a4242c6e
commit
2cd488d8df
5 changed files with 29 additions and 35 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
# build docker image for arch gateway
|
# build docker image for arch gateway
|
||||||
FROM rust:1.92.0 AS builder
|
FROM rust:1.93.0 AS builder
|
||||||
RUN rustup -v target add wasm32-wasip1
|
RUN rustup -v target add wasm32-wasip1
|
||||||
WORKDIR /arch
|
WORKDIR /arch
|
||||||
COPY crates .
|
COPY crates .
|
||||||
|
|
|
||||||
|
|
@ -51,17 +51,14 @@ pub fn replace_params_in_path(
|
||||||
|
|
||||||
// add default values
|
// add default values
|
||||||
for param in prompt_target_params.iter() {
|
for param in prompt_target_params.iter() {
|
||||||
if !vars_replaced.contains(¶m.name) && param.default.is_some() {
|
if !vars_replaced.contains(¶m.name) {
|
||||||
let default_val = param.default.as_ref().unwrap();
|
if let Some(default_val) = ¶m.default {
|
||||||
params.insert(param.name.clone(), default_val.clone());
|
params.insert(param.name.clone(), default_val.clone());
|
||||||
if query_string_replaced.contains("?") {
|
if query_string_replaced.contains("?") {
|
||||||
query_string_replaced.push_str(&format!("&{}={}", param.name, default_val));
|
query_string_replaced.push_str(&format!("&{}={}", param.name, default_val));
|
||||||
} else {
|
} else {
|
||||||
query_string_replaced.push_str(&format!(
|
query_string_replaced.push_str(&format!("?{}={}", param.name, default_val));
|
||||||
"?{}={}",
|
}
|
||||||
param.name,
|
|
||||||
param.default.as_ref().unwrap()
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -327,8 +327,7 @@ impl TryFrom<(SseEvent, &SupportedAPIsFromClient, &SupportedUpstreamAPIs)> for S
|
||||||
}
|
}
|
||||||
|
|
||||||
// If has data, parse the data as a provider stream response (business logic layer)
|
// If has data, parse the data as a provider stream response (business logic layer)
|
||||||
if transformed_event.data.is_some() {
|
if let Some(data_str) = &transformed_event.data {
|
||||||
let data_str = transformed_event.data.as_ref().unwrap();
|
|
||||||
let data_bytes = data_str.as_bytes();
|
let data_bytes = data_str.as_bytes();
|
||||||
let transformed_response: ProviderStreamResponseType =
|
let transformed_response: ProviderStreamResponseType =
|
||||||
ProviderStreamResponseType::try_from((data_bytes, client_api, upstream_api))?;
|
ProviderStreamResponseType::try_from((data_bytes, client_api, upstream_api))?;
|
||||||
|
|
|
||||||
|
|
@ -216,12 +216,12 @@ impl HttpContext for StreamContext {
|
||||||
("x-envoy-upstream-rq-timeout-ms", timeout_str.as_str()),
|
("x-envoy-upstream-rq-timeout-ms", timeout_str.as_str()),
|
||||||
];
|
];
|
||||||
|
|
||||||
if self.request_id.is_some() {
|
if let Some(request_id) = &self.request_id {
|
||||||
headers.push((REQUEST_ID_HEADER, self.request_id.as_ref().unwrap()));
|
headers.push((REQUEST_ID_HEADER, request_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.traceparent.is_some() {
|
if let Some(traceparent) = &self.traceparent {
|
||||||
headers.push((TRACE_PARENT_HEADER, self.traceparent.as_ref().unwrap()));
|
headers.push((TRACE_PARENT_HEADER, traceparent));
|
||||||
}
|
}
|
||||||
|
|
||||||
let call_args = CallArgs::new(
|
let call_args = CallArgs::new(
|
||||||
|
|
|
||||||
|
|
@ -183,8 +183,8 @@ impl StreamContext {
|
||||||
("x-envoy-upstream-rq-timeout-ms", timeout_str.as_str()),
|
("x-envoy-upstream-rq-timeout-ms", timeout_str.as_str()),
|
||||||
];
|
];
|
||||||
|
|
||||||
if self.request_id.is_some() {
|
if let Some(request_id) = &self.request_id {
|
||||||
headers.push((REQUEST_ID_HEADER, self.request_id.as_ref().unwrap()));
|
headers.push((REQUEST_ID_HEADER, request_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
let call_args = CallArgs::new(
|
let call_args = CallArgs::new(
|
||||||
|
|
@ -437,12 +437,12 @@ impl StreamContext {
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
if self.request_id.is_some() {
|
if let Some(request_id) = &self.request_id {
|
||||||
headers.insert(REQUEST_ID_HEADER, self.request_id.as_ref().unwrap());
|
headers.insert(REQUEST_ID_HEADER, request_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.traceparent.is_some() {
|
if let Some(traceparent) = &self.traceparent {
|
||||||
headers.insert(TRACE_PARENT_HEADER, self.traceparent.as_ref().unwrap());
|
headers.insert(TRACE_PARENT_HEADER, traceparent);
|
||||||
}
|
}
|
||||||
|
|
||||||
// override http headers that are set in the prompt target
|
// override http headers that are set in the prompt target
|
||||||
|
|
@ -648,7 +648,15 @@ impl StreamContext {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn generate_tool_call_message(&mut self) -> Message {
|
pub fn generate_tool_call_message(&mut self) -> Message {
|
||||||
if self.arch_fc_response.is_none() {
|
if let Some(arch_fc_response) = &self.arch_fc_response {
|
||||||
|
Message {
|
||||||
|
role: ASSISTANT_ROLE.to_string(),
|
||||||
|
content: Some(ContentType::Text(arch_fc_response.clone())),
|
||||||
|
model: Some(ARCH_FC_MODEL_NAME.to_string()),
|
||||||
|
tool_calls: None,
|
||||||
|
tool_call_id: None,
|
||||||
|
}
|
||||||
|
} else {
|
||||||
info!("arch_fc_response is none, generating tool call message");
|
info!("arch_fc_response is none, generating tool call message");
|
||||||
Message {
|
Message {
|
||||||
role: ASSISTANT_ROLE.to_string(),
|
role: ASSISTANT_ROLE.to_string(),
|
||||||
|
|
@ -657,16 +665,6 @@ impl StreamContext {
|
||||||
tool_calls: self.tool_calls.clone(),
|
tool_calls: self.tool_calls.clone(),
|
||||||
tool_call_id: None,
|
tool_call_id: None,
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
Message {
|
|
||||||
role: ASSISTANT_ROLE.to_string(),
|
|
||||||
content: Some(ContentType::Text(
|
|
||||||
self.arch_fc_response.as_ref().unwrap().clone(),
|
|
||||||
)),
|
|
||||||
model: Some(ARCH_FC_MODEL_NAME.to_string()),
|
|
||||||
tool_calls: None,
|
|
||||||
tool_call_id: None,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue