Merge pull request #73 from sijinhui/dev

Dev
This commit is contained in:
sijinhui 2024-04-26 18:12:44 +08:00 committed by GitHub
commit 6c6453644e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 7 deletions

View File

@ -88,13 +88,13 @@ export function auth(
} }
if (systemApiKey) { if (systemApiKey) {
console.log("[Auth] use system api key"); // console.log("[Auth] use system api key");
req.headers.set("Authorization", `Bearer ${systemApiKey}`); req.headers.set("Authorization", `Bearer ${systemApiKey}`);
} else { } else {
console.log("[Auth] admin did not provide an api key"); // console.log("[Auth] admin did not provide an api key");
} }
} else { } else {
console.log("[Auth] use user api key"); // console.log("[Auth] use user api key");
} }
return { return {

View File

@ -117,7 +117,7 @@ export async function requestOpenai(
// If openaiOrganizationHeader is present, log it; otherwise, log that the header is not present // If openaiOrganizationHeader is present, log it; otherwise, log that the header is not present
console.log("[Org ID]", openaiOrganizationHeader); console.log("[Org ID]", openaiOrganizationHeader);
} else { } else {
console.log("[Org ID] is not set up."); // console.log("[Org ID] is not set up.");
} }
// to prevent browser prompt for credentials // to prevent browser prompt for credentials
@ -196,6 +196,7 @@ export async function saveLogs(logData: {
getTokenLength(matchAllMessage.join(" ")) + getTokenLength(matchAllMessage.join(" ")) +
matchAllMessage.length * 3; matchAllMessage.length * 3;
} }
console.log("[debug log]----", logData);
delete logData?.logEntry; delete logData?.logEntry;
} }
if (logData?.model == "midjourney") { if (logData?.model == "midjourney") {
@ -205,8 +206,16 @@ export async function saveLogs(logData: {
console.log("[LOG]", "logToken", e); console.log("[LOG]", "logToken", e);
logData.logToken = 0; logData.logToken = 0;
} }
const result = await prisma.logEntry.create({ try {
data: logData, const result = await prisma.logEntry.create({
}); data: logData,
});
} catch {
delete logData?.userID;
const result = await prisma.logEntry.create({
data: logData,
});
}
// console.log("result", result) // console.log("result", result)
} }