Merge branch 'master' into joanne-tutorialagent

2 files changed, 5 insertions, 3 deletions

diff --git a/src/client/apis/google_docs/GooglePhotosClientUtils.ts b/src/client/apis/google_docs/GooglePhotosClientUtils.ts
index 4b86a8341..15fd6313a 100644
--- a/src/client/apis/google_docs/GooglePhotosClientUtils.ts
+++ b/src/client/apis/google_docs/GooglePhotosClientUtils.ts
@@ -311,7 +311,7 @@ export namespace GooglePhotos {
             sources
                 .filter(source => ImageCast(Doc.GetProto(source).data))
                 .forEach(async source => {
-                    const data = ImageCast(Doc.GetProto(source).data);
+                    const data = ImageCast(Doc.GetProto(source).data)!;
                     const url = data.url.href;
                     const target = Doc.MakeEmbedding(source);
                     const description = parseDescription(target, descriptionKey);
diff --git a/src/client/apis/gpt/GPT.ts b/src/client/apis/gpt/GPT.ts
index 29b6ab989..9cb47995c 100644
--- a/src/client/apis/gpt/GPT.ts
+++ b/src/client/apis/gpt/GPT.ts
@@ -1,5 +1,6 @@
 import { ChatCompletionMessageParam, Image } from 'openai/resources';
 import { openai } from './setup';
+import { imageUrlToBase64 } from '../../../ClientUtils';
 
 export enum GPTDocCommand {
     AssignTags = 1,
@@ -270,7 +271,6 @@ const gptImageLabel = async (src: string, prompt: string): Promise<string> => {
             ],
         });
         if (response.choices[0].message.content) {
-            console.log(response.choices[0].message.content);
             return response.choices[0].message.content;
         }
         return 'Missing labels';
@@ -310,7 +310,9 @@ const gptHandwriting = async (src: string): Promise<string> => {
     }
 };
 
-const gptDescribeImage = async (image: string): Promise<string> => {
+const gptDescribeImage = async (userPrompt: string, url: string): Promise<string> => {
+    if (userPrompt) return userPrompt;
+    const image = imageUrlToBase64(url);
     try {
         const response = await openai.chat.completions.create({
             model: 'gpt-4o',