15 Commits

Author SHA1 Message Date
Suvodip
d18f173ef6 add last attempt function 2025-02-04 19:28:07 +05:30
Suvodip
10a797d450 s44 2025-02-04 19:12:00 +05:30
Suvodip
3a64479fd4 s33 2025-02-04 18:25:20 +05:30
Suvodip
d4d2a32a71 s33 2025-02-04 16:47:16 +05:30
Suvodip
e8c29025aa s22 2025-02-04 16:41:40 +05:30
Suvodip
b909a85225 ai evaluate userid change to childid 2025-02-04 16:36:21 +05:30
Suvodip
b69bc6200f s2 2025-02-04 16:14:54 +05:30
Suvodip
6d03408495 all userId replace to childId 2025-02-04 16:11:06 +05:30
Suvodip
552cfbe574 s3 2025-02-03 17:21:05 +05:30
Suvodip
ed657df69a replace userId to childId 2025-02-03 16:20:05 +05:30
Suvodip
3b75e915e3 s4 2025-01-31 13:21:26 +05:30
Suvodip
02cc60f824 s3 2025-01-31 13:20:02 +05:30
Suvodip
c2ee394195 s2 2025-01-31 13:16:19 +05:30
Suvodip
7dda27e86e s2 2025-01-23 19:38:46 +05:30
Suvodip
5152ca2e23 gallery 2 api 2024-12-23 19:17:45 +05:30
13 changed files with 2817 additions and 50 deletions

BIN
output.png Normal file

Binary file not shown.

2553
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -60,15 +60,19 @@
"express-mongo-sanitize": "^2.0.0",
"express-rate-limit": "^5.0.0",
"form-data": "^4.0.1",
"formdata-node": "^6.0.3",
"helmet": "^4.1.0",
"http-status": "^1.4.0",
"install": "^0.13.0",
"joi": "^17.3.0",
"jsonwebtoken": "^8.5.1",
"moment": "^2.24.0",
"mongoose": "^8.7.1",
"morgan": "^1.9.1",
"mysql2": "^3.11.0",
"node-fetch": "^3.3.2",
"nodemailer": "^6.3.1",
"npm": "^11.0.0",
"passport": "^0.4.0",
"passport-jwt": "^4.0.0",
"pm2": "^5.1.0",

View File

@@ -2,12 +2,11 @@ const mongoose = require("mongoose");
const gameSchema = new mongoose.Schema({
gameName: { type: String, required: true },
userId: { type: String, required: true },
childId: { type: String, required: true },
gameID: { type: String, required: true },
gameTime: { type: String, required: false },
score: { type: String},
gameStar: { type: Number},
screenshotUrl: { type: String }, // Store the S3 URL of the screenshot
});
gameStar: { type: Number },
screenshotUrl: { type: String },
}, { collection: "gameData" });
module.exports = mongoose.model("Game", gameSchema);

View File

@@ -0,0 +1,15 @@
const mongoose = require('mongoose');
// Define the GalleryImage schema
const galleryImageSchema = new mongoose.Schema({
childId: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: true }, // Assuming you have a User model
gameName: { type: String, required: true },
gameID: { type: String, required: true },
screenshotUrl: { type: String, required: true },
message: { type: String, default: 'Image received' },
}, { timestamps: true });
// Check if the model already exists in mongoose.models
const GalleryImage = mongoose.models.GalleryImage || mongoose.model('GalleryImage', galleryImageSchema);
module.exports = GalleryImage;

View File

@@ -0,0 +1,10 @@
const mongoose = require("mongoose");
const galleryImageScema = new mongoose.Schema({
gameName: { type: String, required: true },
childId: { type: String, required: true },
gameID: { type: String, required: true },
screenshotUrl: { type: String },
});
module.exports = mongoose.model("GalleryImage", galleryImageScema);

View File

@@ -0,0 +1,21 @@
const fs = require('fs');
const path = require('path');
function base64ToImageFile(base64, fileName) {
const matches = base64.match(/^data:(.+);base64,(.+)$/);
if (!matches) {
throw new Error("Invalid Base64 string");
}
const mimeType = matches[1]; // e.g., image/png
const base64Data = matches[2]; // Actual base64 string
const buffer = Buffer.from(base64Data, 'base64');
const filePath = path.join(__dirname, fileName);
fs.writeFileSync(filePath, buffer);
return filePath;
}
module.exports = { base64ToImageFile };

View File

