rework using response api

Author: Decryptu

.gitignore

@@ -108,3 +108,4 @@ speech-*.mp3
 .env
 config.js
 package-lock.json
+bun.lock

README.md

@@ -1,6 +1,6 @@
-# DecryptGPT
+# EdgarGPT
 
-DecryptGPT is an advanced Discord bot developed by Decrypt, utilizing the `discord.js` library along with OpenAI's latest models including GPT-4o, GPT-4.1, and o3. The bot features image generation and editing capabilities using GPT-Image-1, voice message transcription with Whisper, and comprehensive document processing. Designed specifically for medical students and professionals, Edgar provides academic assistance and AI-powered conversations in French, making it ideal for advanced medical revisions and study sessions.
+EdgarGPT is an advanced Discord bot developed by Decrypt, utilizing the `discord.js` library along with OpenAI's latest models including GPT-4o, GPT-4.1, and o3. The bot features image generation and editing capabilities using GPT-Image-1, voice message transcription with Whisper, and comprehensive document processing. Designed specifically for medical students and professionals, Edgar provides academic assistance and AI-powered conversations in French, making it ideal for advanced medical revisions and study sessions.
 
 ## Features
 
@@ -22,7 +22,7 @@ DecryptGPT is an advanced Discord bot developed by Decrypt, utilizing the `disco
 
 ## Slash Commands
 
-DecryptGPT supports the following slash commands:
+EdgarGPT supports the following slash commands:
 
 - `/gpt-model` — Switch between AI models (GPT-4o, GPT-4.1, o3)
 - `/gpt-mode` — Toggle between text and voice interaction modes
@@ -33,7 +33,7 @@ All commands include comprehensive logging for monitoring and debugging purposes
 
 ## Configuration
 
-Before running DecryptGPT, configure the following:
+Before running EdgarGPT, configure the following:
 
 ### Environment Variables
 
@@ -64,13 +64,13 @@ Replace the placeholder values with your actual OpenAI API key and Discord bot c
 1. Clone the repository:
 
 ```bash
-git clone https://github.com/Decryptu/DecryptGPT.git
+git clone https://github.com/Decryptu/EdgarGPT.git
 ```
 
 2. Navigate to the project directory:
 
 ```bash
