Update app.py

app.py

@@ -7,28 +7,28 @@ model = joblib.load('mushroom_classifier.pkl')
 mappings = joblib.load('mappings.pkl')
 
 feature_options = {
-    'cap-shape': {'bell': 'b', 'conical': 'c', 'convex': 'x', 'flat': 'f', 'knobbed': 'k', 'sunken': 's'},
-    'cap-surface': {'fibrous': 'f', 'grooves': 'g', 'scaly': 'y', 'smooth': 's'},
-    'cap-color': {'brown': 'n', 'buff': 'b', 'cinnamon': 'c', 'gray': 'g', 'green': 'r', 'pink': 'p', 'purple': 'u', 'red': 'e', 'white': 'w', 'yellow': 'y'},
-    'bruises': {'bruises': 't', 'no': 'f'},
-    'odor': {'almond': 'a', 'anise': 'l', 'creosote': 'c', 'fishy': 'y', 'foul': 'f', 'musty': 'm', 'none': 'n', 'pungent': 'p', 'spicy': 's'},
-    'gill-attachment': {'attached': 'a', 'descending': 'd', 'free': 'f', 'notched': 'n'},
-    'gill-spacing': {'close': 'c', 'crowded': 'w', 'distant': 'd'},
-    'gill-size': {'broad': 'b', 'narrow': 'n'},
-    'gill-color': {'black': 'k', 'brown': 'n', 'buff': 'b', 'chocolate': 'h', 'gray': 'g', 'green': 'r', 'orange': 'o', 'pink': 'p', 'purple': 'u', 'red': 'e', 'white': 'w', 'yellow': 'y'},
-    'stalk-shape': {'enlarging': 'e', 'tapering': 't'},
-    'stalk-root': {'bulbous': 'b', 'club': 'c', 'cup': 'u', 'equal': 'e', 'rhizomorphs': 'z', 'rooted': 'r', 'missing': '?'},
-    'stalk-surface-above-ring': {'fibrous': 'f', 'scaly': 'y', 'silky': 'k', 'smooth': 's'},
-    'stalk-surface-below-ring': {'fibrous': 'f', 'scaly': 'y', 'silky': 'k', 'smooth': 's'},
-    'stalk-color-above-ring': {'brown': 'n', 'buff': 'b', 'cinnamon': 'c', 'gray': 'g', 'orange': 'o', 'pink': 'p', 'red': 'e', 'white': 'w', 'yellow': 'y'},
-    'stalk-color-below-ring': {'brown': 'n', 'buff': 'b', 'cinnamon': 'c', 'gray': 'g', 'orange': 'o', 'pink': 'p', 'red': 'e', 'white': 'w', 'yellow': 'y'},
-    'veil-type': {'partial': 'p', 'universal': 'u'},
-    'veil-color': {'brown': 'n', 'orange': 'o', 'white': 'w', 'yellow': 'y'},
-    'ring-number': {'none': 'n', 'one': 'o', 'two': 't'},
-    'ring-type': {'cobwebby': 'c', 'evanescent': 'e', 'flaring': 'f', 'large': 'l', 'none': 'n', 'pendant': 'p', 'sheathing': 's', 'zone': 'z'},
-    'spore-print-color': {'black': 'k', 'brown': 'n', 'buff': 'b', 'chocolate': 'h', 'green': 'r', 'orange': 'o', 'purple': 'u', 'white': 'w', 'yellow': 'y'},
-    'population': {'abundant': 'a', 'clustered': 'c', 'numerous': 'n', 'scattered': 's', 'several': 'v', 'solitary': 'y'},
-    'habitat': {'grasses': 'g', 'leaves': 'l', 'meadows': 'm', 'paths': 'p', 'urban': 'u', 'waste': 'w', 'woods': 'd'}
+    'cap-shape': {'b': 'bell', 'c': 'conical', 'x': 'convex', 'f': 'flat', 'k': 'knobbed', 's': 'sunken'},
+    'cap-surface': {'f': 'fibrous', 'g': 'grooves', 'y': 'scaly', 's': 'smooth'},
+    'cap-color': {'n': 'brown', 'b': 'buff', 'c': 'cinnamon', 'g': 'gray', 'r': 'green', 'p': 'pink', 'u': 'purple', 'e': 'red', 'w': 'white', 'y': 'yellow'},
+    'bruises': {'t': 'bruises', 'f': 'no'},
+    'odor': {'a': 'almond', 'l': 'anise', 'c': 'creosote', 'y': 'fishy', 'f': 'foul', 'm': 'musty', 'n': 'none', 'p': 'pungent', 's': 'spicy'},
+    'gill-attachment': {'a': 'attached', 'd': 'descending', 'f': 'free', 'n': 'notched'},
+    'gill-spacing': {'c': 'close', 'w': 'crowded', 'd': 'distant'},
+    'gill-size': {'b': 'broad', 'n': 'narrow'},
+    'gill-color': {'k': 'black', 'n': 'brown', 'b': 'buff', 'h': 'chocolate', 'g': 'gray', 'r': 'green', 'o': 'orange', 'p': 'pink', 'u': 'purple', 'e': 'red', 'w': 'white', 'y': 'yellow'},
+    'stalk-shape': {'e': 'enlarging', 't': 'tapering'},
+    'stalk-root': {'b': 'bulbous', 'c': 'club', 'u': 'cup', 'e': 'equal', 'z': 'rhizomorphs', 'r': 'rooted', '?': 'missing'},
+    'stalk-surface-above-ring': {'f': 'fibrous', 'y': 'scaly', 'k': 'silky', 's': 'smooth'},
+    'stalk-surface-below-ring': {'f': 'fibrous', 'y': 'scaly', 'k': 'silky', 's': 'smooth'},
+    'stalk-color-above-ring': {'n': 'brown', 'b': 'buff', 'c': 'cinnamon', 'g': 'gray', 'o': 'orange', 'p': 'pink', 'e': 'red', 'w': 'white', 'y': 'yellow'},
+    'stalk-color-below-ring': {'n': 'brown', 'b': 'buff', 'c': 'cinnamon', 'g': 'gray', 'o': 'orange', 'p': 'pink', 'e': 'red', 'w': 'white', 'y': 'yellow'},
+    'veil-type': {'p': 'partial', 'u': 'universal'},
+    'veil-color': {'n': 'brown', 'o': 'orange', 'w': 'white', 'y': 'yellow'},
+    'ring-number': {'n': 'none', 'o': 'one', 't': 'two'},
+    'ring-type': {'c': 'cobwebby', 'e': 'evanescent', 'f': 'flaring', 'l': 'large', 'n': 'none', 'p': 'pendant', 's': 'sheathing', 'z': 'zone'},
+    'spore-print-color': {'k': 'black', 'n': 'brown', 'b': 'buff', 'h': 'chocolate', 'r': 'green', 'o': 'orange', 'u': 'purple', 'w': 'white', 'y': 'yellow'},
+    'population': {'a': 'abundant', 'c': 'clustered', 'n': 'numerous', 's': 'scattered', 'v': 'several', 'y': 'solitary'},
+    'habitat': {'g': 'grasses', 'l': 'leaves', 'm': 'meadows', 'p': 'paths', 'u': 'urban', 'w': 'waste', 'd': 'woods'}
 }
 
 # def predict_mushroom(features):
