merge conflict

app.py

@@ -1,15 +1,14 @@
 import gradio as gr
 import numpy as np
 import pandas as pd
-import json
 
 pd.options.plotting.backend = "plotly"
 
 
 TITLE = "Diffusion Faces Cluster Explorer"
-clusters_12 = json.load(open("clusters/professions_to_clusters_12.json"))
-clusters_24 = json.load(open("clusters/professions_to_clusters_24.json"))
-clusters_48 = json.load(open("clusters/professions_to_clusters_48.json"))
+clusters_12 = pd.read_json("clusters/professions_to_clusters_12.json")
+clusters_24 = pd.read_json("clusters/professions_to_clusters_24.json")
+clusters_48 =  pd.read_json("clusters/professions_to_clusters_48.json")
 
 clusters_by_size = {
     12: clusters_12,
@@ -60,6 +59,10 @@ def make_profession_table(num_clusters, prof_name):
     prof_plot = df.plot(kind="bar", barmode="group")
     return prof_plot
 
+def gen_df(num_clusters,model,profs):
+    if num_clusters == 12:
+        print(clusters_12.head())
+    
 
 with gr.Blocks() as demo:
     gr.Markdown("# 🤗 Diffusion Cluster Explorer")