[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Python deps, base64 impl, add examples #426

Merged
merged 14 commits into from
Jun 12, 2024
Merged

Fix Python deps, base64 impl, add examples #426

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b7aa093
Fix python api deps
EricLBuehler Jun 12, 2024
fae4d7e
Fix deps and add examples
EricLBuehler Jun 12, 2024
b311e19
Update readmes with credit
EricLBuehler Jun 12, 2024
bf895f8
Fix links
EricLBuehler Jun 12, 2024
753969f
Fix base64 examples and configure higher body limit
EricLBuehler Jun 12, 2024
0b683e6
Fix base64 examples and configure higher body limit
EricLBuehler Jun 12, 2024
41af553
Cleaner way to load from file, base64, http
EricLBuehler Jun 12, 2024
ce2598f
Update example
EricLBuehler Jun 12, 2024
4e6a53b
Add loading from local img docs
EricLBuehler Jun 12, 2024
937d403
Update docs
EricLBuehler Jun 12, 2024
03b8dd1
Bump version to 0.1.18
EricLBuehler Jun 12, 2024
8f00d82
Clippy format and docs
EricLBuehler Jun 12, 2024
1177efa
Default profile for py is release
EricLBuehler Jun 12, 2024
b2790cd
Update readme to build in verbose
EricLBuehler Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleaner way to load from file, base64, http
  • Loading branch information
@EricLBuehler
EricLBuehler committed Jun 12, 2024
commit 41af5532ce161c76e798b4df6c675932c0981c85
40 changes: 25 additions & 15 deletions mistralrs-pyo3/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
use candle_core::{quantized::GgmlDType, Result};
use either::Either;
use indexmap::IndexMap;
use reqwest::StatusCode;
use std::{
cell::RefCell,
collections::HashMap,
fmt::Debug,
fs,
io::Read,
str::FromStr,
sync::{Arc, Mutex},
};
Expand Down Expand Up @@ -603,22 +604,31 @@
if !image_urls.is_empty() {
let mut images = Vec::new();
for url in image_urls {
let bytes = match reqwest::blocking::get(url.clone()) {
Ok(http_resp) => http_resp
.bytes()
.map_err(|e| PyValueError::new_err(e.to_string()))?
.to_vec(),
Err(e) => {
if e.status()
.is_some_and(|code| code == StatusCode::NOT_FOUND)
{
general_purpose::STANDARD
.decode(url)
.map_err(|e| PyValueError::new_err(e.to_string()))?
} else {
return Err(PyValueError::new_err(e.to_string()));
let bytes = if url.contains("http") {
// Read from http
match reqwest::blocking::get(url.clone()) {
Ok(http_resp) => http_resp
.bytes()
.map_err(|e| PyValueError::new_err(e.to_string()))?
.to_vec(),
Err(e) => {
return Err(PyValueError::new_err(format!("{e}")))
}
}
} else {

Check failure on line 618 in mistralrs-pyo3/src/lib.rs

View workflow job for this annotation

GitHub Actions / Clippy 

this `else { if .. }` block can be collapsed
if let Ok(mut f) = File::open(&url) {
// Read from local file
let metadata = fs::metadata(&url)
.map_err(|e| PyValueError::new_err(e.to_string()))?;
let mut buffer = vec![0; metadata.len() as usize];
f.read(&mut buffer)?;

Check failure on line 624 in mistralrs-pyo3/src/lib.rs

View workflow job for this annotation

GitHub Actions / Clippy 

read amount is not handled
buffer
} else {
// Decode with base64
general_purpose::STANDARD
.decode(url)
.map_err(|e| PyValueError::new_err(e.to_string()))?
}
};
images.push(
image::load_from_memory(&bytes)
Expand Down
26 changes: 18 additions & 8 deletions mistralrs-server/src/chat_completion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
collections::HashMap,
env,
error::Error,
fs::{self, File},
io::Read,
ops::Deref,
pin::Pin,
sync::Arc,
Expand Down Expand Up @@ -256,14 +258,22 @@
if !image_urls.is_empty() {
let mut images = Vec::new();
for url in image_urls {
let bytes = match reqwest::get(url.clone()).await {
Ok(http_resp) => http_resp.bytes().await?.to_vec(),
Err(e) => {
if e.status().is_some_and(|code| code == StatusCode::NOT_FOUND) {
general_purpose::STANDARD.decode(url)?
} else {
anyhow::bail!(e)
}
let bytes = if url.contains("http") {
// Read from http
match reqwest::get(url.clone()).await {
Ok(http_resp) => http_resp.bytes().await?.to_vec(),
Err(e) => anyhow::bail!(e),
}
} else {

Check failure on line 267 in mistralrs-server/src/chat_completion.rs

View workflow job for this annotation

GitHub Actions / Clippy 

this `else { if .. }` block can be collapsed
if let Ok(mut f) = File::open(&url) {
// Read from local file
let metadata = fs::metadata(&url)?;
let mut buffer = vec![0; metadata.len() as usize];
f.read(&mut buffer)?;

Check failure on line 272 in mistralrs-server/src/chat_completion.rs

View workflow job for this annotation

GitHub Actions / Clippy 

read amount is not handled
buffer
} else {
// Decode with base64
general_purpose::STANDARD.decode(url)?
}
};
images.push(image::load_from_memory(&bytes)?);
Expand Down
Loading