Update app.py

app.py

@@ -324,7 +324,7 @@ def summarisePerStore():
             sesh.summary_joined[store][item] = {'product_dict': pd, 'count':1}
 
 
-def updateItemDisplay(budget=False):
+def updateItemDisplay(seshid, budget=False):
     if True:
         keys = ['filtered_items_room', 'current_img_signature', 'items', 'filtered_items_style', 'room_style', 'room_type', 'bedsize', 'price', 'filtered_items_colors', 'Palette_ids', 'item_data', 'item_data_', 'display_items', 'item_data_keys', 'Palettes_displayed', 'room_img_loaded', 'Paletteid', 'img_id', 'seshid']
         url = 'https://dreamdemo.pythonanywhere.com/sesh'
@@ -502,12 +502,13 @@ def isJSONSerialiazable(obj):
     except:
         return False
 
-def updateItemDisplay(budget=False):
+def updateItemDisplay(seshid, budget=False):
     if True:
         keys = ['filtered_items_room', 'current_img_signature', 'items', 'filtered_items_style', 'room_style', 'room_type', 'bedsize', 'price', 'filtered_items_colors', 'Palette_ids', 'item_data', 'item_data_', 'display_items', 'item_data_keys', 'Palettes_displayed', 'room_img_loaded', 'Paletteid', 'img_id', 'seshid']
         url = 'https://dreamdemo.pythonanywhere.com/sesh'
         data = sesh.__dict__
         valid_data = {k:v for k,v in data.items() if k in keys and isJSONSerialiazable(v)} 
+        valid_data['seshid'] = seshid
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
 
     if True: #try:
@@ -620,7 +621,7 @@ first mover
 """    
 
 
-def updateRoomType(evt: gr.SelectData):
+def updateRoomType(evt: gr.SelectData, seshid):
     label = evt.value['caption'].lower().split()[0] if evt.value['caption'] else sesh.room_type 
     sesh.room_type = label
     images = [(v['bedroom'] if sesh.room_type == 'bedroom' else v['living room'], k) for k,v in styles_images.items()]
@@ -630,7 +631,7 @@ def updateRoomType(evt: gr.SelectData):
     #display = updateItemDisplay()
 
     if hasattr(sesh, 'room_img_loaded') and sesh.room_img_loaded:
-        display = updateItemDisplay()
+        display = updateItemDisplay(seshid)
     else:
         display = sesh.updated_display
 
@@ -646,12 +647,12 @@ def updateRoomType(evt: gr.SelectData):
     return images, gr.Radio(['Full', 'Queen', 'King'], value='Full', label='Bed Size', interactive=True, visible=True) if label == 'bedroom' else gr.Radio(visible=False), gr.Gallery(sesh.updated_display, label='Room Items', columns=5)"""
 
 
-def updateStyle(evt: gr.SelectData):
+def updateStyle(evt: gr.SelectData, seshid):
     style = evt.value['caption'].lower().split()[0] if evt.value['caption'] else sesh.room_style
     sesh.room_style = style
 
     if hasattr(sesh, 'room_img_loaded') and sesh.room_img_loaded:
-        display = updateItemDisplay()
+        display = updateItemDisplay(seshid)
         return display
     else:
         return sesh.updated_display
@@ -664,14 +665,14 @@ def updateStyle(evt: gr.SelectData):
     sesh.filtered_items_style[sesh.current_img_signature] = {item: ifiles if item in ['Palette', 'Living Room', 'Bedroom'] else [f for f in ifiles if '_'.join(sesh.price.replace('-', ' ').lower().split()) in f] for item,ifiles in sesh.filtered_items_style[sesh.current_img_signature].items()}
     print('updateStyle: ', [(item,len(ifiles)) for item,ifiles in sesh.filtered_items_style[sesh.current_img_signature].items()])"""
 
-def updatePrice(evt: gr.SelectData):
+def updatePrice(evt: gr.SelectData, seshid):
     print('updatePrice: ', type(evt.value), evt.value)
     price = evt.value if evt.value else sesh.price
     sesh.price = price
 
 
     if hasattr(sesh, 'room_img_loaded') and sesh.room_img_loaded:
-        display = updateItemDisplay()
+        display = updateItemDisplay(seshid)
         return display
     else:
         return sesh.updated_display
@@ -684,13 +685,13 @@ def updatePrice(evt: gr.SelectData):
     sesh.filtered_items_style[sesh.current_img_signature] = {item: ifiles if item in ['Palette', 'Living Room', 'Bedroom'] else [f for f in ifiles if '_'.join(sesh.price.replace('-', ' ').lower().split()) in f] for item,ifiles in sesh.filtered_items_style[sesh.current_img_signature].items()}
     print('updatePrice: ', [(item,len(ifiles)) for item,ifiles in sesh.filtered_items_style[sesh.current_img_signature].items()]) """
 
