Remove fallback and hardcoded prompts to rely on database prompts only for AI
This commit is contained in:
@@ -353,15 +353,14 @@ async function generateDebugResponse(productsToUse, res) {
|
|||||||
WHERE prompt_type = 'system'
|
WHERE prompt_type = 'system'
|
||||||
`);
|
`);
|
||||||
|
|
||||||
// Get system prompt or use default
|
if (systemPromptResult.rows.length === 0) {
|
||||||
let systemPrompt = null;
|
console.error("❌ No system prompt found in database");
|
||||||
if (systemPromptResult.rows.length > 0) {
|
throw new Error("No system prompt found in database");
|
||||||
systemPrompt = systemPromptResult.rows[0];
|
|
||||||
console.log("📝 Loaded system prompt from database, ID:", systemPrompt.id);
|
|
||||||
} else {
|
|
||||||
console.warn("⚠️ No system prompt found in database, will use default");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const systemPrompt = systemPromptResult.rows[0];
|
||||||
|
console.log("📝 Loaded system prompt from database, ID:", systemPrompt.id);
|
||||||
|
|
||||||
// Then, fetch the general prompt using the consolidated endpoint approach
|
// Then, fetch the general prompt using the consolidated endpoint approach
|
||||||
const generalPromptResult = await pool.query(`
|
const generalPromptResult = await pool.query(`
|
||||||
SELECT * FROM ai_prompts
|
SELECT * FROM ai_prompts
|
||||||
@@ -369,7 +368,7 @@ async function generateDebugResponse(productsToUse, res) {
|
|||||||
`);
|
`);
|
||||||
|
|
||||||
if (generalPromptResult.rows.length === 0) {
|
if (generalPromptResult.rows.length === 0) {
|
||||||
console.warn("⚠️ No general prompt found in database");
|
console.error("❌ No general prompt found in database");
|
||||||
throw new Error("No general prompt found in database");
|
throw new Error("No general prompt found in database");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -481,22 +480,15 @@ async function generateDebugResponse(productsToUse, res) {
|
|||||||
: null,
|
: null,
|
||||||
}
|
}
|
||||||
: null,
|
: null,
|
||||||
basePrompt: systemPrompt ? systemPrompt.prompt_text + "\n\n" + generalPrompt.prompt_text : generalPrompt.prompt_text,
|
basePrompt: systemPrompt.prompt_text + "\n\n" + generalPrompt.prompt_text,
|
||||||
sampleFullPrompt: fullUserPrompt,
|
sampleFullPrompt: fullUserPrompt,
|
||||||
promptLength: promptLength,
|
promptLength: promptLength,
|
||||||
apiFormat: apiMessages,
|
apiFormat: apiMessages,
|
||||||
promptSources: {
|
promptSources: {
|
||||||
...(systemPrompt ? {
|
|
||||||
systemPrompt: {
|
systemPrompt: {
|
||||||
id: systemPrompt.id,
|
id: systemPrompt.id,
|
||||||
prompt_text: systemPrompt.prompt_text
|
prompt_text: systemPrompt.prompt_text
|
||||||
}
|
},
|
||||||
} : {
|
|
||||||
systemPrompt: {
|
|
||||||
id: 0,
|
|
||||||
prompt_text: `You are a specialized e-commerce product data processor for a crafting supplies website tasked with providing complete, correct, appealing, and SEO-friendly product listings. You should write professionally, but in a friendly and engaging tone. You have meticulous attention to detail and are a master at your craft.`
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
generalPrompt: {
|
generalPrompt: {
|
||||||
id: generalPrompt.id,
|
id: generalPrompt.id,
|
||||||
prompt_text: generalPrompt.prompt_text
|
prompt_text: generalPrompt.prompt_text
|
||||||
@@ -702,17 +694,14 @@ async function loadPrompt(connection, productsToValidate = null, appPool = null)
|
|||||||
WHERE prompt_type = 'system'
|
WHERE prompt_type = 'system'
|
||||||
`);
|
`);
|
||||||
|
|
||||||
// Default system instructions in case the system prompt is not found
|
if (systemPromptResult.rows.length === 0) {
|
||||||
let systemInstructions = `You are a specialized e-commerce product data processor for a crafting supplies website tasked with providing complete, correct, appealing, and SEO-friendly product listings. You should write professionally, but in a friendly and engaging tone. You have meticulous attention to detail and are a master at your craft.`;
|
console.error("❌ No system prompt found in database");
|
||||||
|
throw new Error("No system prompt found in database");
|
||||||
// If system prompt exists in the database, use it
|
|
||||||
if (systemPromptResult.rows.length > 0) {
|
|
||||||
systemInstructions = systemPromptResult.rows[0].prompt_text;
|
|
||||||
console.log("📝 Loaded system prompt from database");
|
|
||||||
} else {
|
|
||||||
console.warn("⚠️ No system prompt found in database, using default");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const systemInstructions = systemPromptResult.rows[0].prompt_text;
|
||||||
|
console.log("📝 Loaded system prompt from database");
|
||||||
|
|
||||||
// Fetch the general prompt using the consolidated endpoint approach
|
// Fetch the general prompt using the consolidated endpoint approach
|
||||||
const generalPromptResult = await pool.query(`
|
const generalPromptResult = await pool.query(`
|
||||||
SELECT * FROM ai_prompts
|
SELECT * FROM ai_prompts
|
||||||
@@ -720,7 +709,7 @@ async function loadPrompt(connection, productsToValidate = null, appPool = null)
|
|||||||
`);
|
`);
|
||||||
|
|
||||||
if (generalPromptResult.rows.length === 0) {
|
if (generalPromptResult.rows.length === 0) {
|
||||||
console.warn("⚠️ No general prompt found in database");
|
console.error("❌ No general prompt found in database");
|
||||||
throw new Error("No general prompt found in database");
|
throw new Error("No general prompt found in database");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -779,8 +768,11 @@ async function loadPrompt(connection, productsToValidate = null, appPool = null)
|
|||||||
combinedPrompt += "\n--- END COMPANY-SPECIFIC INSTRUCTIONS ---\n";
|
combinedPrompt += "\n--- END COMPANY-SPECIFIC INSTRUCTIONS ---\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we have products to validate, create a filtered prompt
|
// Products are required for validation
|
||||||
if (productsToValidate) {
|
if (!productsToValidate || !Array.isArray(productsToValidate) || productsToValidate.length === 0) {
|
||||||
|
throw new Error("Products are required for prompt generation");
|
||||||
|
}
|
||||||
|
|
||||||
console.log("Creating filtered prompt for products:", productsToValidate);
|
console.log("Creating filtered prompt for products:", productsToValidate);
|
||||||
|
|
||||||
// Extract unique values from products for non-core attributes
|
// Extract unique values from products for non-core attributes
|
||||||
@@ -904,41 +896,6 @@ ${JSON.stringify(mixedTaxonomy.sizeCategories)}${
|
|||||||
|
|
||||||
----------Here is the product data to validate----------`;
|
----------Here is the product data to validate----------`;
|
||||||
|
|
||||||
// Return both system instructions and user content separately
|
|
||||||
return {
|
|
||||||
systemInstructions,
|
|
||||||
userContent: combinedPrompt + "\n" + taxonomySection
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate the full unfiltered prompt for taxonomy section
|
|
||||||
const taxonomySection = `
|
|
||||||
Available Categories:
|
|
||||||
${JSON.stringify(taxonomy.categories)}
|
|
||||||
|
|
||||||
Available Themes:
|
|
||||||
${JSON.stringify(taxonomy.themes)}
|
|
||||||
|
|
||||||
Available Colors:
|
|
||||||
${JSON.stringify(taxonomy.colors)}
|
|
||||||
|
|
||||||
Available Tax Codes:
|
|
||||||
${JSON.stringify(taxonomy.taxCodes)}
|
|
||||||
|
|
||||||
Available Size Categories:
|
|
||||||
${JSON.stringify(taxonomy.sizeCategories)}
|
|
||||||
|
|
||||||
Available Suppliers:
|
|
||||||
${JSON.stringify(taxonomy.suppliers)}
|
|
||||||
|
|
||||||
Available Companies:
|
|
||||||
${JSON.stringify(taxonomy.companies)}
|
|
||||||
|
|
||||||
Available Artists:
|
|
||||||
${JSON.stringify(taxonomy.artists)}
|
|
||||||
|
|
||||||
Here is the product data to validate:`;
|
|
||||||
|
|
||||||
// Return both system instructions and user content separately
|
// Return both system instructions and user content separately
|
||||||
return {
|
return {
|
||||||
systemInstructions,
|
systemInstructions,
|
||||||
@@ -1007,7 +964,7 @@ router.post("/validate", async (req, res) => {
|
|||||||
input: [
|
input: [
|
||||||
{
|
{
|
||||||
role: "developer",
|
role: "developer",
|
||||||
content: `${promptData.systemInstructions}\n\nYou MUST respond with a single valid JSON object containing the following top-level keys: correctedData, changes, warnings, summary, metadata.\n- correctedData: array of product objects reflecting the updated data.\n- changes: array of human-readable bullet points summarizing the nature of updates.\n- warnings: array of caveats or risks that still require review.\n- summary: a concise paragraph (<=75 words) describing overall data quality and improvements.\n- metadata: object containing any supplemental machine-readable information (optional fields allowed).\nDo NOT include Markdown code fences or any text outside the JSON object.`,
|
content: promptData.systemInstructions,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
role: "user",
|
role: "user",
|
||||||
@@ -1242,26 +1199,15 @@ router.post("/validate", async (req, res) => {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
// Set prompt sources
|
// Set prompt sources
|
||||||
if (generalPromptResult.rows.length > 0) {
|
if (generalPromptResult.rows.length > 0 && systemPromptResult.rows.length > 0) {
|
||||||
const generalPrompt = generalPromptResult.rows[0];
|
const generalPrompt = generalPromptResult.rows[0];
|
||||||
let systemPrompt = null;
|
const systemPrompt = systemPromptResult.rows[0];
|
||||||
|
|
||||||
if (systemPromptResult.rows.length > 0) {
|
|
||||||
systemPrompt = systemPromptResult.rows[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
promptSources = {
|
promptSources = {
|
||||||
...(systemPrompt ? {
|
|
||||||
systemPrompt: {
|
systemPrompt: {
|
||||||
id: systemPrompt.id,
|
id: systemPrompt.id,
|
||||||
prompt_text: systemPrompt.prompt_text
|
prompt_text: systemPrompt.prompt_text
|
||||||
}
|
},
|
||||||
} : {
|
|
||||||
systemPrompt: {
|
|
||||||
id: 0,
|
|
||||||
prompt_text: `You are a specialized e-commerce product data processor for a crafting supplies website tasked with providing complete, correct, appealing, and SEO-friendly product listings. You should write professionally, but in a friendly and engaging tone. You have meticulous attention to detail and are a master at your craft.`
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
generalPrompt: {
|
generalPrompt: {
|
||||||
id: generalPrompt.id,
|
id: generalPrompt.id,
|
||||||
prompt_text: generalPrompt.prompt_text
|
prompt_text: generalPrompt.prompt_text
|
||||||
|
|||||||
Reference in New Issue
Block a user