Compare commits

...
Author SHA1 Message Date
Jake Miller 14eece1b52 Evaluator can be stopped early and output results
Callback object contains intermediate results from evaluator function and
will output results if user sends a keyboard interrupt.
2019-04-30 12:41:00 -04:00
Jake Miller 4ac2f8a108 Changed dependency mgmt from setup.py to pip 2019-04-30 12:17:18 -04:00
Jake Miller 6ff06d3031 Removed matplotlib tkinter dependency 2019-04-30 11:25:10 -04:00
Dan Petro b95054b2c9 Fixed bug with predicting on single files
- Needed to properly join paths
2019-04-24 09:27:18 -07:00
Dan Petro e856d68bf6 Add support for predicting on directories
- Outputs a csv
2019-04-17 15:09:37 -07:00
Dan Petro b450c1e70a Made graphs output into a graphs/ folder 2019-04-17 13:24:56 -07:00
Dan Petro 40a8016b52 Minor code cleanup
- Removed an unused function
 - Made one private
2019-04-16 17:02:18 -07:00
Dan Petro 2b33faed53 Merge branch 'save-histograms' 2019-04-16 17:00:55 -07:00
Dan Petro 96633f3306 Code cleanups around histogram creation 2019-04-16 16:55:53 -07:00
Dan Petro de040a8f05 De-lint code 2019-04-16 15:54:46 -07:00
Dan Petro 116978b29b Added advanced image augmentation
- random minor color changes
 - random contrast change
 - brightness
 - occlusion
2019-04-16 14:58:33 -07:00
bfgstroy 7525e8a5ba Removed code artifact
For some weird reason there was a `labels =` in the Eyeballer Class
2019-04-15 14:43:23 -07:00
Dan Petro e7294b7d61 Fixed evaluate print
- Should have said "recall"
2019-04-12 16:49:30 -07:00
Dan Petro d606a12b47 Add support for "oldlooking" dataset 2019-04-12 16:45:49 -07:00
Dan Petro ecfb8f5800 Util to convert labelbox CSV to our labels.csv format 2019-04-12 16:45:18 -07:00
bfgstroy 0dbb85df89 Update model.py 2019-04-10 15:02:26 -07:00
bfgstroy ac47c41d35 Updated save_prediction_histograms()
Added function run on every call to evaluation()
2019-04-10 14:59:37 -07:00
Dan Petro 01a12b15f3 Merge pull request #25 from BishopFox/ogtony-patch-1
Update eyeballer.py
2019-04-10 13:57:43 -07:00
Dan Petro 2a94432724 Merge branch 'master' into top-best-top-worst 2019-04-10 13:56:53 -07:00
Dan Petro 041f3447c5 Fixed up top images function interface 2019-04-10 13:50:47 -07:00
Dan Petro 46d0e22e1e Fixed overall binary accuracy
- Uses sklearn's hamming loss
2019-04-10 13:20:45 -07:00
ogtony 178687e563 Update eyeballer.py
Fixing comment
2019-04-10 13:04:22 -07:00
Dan Petro 8775887aee De-lint PR 2019-04-10 13:04:08 -07:00
bfgstroy ef0d0d8880 Added save_prediction_histograms()
Added save_prediction_histograms() function
2019-04-10 12:57:41 -07:00
Dan Petro 495da62f9b Merge branch 'master' into fix-stats 2019-04-10 12:25:01 -07:00
Dan Petro 8b897adb20 Made format string output 4.2 to print decimal points
- XX.YY%
2019-04-10 10:05:33 -07:00
ogtony ff52e7bd24 Looping over labels is more compact 2019-04-09 18:09:14 -07:00
ogtony 5ce24d80c5 Easier way to format strings. 2019-04-09 17:44:55 -07:00
bfgstroy 911f68f5e8 Added top 10 best and worst predicted images
Added top 10 best and worst predicted images to stats in the evaluation method.
2019-04-09 17:35:06 -07:00
7 changed files with 233 additions and 76 deletions

