updated image classification with working functions

.circleci/config.yml

@@ -0,0 +1,129 @@
+# version: 2.1
+
+# executors:
+#   docker-executor:
+#     docker:
+#       - image: docker:20.10.7
+
+# jobs:
+#   build_and_push:
+#     executor: docker-executor
+#     steps:
+#       # Set up Docker environment for building images
+#       - setup_remote_docker:
+#           version: 20.10.7
+
+#       # Check out the code from the repository
+#       - checkout
+
+#       # Build the Docker image
+#       - run:
+#           name: Build Docker image
+#           #command: docker build -t mgallai/vision_ai:${CIRCLE_SHA1} .
+#           command: docker build -t $DOCKER_USER/vision_ai:${CIRCLE_SHA1} .
+
+
+#       # Log in to Docker Hub using credentials stored in CircleCI environment variables
+#       - run:
+#           name: Log in to Docker Hub
+#           command: echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
+
+#       # Push Docker image
+#       - run:
+#           name: Push Docker image
+#           command: docker push $DOCKER_USER/vision_ai:${CIRCLE_SHA1}
+
+# workflows:
+#   version: 2
+#   build_and_push:
+#     jobs:
+#       - build_and_push:
+#           filters:
+#             branches:
+#               only:
+#                 - main
+
+version: 2.1
+
+executors:
+  python-executor:
+    docker:
+      - image: circleci/python:3.10
+    environment:
+      DISPLAY: :99
+
+  docker-executor:
+    docker:
+      - image: docker:20.10.7
+
+jobs:
+
+  build-and-test:
+    executor: python-executor
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y xvfb libxi-dev libxtst-dev xdotool
+            sudo apt-get install -y xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils
+            python -m venv venv
+            . venv/bin/activate
+            pip install --upgrade pip
+            pip install -r requirements.txt
+            pip install pytest-qt
+            pip install pytest pytest-qt PyQt5
+            pip install pytest pytest-xvfb pyautogui
+      - run:
+          name: Setup PYTHONPATH
+          command: |
+            export PYTHONPATH="$PYTHONPATH:/home/circleci/project"
+      - run:
+          name: Run tests
+          command: |
+            . venv/bin/activate
+            xvfb-run -a pytest tests/test_AI_NumberOfOutputs.py -v
+            xvfb-run -a pytest tests/test_AI_PredictedCity.py -v
+            xvfb-run -a pytest tests/test_AI_Preprocessing.py -v
+            xvfb-run -a pytest tests/test_ButtonPanel.py -v
+            xvfb-run -a pytest tests/test_IconsExist.py -v
+            xvfb-run -a pytest tests/test_InformationDialog.py -v
+            xvfb-run -a pytest tests/test_ModelExist.py -v
+            xvfb-run -a pytest tests/test_SelectMethod.py -v
+            xvfb-run -a pytest tests/test_sort_button.py -v
+      - persist_to_workspace:
+          root: .
+          paths:
+            - ./*
+
+  build-and-push:
+    executor: docker-executor
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 20.10.7
+      - attach_workspace:
+          at: .
+      - run:
+          name: Build Docker image
+          command: docker build -t $DOCKER_USER/vision_ai:${CIRCLE_SHA1} .
+      - run:
+          name: Log in to Docker Hub
+          command: echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
+      - run:
+          name: Push Docker image
+          command: docker push $DOCKER_USER/vision_ai:${CIRCLE_SHA1}
+
+workflows:
+  version: 2
+  build-test-and-push:
+    jobs:
+      - build-and-test
+      - build-and-push:
+          requires:
+            - build-and-test
+          filters:
+            branches:
+              only:
+                - main

Dockerfile

@@ -0,0 +1,64 @@
+# Use a specific version of Miniconda as the base image
+FROM continuumio/miniconda3:4.9.2
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Update repository information and install necessary system libraries and Xvfb
+RUN apt-get update --allow-releaseinfo-change && \
+    apt-get install -y --no-install-recommends apt-utils && \
+    sed -i 's|http://deb.debian.org/debian buster|http://deb.debian.org/debian oldoldstable|g' /etc/apt/sources.list && \
+    sed -i 's|http://security.debian.org/debian-security buster/updates|http://security.debian.org/debian-security oldoldstable/updates|g' /etc/apt/sources.list && \
+    apt-get update --allow-releaseinfo-change && \
+    apt-get install -y \
+    libgl1-mesa-glx \
+    libglib2.0-0 \
+    libxkbcommon-x11-0 \
+    libxcb-glx0 \
+    libxcb-keysyms1 \
+    libx11-xcb1 \
+    libxrender1 \
+    libfontconfig1 \
+    libxcomposite1 \
+    libxcursor1 \
+    libxdamage1 \
+    libxtst6 \
+    libxi6 \
+    libxrandr2 \
+    libxss1 \
+    libxshmfence1 \
+    libxcb-icccm4 \
+    libxcb-image0 \
+    libxcb-shm0 \
+    libxcb-util0 \
+    libxcb-xfixes0 \
+    libxcb-randr0 \
+    libxcb-render-util0 \
+    libxcb-xinerama0 \
+    xvfb && \
+    rm -rf /var/lib/apt/lists/*
+
+# Set environment variables for Qt
+ENV QT_XCB_GL_INTEGRATION=none
+ENV QT_DEBUG_PLUGINS=1
+
+# Copy the environment configuration file
+COPY environment.yml .
+
+# Create the Conda environment specified in environment.yml
+RUN conda env create -f environment.yml
+
+# Install onnxruntime via pip
+RUN conda run -n myenv pip install onnxruntime==1.8.0
+
+# Make sure the environment is activated by default
+SHELL ["conda", "run", "-n", "myenv", "/bin/bash", "-c"]
+
+# Copy the rest of the application code into the container
+COPY . .
+
+# Define environment variable
+ENV NAME World
+
+# Start Xvfb and run the application when the container launches
+CMD ["bash", "-c", "xvfb-run -a python app.py"]

README.md

@@ -1,2 +1,185 @@
 # VisionAI
-Image Classification Software
+
+![VisionAI Logo](https://i.ibb.co/sq5J35B/Screenshot-2024-06-12-094922.png)
+
+VisionAI is a PyQt5-based desktop application for organizing image collections using Vision AI and manual tools. Users can select folders, navigate history, sort folders, view individual images, open subfolders, and delete unwanted folders. VisionAI leverages AI to analyze and categorize images, enhancing the manual organization process and making it efficient to manage large image collections.
+
+## Table of Contents
+- [Features](#features)
+- [Installation](#installation)
+- [Usage](#usage)
+- [Testing](#testing)
+- [Datasets](#datasets)
+- [Project Structure](#project-structure)
+- [Demo](#demo)
+- [Burndown Chart](#burndown-chart)
+- [Technologies Used](#technologies-used)
+- [Contributing](#contributing)
+- [License](#license)
+- [Acknowledgements](#acknowledgements)
+
+## Features
+
+- **Select Folder:** Choose a directory to display its contents.
+- **Navigate History:** Use back and forward buttons to navigate through folder history.
+- **Sort Folders:** Sort folders by the number of images they contain.
+- **View Images:** Double-click to view single images.
+- **Open Folder:** Double-click to open any displayed folder.
+- **Vision AI:** Automatically create albums for folders using Vision AI.
+- **Manual Classification:** Manually create albums for selected images.
+- **Web Demo:** View a web demo hosted on Hugging Face.
+- **Rename Folder:** Rename an album folder with confirmation.
+- **Delete Folder:** Delete an album folder with confirmation.
+- **Information Dialog:** View instructions and information about the application.
+
+## Installation
+
+1. **Clone the repository:**
+   ```
+   git clone https://github.com/mmgallai/VisionAI.git
+   cd VisionAI
+   ```
+
+2. **Create and activate a virtual environment:**
+   ```
+   python -m venv venv
+   source venv/bin/activate  # On Windows, use `venv\Scripts\activate`
+   ```
+
+3. **Install dependencies:**
+   ```
+   pip install -r requirements.txt
+   ```
+
+4. **Install PyQt5:**
+   ```
+   pip install PyQt5
+   ```
+
+5. **Install pytest and pytest-qt for testing:**
+   ```
+   pip install pytest pytest-qt
+   ```
+
+## Usage
+
+1. **Run the application:**
+   ```
+   python app.py
+   ```
+
+2. **Interact with the UI:**
+   - Use the buttons to navigate, sort, and select folders.
+   - Double-click on images to view them.
+   - Use the "Vision AI" and "Manual" buttons to organize images.
+   - Use the "Delete" button to remove folders.
+
+## Testing
+
+1. **Run the tests:**
+   ```
+   pytest tests/
+   ```
+
+## Datasets
+1. **Link to Dataset :** [Subset of parent](https://drive.google.com/drive/folders/1Drk4mrMexkMgB0lk4JvJPYrQYq1OvzFL)
+2. **Link to Parent Dataset :** [Parent dataset](https://www.kaggle.com/datasets/amaralibey/gsv-cities/data)
+
+## Project Structure
+
+```
+VisionAI/
+├── controller/
+│   ├── AI.py
+│   └── Manual.py
+├── view/
+│   ├── ButtonPanel.py
+│   ├── ButtonStyle.py
+│   ├── CloseConfirmationDialog.py
+│   ├── DemoButton.py
+│   ├── FolderList.py
+│   ├── FrameSettings.py
+│   ├── HistoryManager.py
+│   ├── ImageDisplay.py
+│   ├── InformationDialog.py
+│   ├── InitialFolderSelection.py
+│   ├── MainView.py
+│   ├── UploadButton.py
+│   └── SelectMethod.py
+├── tests/
+│   ├── __init__.py
+│   ├── test_AI_NumberOfOutputs.py
+│   ├── test_AI_PredictedCity.py
+│   ├── test_AI_Preprocessing.py
+│   ├── test_ButtonPanel.py
+│   ├── test_Delete_FolderList.py
+│   ├── test_IconsExist.py
+│   ├── test_ImageCount.py
+│   ├── test_InformationDialog.py
+│   ├── test_Manual.py
+│   ├── test_ModelExist.py
+│   ├── test_SelectMethod.py
+│   └── test_WebDemo.py
+├── test images/
+│   ├── image1.jpg
+│   ├── image2.jpg
+│   ├── image3.jpg
+│   ├── image4.jpg
+│   ├── image5.jpg
+│   ├── image6.jpg
+│   ├── image7.jpg
+│   ├── image8.jpg
+│   ├── image9.jpg
+│   ├── image10.jpg
+│   └── names.txt
+├── icons/
+│   ├── back_icon.png
+│   ├── delete_icon.png
+│   ├── directories_icon.png
+│   ├── folder_icon.png
+│   ├── forward_icon.png
+│   ├── image_icon.png
+│   ├── info_icon.png
+│   ├── method_icon.png
+│   └── sort_icon.png
+├── model/
+│   └── best.onnx
+├── app.py
+├── requirements.txt
+└── README.md
+
+```
+- app.py: The main entry point for the application.
+
+## Demo
+![Demo](https://media.giphy.com/media/v1.Y2lkPTc5MGI3NjExZHAydWU3MnE5dnZ4Njg4eXdzYnBkZDgwMzJnemw0Z3Z0azl1MmN0MCZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9Zw/Y5rMvrTf8JABxYHAPh/giphy.gif)
+
+## Burndown Chart
+**Sprint 2:**
+![Burndown Chart 2](https://i.ibb.co/9TLgm7g/Sprint-burndown.png)
+**Sprint 3:**
+![Burndown Chart 3](https://i.ibb.co/gJ35qW9/Screenshot-2024-06-18-114417.png)
+
+## Technologies Used
+- <img src="https://img.icons8.com/color/48/000000/python.png" alt="Python" width="48" height="48"> **Python**: The primary programming language used for this project.
+- <img src="https://upload.wikimedia.org/wikipedia/commons/e/e6/Python_and_Qt.svg" alt="PyQt5" width="48" height="48"> **PyQt5**: Used for creating the graphical user interface.
+- <img src="https://upload.wikimedia.org/wikipedia/commons/1/17/Open_Neural_Network_Exchange_logo.svg" alt="ONNX" width="48" height="48"> **ONNX**: Used for the machine learning models.
+- <img src="https://upload.wikimedia.org/wikipedia/commons/b/ba/Pytest_logo.svg" alt="pytest" width="48" height="48"> **pytest**: Used for testing the application.
+- <img src="https://img.icons8.com/fluent/48/000000/github.png" alt="GitHub" width="48" height="48"> **GitHub**: For version control and collaboration.
+
+
+## Contributing
+
+Contributions are welcome! Please create an issue or submit a pull request for any improvements or bug fixes.
+
+## License
+
+This project is licensed under the MIT License.
+
+## Acknowledgements
+
+- This project uses PyQt5 for the graphical user interface.
+- This project uses [YOLOv8](https://github.com/ultralytics/ultralytics) to organize images.
+- Special thanks to user "[amaralibey](https://www.kaggle.com/amaralibey)" in kaggle for the datatset.
+- Special thanks to the contributors and the open-source community for their support.
+