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

fix: CPX-1259 Strip Markdown code block from response #67

Merged
merged 1 commit into from
Jan 22, 2025
Merged

fix: CPX-1259 Strip Markdown code block from response #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 26 additions & 5 deletions src/server/google-ai/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default async function generateDescription(
const vertexAI = new VertexAI({
project: env.FIRE_PROJECT_ID,
location: 'us-central1',
googleAuthOptions: { credentials: getGoogleAuthCredentials() }
googleAuthOptions: { credentials: getGoogleAuthCredentials() },
});

const model = vertexAI.getGenerativeModel({
Expand All @@ -33,8 +33,15 @@ export default async function generateDescription(
const result = await model.generateContent(prompt);
const response = result.response;

if (response.candidates && response.candidates[0] && response.candidates[0].content && response.candidates[0].content.parts && response.candidates[0].content.parts[0]) {
return response.candidates[0].content.parts[0].text || 'No response from Google AI';
if (
response.candidates &&
response.candidates[0] &&
response.candidates[0].content &&
response.candidates[0].content.parts &&
response.candidates[0].content.parts[0] &&
response.candidates[0].content.parts[0].text
) {
return formatResponse(response.candidates[0].content.parts[0].text);
}
} catch (error) {
console.error(error);
Expand Down Expand Up @@ -68,6 +75,17 @@ const prepareInput = (attributes: z.infer<typeof aiSchema>): string => {
}
};

const formatResponse = (response: string): string => {
// Strips the markdown code block from the response
const match = /```html\n([\s\S]*)\n```/.exec(response);

if (match && match[1]) {
return match[1];
}

return response;
};

const prepareProductAttributes = (
attributes: z.infer<typeof aiSchema>
): string => {
Expand All @@ -94,7 +112,10 @@ const prepareProductAttributes = (
};

const getGoogleAuthCredentials = (): JWTInput => {
const credentialsBuffer = Buffer.from(env.GOOGLE_SERVICE_ACCOUNT_JSON_BASE64, 'base64');
const credentialsBuffer = Buffer.from(
env.GOOGLE_SERVICE_ACCOUNT_JSON_BASE64,
'base64'
);

return JSON.parse(credentialsBuffer.toString('utf-8')) as JWTInput;
}
};