Update app.py

app.py

@@ -5,23 +5,67 @@ from io import BytesIO
 import requests
 
 f = modal.Cls.lookup("casa-interior-hf-v3", "DesignModel")
-f_gc = modal.Cls.lookup("casa-interior-gc-v2", "GetProduct") 
 
-# def casa_ai_run_tab1(image=None, room_type=None, interior_style=None, objects=None): 
+from PIL import Image
+import requests
+from io import BytesIO
+from google.cloud import vision
+from google.oauth2 import service_account
+import json
+import os
+
+credentials = {
+  "type": "service_account",
+  "project_id": "furniture-423815",
+  "private_key_id": "be5e481a8e4499c164ed0147b3f024d4ef1f42f3",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCdy13qrKLk+Lai\nspQgcgKU8YYBOfPdo+FGlodKVb7kTJiEsTN7Ovq69c4S9Hzsf/UNdiEB4wpDIG5m\nBaZrHPBeaZSxmSVhNjctaYR/id06Qvka/Y4PerntUA9ubcVYvZ/ntEpHaL1kVYNe\nATAD0LE0QuQuXPWfBDGvyfsy2hK91D+/WbPCby+pWhh4buRZk3xGku+SGtoTenMP\nzHagPCVNreJD13mrIJu5M1NkB0ZHAdlkOVdRqyxntgcg97krUpace8DM28xB0Pfb\nXk1vaESeUbrcjVt4RDxQAIZwYB4MQ68MiEsuOGZ3O/coXafK89ldMOu+zKlvgloB\ns/JlPtH5AgMBAAECggEABTXpmWXfQKyiWkvHlq0xHuI9XLXBUuq2Fg7DM64SbkdF\nu47+7lUvoaQbjJZweB5PFSVXGHD6/iW4Y4vQ96VGXjXCFF3EZVoFFy2uc4g1yxZa\nU7z295WjxV2BDvJWw5QKb1wtnj9MDr/ApWZoY53c9ib10j6dWUWKDv4eWornNse5\n0ZZYCJV3RtPgEeuf2dyWtFKeAGwiUKYf60l4sBloJbpI1Jedw/0WdlH8WyX5ufuN\nBb9ZWWOmjImr4KGnttLOGg0Id/NZNMJc1i3iz91qWKecregoBuMoNp0AnfclOc1h\nipHXg6zqRZXBDOGPTwBibm8YsR0wWuFx0qCuZNGaYQKBgQDVQW54oneinUL8vVIi\nSdoR8zDrEzje5mgjk68NXn/mUZXhc9toYWblDr5x+PR/LIkjGtUAo706ncV4ysON\nEPB2yrIY1SgTOHP9eW4uTqhQanNr/NgH1/viNXPeQIEx2BnQvcLuORU/V8ZPK+X5\nhRF/xoN9B0Phwxy10SSQZ/iVIQKBgQC9bByD3lvov5ibQn1x57B59zHkq5TPvnXU\ntSFNkWTqus3mmHttJQNP6PcwRiRBaHt2NfKxO9nfIq1rkTaSOMCtsu1N48MF7ccx\niBNnRYMNdu4xmB3JcLyfJ5SZhcO46lJQOrRg0JfemD+BrEgazJi8S7ECwAGemlY1\nrllZnsJJ2QKBgEMxzMdCGgQpHTRZywl2z7mcMSvA8Mh7PREItb22qwI9bsaNJPMs\nzakbDjMHSLLRq5xeFgOPlE5l7BT1fsxyK/KiR5+/elMkFJgnrOn2at57zEaYctF1\n4q4SPaIoHQ1BlFDLmiJJ5kIBPEEyCdKndS4XtNKueVsniWJYtfaybAdBAoGBALU4\n9Z8D4ZKvm2UPG80aCLDnWoiXz2thoIG8OPxpGc+ooMz5HTyyqJSPIc7BjHY3a8cQ\nnfwKcssT9i5vY3JJca28/WQDf9XwQx6UPVwUGOmM2x3/lp/eh9cMmxK18ya6p72y\nLFhjuKhxqHB7TxC0pXugPt2OrP38UnZRM5KWXPMhAoGALFZCVXiDaY/4ay9ATlLs\ndDhS+yX7zJ5vKusT42wAPrFlcu+3eKxGRzFL3c/yNQaFFcpV+TeVsHx2gQ/NRWaL\nu1+99cZ56tTMfajXmRkri+R9wz70awmDx9ReCrl1IMEvPFwtaMMWf6m1xbimfgDv\n3tIueX+ZTxWFRYcI6UGbW7k=\n-----END PRIVATE KEY-----\n",
+  "client_email": "[email protected]",
+  "client_id": "101044092237072973103",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/furniture-service%40furniture-423815.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
+
+class GetProduct:
     
-#     if image is None: 
-#         print('Please provide image of empty room to design')
-#         return None
-
-#     if (room_type is None or interior_style is None or objects is None): 
-#         print('Please select all three (Room type, Interior Style and Objects')
-#         return None
+    def __init__(self):
+        creds = service_account.Credentials.from_service_account_info(credentials)
+        self.client = vision.ImageAnnotatorClient(credentials=creds)
+    
+    def inference(self, cropped_image: Image) -> list:
+        annotations = self.annotate_image(cropped_image)
+        selected_images = self.report(annotations)
+        
+        return selected_images
 
-#     objects_str = ", ".join(objects)
-#     text = f"A {room_type} in style of {interior_style} with {objects_str}."
+    def annotate_image(self, image: Image): 
+        
+        buffer = BytesIO()
+        # Convert the image to RGB mode if it is RGBA
+        if image.mode == 'RGBA':
+            image = image.convert('RGB')
+        image.save(buffer, format="JPEG")
+        content = buffer.getvalue()
     
-#     result_image = f.inference.remote("tab1", image, text)
-#     return result_image
+        image = vision.Image(content=content)
+        web_detection = self.client.web_detection(image=image).web_detection
+        return web_detection
+
+    def report(self, annotations) -> list:
+        selected_images = []
+        if annotations.visually_similar_images: 
+            for page in annotations.visually_similar_images:
+                try: 
+                    response = requests.get(page.url)
+                    img = Image.open(BytesIO(response.content))
+                    selected_images.append(img)
+                except:
+                    pass
+        return selected_images 
+
+GP = GetProduct()
 
 def casa_ai_run_tab1(image=None, text=None): 
     
@@ -61,18 +105,8 @@ def casa_ai_run_tab3(dict=None):
         print('Please provide cropped object')
         return None
     
-    result_urls = f_gc.inference.remote(selected_crop)
-    print(result_urls)
-
-    result_image = []
-    for r in result_urls: 
-        try: 
-            response = requests.get(r)
-            img = Image.open(BytesIO(response.content))
-            result_image.append(img)
-        except:
-            pass
-    return result_image
+    results = GP.inference(selected_crop)
+    return results
 
 with gr.Blocks() as casa:
     title = "Casa-AI Demo"
@@ -84,21 +118,6 @@ with gr.Blocks() as casa:
                 inputs = [
                             gr.Image(sources='upload', type="pil", label="Upload"), 
                             gr.Textbox(label="Room description.")
-                            # gr.Dropdown(
-                            #             label="Room type",
-                            #             choices=["Living Room", "Bedroom", "Home Office", "Dining Room", "Kitchen", "Bathroom"],
-                            #             multiselect=False
-                            #         ), 
-                            # gr.Dropdown(
-                            #             label="Interior Style",
-                            #             choices=["Modern", "Traditional", "Contemporary", "Minimalist", "Rustic", "Industrial", "Scandinavian"],
-                            #             multiselect=False
-                            #         ), 
-                            # gr.Dropdown(
-                            #             label="Objects",
-                            #             choices=["Sofa", "Bed", "Table", "Chair", "Fridge", "Dinning table", "Coffee table"],
-                            #             multiselect=True
-                            #         ),
                         ]
             with gr.Column():
                 outputs = [gr.Image(label="Generated room image")]
@@ -132,16 +151,4 @@ with gr.Blocks() as casa:
         submit_btn = gr.Button("Find similar products!")
         submit_btn.click(casa_ai_run_tab3, inputs=inputs, outputs=outputs)
 
-casa.launch()
-
-# demo = gr.Interface(casa_ai_run,
-#                     inputs = [gr.ImageEditor(sources='upload', brush=gr.Brush(colors=["#FFFFFF"]), elem_id="image_upload", type="pil", label="Upload", layers=False, eraser=True, transforms=[]),
-#                               gr.Textbox(label="Prompt to design room"), 
-#                               ],
-#                     outputs = [
-#                               gr.Image(label="Generated room image"),
-#                               ],
-#                     title = title,
-#                     description = description,
-#                     )
-# demo.launch()
+casa.launch()