@@ -1,29 +1,27 @@
const AWS = require('aws-sdk');
const axios = require('axios');
const mongoose = require('mongoose');
const Game = require('../../models/gameModel'); // Ensure this path matches your project structure
const FormData = require('form-data');
const Game = require('../../models/gameModel');
const aiEvaluateImageToStar = async (req, res) => {
try {
const { userId, gameName, gameID, gameTime, gameStar, screenShot } = req.body;
const { childId, gameName, gameID, gameTime, gameStar, screenShot } = req.body;
if (!screenShot) {
return res.status(400).json({ error: 'Screenshot is required' });
}
const formData = new FormData();
formData.append('image', screenShot);
const screenshotUrl = await axios.post('https://teachertrainingchennai.in/api/uploadBase64/', formData, {
headers: {
'Content-Type': 'multipart/form-data',
},
})
// .then(response => {
// console.log('Response:', response.data);
// })
// .catch(error => {
// console.error('Error:', error);
// });
console.log(screenshotUrl.data.filePath)
// Upload screenshot
const formData = new FormData();
formData.append('image', screenShot);
const screenshotUploadResponse = await axios.post('https://teachertrainingchennai.in/api/uploadBase64/', formData, {
headers: {
...formData.getHeaders(),
},
});
const screenshotUrl = screenshotUploadResponse.data.filePath;
// The coloring was done by a 5-year-old kid. Give a score between 1 to 10 in JSON format.
const openAiPayload = {
model: 'gpt-4o-mini',
messages: [
@@ -32,12 +30,12 @@ const aiEvaluateImageToStar = async (req, res) => {
content: [
{
type: 'text',
text: 'The coloring was done by a 5-year-old kid. Give a score between 1 to 10 in JSON format.',
text: 'The coloring was done by a 5-year-old kid. Give a score between 1 to 10 the Respond ONLY with a valid JSON object like {"score": 7}. No extra text, no formatting, just raw JSON.',
},
{
type: 'image_url',
image_url: {
url: screenshotUrl.data.filePath,
url: screenshotUrl,
},
},
],
@@ -46,7 +44,6 @@ const aiEvaluateImageToStar = async (req, res) => {
max_tokens: 300,
};
console.log('AAAAAA')
const openAiResponse = await axios.post(
'https://api.openai.com/v1/chat/completions',
openAiPayload,
@@ -58,18 +55,27 @@ const aiEvaluateImageToStar = async (req, res) => {
}
);
// Extract the score from OpenAI's response
const scoreResponse = openAiResponse.data.choices[0].message.content;
const parsedScore = JSON.parse(scoreResponse);
console.log(openAiResponse)
if (!openAiResponse.data.choices || openAiResponse.data.choices.length === 0) {
throw new Error('Invalid OpenAI response format');
}
let scoreResponse = openAiResponse.data.choices[0].message.content.trim();
if (scoreResponse.startsWith('```json')) {
scoreResponse = scoreResponse.replace(/```json/, '').replace(/```/, '').trim();
}
const parsedScore = JSON.parse(scoreResponse);
// console.log('Parsed Score:', parsedScore);
const gameData = new Game({
gameName,
userId,
childId,
gameID,
gameTime,
score: parsedScore.score || 'N/A', // Adjust key to match OpenAI response
gameStar,
gameStar: parsedScore.score || 'N/A',
screenshotUrl,
});
@@ -81,7 +87,7 @@ console.log(openAiResponse)
});
} catch (error) {
console.error('Error:', error.message);
return res.status(500).json({ error: 'Something went wrong' });
return res.status(500).json({ error: error.message || 'Something went wrong' });
}
};

View File

@@ -0,0 +1,36 @@
const GalleryImage = require('../../models/getGalleyImage');
const getGalleryImage = async (req, res) => {
try {
// Extract query parameters for filtering (if provided)
const { gameName, childId, gameID} = req.query;
// Build a filter object based on the query parameters
const filter = {};
if (gameName) {
filter.gameName = gameName;
}
if (childId) {
filter.childId = childId;
}
if (gameID) {
filter.gameID = gameID;
}
// Fetch gallery images with filters and selected fields
const galleryImages = await GalleryImage.find(filter).select('gameName childId gameID screenshotUrl'); // Select only these fields
if (!galleryImages.length) {
return res.status(404).json({ message: 'No images found' });
}
return res.status(200).json(galleryImages); // Return the filtered gallery images with selected fields
} catch (error) {
console.error('Error fetching images:', error.message);
return res.status(500).json({ error: 'Something went wrong' });
}
};
module.exports = getGalleryImage;

View File

@@ -15,15 +15,19 @@ async function main() {
const collection = database.collection('gameData'); // Replace with your collection name
// Find a single document
// const user = await collection.findOne({ userId: 'dsfdfgffgfgeg' });
// const user = await collection.findOne({ childId: 'dsfdfgffgfgeg' });
const { userId, gameName, gameID } = req.body;
const gameData = await collection.findOne({
userId: userId,
gameName: gameName,
gameID: gameID
});
const { childId, gameName, gameID } = req.body;
const gameData = await collection.findOne(
{
childId: childId,
gameName: gameName,
gameID: gameID
},{
sort: {_id: -1}
}
);
// console.log('gameData', gameData);
if (gameData) {
res.json({gameData});
} else {

View File

@@ -0,0 +1,79 @@
const GalleryImage = require('../../models/imageGallery');
const axios = require('axios');
const FormData = require('form-data'); // Import form-data for Node.js
const saveGalleryImage = async (req, res) => {
try {
const { childId, gameName, gameID, screenShot } = req.body;
// Validate base64 format
const isValidBase64 = validateBase64(screenShot);
if (!isValidBase64) {
return res.status(400).json({ error: 'Invalid base64 image data' });
}
// Extract image details
const imageData = extractImageDataFromBase64(screenShot);
const contentType = imageData.contentType || 'image/jpeg'; // Default to JPEG
// Convert base64 to buffer
const buffer = Buffer.from(screenShot.replace(/^data:image\/(png|jpg|jpeg);base64,/, ''), 'base64');
// Create FormData
const formData = new FormData();
formData.append('file1', buffer, { filename: 'screenshot.jpg', contentType });
formData.append('folder', 'gameGallery');
formData.append('bucket', 'polly-bs');
// Upload image to external API using axios
const uploadResponse = await axios.post(
'https://preschool-curriculum.in/api/one/v1/file/upload',
formData,
{
headers: {
...formData.getHeaders(), // Add form-data headers like Content-Type boundary
// Add any necessary authentication headers if required
},
}
);
if (uploadResponse.status !== 200) {
throw new Error('Image upload failed: ' + uploadResponse.statusText);
}
// Extract and store the uploaded image URL from the response
const screenshotUrl = uploadResponse.data.urls[0];
// Create and save gallery image data
const galleryImageData = new GalleryImage({
childId,
gameName,
gameID,
screenshotUrl,
message: 'Image received',
});
await galleryImageData.save();
return res.status(200).json(galleryImageData);
} catch (error) {
console.error('Error:', error.message);
return res.status(500).json({ error: 'Something went wrong' });
}
};
// Validate base64 image
function validateBase64(base64String) {
const regex = /^data:image\/(png|jpg|jpeg);base64,/;
return regex.test(base64String);
}
// Extract image data (like content type) from base64 string
function extractImageDataFromBase64(base64String) {
const matches = base64String.match(/^data:image\/(png|jpg|jpeg);base64,/);
return {
contentType: matches ? `image/${matches[1]}` : 'image/jpeg',
};
}
module.exports = saveGalleryImage;

View File

@@ -1,4 +1,5 @@
const AWS = require("aws-sdk");
const mongoose = require("mongoose");
const Game = require("../../models/gameModel");
const s3 = new AWS.S3({
@@ -7,35 +8,55 @@ const s3 = new AWS.S3({
region: process.env.AWS_REGION,
});
// MongoDB Connection
const mongoURI = process.env.MONGODB_URL;
const dbName = process.env.MONGO_DB_NAME;
mongoose.connect(mongoURI, {
dbName: dbName,
useNewUrlParser: true,
useUnifiedTopology: true,
})
.then(() =>
console.log("Connected to MongoDB"))
.catch((err) => console.error("MongoDB connection error:", err));
const saveGameScore2 = async (req, res) => {
const { userId, gameName, gameID, gameTime, score, gameStar, screenShot } = req.body;
const { childId, gameName, gameID, gameTime, score, gameStar, screenShot } = req.body;
try {
if (!gameName || !userId || !gameID) {
if (!gameName || !childId || !gameID) {
return res.status(400).json({ error: "Missing required fields" });
}
const newGame = new Game({
gameName,
userId,
childId,
gameID,
gameTime,
score,
gameStar,
});
// Save to MongoDB
const result = await newGame.save();
// Upload screenshot to S3 if provided
if (screenShot) {
let base64Image = screenShot.split(";base64,").pop();
const buffer = Buffer.from(base64Image, 'base64');
// const buffer = Buffer.from(screenShot, "base64");
let base64Image = screenShot.split(";base64,").pop();
const buffer = Buffer.from(base64Image, "base64");
const uploadParams = {
Bucket: process.env.S3_BUCKET_NAME,
Key: `images/${result._id}.png`,
Body: buffer,
ContentType: "image/png",
};
const s3Response = await s3.upload(uploadParams).promise();
newGame.screenshotUrl = s3Response.Location;
await newGame.save();
}
res.status(200).json({
message: "Game data saved successfully",
data: newGame,

View File

@@ -31,7 +31,10 @@ const aiMarkDrawing = require("../api/aiMarkDrawing");
const aiFeedbackOnReportWithFollowup = require("../api/aiFeedbackOnReportWithFollowup");
const aiTextToSpeech = require("../api/aiTextToSpeech");
const aiEvaluateImageToStar = require("../api/aiEvaluateImageToStar");
// const getGameInfo = require("../api/getGameInfo");
const saveGalleryImage = require("../api/saveGalleryImage");
const getGalleryImage = require("../api/getGalleryImage");
// const aiTest = require("../api/aiTest");
const router = express.Router();
@@ -190,8 +193,26 @@ router.get("/ping", (req, res) => {
router.post("/aiEvaluateImageToStar", (req, res) => {
aiEvaluateImageToStar(req, res);
});
// getGameInfo.
// router.get("/getGameInfo", (req, res) => {
// getGameInfo(req, res);
// });
// Save Drawing Game Gallery Image
router.post("/saveGalleryImage", (req, res) => {
saveGalleryImage(req, res);
});
// Get Drawing Game Gallery Image
router.get("/getGalleryImage", (req, res) => {
getGalleryImage(req, res);
});
// Get Drawing Game Gallery Image
// router.post("/aiTest", (req, res) => {
// aiTest(req, res);
// });
module.exports = router;