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

added debugging output and logging

Browse source
This commit is contained in:
Falko Zurell 2025-03-04 21:37:41 +01:00
parent 00470d0438
commit abefe95a83
3 changed files with 51 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/image_description.rs
View file

@ -3,7 +3,7 @@ use serde::Deserialize;
use serde::Serialize;
use serde_json::json;
use std::time::Duration;
use log::{debug, error, log_enabled, info, Level};
@ -13,14 +13,16 @@ use std::time::Duration;
pub struct ChatGPTConfig {
pub openai_api_key: String,
pub openai_api_url: String,
pub openai_model: String
pub openai_model: String,
pub openai_prompt: String
}
pub struct OllamaConfig {
pub ollama_api_key: String,
pub ollama_api_url: String,
pub ollama_model: String
pub ollama_model: String,
pub ollama_prompt: String
}
pub struct FileConfig {
@ -44,7 +46,7 @@ pub fn get_description_from_file(image_name: String , file_config: FileConfig)
let caption_extension = file_config.caption_extension;
let captionname = format!("{}{}", image_name, caption_extension);
println!("Looking for {}",captionname);
debug!("Looking for {}", &captionname);
let caption_data = std::fs::read_to_string(captionname);
@ -76,7 +78,7 @@ pub fn get_description_from_chatgpt(image_name: String, chatgpt_config: self::C
"content": [
{
"type": "text",
"text": "Please describe this image concisely for use as an alt text description. Focus on key visual elements and context."
"text": chatgpt_config.openai_prompt.to_string(),
},
{
"type": "image_url",
@ -121,12 +123,12 @@ pub fn get_description_from_ollama(image_name: String, ollama_config: OllamaCon
// Create the JSON payload
let payload = json!({
"model": ollama_config.ollama_model.to_string(),
"prompt": "Can you complete this sentence: This picture shows... Try to be as accurate as possible but keep the description simple and shorter than 5000 characters.",
"prompt": ollama_config.ollama_prompt.to_string(),
"stream": false,
"images": [base64_image]
});
debug!("Payload for image OLLAMA API: \n{}", &payload.to_string());
// println!("JSON output:\n{}", json.clone());
// Create ChatGPT API request
// let client = reqwest::blocking::Client::new();
@ -144,11 +146,11 @@ pub fn get_description_from_ollama(image_name: String, ollama_config: OllamaCon
// Improved error handling for API response
// Check for HTTP errors
if response.as_ref().unwrap().status().is_success() {
println!("success!");
debug!("success!");
} else if response.as_ref().unwrap().status().is_server_error() {
println!("server error!");
error!("server error!");
} else {
println!("Something else happened. Status: {:?}", response.as_ref().unwrap().status());
error!("Something else happened. Status: {:?}", response.as_ref().unwrap().status());
}
@ -164,7 +166,7 @@ pub fn get_description_from_ollama(image_name: String, ollama_config: OllamaCon
}
println!("Description generated by OLLAMA: {}", description.clone());
debug!("Description generated by OLLAMA: {}", &description.clone());
Ok(description)

16
src/main.rs
View file

@ -6,6 +6,8 @@ use std::fs::File;
use std::io::BufReader;
use clap::{Parser, ValueEnum};
use std::path::PathBuf;
use log::{debug, error, log_enabled, info, Level};
mod pixelfed;
pub mod image_description;
@ -59,6 +61,7 @@ struct Config {
ollama_api_url: String,
ollama_model: String,
caption_extension: String,
prompt: String,
}
@ -96,6 +99,8 @@ fn get_jpeg_files(directory: &str) -> Vec<String> {
fn main() -> Result<(), Box<dyn Error>> {
env_logger::init();
let args = Cli::parse();
//if args.len() < 2 || args.len() > 3 {
@ -114,11 +119,12 @@ fn get_jpeg_files(directory: &str) -> Vec<String> {
None => {my_config = "config.json".to_string()},
}
println!("effective config file: {}", my_config);
debug!("effective config file: {}", &my_config);
let mut config = load_config(my_config).unwrap();
println!("Config OK? true");
debug!("Config OK?: " );
// Overwrite config values with command line arguments
match args.visibility {
@ -131,15 +137,15 @@ fn get_jpeg_files(directory: &str) -> Vec<String> {
// get list of all the images in the gives path
let images = get_jpeg_files(&args.image_path);
println!("Images empty? {}", images.is_empty().to_string());
debug!("Images empty? {}", &images.is_empty().to_string());
// knowing now the total number of images, calculate the number of batches
let total_batches = (images.len() + config.pixelfed_batch_size - 1) / config.pixelfed_batch_size;
println!("Found a total of {} images to upload. Will take {} batches", images.len(), total_batches);
println!("Found a total of {} images to upload. Will take {} batches", &images.len(), &total_batches);
// now iterate over all images in batches of batch_size
for (i, chunk) in images.chunks(config.pixelfed_batch_size).enumerate() {
println!("{}", i.clone());
info!("{}", i.clone());
let _ =pixelfed::bulk_upload_images(&config, chunk, i + 1, total_batches, &title, &args.mode);
}
println!("All images uploaded successfully.");

35
src/pixelfed.rs
View file

@ -1,5 +1,7 @@
use reqwest::{self};
use std::error::Error;
use log::{debug, error, log_enabled, info, Level};
struct PixelfedConfig {
pixelfed_url: String,
@ -31,7 +33,7 @@ pub fn bulk_upload_images(config: &super::Config, images: &[String], batch_num:
for image_path in images {
let description: String;
println!("Uploading image {}", image_path.to_string());
debug!("Handling image {}", &image_path.to_string());
// get image description depending on the caption_mode
match caption_mode {
super::Mode::ChatGPT => {
@ -39,7 +41,9 @@ pub fn bulk_upload_images(config: &super::Config, images: &[String], batch_num:
openai_model: config.openai_model.clone(),
openai_api_key: config.openai_api_key.clone(),
openai_api_url: config.openai_api_url.clone(),
openai_prompt: config.prompt.clone()
};
info!("Fetching image description from ChatGPT for {}", &image_path.to_string());
description = super::image_description::get_description_from_chatgpt(image_path.to_string(), im_config)?;
media_descriptions.push(description.clone());
},
@ -47,7 +51,7 @@ pub fn bulk_upload_images(config: &super::Config, images: &[String], batch_num:
let im_config = super::image_description::FileConfig {
caption_extension: config.caption_extension.clone(),
};
println!("Fetching image description from File for {}", image_path.to_string());
info!("Fetching image description from File for {}", &image_path.to_string());
description = super::image_description::get_description_from_file(image_path.to_string(), im_config)?;
media_descriptions.push(description.clone());
},
@ -56,15 +60,16 @@ pub fn bulk_upload_images(config: &super::Config, images: &[String], batch_num:
ollama_api_key: config.ollama_api_key.clone(),
ollama_api_url: config.ollama_api_url.clone(),
ollama_model: config.ollama_model.clone(),
ollama_prompt: config.prompt.clone(),
};
println!("Fetching image description from OLLAMA for {}", image_path.to_string());
info!("Fetching image description from OLLAMA for {}", &image_path.to_string());
description = super::image_description::get_description_from_ollama(image_path.to_string(), im_config)?;
println!("Description generated by OLLAMA: {}", description.clone());
debug!("Description generated by OLLAMA: {}", &description.clone());
media_descriptions.push(description.clone());
},
}
println!("Uploading image {}", image_path.to_string());
println!("Uploading image {} to Pixelfed", &image_path.to_string());
// construct the upload form for Pixelfed Upload of a single image including image description
let form = reqwest::blocking::multipart::Form::new().text("description", description.clone())
@ -75,6 +80,20 @@ pub fn bulk_upload_images(config: &super::Config, images: &[String], batch_num:
.multipart(form)
.send();
// Improved error handling for API response
// Check for HTTP errors
if res.as_ref().unwrap().status().is_success() {
debug!("success!");
} else if res.as_ref().unwrap().status().is_server_error() {
error!("server error!");
} else {
error!("Something else happened. Status: {:?}", res.as_ref().unwrap().status());
}
let res_json: serde_json::Value = res.unwrap().json()?;
let image_id = res_json["id"].as_str().unwrap().to_string();
media_ids.push(image_id);
@ -89,9 +108,9 @@ pub fn bulk_upload_images(config: &super::Config, images: &[String], batch_num:
"alt_texts": media_descriptions,
"visibility": pxl_config.pixelfed_visibility,
});
println!("Body: \n{}", body.to_string());
println!("MediaIDs: {}", media_ids.len());
println!("Alt_texts: {}", media_descriptions.len());
debug!("Body: \n{}", &body.to_string());
debug!("MediaIDs: {}", &media_ids.len());
debug!("Alt_texts: {}", &media_descriptions.len());
println!("Posting batch {} out of {} with media {}", batch_num, total_batches, media_ids.len());
let res = client.post(&post_url)
.bearer_auth(&pxl_config.pixelfed_access_token)