-cd DecryptGPT
+cd EdgarGPT
 ```
 
 3. Install dependencies:
@@ -127,7 +127,7 @@ The bot is built with modern JavaScript (ES modules) and includes:
 
 ## Contributing
 
-Contributions to DecryptGPT are welcome! Feel free to submit pull requests, create issues, or suggest new features.
+Contributions to EdgarGPT are welcome! Feel free to submit pull requests, create issues, or suggest new features.
 
 ## License
 

channels.mjs

@@ -1,3 +1,4 @@
+// channels.mjs
 const allowedChannels = [
   "1088435060170051714", // decrypt
   "1097824934153170984", // idkzp

commands/gpt-mode.js

@@ -1,26 +1,25 @@
+// commands/gpt-model.js
 import { GPT_MODELS, MODEL_SURNAMES } from "../config.js";
 import setBotActivity from "../utils/setBotActivity.js";
 import { MessageFlags } from "discord.js";
 
 async function gptModel(interaction, client) {
-	await interaction.deferReply({ flags: MessageFlags.Ephemeral });
+  await interaction.deferReply({ flags: MessageFlags.Ephemeral });
 
-	const selectedModel = interaction.options.getString("model");
+  const selectedModel = interaction.options.getString("model");
+  
+  if (!Object.values(GPT_MODELS).includes(selectedModel)) {
+    return await interaction.editReply({ content: "Modèle invalide." });
+  }
 
-	if (!Object.values(GPT_MODELS).includes(selectedModel)) {
-		await interaction.editReply({ content: "Invalid model selected." });
-		return;
-	}
+  const previousModel = MODEL_SURNAMES[client.currentModel];
+  client.currentModel = selectedModel;
+  setBotActivity(client, client.currentModel);
 
-	console.log(
-		`Switching global model to: ${selectedModel} (requested by ${interaction.user.username})`,
-	);
-
-	client.currentModel = selectedModel;
-	setBotActivity(client, client.currentMode, client.currentModel);
-
-	const surname = MODEL_SURNAMES[selectedModel];
-	await interaction.editReply({ content: `Switched to model: ${surname}` });
+  const newModel = MODEL_SURNAMES[selectedModel];
+  console.log(`[MODEL SWITCH] ${interaction.user.username}: ${previousModel} → ${newModel}`);
+  
+  await interaction.editReply({ content: `Modèle activé: ${newModel}` });
 }
 
-export default gptModel;
+export default gptModel;

commands/gpt-model.js

@@ -1,105 +1,63 @@
+// commands/image-edit.js
 import { EmbedBuilder, AttachmentBuilder } from "discord.js";
-import axios from "axios";
 import { toFile } from "openai";
 
 async function imageEdit(interaction, client) {
-  // Immediately defer the reply to avoid timeout issues
   await interaction.deferReply();
 
   try {
-    // Log the interaction for debugging
-    console.log("Image edit command received:", {
-      user: interaction.user.tag,
-      options: interaction.options.data
-    });
-    
     const description = interaction.options.getString("description");
     const imageAttachment = interaction.options.getAttachment("image");
 
-    // Validate inputs after deferring to ensure we can respond properly
-    if (!description) {
-      return await interaction.editReply({
-        content: "Please provide an image description."
-      });
+    if (!imageAttachment?.contentType?.startsWith("image/")) {
+      return await interaction.editReply("Veuillez fournir une image valide (PNG, JPEG, WebP).");
     }
 
-    if (!imageAttachment) {
-      return await interaction.editReply({
-        content: "Please provide a valid image attachment."
-      });
-    }
+    console.log(`[IMAGE EDIT] ${interaction.user.username}: "${description}"`);
+    console.log(`[IMAGE EDIT] Input image: ${imageAttachment.name} (${imageAttachment.size} bytes)`);
 
-    // Log the attachment details
-    console.log("Attachment details:", {
-      name: imageAttachment.name,
-      contentType: imageAttachment.contentType,
-      size: imageAttachment.size,
-      url: imageAttachment.url
-    });
-
-    if (!imageAttachment.contentType?.startsWith("image/")) {
-      return await interaction.editReply({
-        content: "The provided attachment is not an image. Please upload a PNG, JPEG, or WebP image."
-      });
-    }
-    
-    // Download the image from Discord
-    console.log("Downloading image from Discord...");
-    const response = await axios.get(imageAttachment.url, { responseType: 'arraybuffer' });
-    const imageBuffer = Buffer.from(response.data);
-    console.log(`Image downloaded, size: ${imageBuffer.length} bytes`);
-    
-    // Convert to proper format for OpenAI
-    console.log("Converting image for OpenAI...");
-    const imageFile = await toFile(imageBuffer, imageAttachment.name || "image.png", {
+    const response = await fetch(imageAttachment.url);
+    const buffer = await response.arrayBuffer();
+    const imageFile = await toFile(buffer, imageAttachment.name, {
       type: imageAttachment.contentType
     });
-    console.log("Image converted successfully");
 
-    // Call the edit endpoint
-    console.log("Calling OpenAI edit API with prompt:", description);
     const result = await client.openai.images.edit({
       model: "gpt-image-1",
       image: imageFile,
       prompt: description,
+      // Removed response_format - no longer supported
     });
 
-    console.log("OpenAI API response received:", result);
-
-    if (!result?.data?.[0]?.b64_json) {
-      throw new Error("No image data returned from API");
+    // Check if response has base64 data or URL
+    let outputBuffer;
+    if (result.data[0].b64_json) {
+      // Base64 response
+      outputBuffer = Buffer.from(result.data[0].b64_json, "base64");
+      console.log(`[IMAGE EDIT] Received base64 edited image`);
+    } else if (result.data[0].url) {
+      // URL response - download the image
+      console.log(`[IMAGE EDIT] Downloading from URL: ${result.data[0].url}`);
+      const imageResponse = await fetch(result.data[0].url);
+      const arrayBuffer = await imageResponse.arrayBuffer();
+      outputBuffer = Buffer.from(arrayBuffer);
+    } else {
+      throw new Error("No image data in response");
     }
 
-    // Convert base64 to buffer for Discord attachment
-    const outputBuffer = Buffer.from(result.data[0].b64_json, "base64");
-    const attachment = new AttachmentBuilder(outputBuffer, { name: "edited-image.png" });
+    const attachment = new AttachmentBuilder(outputBuffer, { name: "edited.png" });
 
     const embed = new EmbedBuilder()
-      .setTitle("Image edited successfully")
+      .setTitle("Image modifiée")
       .setDescription(`Prompt: ${description}`)
-      .setImage("attachment://edited-image.png")
+      .setImage("attachment://edited.png")
       .setTimestamp();
 
-    await interaction.editReply({
-      content: null,
-      embeds: [embed],
-      files: [attachment]
-    });
-    
-    console.log("Successfully sent edited image response");
+    console.log(`[IMAGE EDIT] Success - Edited image sent to ${interaction.user.username}`);
+    await interaction.editReply({ embeds: [embed], files: [attachment] });
   } catch (error) {
-    console.error("Error in imageEdit function:", error);
-    
-    // Check for specific API errors
-    const errorMessage = error.response?.data?.error?.message || error.message || "Unknown error";
-    console.error("Detailed error:", errorMessage);
-    
-    // Always use editReply since we deferred at the beginning
-    await interaction.editReply({
-      content: `Failed to edit the image. Error: ${errorMessage}`,
-      embeds: [],
-      files: []
-    });
+    console.error("[IMAGE EDIT] Error:", error);
+    await interaction.editReply("Échec de modification d'image. " + (error.message || ""));
   }
 }
 

commands/image-edit.js

@@ -1,52 +1,59 @@
+// commands/image-gpt.js
 import { EmbedBuilder, AttachmentBuilder, MessageFlags } from "discord.js";
+import { GPT_IMAGE_MODEL, GPT_IMAGE_SIZE, GPT_IMAGE_QUALITY } from "../config.js";
 
 async function imageGpt(interaction, client) {
   const description = interaction.options.getString("description");
+  
   if (!description) {
-    await interaction.reply({
-      content: "Please provide an image description.",
+    return await interaction.reply({
+      content: "Veuillez fournir une description.",
       flags: MessageFlags.Ephemeral
     });
-    return;
   }
 
+  await interaction.deferReply();
+  console.log(`[IMAGE GENERATION] ${interaction.user.username}: "${description}"`);
+
   try {
-    // Acknowledge the interaction immediately to prevent timeouts
-    await interaction.deferReply();
-    
-    const imageBase64 = await client.createGptImage(description);
+    const response = await client.openai.images.generate({
+      model: GPT_IMAGE_MODEL,
+      prompt: description,
+      n: 1,
+      size: GPT_IMAGE_SIZE,
+      quality: GPT_IMAGE_QUALITY,
+      // Removed response_format - no longer supported
+    });
 
-    if (!imageBase64) {
-      throw new Error("No image data returned");
+    // Check if response has base64 data or URL
+    let buffer;
+    if (response.data[0].b64_json) {
+      // Base64 response
+      buffer = Buffer.from(response.data[0].b64_json, "base64");
+      console.log(`[IMAGE GENERATION] Received base64 image`);
+    } else if (response.data[0].url) {
+      // URL response - download the image
+      console.log(`[IMAGE GENERATION] Downloading from URL: ${response.data[0].url}`);
+      const imageResponse = await fetch(response.data[0].url);
+      const arrayBuffer = await imageResponse.arrayBuffer();
+      buffer = Buffer.from(arrayBuffer);
+    } else {
+      throw new Error("No image data in response");
     }
 
-    // Convert base64 to buffer for Discord attachment
-    const buffer = Buffer.from(imageBase64, "base64");
-    const attachment = new AttachmentBuilder(buffer, { name: "generated-image.png" });
+    const attachment = new AttachmentBuilder(buffer, { name: "image.png" });
 
     const embed = new EmbedBuilder()
-      .setTitle("Votre image")
-      .setImage("attachment://generated-image.png");
+      .setTitle("Image générée")
+      .setDescription(`Prompt: ${description}`)
+      .setImage("attachment://image.png")
+      .setTimestamp();
 
-    await interaction.editReply({
-      embeds: [embed],
-      files: [attachment]
-    });
+    console.log(`[IMAGE GENERATION] Success - Image sent to ${interaction.user.username}`);
+    await interaction.editReply({ embeds: [embed], files: [attachment] });
   } catch (error) {
-    console.error("Error in imageGpt function:", error);
-    
-    // Check if the interaction has already been replied to
-    if (interaction.deferred || interaction.replied) {
-      await interaction.editReply({
-        content: "Échec de la génération d'une image. Veuillez réessayer ultérieurement.",
-        files: []
-      });
-    } else {
-      await interaction.reply({
-        content: "Échec de la génération d'une image. Veuillez réessayer ultérieurement.",
-        flags: MessageFlags.Ephemeral
-      });
-    }
+    console.error("[IMAGE GENERATION] Error:", error);
+    await interaction.editReply("Échec de génération d'image. " + (error.message || ""));
   }
 }