Laufey commited on
Commit
1758e8f
·
verified ·
1 Parent(s): b2de95c

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +3 -3
app.py CHANGED
@@ -4,13 +4,13 @@ import joblib
4
  import numpy as np
5
 
6
  from preprocess_cnn import preprocess_for_cnn
7
- from preprocess_quality import extract_quality_features
8
 
9
  cnn_model = tf.keras.models.load_model("custom_cnn_shape.keras")
10
  xgb_quality = joblib.load("xgb_quality.pkl")
11
  scaler = joblib.load("scaler.pkl")
12
  le_quality = joblib.load("le_quality.pkl")
13
-
14
  SHAPES = ['Triangle', 'Square', 'Circle', 'Rectangle']
15
 
16
  def predict(image):
@@ -23,7 +23,7 @@ def predict(image):
23
  response["shape"] = SHAPES[shape_idx]
24
  response["shape_confidence"] = float(shape_probs[shape_idx])
25
 
26
- features = extract_quality_features(image)
27
 
28
  if features is None:
29
  response["quality"] = "unknown"
 
4
  import numpy as np
5
 
6
  from preprocess_cnn import preprocess_for_cnn
7
+ from preprocess_quality import GeometricFeatureExtractor
8
 
9
  cnn_model = tf.keras.models.load_model("custom_cnn_shape.keras")
10
  xgb_quality = joblib.load("xgb_quality.pkl")
11
  scaler = joblib.load("scaler.pkl")
12
  le_quality = joblib.load("le_quality.pkl")
13
+ feature_extractor = GeometricFeatureExtractor()
14
  SHAPES = ['Triangle', 'Square', 'Circle', 'Rectangle']
15
 
16
  def predict(image):
 
23
  response["shape"] = SHAPES[shape_idx]
24
  response["shape_confidence"] = float(shape_probs[shape_idx])
25
 
26
+ features = feature_extractor.extract_features(image)
27
 
28
  if features is None:
29
  response["quality"] = "unknown"