github-mirrors/shimmy
1
0
Fork 0
mirror of https://fastgit.cc/github.com/Michael-A-Kuykendall/shimmy synced 2026-05-01 06:12:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: format code with cargo fmt

Browse Source
This commit is contained in:
Michael A. Kuykendall
2025-12-07 19:00:47 -06:00
parent b08d14a59e
commit d2681186fb
2 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/auto_discovery.rs
View File

@@ -279,9 +279,13 @@ impl ModelAutoDiscovery {
/// Group sharded model files together (Issue #147)
/// Detects patterns like model-00001-of-00004.safetensors and groups them as single models
fn group_sharded_models(&self, dir: &Path, model_files: &[PathBuf]) -> Result<Vec<DiscoveredModel>> {
use std::collections::HashMap;
fn group_sharded_models(
&self,
dir: &Path,
model_files: &[PathBuf],
) -> Result<Vec<DiscoveredModel>> {
use regex::Regex;
use std::collections::HashMap;
let mut grouped_models = Vec::new();
let mut processed_files = std::collections::HashSet::new();
@@ -299,7 +303,10 @@ impl ModelAutoDiscovery {
let base_name = captures.get(1).unwrap().as_str();
let extension = captures.get(2).unwrap().as_str();
let group_key = format!("{}{}", base_name, extension);
shard_groups.entry(group_key).or_insert_with(Vec::new).push(file_path.clone());
shard_groups
.entry(group_key)
.or_insert_with(Vec::new)
.push(file_path.clone());
processed_files.insert(file_path.clone());
}
}
@@ -309,38 +316,47 @@ impl ModelAutoDiscovery {
for (group_key, files) in shard_groups {
if files.len() > 1 {
// Calculate total size
let total_size: u64 = files.iter()
let total_size: u64 = files
.iter()
.filter_map(|path| fs::metadata(path).ok().map(|m| m.len()))
.sum();
// Use directory name as model name for sharded models
let model_name = dir.file_name()
let model_name = dir
.file_name()
.and_then(|n| n.to_str())
.unwrap_or(&group_key)
.to_string();
// Create a descriptive path showing the sharded files
let first_file = &files[0];
let filename = first_file.file_name().and_then(|n| n.to_str()).unwrap_or("unknown");
let filename = first_file
.file_name()
.and_then(|n| n.to_str())
.unwrap_or("unknown");
let descriptive_path = if files.len() == 1 {
first_file.clone()
} else {
// Show first file with count of additional files
PathBuf::from(format!("{} (+{} more files)", first_file.display(), files.len() - 1))
PathBuf::from(format!(
"{} (+{} more files)",
first_file.display(),
files.len() - 1
))
};
let (model_type, parameter_count, quantization) = self.parse_filename(filename);
// CRITICAL: All GGUF files must use Llama backend
let backend_type = if first_file.extension().and_then(|s| s.to_str()) == Some("gguf") {
"Llama".to_string()
} else {
model_type
};
let backend_type =
if first_file.extension().and_then(|s| s.to_str()) == Some("gguf") {
"Llama".to_string()
} else {
model_type
};
// Look for paired LoRA adapter (check all files for LoRA)
let lora_path = files.iter()
.find_map(|path| self.find_lora_for_model(path));
let lora_path = files.iter().find_map(|path| self.find_lora_for_model(path));
grouped_models.push(DiscoveredModel {
name: model_name,

35
src/discovery.rs
View File

@@ -97,7 +97,10 @@ impl ModelDiscovery {
}
pub fn discover_models(&self) -> Result<Vec<DiscoveredModel>> {
println!("DEBUG: discover_models called, search_paths: {:?}", self.search_paths);
println!(
"DEBUG: discover_models called, search_paths: {:?}",
self.search_paths
);
let mut models = Vec::new();
for path in &self.search_paths {
@@ -144,10 +147,18 @@ impl ModelDiscovery {
/// Group sharded model files together (Issue #147)
/// Detects patterns like model-00001-of-00004.safetensors and groups them as single models
fn group_sharded_models(&self, dir: &Path, model_files: &[PathBuf]) -> Result<Vec<DiscoveredModel>> {
println!("DEBUG: group_sharded_models called for dir: {:?}, files: {}", dir, model_files.len());
use std::collections::HashMap;
fn group_sharded_models(
&self,
dir: &Path,
model_files: &[PathBuf],
) -> Result<Vec<DiscoveredModel>> {
println!(
"DEBUG: group_sharded_models called for dir: {:?}, files: {}",
dir,
model_files.len()
);
use regex::Regex;
use std::collections::HashMap;
let mut grouped_models = Vec::new();
let mut processed_files = std::collections::HashSet::new();
@@ -166,8 +177,14 @@ impl ModelDiscovery {
let base_name = captures.get(1).unwrap().as_str();
let extension = captures.get(2).unwrap().as_str();
let group_key = format!("{}{}", base_name, extension);
println!("DEBUG: Matched sharded file - base: {}, ext: {}, key: {}", base_name, extension, group_key);
shard_groups.entry(group_key).or_insert_with(Vec::new).push(file_path.clone());
println!(
"DEBUG: Matched sharded file - base: {}, ext: {}, key: {}",
base_name, extension, group_key
);
shard_groups
.entry(group_key)
.or_insert_with(Vec::new)
.push(file_path.clone());
processed_files.insert(file_path.clone());
} else {
println!("DEBUG: No match for: {}", filename);
@@ -179,12 +196,14 @@ impl ModelDiscovery {
for (group_key, files) in shard_groups {
if files.len() > 1 {
// Calculate total size
let total_size: u64 = files.iter()
let total_size: u64 = files
.iter()
.filter_map(|path| fs::metadata(path).ok().map(|m| m.len()))
.sum();
// Use directory name as model name for sharded models
let model_name = dir.file_name()
let model_name = dir
.file_name()
.and_then(|n| n.to_str())
.unwrap_or(&group_key)
.to_string();