-def updateBedsize(evt: gr.SelectData):
+def updateBedsize(evt: gr.SelectData, seshid):
     bedsize = evt.value if evt.value else sesh.bedsize 
     sesh.bedsize = bedsize 
 
 
     if hasattr(sesh, 'room_img_loaded') and sesh.room_img_loaded:
-        display = updateItemDisplay()
+        display = updateItemDisplay(seshid)
         return display
     else:
         return sesh.updated_display
@@ -705,7 +706,7 @@ def updateBedsize(evt: gr.SelectData):
 
 
 #sesh.palettes_data
-def updateColors(evt: gr.SelectData):
+def updateColors(evt: gr.SelectData, seshid):
     Paletteid = evt.value['caption'] if evt.value['caption'] else '0'
     sesh.Paletteid = evt.value['caption']
     sesh.Palette_ids[sesh.current_img_signature] = Paletteid 
@@ -721,7 +722,7 @@ def updateColors(evt: gr.SelectData):
     sesh.Palette_imgs[sesh.img_id] = sesh.Palette_img
 
     if hasattr(sesh, 'room_img_loaded') and sesh.room_img_loaded:
-        display = updateItemDisplay()
+        display = updateItemDisplay(seshid)
         return display
     else:
         return sesh.updated_display
@@ -776,11 +777,11 @@ def updateColors(evt: gr.SelectData):
  
 #Palettes_displayed, Palettes
 
-def makePalettes(evt: gr.SelectData):
+def makePalettes(evt: gr.SelectData, seshid):
     #print('makePalettes: ', type(evt.value), evt.value)
     sesh.img_id = sesh.current_img_signature = evt.value['caption'] if evt.value['caption'] else sesh.current_img_signature
     if sesh.current_img_signature in sesh.Palettes_displayed:
-        display = updateItemDisplay()
+        display = updateItemDisplay(seshid)
         return sesh.Palettes_displayed[sesh.current_img_signature], sesh.img_data[sesh.current_img_signature], display
 
     img = sesh.img_data[sesh.img_id]
@@ -806,7 +807,8 @@ def makePalettes(evt: gr.SelectData):
     #print('bestclr_keys: ', bestclr_keys)
     url = 'https://dreamdemo.pythonanywhere.com/palletes'
     #valid_data = {'seshid': str(sesh.seshid), 'img_id':str(sesh.img_id), 'dark_light_bool':str(dark_light_bool), 'bestclr_keys':bestclr_keys} 
-    valid_data = {'seshid': str(sesh.seshid), 'img_id':str(sesh.img_id), 'dark_light_bool':str(dark_light_bool), 'counts_srtd_rgb':counts_srtd_rgb} 
+    #valid_data = {'seshid': str(sesh.seshid), 'img_id':str(sesh.img_id), 'dark_light_bool':str(dark_light_bool), 'counts_srtd_rgb':counts_srtd_rgb} 
+    valid_data = {'seshid': str(seshid), 'img_id':str(sesh.img_id), 'dark_light_bool':str(dark_light_bool), 'counts_srtd_rgb':counts_srtd_rgb} 
     headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
     #print('json requests response: ', str({k:(type(v), None if type(v) != type(dict({})) or not v else (type(list(v.items())[0][0]), type(list(v.items())[0][1]))) for k,v in valid_data.items()}))
     #print('json requests response: ', str({k:(type(v), None if type(v) != type(dict({})) or not v else (type(list(v.items())[0][0]), type(list(v.items())[0][1]))) for k,v in data.items()}))
