Merge pull request #16 from Atashnezhad/feature/img_pro

Feature/img pro
Atashnezhad · Oct 19, 2023 · 31747ac · 31747ac
2 parents a69b677 + 8a0a54d
commit 31747ac
Show file tree

Hide file tree

Showing 8 changed files with 675 additions and 67 deletions.
diff --git a/assets/scikit_image_example.jpg b/assets/scikit_image_example.jpg
diff --git a/assets/scikit_image_example_core.jpg b/assets/scikit_image_example_core.jpg
diff --git a/neural_network_model/class_labels.json b/neural_network_model/class_labels.json
@@ -0,0 +1 @@
+{"GRANODIORITE": 0, "MONZONITE": 1, "QUARTZ_DIORITE": 2}
diff --git a/neural_network_model/model.py b/neural_network_model/model.py
@@ -278,6 +278,16 @@ class Config:
         # Allow extra fields in the model (to ignore the pydantic ConfigError)
         extra = Extra.allow
 
+    SUPPORTED_FILE_FORMATS: list = [
+        ".jpg",
+        ".jpeg",
+        ".png",
+        ".bmp",
+        ".tif",
+        ".tiff",
+        ".gif",
+    ]
+
 
 class localBinaryPatterns(BaseModel):
     NUM_POINTS: int = 8

diff --git a/neural_network_model/process_data.py b/neural_network_model/process_data.py
@@ -214,7 +214,8 @@ def augment_data(
                 img = load_img(img_address)
 
                 x = img_to_array(img)
-                x = x.reshape((1,) + x.shape())
+                # x = x.reshape((1,) + x.shape())
+                x = x.reshape((1,) + x.shape)
 
                 for _ in Augment_data_gen.flow(
                     x,