Merge branch 'master' into sophie-ai-images

3 files changed, 41 insertions, 10 deletions

diff --git a/src/client/apis/google_docs/GoogleApiClientUtils.ts b/src/client/apis/google_docs/GoogleApiClientUtils.ts
index 551dca073..c8f381cc0 100644
--- a/src/client/apis/google_docs/GoogleApiClientUtils.ts
+++ b/src/client/apis/google_docs/GoogleApiClientUtils.ts
@@ -84,7 +84,7 @@ export namespace GoogleApiClientUtils {
             };
             try {
                 const schema: docs_v1.Schema$Document = await Networking.PostToServer(path, parameters);
-                return schema.documentId;
+                return schema.documentId === null ? undefined : schema.documentId;
             } catch {
                 return undefined;
             }
@@ -195,7 +195,7 @@ export namespace GoogleApiClientUtils {
                     const title = document.title;
                     let bodyLines = Utils.extractText(document).text.split("\n");
                     options.removeNewlines && (bodyLines = bodyLines.filter(line => line.length));
-                    return { title, bodyLines };
+                    return { title: title ?? "", bodyLines };
                 }
             });
         };
diff --git a/src/client/apis/gpt/GPT.ts b/src/client/apis/gpt/GPT.ts
index 9403e4d3a..cea862330 100644
--- a/src/client/apis/gpt/GPT.ts
+++ b/src/client/apis/gpt/GPT.ts
@@ -1,4 +1,23 @@
-import { GPTCallOpts, GPTCallType, callTypeMap, openai } from './setup';
+import { ClientOptions, OpenAI } from 'openai';
+
+enum GPTCallType {
+    SUMMARY = 'summary',
+    COMPLETION = 'completion',
+    EDIT = 'edit',
+}
+
+type GPTCallOpts = {
+    model: string;
+    maxTokens: number;
+    temp: number;
+    prompt: string;
+};
+
+const callTypeMap: { [type: string]: GPTCallOpts } = {
+    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: '' },
+};
 
 /**
  * Calls the OpenAI API.
@@ -10,13 +29,18 @@ const gptAPICall = async (inputText: string, callType: GPTCallType) => {
     if (callType === GPTCallType.SUMMARY) inputText += '.';
     const opts: GPTCallOpts = callTypeMap[callType];
     try {
-        const response = await openai.createCompletion({
+        const configuration: ClientOptions = {
+            apiKey: process.env.OPENAI_KEY,
+            dangerouslyAllowBrowser: true,
+        };
+        const openai = new OpenAI(configuration);
+        const response = await openai.completions.create({
             model: opts.model,
             max_tokens: opts.maxTokens,
             temperature: opts.temp,
             prompt: `${opts.prompt}${inputText}`,
         });
-        return response.data.choices[0].text;
+        return response.choices[0].text;
     } catch (err) {
         console.log(err);
         return 'Error connecting with API.';
@@ -25,12 +49,18 @@ const gptAPICall = async (inputText: string, callType: GPTCallType) => {
 
 const gptImageCall = async (prompt: string, n?: number) => {
     try {
-        const response = await openai.createImage({
+        const configuration: ClientOptions = {
+            apiKey: process.env.OPENAI_KEY,
+            dangerouslyAllowBrowser: true,
+        };
+
+        const openai = new OpenAI(configuration);
+        const response = await openai.images.generate({
             prompt: prompt,
             n: n ?? 1,
             size: '1024x1024',
         });
-        return response.data.data.map(data => data.url);
+        return response.data.map((data: any) => data.url);
         // return response.data.data[0].url;
     } catch (err) {
         console.error(err);
diff --git a/src/client/apis/youtube/YoutubeBox.tsx b/src/client/apis/youtube/YoutubeBox.tsx
index 2da9927c0..d3a15cd84 100644
--- a/src/client/apis/youtube/YoutubeBox.tsx
+++ b/src/client/apis/youtube/YoutubeBox.tsx
@@ -10,7 +10,8 @@ import { DocumentView } from '../../views/nodes/DocumentView';
 import { FieldView, FieldViewProps } from '../../views/nodes/FieldView';
 import '../../views/nodes/WebBox.scss';
 import './YoutubeBox.scss';
-import React = require('react');
+import * as React from 'react';
+import { SnappingManager } from '../../util/SnappingManager';
 
 interface VideoTemplate {
     thumbnailUrl: string;
@@ -355,9 +356,9 @@ export class YoutubeBox extends React.Component<FieldViewProps> {
             </div>
         );
 
-        const frozen = !this.props.isSelected() || DocumentView.Interacting;
+        const frozen = !this.props.isSelected() || SnappingManager.IsResizing;
 
-        const classname = 'webBox-cont' + (this.props.isSelected() && Doc.ActiveTool === InkTool.None && !DocumentView.Interacting ? '-interactive' : '');
+        const classname = 'webBox-cont' + (this.props.isSelected() && Doc.ActiveTool === InkTool.None && !SnappingManager.IsResizing ? '-interactive' : '');
         return (
             <>
                 <div className={classname}>{content}</div>