up

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/RemoveFurnitureV1.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,15 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredPackages">
-        <value>
-          <list size="2">
-            <item index="0" class="java.lang.String" itemvalue="opencv_python" />
-            <item index="1" class="java.lang.String" itemvalue="skimage" />
-          </list>
-        </value>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.12" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/RemoveFurnitureV1.iml" filepath="$PROJECT_DIR$/.idea/RemoveFurnitureV1.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

app.py

@@ -4,19 +4,10 @@ from PIL import Image
 import numpy as np
 
 # from config import setResoluton
-from models import make_image_controlnet, make_inpainting
+from models import make_inpainting
 from preprocessing import get_mask
 
-def image_to_byte_array(image: Image) -> bytes:
-    # BytesIO is a fake file stored in memory
-    imgByteArr = io.BytesIO()
-    # image.save expects a file as a argument, passing a bytes io ins
-    image.save(imgByteArr, format='png')  # image.format
-    # Turn the BytesIO object back into a bytes object
-    imgByteArr = imgByteArr.getvalue()
-    return imgByteArr
-
-def predict(input_img1,
+def rf(input_img1,
             input_img2,
             positive_prompt,
             negative_prompt,
@@ -24,18 +15,9 @@ def predict(input_img1,
             resolution
             ):
 
-
-
     print("predict")
-    # bla bla
-    # input_img1 = Image.fromarray(input_img1)
-    # input_img2 = Image.fromarray(input_img2)
-
-    # setResoluton(resolution)
     HEIGHT = resolution
     WIDTH = resolution
-    # WIDTH = resolution
-    # HEIGHT = resolution
 
     input_img1 = input_img1.resize((resolution, resolution))
     input_img2 = input_img2.resize((resolution, resolution))
@@ -58,41 +40,36 @@ def predict(input_img1,
 
     return retList
 
-
-app = gr.Interface(
-    predict,
-    inputs=[gr.Image(label="img", sources=['upload'], type="pil"),
-            gr.Image(label="mask", sources=['upload'], type="pil"),
-            gr.Textbox(label="positive_prompt",value="empty room"),
-            gr.Textbox(label="negative_prompt",value=""),
-            gr.Number(label="num_of_images",value=2),
-            gr.Number(label="resolution",value=512)
-            ],
-    outputs= [
-        gr.Image(label="resp0"),
-        gr.Image(label="resp1"),
-        gr.Image(label="resp2"),
-        gr.Image(label="resp3"),
-        gr.Image(label="resp4"),
-        gr.Image(label="resp5"),
-        gr.Image(label="resp6"),
-        gr.Image(label="resp7"),
-        gr.Image(label="resp8"),
-        gr.Image(label="resp9")],
-    title="rem fur 1",
-)
-
-app.launch(share=True)
-
-#
-
-
-# gr.Interface(
-#     test1,
-#     inputs=[gr.Textbox(label="param1")],
-#     outputs= gr.Textbox(label="result"),
-#     title="rem fur 1",
-# ).launch(share=True)
-
-
-
+def segmentation(image):
+    return image
+
+def upscale(image):
+    return image
+
+with gr.Blocks() as app:    
+    
+    gr.Button("FurnituRemove").click(rf, 
+                                     inputs=[gr.Image(label="img", type="pil"),
+                                            gr.Image(label="mask", type="pil"),
+                                            gr.Textbox(label="positive_prompt",value="empty room"),
+                                            gr.Textbox(label="negative_prompt",value=""),
+                                            gr.Number(label="num_of_images",value=2),
+                                            gr.Number(label="resolution",value=512)
+                                            ], 
+                                    outputs=[
+                                            gr.Image(),
+                                            gr.Image(),
+                                            gr.Image(),
+                                            gr.Image(),
+                                            gr.Image(),
+                                            gr.Image(),
+                                            gr.Image(),
+                                            gr.Image(),
+                                            gr.Image(),
+                                            gr.Image()])
+
+    gr.Button("Segmentation").click(segmentation, inputs=gr.Image(type="pil"), outputs=gr.Image())
+
+    gr.Button("Upscale").click(upscale, inputs=gr.Image(type="pil"), outputs=gr.Image())
+
+app.launch(debug=True)

utils.py

@@ -0,0 +1,8 @@
+def image_to_byte_array(image: Image) -> bytes:
+    # BytesIO is a fake file stored in memory
+    imgByteArr = io.BytesIO()
+    # image.save expects a file as a argument, passing a bytes io ins
+    image.save(imgByteArr, format='png')  # image.format
+    # Turn the BytesIO object back into a bytes object
+    imgByteArr = imgByteArr.getvalue()
+    return imgByteArr