No files matched your search

+1
View File
@@ -113,3 +113,4 @@ venv.bak/
*.model
*.csv
*.txt
!requirements.txt
+18
View File
@@ -0,0 +1,18 @@
import numpy as np
from Augmentor.Operations import Operation
from keras.applications.mobilenet import preprocess_input
class EyeballerAugmentation(Operation):
def __init__(self, probability=1):
Operation.__init__(self, probability)
# Class must implement the perform_operation method
def perform_operation(self, images):
return_list = []
for image in images:
image_array = np.array(image).astype('uint8')
image_array = preprocess_input(image_array)
return_list.append(image_array)
return return_list
+24 -13
View File
@@ -1,6 +1,8 @@
#!/usr/bin/env python3
import click
from model import EyeballModel
import csv
from model import EyeballModel, DATA_LABELS
@click.group(invoke_without_command=True)
@@ -31,24 +33,33 @@ def train(ctx, graphs, batchsize, epochs):
@cli.command()
@click.argument('screenshot', nargs=-1) # Nargs=-1 means you can pass as many in as you want
@click.argument('screenshot')
@click.pass_context
def predict(ctx, screenshot):
model = EyeballModel(**ctx.obj['model_kwargs'])
for fn in screenshot:
model.predict(fn)
results = model.predict(screenshot)
if not results:
print("Error: Input file does not exist")
if len(results) == 1:
print(results)
else:
with open("results.csv", "w", newline="") as csvfile:
fieldnames = ["filename", "custom404", "login", "homepage", "oldlooking"]
labelwriter = csv.DictWriter(csvfile, fieldnames=fieldnames)
labelwriter.writeheader()
labelwriter.writerows(results)
print("Output written to results.csv")
def pretty_print_evaluation(results):
"""Print a human-readable summary of the evaulation results"""
print("Custom404 Precision Score: " + str(round(results["custom404"]["precision"] * 100, 2)) + "%")
print("Custom404 Recall Score: " + str(round(results["custom404"]["recall"] * 100, 2)) + "%")
print("Login Precision Score: " + str(round(results["login"]["precision"] * 100, 2)) + "%")
print("Login Recall Score: " + str(round(results["login"]["recall"] * 100, 2)) + "%")
print("Homepage Precision Score: " + str(round(results["homepage"]["precision"] * 100, 2)) + "%")
print("Homepage Recall Score: " + str(round(results["homepage"]["recall"] * 100, 2)) + "%")
print("Overall Binary Accuracy: " + str(round(results["total_binary_accuracy"] * 100, 2)) + "%")
print("All or nothing accuracy: " + str(round(results["all_or_nothing_accuracy"] * 100, 2)) + "%")
"""Print a human-readable summary of the evaluation"""
# We use 4.2% to handle all the way from " 0.00%" (7chars) to "100.00%" (7chars)
for label in DATA_LABELS:
print(f"{label} Precision Score: {results[label]['precision']:4.2%}")
print(f"{label} Recall Score: {results[label]['recall']:4.2%}")
print(f"Overall Binary Accuracy: {results['total_binary_accuracy']:4.2%}")
print(f"All or nothing accuracy: {results['all_or_nothing_accuracy']:4.2%}")
print(f"Top 10 worst predictions: {results['top_10_worst'][1]}")
@cli.command()
+144 -41
View File
@@ -1,10 +1,14 @@
import os
import random
import time
# Prevent Tkinter Dependency
import matplotlib
matplotlib.use('agg')
import matplotlib.pyplot as plt
import numpy as np
import pandas as pd
import Augmentor
from keras import regularizers
from keras.applications import MobileNet
@@ -16,9 +20,23 @@ from keras.models import Model
from keras.optimizers import Adam
from keras.preprocessing import image
from keras.preprocessing.image import ImageDataGenerator
from sklearn.metrics import classification_report, accuracy_score, jaccard_similarity_score
from sklearn.metrics import classification_report, accuracy_score, hamming_loss
from augmentation import EyeballerAugmentation
from keras.callbacks import Callback
DATA_LABELS = ["custom404", "login", "homepage"]
DATA_LABELS = ["custom404", "login", "homepage", "oldlooking"]
class PredictionManager(Callback):
def __init__(self):
super(PredictionManager, self).__init__()
self.predictions = []
def getPredictions(self):
return np.array(self.predictions)
def on_predict_batch_end(self, batch, logs=None):
self.predictions.append(logs['outputs'][0].tolist()[0])
class EyeballModel:
@@ -26,7 +44,8 @@ class EyeballModel:
Contains high-level functions for training, evaluating, and predicting.
"""
checkpoint_file = "weights-snapshot.h5"
graphs_directory = "graphs/"
checkpoint_file = "weights.h5"
image_dir = "images_224x224/"
image_width, image_height = 224, 224
input_shape = (image_width, image_height, 3)
@@ -47,11 +66,11 @@ class EyeballModel:
x = Dropout(0.5)(x)
x = Dense(128, activation="relu", name="HiddenLayer2", kernel_regularizer=regularizers.l2(0.01))(x)
x = Dropout(0.2)(x)
output_layer = Dense(3, activation="sigmoid", name="OutputLayer")(x)
output_layer = Dense(len(DATA_LABELS), activation="sigmoid", name="OutputLayer")(x)
self.model = Model(inputs=base_model.input, outputs=output_layer)
# for layer in base_model.layers:
# layer.trainable = False
# layer.trainable = False
adam = Adam(lr=0.0005)
self.model.compile(optimizer=adam, loss="binary_crossentropy", metrics=["accuracy"])
@@ -81,6 +100,20 @@ class EyeballModel:
else:
print("No model loaded from file")
# Data augmentation
augmentor = Augmentor.Pipeline()
augmentor.set_seed(self.seed)
augmentor.zoom(probability=0.75, min_factor=0.8, max_factor=1.2)
augmentor.random_color(probability=0.75, min_factor=0.5, max_factor=1.0)
augmentor.random_contrast(probability=0.75, min_factor=0.8, max_factor=1.0)
augmentor.random_brightness(probability=0.75, min_factor=0.8, max_factor=1.2)
augmentor.random_erasing(probability=0.75, rectangle_area=0.15)
# Finalizes the augmentation with a custom operation to prepare the image for the specific pretrained model we're using
training_augmentation = EyeballerAugmentation()
augmentor.add_operation(training_augmentation)
self.preprocess_training_function = augmentor.keras_preprocess_func()
def train(self, epochs=20, batch_size=32, print_graphs=False):
"""Train the model, making a new weights file at each successfull checkpoint. You'll probably need a GPU for this to realistically run.
@@ -91,15 +124,10 @@ class EyeballModel:
"""
print("Training with seed: " + str(self.seed))
# Data augmentation
data_generator = ImageDataGenerator(
preprocessing_function=preprocess_input,
shear_range=0.0,
zoom_range=0.2,
brightness_range=(0.7, 1.3),
samplewise_center=True,
preprocessing_function=self.preprocess_training_function,
validation_split=0.2,
horizontal_flip=False)
samplewise_center=True)
training_generator = data_generator.flow_from_dataframe(
self.training_labels,
@@ -138,6 +166,8 @@ class EyeballModel:
verbose=1)
if print_graphs:
if not os.path.exists(self.graphs_directory):
os.makedirs(self.graphs_directory)
# Plot training & validation accuracy values
plt.plot(history.history['acc'])
plt.plot(history.history['val_acc'])
@@ -145,7 +175,7 @@ class EyeballModel:
plt.ylabel('Accuracy')
plt.xlabel('Epoch')
plt.legend(['Train', 'Validation'], loc='upper left')
plt.savefig("accuracy.png")
plt.savefig(self.graphs_directory + "accuracy.png")
plt.clf()
plt.cla()
plt.close()
@@ -157,28 +187,42 @@ class EyeballModel:
plt.ylabel('Loss')
plt.xlabel('Epoch')
plt.legend(['Train', 'Validation'], loc='upper left')
plt.savefig("loss.png")
plt.savefig(self.graphs_directory + "loss.png")
def predict(self, filename):
def predict(self, path):
"""Predict the labels for a single file
Keyword arguments:
filename -- The path to the file that we'll be evaluating
path -- The path to the file that we'll be evaluating
"""
# Load the image into memory
img = image.load_img(filename, target_size=(self.image_width, self.image_height))
img = image.img_to_array(img)
img = np.expand_dims(img, axis=0)
img = preprocess_input(img)
# Is this a single file, or a directory?
screenshots = []
if os.path.isfile(path):
screenshots = [path]
elif os.path.isdir(path):
screenshots = os.listdir(path)
screenshots = [os.path.join(path, s) for s in screenshots]
else:
return None
time_start = time.time()
prediction = self.model.predict(img, batch_size=1)
time_end = time.time()
print("Predictions:")
print("\tCustom 404: " + str(round(prediction[0][0] * 100, 2)) + "%")
print("\tLogin Page: " + str(round(prediction[0][1] * 100, 2)) + "%")
print("\tHome Page: " + str(round(prediction[0][2] * 100, 2)) + "%")
print("Prediction Took (seconds): ", time_end - time_start)
results = []
for screenshot in screenshots:
# Load the image into memory
img = image.load_img(screenshot, target_size=(self.image_width, self.image_height))
img = image.img_to_array(img)
img = np.expand_dims(img, axis=0)
img = preprocess_input(img)
prediction = self.model.predict(img, batch_size=1)
result = dict()
result["filename"] = screenshot
result["custom404"] = prediction[0][0]
result["login"] = prediction[0][1]
result["homepage"] = prediction[0][2]
result["oldlooking"] = prediction[0][3]
results.append(result)
return results
def evaluate(self, threshold=0.5):
"""Evaluate performance against the persistent evaluation data set
@@ -203,13 +247,9 @@ class EyeballModel:
print("Using validation set...")
# Data augmentation
data_generator = ImageDataGenerator(
preprocessing_function=preprocess_input,
shear_range=0.0,
zoom_range=0.2,
brightness_range=(0.7, 1.3),
preprocessing_function=self.preprocess_training_function,
samplewise_center=True,
validation_split=0.2,
horizontal_flip=False)
validation_split=0.2)
evaluation_generator = data_generator.flow_from_dataframe(
self.training_labels,
directory=self.image_dir,
@@ -224,14 +264,77 @@ class EyeballModel:
else:
print("Using evaluation set...")
predictions = self.model.predict_generator(evaluation_generator, verbose=1, steps=len(evaluation_generator))
prediction_manager = PredictionManager()
try:
output = self.model.predict_generator(
evaluation_generator,
callbacks=[prediction_manager],
verbose=1,
steps=len(evaluation_generator))
except KeyboardInterrupt:
print('\r\nJob interrupted (Ctrl+C): Outputting completed results')
predictions = prediction_manager.getPredictions()
# Truncates evaluation generator if test was interrupted
evaluation_generator._data = evaluation_generator.data[:predictions.shape[0]]
self._save_prediction_histograms(predictions)
predictions = predictions > threshold
ground_truth = evaluation_generator.data
stats = classification_report(ground_truth, predictions, target_names=DATA_LABELS, output_dict=True)
stats["total_binary_accuracy"] = jaccard_similarity_score(ground_truth, predictions)
stats["total_binary_accuracy"] = 1 - hamming_loss(ground_truth, predictions)
stats["all_or_nothing_accuracy"] = accuracy_score(ground_truth, predictions)
stats["top_10_best"] = self._top_images(evaluation_generator, predictions, best=True)
stats["top_10_worst"] = self._top_images(evaluation_generator, predictions, best=False)
return stats
def get_data_column(self, data_slice, data):
return np.reshape(np.array(data)[data_slice], len(data)).tolist()
def _top_images(self, labels, predictions, top_k=10, best=False):
"""Collect top-k best or top-k worst predicted images
Keyword arguments:
labels -- The keras generator that contains the filenames and data labels
predictions -- The numpy array of predictions
top_k -- Top k elements
best -- True/False. Calculate either the best or worst images
:Return -- Tuple of top-k indicies and top-k filenames
"""
true_labels = np.array(labels.data).astype(float)
predictions = predictions.astype(float)
differences = np.abs(predictions - true_labels).sum(axis=1)
indicies = np.argsort(differences, axis=0)
top_file_list = []
if not best:
# Reverse numpy array
indicies = np.flipud(indicies)
for i in indicies[:top_k]:
top_file_list.append(labels.filenames[i])
return indicies[:top_k], top_file_list
def _save_prediction_histograms(self, predictions, buckets=50):
"""Saves a series of histogram screenshots
Keyword arguments:
predictions -- The numpy array of predicted labels, ranging from 0->1.
buckets -- The number of buckets to divide the data into. Default: 50
:Returns -- Nothing"
"""
figure, axes = plt.subplots(nrows=len(DATA_LABELS))
for i, label in enumerate(DATA_LABELS):
axes[i].hist(predictions[:, i], buckets, alpha=.75)
axes[i].set_xlabel("Prediction")
axes[i].set_ylabel("Counts of Predictions")
axes[i].set_title(label)
axes[i].grid(True)
figure.set_size_inches(5, 3*len(DATA_LABELS))
figure.tight_layout()
if not os.path.exists(self.graphs_directory):
os.makedirs(self.graphs_directory)
plt.savefig(self.graphs_directory + "label_histograms.png")
+9
View File
@@ -0,0 +1,9 @@
Augmentor
click
matplotlib
numpy
pandas
pillow
sklearn
tensorflow
git+https://github.com/keras-team/keras/
-22
View File
@@ -1,22 +0,0 @@
from setuptools import find_packages, setup
setup(
name='eyeballer',
version='0.0.1',
packages=find_packages(exclude=["tests"]),
url='https://github.com/BishopFox/eyeballer',
license='GNU General Public License v3.0',
author='Daniel Petro',
author_email='',
description='',
install_requires=[
'keras',
'sklearn',
'numpy',
'pandas',
'matplotlib',
'pillow', 'click'
],
test_requires=[],
python_requires='>=3.6', # We use some python 3.6+ only features, like ordered dicts by default and f-strings
)
+37
View File
@@ -0,0 +1,37 @@
#!/usr/bin/env python3
import csv
import random
import json
with open("newlabels.csv", "w", newline="") as csvfile:
# Open the old labels file
with open("labelbox.csv", newline="") as oldfile:
# Get the header labels
csvreader = csv.DictReader(oldfile)
fieldnames = next(csvreader)
labelwriter = csv.DictWriter(csvfile, fieldnames=["filename", "login", "custom404", "homepage", "oldlooking", "evaluation"])
labelwriter.writeheader()
# Loop through the file
rows = []
for row in csvreader:
filename = row["External ID"]
print(row["Label"])
labelstring = row["Label"]
if row["Label"] == "Skip":
labelstring = '{"imageclassification":[]}'
labels = json.loads(labelstring)
newrow = dict()
newrow["filename"] = filename
newrow["oldlooking"] = True
newrow["login"] = "loginpage" in labels["imageclassification"]
newrow["homepage"] = "homepage" in labels["imageclassification"]
newrow["custom404"] = "custom404"in labels["imageclassification"]
newrow["evaluation"] = random.random() > 0.8
rows.append(newrow)
labelwriter.writerows(rows)
print("Made new labels file: newlabels.csv")