Update server.js

server.js

@@ -13,6 +13,9 @@ const openaiKey = process.env.OPENAI_KEY;
 const port = 7860;
 const baseUrl = getExternalUrl(process.env.SPACE_ID);
 
+let requestDetails = [];
+let apiKeyDetails = {};
+
 const allowedModels = [
     'gpt-3.5-turbo-0125',
     'gpt-3.5-turbo',
@@ -23,9 +26,6 @@ const allowedModels = [
     'gpt-3.5-turbo-16k-0613'
 ];
 
-let requestDetails = [];
-let apiKeyDetails = {}; // Track API key usage and first use timestamp
-
 io.on('connection', (socket) => {
     console.log('A user connected to the websocket for live logs.');
 });
@@ -56,52 +56,32 @@ function authenticateApiKey(req, res, next) {
         return res.status(401).send('Unauthorized: API key is invalid');
     }
 
-    const displayKey = apiKeyMatch.trim().substring(0, 7); // Only use the first four characters for display
+    const displayKey = apiKeyMatch.trim().substring(0, 7);
 
     if (!apiKeyDetails[apiKeyMatch]) {
         apiKeyDetails[apiKeyMatch] = {
             count: 0,
-            firstUse: moment()  // Set the first use to now if it's not already set
+            firstUse: moment()
         };
     }
 
-    // Check if more than a week has passed since the first use
     if (moment().diff(apiKeyDetails[apiKeyMatch].firstUse, 'weeks') >= 1) {
         return res.status(429).send(`API Key ${displayKey}... is blocked after one week of use.`);
     }
 
-    // Increment the request count
     apiKeyDetails[apiKeyMatch].count++;
-
     const logMessage = `API Key ${displayKey}... used ${apiKeyDetails[apiKeyMatch].count} times so far.`;
     logAndEmit(logMessage, true);
     
-    req.apiKey = apiKeyMatch; // Store the API key for the request
+    req.apiKey = apiKeyMatch;
     next();
 }
 
-app.use('/api', authenticateApiKey, (req, res, next) => {
-    const urlParts = req.url.split('/');
-    const modelId = urlParts.length > 1 ? urlParts[1] : null;
-
-    // Check if the model ID is part of the allowed models.
-    if (!modelId || !allowedModels.includes(modelId)) {
-        return res.status(403).send("Access Denied: This model is not allowed.");
+app.use('/api/models/:model', authenticateApiKey, (req, res, next) => {
+    const modelRequested = req.params.model;
+    if (!allowedModels.includes(modelRequested)) {
+        return res.status(403).send('The requested model is not permitted.');
     }
-
-    const timestamp = moment().tz("Asia/Tbilisi").format("DD-MMM-YYYY HH:mm");
-    const displayKey = req.apiKey.substring(0, 10);
-    const requestData = {
-        requestNumber: apiKeyDetails[req.apiKey].count,
-        apiKey: displayKey,
-        timestamp: timestamp,
-        text: req.method + ' ' + req.url
-    };
-    requestDetails.push(requestData);
-
-    const detailedLog = `Request ${requestData.requestNumber} on ${requestData.timestamp} from API Key ${displayKey}... with method "${req.method}" and URL line "${req.url}"`;
-    logAndEmit(detailedLog, true);
-
     next();
 }, proxy(targetUrl, {
     proxyReqOptDecorator: function(proxyReqOpts, srcReq) {
@@ -131,5 +111,5 @@ function getExternalUrl(spaceId) {
 
 server.listen(port, () => {
     const message = `Reverse proxy server and WebSocket running on port ${port}`;
-    logAndEmit(message, true); // true to include total requests in the log
+    logAndEmit(message, true);
 });