[router] Add rustfmt and set group imports by default (#11732)
This commit is contained in:
@@ -1,14 +1,18 @@
|
||||
use std::collections::{BTreeMap, HashMap};
|
||||
use std::sync::RwLock;
|
||||
use std::{
|
||||
collections::{BTreeMap, HashMap},
|
||||
sync::RwLock,
|
||||
};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use chrono::{DateTime, Utc};
|
||||
|
||||
use super::conversation_items::{
|
||||
make_item_id, ConversationItem, ConversationItemId, ConversationItemStorage, ListParams,
|
||||
Result, SortOrder,
|
||||
use super::{
|
||||
conversation_items::{
|
||||
make_item_id, ConversationItem, ConversationItemId, ConversationItemStorage, ListParams,
|
||||
Result, SortOrder,
|
||||
},
|
||||
conversations::ConversationId,
|
||||
};
|
||||
use super::conversations::ConversationId;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct MemoryConversationItemStorage {
|
||||
@@ -190,9 +194,10 @@ impl ConversationItemStorage for MemoryConversationItemStorage {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use chrono::{TimeZone, Utc};
|
||||
|
||||
use super::*;
|
||||
|
||||
fn make_item(
|
||||
item_type: &str,
|
||||
role: Option<&str>,
|
||||
|
||||
@@ -1,18 +1,21 @@
|
||||
use crate::config::OracleConfig;
|
||||
use crate::data_connector::conversation_items::{
|
||||
make_item_id, ConversationItem, ConversationItemId, ConversationItemStorage,
|
||||
ConversationItemStorageError, ListParams, Result as ItemResult, SortOrder,
|
||||
};
|
||||
use crate::data_connector::conversations::ConversationId;
|
||||
use std::{path::Path, sync::Arc, time::Duration};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use chrono::{DateTime, Utc};
|
||||
use deadpool::managed::{Manager, Metrics, Pool, PoolError, RecycleError, RecycleResult};
|
||||
use oracle::sql_type::ToSql;
|
||||
use oracle::Connection;
|
||||
use oracle::{sql_type::ToSql, Connection};
|
||||
use serde_json::Value;
|
||||
use std::path::Path;
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::{
|
||||
config::OracleConfig,
|
||||
data_connector::{
|
||||
conversation_items::{
|
||||
make_item_id, ConversationItem, ConversationItemId, ConversationItemStorage,
|
||||
ConversationItemStorageError, ListParams, Result as ItemResult, SortOrder,
|
||||
},
|
||||
conversations::ConversationId,
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct OracleConversationItemStorage {
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
use std::{
|
||||
fmt::{Display, Formatter},
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use chrono::{DateTime, Utc};
|
||||
use rand::RngCore;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
use std::fmt::{Display, Formatter};
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::conversations::ConversationId;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::{collections::HashMap, sync::Arc};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use parking_lot::RwLock;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::conversations::{
|
||||
Conversation, ConversationId, ConversationMetadata, ConversationStorage, NewConversation,
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
use crate::config::OracleConfig;
|
||||
use crate::data_connector::conversations::{
|
||||
Conversation, ConversationId, ConversationMetadata, ConversationStorage,
|
||||
ConversationStorageError, NewConversation, Result,
|
||||
};
|
||||
use std::{path::Path, sync::Arc, time::Duration};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use chrono::Utc;
|
||||
use deadpool::managed::{Manager, Metrics, Pool, PoolError, RecycleError, RecycleResult};
|
||||
use oracle::{sql_type::OracleType, Connection};
|
||||
use serde_json::Value;
|
||||
use std::path::Path;
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::{
|
||||
config::OracleConfig,
|
||||
data_connector::conversations::{
|
||||
Conversation, ConversationId, ConversationMetadata, ConversationStorage,
|
||||
ConversationStorageError, NewConversation, Result,
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct OracleConversationStorage {
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
use std::{
|
||||
fmt::{Display, Formatter},
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use chrono::{DateTime, Utc};
|
||||
use rand::RngCore;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::{Map as JsonMap, Value};
|
||||
use std::fmt::{Display, Formatter};
|
||||
use std::sync::Arc;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, PartialOrd, Ord)]
|
||||
pub struct ConversationId(pub String);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::{collections::HashMap, sync::Arc};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use parking_lot::RwLock;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::responses::{ResponseChain, ResponseId, ResponseStorage, Result, StoredResponse};
|
||||
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
use crate::config::OracleConfig;
|
||||
use crate::data_connector::responses::{
|
||||
ResponseChain, ResponseId, ResponseStorage, ResponseStorageError, Result as StorageResult,
|
||||
StoredResponse,
|
||||
};
|
||||
use std::{collections::HashMap, path::Path, sync::Arc, time::Duration};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use deadpool::managed::{Manager, Metrics, Pool, PoolError, RecycleError, RecycleResult};
|
||||
use oracle::{Connection, Row};
|
||||
use serde_json::Value;
|
||||
use std::collections::HashMap;
|
||||
use std::path::Path;
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::{
|
||||
config::OracleConfig,
|
||||
data_connector::responses::{
|
||||
ResponseChain, ResponseId, ResponseStorage, ResponseStorageError, Result as StorageResult,
|
||||
StoredResponse,
|
||||
},
|
||||
};
|
||||
|
||||
const SELECT_BASE: &str = "SELECT id, previous_response_id, input, instructions, output, \
|
||||
tool_calls, metadata, created_at, user_id, model, conversation_id, raw_response FROM responses";
|
||||
@@ -510,9 +511,10 @@ impl OracleErrorExt for ResponseStorageError {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use serde_json::json;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn parse_tool_calls_handles_empty_input() {
|
||||
assert!(parse_tool_calls(None).unwrap().is_empty());
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use std::{collections::HashMap, sync::Arc};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
/// Response identifier
|
||||
#[derive(Debug, Clone, Hash, Eq, PartialEq, Serialize, Deserialize)]
|
||||
|
||||
Reference in New Issue
Block a user