Merge branch 'master' into sophie-report-manager

2 files changed, 8 insertions, 27 deletions

diff --git a/src/client/apis/gpt/GPT.ts b/src/client/apis/gpt/GPT.ts
index 4b3960902..6bde7989b 100644
--- a/src/client/apis/gpt/GPT.ts
+++ b/src/client/apis/gpt/GPT.ts
@@ -14,7 +14,7 @@ type GPTCallOpts = {
 };
 
 const callTypeMap: { [type: string]: GPTCallOpts } = {
-    summary: { model: 'text-davinci-003', maxTokens: 256, temp: 0.5, prompt: 'Summarize this text briefly: ' },
+    summary: { model: 'text-davinci-003', maxTokens: 256, temp: 0.5, prompt: 'Summarize this text in simpler terms: ' },
     edit: { model: 'text-davinci-003', maxTokens: 256, temp: 0.5, prompt: 'Reword this: ' },
     completion: { model: 'text-davinci-003', maxTokens: 256, temp: 0.5, prompt: '' },
 };
@@ -39,7 +39,6 @@ const gptAPICall = async (inputText: string, callType: GPTCallType) => {
             temperature: opts.temp,
             prompt: `${opts.prompt}${inputText}`,
         });
-        console.log(response.data.choices[0]);
         return response.data.choices[0].text;
     } catch (err) {
         console.log(err);
@@ -47,7 +46,7 @@ const gptAPICall = async (inputText: string, callType: GPTCallType) => {
     }
 };
 
-const gptImageCall = async (prompt: string) => {
+const gptImageCall = async (prompt: string, n?: number) => {
     try {
         const configuration = new Configuration({
             apiKey: process.env.OPENAI_KEY,
@@ -55,33 +54,15 @@ const gptImageCall = async (prompt: string) => {
         const openai = new OpenAIApi(configuration);
         const response = await openai.createImage({
             prompt: prompt,
-            n: 1,
+            n: n ?? 1,
             size: '1024x1024',
         });
-        return response.data.data[0].url;
+        return response.data.data.map(data => data.url);
+        // return response.data.data[0].url;
     } catch (err) {
         console.error(err);
         return;
     }
 };
 
-// const gptEditCall = async (selectedText: string, fullText: string) => {
-//     try {
-//         const configuration = new Configuration({
-//             apiKey: process.env.OPENAI_KEY,
-//         });
-//         const openai = new OpenAIApi(configuration);
-//         const response = await openai.createCompletion({
-//             model: 'text-davinci-003',
-//             max_tokens: 256,
-//             temperature: 0.1,
-//             prompt: `Replace the phrase ${selectedText} inside of ${fullText}.`,
-//         });
-//         return response.data.choices[0].text.trim();
-//     } catch (err) {
-//         console.log(err);
-//         return 'Error connecting with API.';
-//     }
-// };
-
 export { gptAPICall, gptImageCall, GPTCallType };
diff --git a/src/client/apis/youtube/YoutubeBox.tsx b/src/client/apis/youtube/YoutubeBox.tsx
index 05879a247..2da9927c0 100644
--- a/src/client/apis/youtube/YoutubeBox.tsx
+++ b/src/client/apis/youtube/YoutubeBox.tsx
@@ -6,7 +6,7 @@ import { Cast, NumCast, StrCast } from '../../../fields/Types';
 import { Utils } from '../../../Utils';
 import { DocServer } from '../../DocServer';
 import { Docs } from '../../documents/Documents';
-import { DocumentDecorations } from '../../views/DocumentDecorations';
+import { DocumentView } from '../../views/nodes/DocumentView';
 import { FieldView, FieldViewProps } from '../../views/nodes/FieldView';
 import '../../views/nodes/WebBox.scss';
 import './YoutubeBox.scss';
@@ -355,9 +355,9 @@ export class YoutubeBox extends React.Component<FieldViewProps> {
             </div>
         );
 
-        const frozen = !this.props.isSelected() || DocumentDecorations.Instance.Interacting;
+        const frozen = !this.props.isSelected() || DocumentView.Interacting;
 
-        const classname = 'webBox-cont' + (this.props.isSelected() && Doc.ActiveTool === InkTool.None && !DocumentDecorations.Instance.Interacting ? '-interactive' : '');
+        const classname = 'webBox-cont' + (this.props.isSelected() && Doc.ActiveTool === InkTool.None && !DocumentView.Interacting ? '-interactive' : '');
         return (
             <>
                 <div className={classname}>{content}</div>