@@ -37,29 +37,34 @@ feature_options = {
 #     prediction = model.predict(input_df)
 #     return 'Poisonous' if prediction[0] == 1 else 'Edible'
 
-def predict_mushroom(*features):
-    # Convert the feature names to a dictionary based on the order
-    feature_names = list(mappings.keys())
-    numerical_features = {}
+# Prediction function for Gradio
+def predict_mushroom(*inputs):
+    # Map the inputs to feature names
+    features = list(feature_options.keys())
+    user_input = dict(zip(features, inputs))
 
-    # Convert the string values to numerical values using the mappings
-    for i, feature in enumerate(features):
-        if feature in mappings[feature_names[i]]:
-            numerical_features[feature_names[i]] = mappings[feature_names[i]][feature]
+    # Convert string inputs to numerical values using mappings
+    numerical_features = {}
+    for feature, value in user_input.items():
+        if feature in mappings:
+            if value in mappings[feature]:
+                numerical_features[feature] = mappings[feature][value]  # Map string to numerical value
+            else:
+                raise ValueError(f"Invalid value '{value}' for feature '{feature}'.")
         else:
-            raise ValueError(f"Invalid value for feature '{feature_names[i]}': {feature}")
+            raise ValueError(f"Feature '{feature}' is not recognized.")
 
-    # Convert the numerical features into a DataFrame for the model
+    # Convert the numerical features into a DataFrame
     input_df = pd.DataFrame([numerical_features])
-    
-    # Ensure the data is in the right format
-    try:
-        prediction = model.predict(input_df)
-    except Exception as e:
-        raise ValueError(f"Error during prediction: {e}")
-    
-    # Return the classification result based on the model output
-    return 'Poisonous' if prediction[0] == 1 else 'Edible'
+
+    # Predict using the trained model
+    prediction = model.predict(input_df)
+
+    # Interpret the prediction
+    if prediction[0] == 0:
+        return 'Edible'
+    else:
+        return 'Poisonous'
 
 demo = gr.Interface(
     fn=predict_mushroom,