remove object_detector (#157)

* `Object_Detector` has been removed from the project --------- Co-authored-by: Inga Ulusoy <[email protected]>
ssciwr · Oct 19, 2023 · b0a6236 · b0a6236
1 parent 8118aa4
commit b0a6236
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 700 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,10 +36,10 @@ jobs:
       run: |
         cd ammico
         python -m pytest test/test_cropposts.py -svv --cov=. --cov-report=xml --cov-append
-    # - name: Run pytest test_display
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_display.py -svv --cov=. --cov-report=xml --cov-append
+    - name: Run pytest test_display
+      run: |
+        cd ammico
+        python -m pytest test/test_display.py -svv --cov=. --cov-report=xml --cov-append
     - name: Run pytest test_faces
       run: |
         cd ammico
@@ -48,19 +48,15 @@ jobs:
       run: |
         cd ammico
         python -m pytest test/test_multimodal_search.py -m "not long" -svv --cov=. --cov-report=xml --cov-append
-    # - name: Run pytest test_objects
-    #   run: |
-    #     cd ammico
-    #     python -m pytest test/test_objects.py -svv --cov=. --cov-report=xml --cov-append
-    - name: Clear cache ubuntu
+    - name: Clear cache ubuntu 1
       if: matrix.os == 'ubuntu-22.04'
       run: |
           rm -rf ~/.cache/*    
     - name: Run pytest test_summary
       run: |
         cd ammico
         python -m pytest test/test_summary.py -m "not long" -svv --cov=. --cov-report=xml --cov-append
-    - name: Clear cache2
+    - name: Clear cache ubuntu 2
       if: matrix.os == 'ubuntu-22.04'
       run: |
           rm -rf ~/.cache/*

diff --git a/ammico/__init__.py b/ammico/__init__.py
@@ -7,7 +7,6 @@
 from ammico.display import AnalysisExplorer
 from ammico.faces import EmotionDetector
 from ammico.multimodal_search import MultimodalSearch
-from ammico.objects import ObjectDetector
 from ammico.summary import SummaryDetector
 from ammico.text import TextDetector, PostprocessText
 from ammico.utils import find_files, get_dataframe
@@ -22,7 +21,6 @@
     "AnalysisExplorer",
     "EmotionDetector",
     "MultimodalSearch",
-    "ObjectDetector",
     "SummaryDetector",
     "TextDetector",
     "PostprocessText",

diff --git a/ammico/display.py b/ammico/display.py
@@ -1,6 +1,5 @@
 import ammico.faces as faces
 import ammico.text as text
-import ammico.objects as objects
 import ammico.colors as colors
 from ammico.utils import is_interactive
 import ammico.summary as summary
@@ -332,7 +331,6 @@ def _right_output_json(self) -> html.Div:
                             dcc.Dropdown(
                                 options=[
                                     "TextDetector",
-                                    "ObjectDetector",
                                     "EmotionDetector",
                                     "SummaryDetector",
                                     "ColorDetector",
@@ -465,7 +463,6 @@ def _right_output_analysis(
         identify_dict = {
             "EmotionDetector": faces.EmotionDetector,
             "TextDetector": text.TextDetector,
-            "ObjectDetector": objects.ObjectDetector,
             "SummaryDetector": summary.SummaryDetector,
             "ColorDetector": colors.ColorDetector,
         }

diff --git a/ammico/notebooks/DemoNotebook_ammico.ipynb b/ammico/notebooks/DemoNotebook_ammico.ipynb
@@ -226,17 +226,7 @@
     "```\n",
     "image_dict[\"image_id\"] = ammico.EmotionDetector(image_dict[\"image_id\"], emotion_threshold=50, race_threshold=50).analyse_image()\n",
     "```\n",
-    "The thresholds can be adapted interactively in the notebook interface and the optimal value can then be used in a subsequent analysis of the whole data set.\n",
-    "\n",
-    "## Object detection\n",
-    "Certain specified objects on the image are detected with the cvlib library and YOLOv4 model. Of the 80 objects from the [yolov library](https://github.com/AlexeyAB/darknet/blob/master/data/coco.names), the detection is restricted to person, bicycle, car, motorcycle, airplane, bus, train, truck, boat, traffic light.\n",
-    "\n",
-    "The analysis returns a dictionary with \"yes\" or \"no\" answers for the detected items: `\"person\": \"yes\", \"bicycle\": \"no\", \"car\": \"no\", \"motorcycle\": \"no\", \"airplane\": \"no\", \"bus\": \"no\", \"train\": \"no\", \"truck\": \"no\", \"boat\": \"no\", \"traffic light\": \"no\", \"cell phone\": \"no\"`.\n",
-    "\n",
-    "The object detection is very straightforward with no further parameters, and is called using\n",
-    "```\n",
-    "image_dict[\"image_id\"] = ammico.ObjectDetector(image_dict[\"image_id\"]).analyse_image()\n",
-    "```"
+    "The thresholds can be adapted interactively in the notebook interface and the optimal value can then be used in a subsequent analysis of the whole data set."
    ]
   },
   {

diff --git a/ammico/notebooks/objects_expression.ipynb b/ammico/notebooks/objects_expression.ipynb
diff --git a/ammico/objects.py b/ammico/objects.py