maxheadroom/insta-import-pixelfed
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages 1 Wiki Activity Actions

adding more error handling and debugging ouptut

Browse source
This commit is contained in:
Falko Zurell 2025-03-05 09:12:52 +01:00
parent b4a3acd2d0
commit 8220fceadf
2 changed files with 109 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
src/image_description.rs
View file

@ -1,12 +1,10 @@
use base64::{Engine as _, engine::general_purpose::STANDARD}; use base64::{engine::general_purpose::STANDARD, Engine as _};
use log::{debug, error, info, log_enabled, Level};
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
use serde_json::json; use serde_json::json;
use std::time::Duration;
use log::{debug, error, log_enabled, info, Level};
use std::str; use std::str;
use std::time::Duration;
// module to hold all code for generating/fetching image descriptions // module to hold all code for generating/fetching image descriptions
// Input is the image name // Input is the image name
@ -15,15 +13,14 @@ pub struct ChatGPTConfig {
pub openai_api_key: String, pub openai_api_key: String,
pub openai_api_url: String, pub openai_api_url: String,
pub openai_model: String, pub openai_model: String,
pub openai_prompt: String pub openai_prompt: String,
} }
pub struct OllamaConfig { pub struct OllamaConfig {
pub ollama_api_key: String, pub ollama_api_key: String,
pub ollama_api_url: String, pub ollama_api_url: String,
pub ollama_model: String, pub ollama_model: String,
pub ollama_prompt: String pub ollama_prompt: String,
} }
pub struct FileConfig { pub struct FileConfig {
@ -38,29 +35,34 @@ struct LlamaModel {
format: String, format: String,
suffix: String, suffix: String,
images: Vec<String>, images: Vec<String>,
keep_alive: i8 keep_alive: i8,
} }
// fetch the imagedescription from a file named like the Image // fetch the imagedescription from a file named like the Image
pub fn get_description_from_file(image_name: String , file_config: FileConfig) -> Result<String, Box<dyn super::Error>> { pub fn get_description_from_file(
image_name: String,
file_config: FileConfig,
) -> Result<String, Box<dyn super::Error>> {
//read image caption from a local file that //read image caption from a local file that
//has the same name than the image with the extension ".caption.txt" //has the same name than the image with the extension ".caption.txt"
let caption_extension = file_config.caption_extension; let caption_extension = file_config.caption_extension;
let captionname = format!("{}{}", image_name, caption_extension); let captionname = format!("{}{}", image_name, caption_extension);
debug!("Looking for {}", &captionname); debug!("Looking for {}", &captionname);
let caption_data = std::fs::read_to_string(captionname); let caption_data = std::fs::read_to_string(captionname);
println!("Description fetched successfully from FILE");
Ok(caption_data.unwrap()) Ok(caption_data.unwrap())
} }
// fetch image description from ChatGPT // fetch image description from ChatGPT
pub fn get_description_from_chatgpt(image_name: String, chatgpt_config: self::ChatGPTConfig) -> Result<String, Box<dyn super::Error>> { pub fn get_description_from_chatgpt(
image_name: String,
chatgpt_config: self::ChatGPTConfig,
) -> Result<String, Box<dyn super::Error>> {
// Read and encode image // Read and encode image
let image_data = std::fs::read(image_name)?; let image_data = std::fs::read(image_name)?;
// Base64 encode the image for ChatGTP API // Base64 encode the image for ChatGTP API
let base64_image = STANDARD.encode(image_data); let base64_image = STANDARD.encode(image_data);
@ -68,30 +70,33 @@ pub fn get_description_from_chatgpt(image_name: String, chatgpt_config: self::C
let client = reqwest::blocking::Client::new(); let client = reqwest::blocking::Client::new();
let response = client let response = client
.post(chatgpt_config.openai_api_url) .post(chatgpt_config.openai_api_url)
.header("Authorization", format!("Bearer {}", chatgpt_config.openai_api_key)) .header(
"Authorization",
format!("Bearer {}", chatgpt_config.openai_api_key),
)
.header("Content-Type", "application/json") .header("Content-Type", "application/json")
.json(&super::json!({ .json(&super::json!({
"model": chatgpt_config.openai_model, "model": chatgpt_config.openai_model,
"max_tokens": 300, "max_tokens": 300,
"messages": [ "messages": [
{ {
"role": "user", "role": "user",
"content": [ "content": [
{ {
"type": "text", "type": "text",
"text": chatgpt_config.openai_prompt.to_string(), "text": chatgpt_config.openai_prompt.to_string(),
}, },
{ {
"type": "image_url", "type": "image_url",
"image_url": { "image_url": {
"url": format!("data:image/jpeg;base64,{}", base64_image) "url": format!("data:image/jpeg;base64,{}", base64_image)
} }
} }
] ]
} }
] ]
})) }))
.send(); .send();
// Improved error handling for API response // Improved error handling for API response
//if !response.unwrap().status().is_success() { //if !response.unwrap().status().is_success() {
@ -102,25 +107,26 @@ pub fn get_description_from_chatgpt(image_name: String, chatgpt_config: self::C
let result: super::Value = response.unwrap().json()?; let result: super::Value = response.unwrap().json()?;
// More detailed error handling for JSON parsing // More detailed error handling for JSON parsing
let description = result["choices"] let description = result["choices"].get(0).ok_or("No choices in response")?["message"]
.get(0) ["content"]
.ok_or("No choices in response")? .as_str()
["message"]["content"] .ok_or("Invalid content format in response")?
.as_str() .to_string();
.ok_or("Invalid content format in response")? println!("Description generated successfully from ChatGPT");
.to_string();
Ok(description) Ok(description)
} }
// fetch images description from own OLLAMA server // fetch images description from own OLLAMA server
pub fn get_description_from_ollama(image_name: String, ollama_config: OllamaConfig) -> Result<String, Box<dyn super::Error>> { pub fn get_description_from_ollama(
image_name: String,
ollama_config: OllamaConfig,
) -> Result<String, Box<dyn super::Error>> {
// Read and encode image // Read and encode image
let image_data = std::fs::read(image_name)?; let image_data = std::fs::read(image_name)?;
// Base64 encode the image for ChatGTP API // Base64 encode the image for ChatGTP API
let base64_image = STANDARD.encode(image_data); let base64_image = STANDARD.encode(image_data);
// Create the JSON payload // Create the JSON payload
let payload = json!({ let payload = json!({
"model": ollama_config.ollama_model.to_string(), "model": ollama_config.ollama_model.to_string(),
@ -129,22 +135,21 @@ pub fn get_description_from_ollama(image_name: String, ollama_config: OllamaCon
"images": [base64_image] "images": [base64_image]
}); });
debug!("Payload for image OLLAMA API: \n{}", payload.clone());
debug!("Payload for image OLLAMA API: \n{}", payload.clone());
// println!("JSON output:\n{}", json.clone()); // println!("JSON output:\n{}", json.clone());
// Create ChatGPT API request // Create ChatGPT API request
// let client = reqwest::blocking::Client::new(); // let client = reqwest::blocking::Client::new();
let client = reqwest::blocking::ClientBuilder::new() let client = reqwest::blocking::ClientBuilder::new()
.connect_timeout(Duration::new(30, 0)) .connect_timeout(Duration::new(30, 0))
.timeout(Duration::new(300,0)) .timeout(Duration::new(300, 0))
.connection_verbose(true).build()?; .connection_verbose(true)
.build()?;
let response = client let response = client
.post(ollama_config.ollama_api_url) .post(ollama_config.ollama_api_url)
.header("Content-Type", "application/json") .header("Content-Type", "application/json")
.json(&payload).send(); .json(&payload)
.send();
let response = match response { let response = match response {
Ok(response) => { Ok(response) => {
@ -174,7 +179,6 @@ pub fn get_description_from_ollama(image_name: String, ollama_config: OllamaCon
}; };
info!("Description generated by OLLAMA: {}", &description); info!("Description generated by OLLAMA: {}", &description);
println!("Description generated successfully from OLLAMA");
Ok(description) Ok(description)
} }

45
src/pixelfed.rs
View file

@ -31,6 +31,8 @@ pub fn bulk_upload_images(
) -> Result<(), Box<dyn Error>> { ) -> Result<(), Box<dyn Error>> {
let mut media_ids = Vec::new(); let mut media_ids = Vec::new();
let mut media_descriptions = Vec::new(); let mut media_descriptions = Vec::new();
// generate our Pixelfed specific Configuration from the given global config
let pxl_config = PixelfedConfig { let pxl_config = PixelfedConfig {
pixelfed_url: config.pixelfed_url.clone(), pixelfed_url: config.pixelfed_url.clone(),
pixelfed_access_token: config.pixelfed_access_token.clone(), pixelfed_access_token: config.pixelfed_access_token.clone(),
@ -38,8 +40,11 @@ pub fn bulk_upload_images(
pixelfed_default_text: config.pixelfed_default_text.clone(), pixelfed_default_text: config.pixelfed_default_text.clone(),
pixelfed_batch_size: config.pixelfed_batch_size.clone(), pixelfed_batch_size: config.pixelfed_batch_size.clone(),
}; };
let url = format!("{}/api/v1/media", config.pixelfed_url.clone());
// construct the full URL for the Pixelfed Upload
let url = format!("{}/api/v1/media", pxl_config.pixelfed_url.clone());
// Iterate over all the images we were given
for image_path in images { for image_path in images {
let client = match reqwest::blocking::ClientBuilder::new() let client = match reqwest::blocking::ClientBuilder::new()
.connect_timeout(Duration::new(30, 0)) .connect_timeout(Duration::new(30, 0))
@ -69,10 +74,16 @@ pub fn bulk_upload_images(
"Fetching image description from ChatGPT for {}", "Fetching image description from ChatGPT for {}",
&image_path.to_string() &image_path.to_string()
); );
description = super::image_description::get_description_from_chatgpt( description = match super::image_description::get_description_from_chatgpt(
image_path.clone().to_string(), image_path.clone().to_string(),
im_config, im_config,
)?; ) {
Ok(description) => description,
Err(e) => {
error!("Failed to fetch image description from ChatGPT for {}", e);
return Err(Box::from(e));
}
};
media_descriptions.push(description.clone()); media_descriptions.push(description.clone());
} }
super::Mode::File => { super::Mode::File => {
@ -83,10 +94,17 @@ pub fn bulk_upload_images(
"Fetching image description from File for {}", "Fetching image description from File for {}",
&image_path.to_string() &image_path.to_string()
); );
description = super::image_description::get_description_from_file( description = match super::image_description::get_description_from_file(
image_path.clone().to_string(), image_path.clone().to_string(),
im_config, im_config,
)?; ) {
Ok(description) => description,
Err(e) => {
error!("Failed to fetch image description from File for {}", e);
return Err(Box::from(e));
}
};
info!("Description generated by ChatGPT: {}", &description.clone());
media_descriptions.push(description.clone()); media_descriptions.push(description.clone());
} }
super::Mode::Local => { super::Mode::Local => {
@ -100,11 +118,17 @@ pub fn bulk_upload_images(
"Fetching image description from OLLAMA for {}", "Fetching image description from OLLAMA for {}",
&image_path.to_string() &image_path.to_string()
); );
description = super::image_description::get_description_from_ollama( description = match super::image_description::get_description_from_ollama(
image_path.clone().to_string(), image_path.clone().to_string(),
im_config, im_config,
)?; ) {
debug!("Description generated by OLLAMA: {}", &description.clone()); Ok(description) => description,
Err(e) => {
error!("Failed to fetch image description from OLLAMA for {}", e);
return Err(Box::from(e));
}
};
info!("Description generated by OLLAMA: {}", &description.clone());
media_descriptions.push(description.clone()); media_descriptions.push(description.clone());
} }
} }
@ -114,13 +138,14 @@ pub fn bulk_upload_images(
// construct the upload form for Pixelfed Upload of a single image including image description // construct the upload form for Pixelfed Upload of a single image including image description
let form = match reqwest::blocking::multipart::Form::new() let form = match reqwest::blocking::multipart::Form::new()
.text("description", description.clone()) .text("description", description.clone())
.file("file", image_path) { .file("file", image_path)
{
Ok(f) => f, Ok(f) => f,
Err(e) => { Err(e) => {
error!("Failed to construct multipart form: {}", e); error!("Failed to construct multipart form: {}", e);
return Err(Box::from(e)); return Err(Box::from(e));
} }
}; };
// upload the form to Pixelfed // upload the form to Pixelfed
let res = client let res = client