bfa168cd by Ryan

Merge branch '27034_spacing' into 'master'

27034_spacing

See merge request !45
2 parents f52ee68a fa2c085c
......@@ -127,6 +127,9 @@
color:white;
}
.message {
width: 100%;
overflow: hidden;
word-wrap: break-word;
padding-left: 40px;
padding-right: 40px;
}
......
......@@ -114,7 +114,7 @@ function App() {
const regex = new RegExp(`\\b(${programmingKeywords.join('|')})\\b`, 'gi');
const matches = parsedData.match(regex);
if (!matches) {
var replaceTags = (parsedData.replace(/(?:\r\n|\r|\n)/g, '<br>').replace(/\./g, '. '))
var replaceTags = (parsedData.replace(/(?:\r\n|\r|\n)/g, '<br>'))
} else {
replaceTags = (parsedData.replace(':',':<code>').replace('<?','&#60;?').replace('?>','?&#62;').replace(/\n/g, '<br>'))
}
......
......@@ -4,6 +4,7 @@ const bodyParser = require('body-parser')
const cors = require('cors')
require('dotenv').config()
const rateLimit = require('express-rate-limit')
const anchorme = require("anchorme").default;
// Open AI Configuration
// console.log(process.env.OPENAI_API_ORG)
......@@ -63,8 +64,16 @@ app.post('/api', async (req, res) => {
max_tokens: 3000,
temperature,
});
let input = response.data.choices[0].text;
res.json({
message: response.data.choices[0].text,
message: anchorme({
input,
options: {
attributes: {
target: "_blank"
},
}
})
})
} catch (e) {
let error_msg = e.response.data.error.message ? e.response.data.error.message : '';
......@@ -83,7 +92,7 @@ app.post('/api', async (req, res) => {
async function runGPTTurbo(req, res) {
// "gpt-3.5-turbo"
const { message, currentModel, temperature } = req.body;
var returnMessage = '';
var input = '';
try {
const response = await openai.createChatCompletion({
model: `${currentModel}`,
......@@ -91,18 +100,25 @@ async function runGPTTurbo(req, res) {
max_tokens: 3000,
temperature
});
returnMessage = response.data.choices[0].message.content
input = response.data.choices[0].message.content
} catch (e) {
let error_msg = e.response.data.error.message ? e.response.data.error.message : '';
if (error_msg.indexOf('maximum context length')>=0){
returnMessage = "The output for your prompt is too long for us to process. Please reduce your prompt and try again.";
input = "The output for your prompt is too long for us to process. Please reduce your prompt and try again.";
}else{
console.log(e.response);
}
} finally {
res.json({
prompt: JSON.parse(message),
message: returnMessage
message: anchorme({
input,
options: {
attributes: {
target: "_blank"
},
}
})
});
return;
}
......
......@@ -9,6 +9,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"anchorme": "^2.1.2",
"body-parser": "^1.20.1",
"cors": "^2.8.5",
"dotenv": "^16.0.3",
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!