Update app.py

app.py

@@ -11,6 +11,7 @@ import platform
 import scipy.spatial
 import plotly.graph_objects as go
 import random
+from huggingface_hub import from_pretrained_keras
 
 # Disable eager execution because its bad
 from tensorflow.python.framework.ops import disable_eager_execution
@@ -1099,7 +1100,7 @@ curves, geometry, S, N, D, F, G, new_curves, new_geometry = load_data()
 
 class Network(object):
 
-  def __init__(self, structure, weights):
+  def __init__(self, type):
       # Instantiate variables
       # self.curves = curves
       # self.new_curves = new_curves
@@ -1112,9 +1113,10 @@ class Network(object):
       # self.G = G
 
       # Load network
-      with open(structure, 'r') as file:
-          self.network = keras.models.model_from_json(file.read())
-          self.network.load_weights(weights)
+      # with open(structure, 'r') as file:
+      #     self.network = keras.models.model_from_json(file.read())
+      #     self.network.load_weights(weights)
+      self.network = from_pretrained_keras("cmudrc/wave-energy-analysis") if type == "forward" else from_pretrained_keras("cmudrc/wave-energy-synthesis")
 
   def analysis(self, idx=None):
       print(idx)
@@ -1240,7 +1242,8 @@ def plotly_fig(values):
         ))
     return fig 
 
-value_net = Network("16forward_structure.json", "16forward_weights.h5")
+
+value_net = Network("forward")
 
 def performance(index):
     return value_net.get_performance(index)
@@ -1250,7 +1253,8 @@ def geometry(index):
     return plotly_fig(values)
 
 def simple_analysis(index, choice, shape, length, width, height, diameter): 
-    forward_net = Network("16forward_structure.json", "16forward_weights.h5")
+    forward_net = Network("forward")
+    # forward_net = Network("16forward_structure.json", "16forward_weights.h5")
     if choice == "Construct Shape from Parameters":  
         return forward_net.analysis_from_geometry(make_voxels_without_figure(shape, length, height, width, diameter))
     elif choice == "Pick Shape from Dataset":
@@ -1258,16 +1262,17 @@ def simple_analysis(index, choice, shape, length, width, height, diameter):
     
 
 def simple_synthesis(index):
-    inverse_net = Network("16inverse_structure.json", "16inverse_weights.h5")
+    inverse_net = Network("inverse")
+    # inverse_net = Network("16inverse_structure.json", "16inverse_weights.h5")
     pred, true = inverse_net.synthesis(index)
     return plotly_fig(pred), plotly_fig(true)
     
 def synthesis_from_spectrum(df):
-    inverse_net = Network("16inverse_structure.json", "16inverse_weights.h5")
+    inverse_net = Network("inverse")
+    # inverse_net = Network("16inverse_structure.json", "16inverse_weights.h5")
     pred = inverse_net.synthesis_from_spectrum(df.to_numpy()[:, 1:])
     return plotly_fig(pred)
    
-
     
 
 def change_textbox(choice, length, height, width, diameter):