@@ -887,7 +889,7 @@ def makePalettes(evt: gr.SelectData):
     sesh.Palette_img[150:,:] = palettes_data[0][3]
 
     sesh.Palette_imgs[sesh.img_id] = sesh.Palette_img
-    display = updateItemDisplay()
+    display = updateItemDisplay(seshid)
 
     sesh.Palettes_displayed[sesh.current_img_signature] = Palette_out
 
@@ -1203,12 +1205,12 @@ def updateProductCount(count):
 
     return gr.Label(str(sesh.counts_totals[sesh.summary_store][0]) if sesh.summary_store and sesh.summary_radio != 'Complete' else all_counts, label='Number of Items'), gr.Label('$'+str(np.round(sesh.counts_totals[sesh.summary_store][1], 2)) if sesh.summary_store and sesh.summary_radio != 'Complete' else '$'+str(np.round(all_totals, 2)), label='Total')
 
-def updateBudget(budget_number):
+def updateBudget(budget_number, seshid):
     sesh.budget_number = float(budget_number)
     #sesh.item_budgets = {img: {item: int(weight*sesh.budget_number) for item,weight in weights.items()} for img,weights in sesh.product_means_weights.items()}
     #print('updateBudget: ', sesh.budget_number, sesh.item_budgets)
 
-    display = updateItemDisplay(budget=True)
+    display = updateItemDisplay(seshid, budget=True)
     sesh.counts_totals = {store:selectMerchantItemCountAndTotal(store) for store in sesh.summary_joined}
     all_counts = str(sum([ct[0] for store,ct in sesh.counts_totals.items()]))
     all_totals = sum([ct[1] for store,ct in sesh.counts_totals.items()])
@@ -2593,20 +2595,22 @@ with gr.Blocks(theme=gr.themes.Monochrome(), js=js_func) as demo:
  
 
     upload_photo.click(submitPhoto, [upload, choose_room], [choose_room, upload])
-    choose_room.select(makePalettes, None, [color_Palettes, room2decorate, room_items])
+    #choose_room.select(makePalettes, None, [color_Palettes, room2decorate, room_items])
+    choose_room.select(makePalettes, seshid, [color_Palettes, room2decorate, room_items])
 
     #upload_photo.click(submitPhoto, upload, [working_room, upload])
     #working_room.select(makePalettes, None, [working_room1, color_Palettes])
-    working_room.select(makePalettes, None, [working_room1, working_room2, working_room3, color_Palettes, room_items])
+    #working_room.select(makePalettes, None, [working_room1, working_room2, working_room3, color_Palettes, room_items])
+    working_room.select(makePalettes, seshid, [working_room1, working_room2, working_room3, color_Palettes, room_items])
     #rooms_gallery.select(set_style, None, [design_gallery, bedsize_radio, room_items])
-    rooms_gallery.select(updateRoomType, None, [design_gallery, bedsize_radio, room_items])
+    rooms_gallery.select(updateRoomType, seshid, [design_gallery, bedsize_radio, room_items])
 
     #color_Palettes.select(set_Palette, None, None)
-    color_Palettes.select(updateColors, None, [room_items])
+    color_Palettes.select(updateColors, seshid, [room_items])
 
-    design_gallery.select(updateStyle, None, room_items)
-    price_radio.select(updatePrice, None, room_items)
-    bedsize_radio.select(updateBedsize, None, room_items)
+    design_gallery.select(updateStyle, seshid, room_items)
+    price_radio.select(updatePrice, seshid, room_items)
+    bedsize_radio.select(updateBedsize, seshid, room_items)
 
     replace.select(productClick, None, merchant)
     replace_item.click(replaceProduct, None, [items_display, item_side, room_side, colors_side, merchant, replace, ads, room_items])
@@ -2619,7 +2623,7 @@ with gr.Blocks(theme=gr.themes.Monochrome(), js=js_func) as demo:
 
     product_dropdown.select(displaySource, None, [source, count])
     count.change(updateProductCount, count, [total, num_of_items])
-    budget.submit(updateBudget, budget, [room_items, total, num_of_items])
+    budget.submit(updateBudget, [budget, seshid], [room_items, total, num_of_items])