BETTER-NMA 1.0.5__tar.gz → 1.0.6__tar.gz

{better_nma-1.0.5 → better_nma-1.0.6}/BETTER_NMA/utilss/classes/adversarial_dataset.py

@@ -1,6 +1,7 @@
 from sklearn.model_selection import train_test_split
 import numpy as np
 from .score_calculator import ScoreCalculator
+from ..photos_uitls import preprocess_numpy_image
 
 class AdversarialDataset:
     def __init__(self, model, clear_images, adversarial_images, Z_full, labels):
@@ -16,8 +17,9 @@ class AdversarialDataset:
         try:
             for image in self.clear_images[:50]:
                 # Add batch dimension for model prediction
-                image_batch = np.expand_dims(image, axis=0)
-                score = self.score_calculator.calculate_adversarial_score(self.model.predict(image_batch, verbose=0))
+                # image_batch = np.expand_dims(image, axis=0)
+                preprocessed_img = preprocess_numpy_image(self.model, image)
+                score = self.score_calculator.calculate_adversarial_score(self.model.predict(preprocessed_img, verbose=0))
                 scores.append(score)
                 labels.append(0)
         except Exception as e:
@@ -27,8 +29,9 @@ class AdversarialDataset:
         try:
             for adv_image in self.adversarial_images[:50]:
                 # Add batch dimension for model prediction
-                adv_image_batch = np.expand_dims(adv_image, axis=0)
-                score = self.score_calculator.calculate_adversarial_score(self.model.predict(adv_image_batch, verbose=0))
+                # adv_image_batch = np.expand_dims(adv_image, axis=0)
+                preprocessed_adv_img = preprocess_numpy_image(self.model, adv_image)
+                score = self.score_calculator.calculate_adversarial_score(self.model.predict(preprocessed_adv_img, verbose=0))
                 scores.append(score)
                 labels.append(1)
         except Exception as e:

{better_nma-1.0.5 → better_nma-1.0.6}/BETTER_NMA/utilss/photos_uitls.py

@@ -69,4 +69,22 @@ def preprocess_image(model, image):
     preprocess_input = get_cached_preprocess_function(model)
     image_array = preprocess_input(np.array(image))
     image_preprocessed = np.expand_dims(image_array, axis=0)
+    return image_preprocessed
+
+def preprocess_numpy_image(model, image):
+    """
+    Preprocess a NumPy array image for the given model.
+    """
+    # if isinstance(image, list):
+    #     image = np.array(image)
+    if image.ndim == 3:
+        # If the image is 3D, add a batch dimension
+        image = np.expand_dims(image, axis=0)
+
+    # Get the appropriate preprocessing function for the model
+    preprocess_input = get_cached_preprocess_function(model)
+
+    # Apply the preprocessing function
+    image_preprocessed = preprocess_input(image)
+
     return image_preprocessed

{better_nma-1.0.5 → better_nma-1.0.6}/BETTER_NMA.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: BETTER_NMA
-Version: 1.0.5
+Version: 1.0.6
 Summary: NMA: Dendrogram-based model analysis, white-box testing, and adversarial detection
 Author: BETTER_XAI
 Author-email: BETTERXAI2025@gmail.com

{better_nma-1.0.5 → better_nma-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: BETTER_NMA
-Version: 1.0.5
+Version: 1.0.6
 Summary: NMA: Dendrogram-based model analysis, white-box testing, and adversarial detection
 Author: BETTER_XAI
 Author-email: BETTERXAI2025@gmail.com

{better_nma-1.0.5 → better_nma-1.0.6}/setup.py

@@ -8,7 +8,7 @@ except FileNotFoundError:
 
 setup(
     name="BETTER_NMA",
-    version="1.0.5",
+    version="1.0.6",
     author="BETTER_XAI",
     author_email="BETTERXAI2025@gmail.com",
     description="NMA: Dendrogram-based model analysis, white-box testing, and adversarial detection",