Synced repo using 'sync_with_huggingface' Github Action

app.py

@@ -1,14 +1,33 @@
+from bokeh import events
+from bokeh.models import CustomJS
+
 import streamlit as st
 
 import dataset_wrangler
 
+dataset = "https://raw.githubusercontent.com/StateLibraryVictoria/public-domain-hack-2024/refs/heads/ch4-data-viz/datasets/ch3_colour_data_viz_suggestions_set_2_augmented.csv"
 
 st.write(
     "Scrambled Images  from [https://www.slv.vic.gov.au/images](https://www.slv.vic.gov.au/images)"
 )
 
 
-p = dataset_wrangler.create_grid()
+p = dataset_wrangler.create_grid(dataset)
+
+callback = CustomJS(
+    code="""
+    console.log(Math.floor(cb_obj.x))
+    console.log(Math.floor(cb_obj.y))
+
+    try {
+        console.log("Hello mum")
+        st.write("Hello mum")
+    } catch {
+        console.log("error")
+    }
+"""
+)
 
+p.js_on_event(events.Tap, callback)
 
 st.bokeh_chart(p, use_container_width=True)

dataset_wrangler.py

@@ -1,13 +1,21 @@
 import pandas as pd
 import math
 
-from bokeh.plotting import figure, show
+from bokeh.models import HoverTool
+from bokeh.plotting import figure
+from bokeh.models import CustomJS
 
 
-dataset = "https://raw.githubusercontent.com/StateLibraryVictoria/public-domain-hack-2024/refs/heads/ch4-data-viz/datasets/ch3_colour_data_viz_suggestions_set_2_augmented.csv"
+def display_event() -> CustomJS:
 
+    js_code = """
+        console.log('Hello mum!)
+    """
 
-def clean_df(columns=None, dataset=dataset, subset=[]):
+    return CustomJS(code=js_code)
+
+
+def clean_df(columns=None, dataset="", subset=[]):
 
     df = pd.read_csv(dataset)
 
@@ -51,27 +59,52 @@ def get_square_coords(df):
     return coords
 
 
-def create_grid(palette_columns=["pal_1", "pal_3", "pal_5"]):
+def get_tooltips_dict(df, columns):
+
+    df = df[columns]
+
+    tooltips = df.to_dict()
+
+    return tooltips
+
+
+def create_grid(dataset, palette_columns=["pal_1", "pal_3", "pal_5"]):
 
     markers = {
         "pal_1": "circle",
+        "pal_2": "hex",
         "pal_3": "square_pin",
+        "pal_4": "plus",
         "pal_5": "triangle",
     }
 
-    df = clean_df(subset=palette_columns)
+    df = clean_df(dataset=dataset, subset=palette_columns)
+
     coords = get_square_coords(df)
 
-    x = [coord[0] for coord in coords]
-    y = [coord[1] for coord in coords]
+    # bodge the df to ensure the length matches the coords
+    df = df.head(len(coords))
+
+    TOOLS = "crosshair,pan,wheel_zoom,zoom_in,zoom_out,box_zoom,undo,redo,reset"
 
-    TOOLS = "hover,crosshair,pan,wheel_zoom,zoom_in,zoom_out,box_zoom,undo,redo,reset"
+    data = pd.DataFrame(
+        {
+            "x": [coord[0] for coord in coords],
+            "y": [coord[1] for coord in coords],
+            "titles": df["Title (DC)"].values.tolist(),
+            "created": df["Created - W 3 CDTF (DCTERMS)"].values.tolist(),
+        }
+    )
 
-    p = figure(tools=TOOLS)
+    p = figure(sizing_mode="stretch_width", max_width=1000, tools=TOOLS)
+    p.grid.grid_line_color = None
+    p.axis.visible = False
+    hover = HoverTool(tooltips=[("Title", "@titles"), ("Date created", "@created")])
+    p.add_tools(hover)
 
-    radius = 10
-    alpha = 0.3
-    hover_alpha = 0.6
+    radius = 12
+    alpha = 0.25
+    hover_alpha = 0.5
 
     for col in palette_columns:
 
@@ -92,21 +125,46 @@ def create_grid(palette_columns=["pal_1", "pal_3", "pal_5"]):
             + ")"
         )
 
-        rgba_list = df[f"rgba_{col}"].values.tolist()
+        data["rgba"] = df[f"rgba_{col}"].values.tolist()
 
         p.scatter(
-            x=x,
-            y=y,
+            x="x",
+            y="y",
             size=radius,
-            color=rgba_list,
+            color="rgba",
             alpha=alpha,
             hover_alpha=hover_alpha,
             hover_line_color="white",
             marker=markers[col],
+            source=data,
         )
 
     return p
 
 
-# p = create_grid(palette_columns=["pal_1"])
+# div = Div(width=1000)
+# curdoc().on_event(events.DocumentReady, display_event(div))
+
+# from bokeh import events
+
+# dataset = "https://raw.githubusercontent.com/StateLibraryVictoria/public-domain-hack-2024/refs/heads/ch4-data-viz/datasets/ch3_colour_data_viz_suggestions_set_2_augmented.csv"
+
+# p = create_grid(dataset)
+
+# callback = CustomJS(
+#     code="""
+#     console.log("Hello mum!")
+#     console.log(Math.floor(cb_obj.x))
+#     console.log(Math.floor(cb_obj.y))
+# """
+# )
+
+# p.js_on_event(events.Tap, callback)
 # show(p)
+
+
+# point_attributes = ["x", "y", "sx", "sy"]
+# p.js_on_event(events.Tap, display_event(div, attributes=point_attributes))
+
+# layout = column(p, div)
+# show(layout)

image_analysis.py

@@ -2,6 +2,7 @@ import cv2 as cv
 import numpy as np
 import requests
 from pathlib import Path
+import pandas as pd
 
 import matplotlib.pyplot as plt
 
@@ -36,6 +37,9 @@ def get_iiif_image_urls(ie_pid: str):
     return image_urls
 
 
+# print(get_iiif_image_urls("IE1258179"))
+
+
 def show_img_compare(img_1, img_2):
     f, ax = plt.subplots(1, 2, figsize=(10, 10))
     ax[0].imshow(img_1)