Update app.py

app.py

@@ -836,27 +836,15 @@ def applyStyle(evt: gr.SelectData, seshid):
     return gr.Gallery(room_items_imgs_tuples, label='Room Items', columns=5) 
 
 
-def dummyFrmt(frmt):
+def uploadToScriptGenPromise(frmt, seshid):
     sesh = getSesh(seshid)
     if True:
-        urls = [sesh.item_data[sesh.current_img_signature][sesh.item_data_keys[sesh.current_img_signature]['room_type']][sesh.item_data_keys[sesh.current_img_signature]['room_style']][sesh.item_data_keys[sesh.current_img_signature]['price']][sesh.item_data_keys[sesh.current_img_signature]['Paletteid']][itemidx_item[1]][itemidx_item[0]]['href'] for itemidx_item in sesh.display_items_[sesh.current_img_signature]  if itemidx_item[1] not in ['Palette', 'Living Room', 'Bedroom']]
-        sesh.responses = asyncio.run(main(urls))
-        urls = ['https://dreamdemo.pythonanywhere.com/store_shop' for _ in range(len(urls))]
-        headers = [{'Content-type': 'application/json', 'Accept': 'text/plain'} for i,_ in enumerate(urls)]
-        responses = [r.decode('ISO-8859-1') if type(r) != type(None) else r for r in sesh.responses]
-        item_locator_data = [sesh.item_data_[sesh.current_img_signature][sesh.room_type][sesh.room_style][sesh.price][sesh.Palette_ids[sesh.current_img_signature]][data[1]][data[0]] for data in sesh.display_items_[sesh.current_img_signature] if data[1] not in ['Palette', 'Living Room', 'Bedroom']]
-        json_data = [json.dumps({'response': responses[i], 'item_locator_data': item_locator_data[i]}) for i,url in enumerate(urls)]
-        responses = asyncio.run(main_post(urls, headers, json_data, timeout=.5))
-        print('*-/*/-*-roomItemClick: dumped store_shop: ', item_locator_data)
-        
         formats = ['Youtube Long-Form', 'Youtube Short-Form', 'Facebook Long-Form', 'Instagram Reel', 'Tiktok', 'LinkedIn']
         formats = [frmt]
         number_of_items = [7, 3, 7, 3, 3, 7]
         urls = [sesh.item_data[sesh.current_img_signature][sesh.item_data_keys[sesh.current_img_signature]['room_type']][sesh.item_data_keys[sesh.current_img_signature]['room_style']][sesh.item_data_keys[sesh.current_img_signature]['price']][sesh.item_data_keys[sesh.current_img_signature]['Paletteid']][itemidx_item[1]][itemidx_item[0]]['href'] for itemidx_item in sesh.display_items_[sesh.current_img_signature]  if itemidx_item[1] not in ['Palette', 'Living Room', 'Bedroom']]
-        sesh.responses = asyncio.run(main(urls))
         #urls = ['https://dreamdemo.pythonanywhere.com/scriptgen_promise' for _ in range(len(formats))]
         #headers = [{'Content-type': 'application/json', 'Accept': 'text/plain'} for i,_ in enumerate(urls)]
-        responses = [[r.decode('ISO-8859-1') if type(r) != type(None) else r for r in sesh.responses] for _ in range(len(formats))]
         item_locator_data = [[sesh.item_data_[sesh.current_img_signature][sesh.room_type][sesh.room_style][sesh.price][sesh.Palette_ids[sesh.current_img_signature]][data[1]][data[0]] for data in sesh.display_items_[sesh.current_img_signature] if data[1] not in ['Palette', 'Living Room', 'Bedroom']] for _ in range(len(formats))]
         items = [[data[1] for data in sesh.display_items_[sesh.current_img_signature] if data[1] not in ['Palette', 'Living Room', 'Bedroom']] for _ in range(len(formats))]
         idxs = [list(range(len(items))) for i,_ in enumerate(formats)]
@@ -872,6 +860,9 @@ def dummyFrmt(frmt):
             time.sleep(.001)
         #json_data = [json.dumps({'video_format': fmt, 'number_of_items': number_of_items[i], 'room_type': sesh.room_type, 'item_locator_data': item_locator_data, 'gen_uid': i, 'responses':responses, 'items': items}) for i,fmt in enumerate(formats)]
         json_data = [json.dumps({'video_format': fmt, 'number_of_items': number_of_items[i], 'idxs':idxs[i][:number_of_items[i]], 'room_type': sesh.room_type, 'item_locator_data': item_locator_data[i], 'gen_uid': sesh.frmt_id_maps[sesh.current_img_signature][formats[i]], 'seshid':seshid, 'items': items[i]}) for i,fmt in enumerate(formats) if process[i]]
+        if not json_data:
+            setSesh(seshid, sesh)
+            return 
         urls = ['https://dreamdemo.pythonanywhere.com/scriptgen_promise' for i in range(len(formats)) if process[i]]
         headers = [{'Content-type': 'application/json', 'Accept': 'text/plain'} for i,_ in enumerate(formats) if process[i]]
         print('*-/*/-*-roomItemClick -- processed: ', len(json_data), [(f,process[i], idxs[i]) for i,f in enumerate(formats)])
@@ -1912,12 +1903,13 @@ def updateLinkedInStatus(text, seshid):
 def selectScript(evt: gr.SelectData, seshid):
     sesh = getSesh(seshid)
     script = evt.value
-    format = evt.value
+    frmt = evt.value
+    uploadToScriptGenPromise(frmt, seshid)
     #frmt_id_maps[formats[i]]
     url = 'https://dreamdemo.pythonanywhere.com/query_textgen'
     #item_locator_data = [tuple(sesh.item_data_[sesh.current_img_signature][sesh.room_type][sesh.room_style][sesh.price][sesh.Palette_ids[sesh.current_img_signature]][data[1]][data[0]]) for data in sesh.display_items_[sesh.current_img_signature] if data[1] not in ['Palette', 'Living Room', 'Bedroom']]
     #valid_data = {'item_locator_data': item_locator_data} 
-    valid_data = {'seshid':seshid, 'genuid': sesh.frmt_id_maps[sesh.current_img_signature][format]} 
+    valid_data = {'seshid':seshid, 'genuid': sesh.frmt_id_maps[sesh.current_img_signature][frmt]} 
     headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
     start = time.time()
     #r = requests.post(url, data=json.dumps(valid_data), headers=headers)
@@ -1925,14 +1917,14 @@ def selectScript(evt: gr.SelectData, seshid):
 
     urls = ['https://dreamdemo.pythonanywhere.com/query_textgen' for i in range(1)]
     headers = [{'Content-type': 'application/json', 'Accept': 'text/plain'} for i in range(1)]
-    json_data = [json.dumps({'seshid':seshid, 'genuid': sesh.frmt_id_maps[sesh.current_img_signature][format]}) for i in range(1)]
+    json_data = [json.dumps({'seshid':seshid, 'genuid': sesh.frmt_id_maps[sesh.current_img_signature][frmt]}) for i in range(1)]
     responses = asyncio.run(main_post(urls, headers, json_data, timeout=.5))
     try:
         data_dict = json.loads(responses[0])
     except:
         data_dict = {}
     
-    print('selectScript: ', format, sesh.frmt_id_maps[sesh.current_img_signature][format], time.time()-start, responses)
+    print('selectScript: ', frmt, sesh.frmt_id_maps[sesh.current_img_signature][format], time.time()-start, responses)
     #return sesh.scripts[script]
     return 'Script being generated. Try again in 30  seconds.' if not data_dict or 'text' not in data_dict else data_dict['text']