Try to fix shapely bug

app.py

@@ -127,15 +127,14 @@ def prompt_with_mutation(user_prompt, fpath=None):
     #Create mutated layout based on initial
     cut_off = np.random.randint(1, 3, size=1)[0]
     cut_off = min(cut_off, len(output)-1)
-    new_prompt = model_prompt + ', '.join(output[:cut_off]) + ', '
+    to_keep = ', '.join(output[:cut_off]) + ', '
+    new_prompt = '[User prompt] {} [Layout] {}'.format(user_prompt, to_keep)
     input_ids = tokenizer(new_prompt, return_tensors='pt')
-    mut_output = finetuned.generate(**input_ids, do_sample=True, top_p=0.94, top_k=100, max_length=200)
+    mut_output = finetuned.generate(**input_ids, do_sample=True, top_p=0.94, top_k=100, max_length=300)
     mut_output = tokenizer.batch_decode(mut_output, skip_special_tokens=True)
     mut_im = mut_txt2layout(mut_output)
     
-    combined = merge_images(im, mut_im)
-    
-    return im, mut_im
+    return im, mut_im, output, mut_output
     
 # Gradio App
 
@@ -143,7 +142,7 @@ def gen_and_mutate(user_prompt, mutate=False):
     if(mutate):
         im, mut_im = None, None
         while (mut_im is None):
-            im, mut_im = prompt_with_mutation(user_prompt)
+            im, mut_im, output, mut_output = prompt_with_mutation(user_prompt)
     else:
         mut_im=Image.open(r"C:\\Users\\user\\Desktop\\empty.png")
         im, _ = prompt_to_layout(user_prompt)
@@ -162,7 +161,7 @@ iface = gr.Interface(fn=gen_and_mutate, inputs=[textbox, checkbox], outputs=[gen
                       article='''<div>
     <p> This app allows users the use of natural language prompts for appartment layout generation, using a variety of semantic information:</p>
      <ul>
-      <li> <strong>typology</strong>: "a bedroom with two bedrooms and two bathrooms"</li>
+      <li> <strong>typology</strong>: "a house with two bedrooms and two bathrooms"</li>
       <li> <strong>enumeration</strong>: "a house with five rooms"</li>
       <li> <strong>adjacency</strong>: "the kitchen is adjacent to a bedroom", "the living room is not adjacent to the bathroom"</li>
       <li> <strong>location</strong>: "a house with a bedroom in the north east side"</li>

requirements.txt

@@ -1,8 +1,59 @@
-numpy>=1.16.4
-textwrap3==0.9.2
-Pillow==8.0.1
-transformers==4.8.0
-gradio>=2.0.7
-shapely==1.7.1
 aggdraw==1.3.12
-torch==1.7.1
+analytics-python==1.4.0
+backoff==1.10.0
+bcrypt==3.2.0
+certifi==2021.5.30
+cffi==1.14.6
+charset-normalizer==2.0.3
+click==8.0.1
+colorama==0.4.4
+cryptography==3.4.7
+cycler==0.10.0
+ffmpy==0.3.0
+filelock==3.0.12
+Flask==2.0.1
+Flask-CacheBuster==1.0.0
+Flask-Cors==3.0.10
+Flask-Login==0.5.0
+gradio==2.2.2
+huggingface-hub==0.0.12
+idna==3.2
+itsdangerous==2.0.1
+Jinja2==3.0.1
+joblib==1.0.1
+kiwisolver==1.3.1
+markdown2==2.4.0
+MarkupSafe==2.0.1
+matplotlib==3.4.2
+monotonic==1.6
+numpy==1.21.1
+packaging==21.0
+pandas==1.3.0
+paramiko==2.7.2
+Pillow==8.3.1
+pip==21.1.3
+pycparser==2.20
+pycryptodome==3.10.1
+PyNaCl==1.4.0
+pyparsing==2.4.7
+python-dateutil==2.8.2
+pytz==2021.1
+PyYAML==5.4.1
+regex==2021.7.6
+requests==2.26.0
+sacremoses==0.0.45
+scipy==1.7.0
+setuptools==52.0.0.post20210125
+Shapely==1.7.1
+six==1.16.0
+tokenizers==0.10.3
+torch==1.9.0+cu102
+torchaudio==0.9.0
+torchvision==0.10.0+cu102
+tqdm==4.61.2
+transformers==4.8.2
+typing-extensions==3.10.0.0
+urllib3==1.26.6
+Werkzeug==2.0.1
+wheel==0.36.2
+wincertstore==0.2