Merge pull request #335 from Jordan-Pierce/dev

YOLOE fixes

Author: Jordan-Pierce

coralnet_toolbox/Explorer/QtExplorer.py …net_toolbox/Explorer/QtExplorerWindow.pycoralnet_toolbox/Explorer/QtExplorer.py renamed to coralnet_toolbox/Explorer/QtExplorerWindow.py coralnet_toolbox/Explorer/QtExplorer.py renamed to coralnet_toolbox/Explorer/QtExplorerWindow.py

@@ -4,6 +4,7 @@
 
 import numpy as np
 import torch
+
 import faiss
 
 from ultralytics import YOLO

coralnet_toolbox/Explorer/__init__.py

@@ -1,6 +1,6 @@
 # coralnet_toolbox/Explorer/__init__.py
 
-from .QtExplorer import ExplorerWindow
+from .QtExplorerWindow import ExplorerWindow
 
 __all__ = [
     'ExplorerWindow',

coralnet_toolbox/Explorer/transformer_models.py

@@ -11,35 +11,42 @@
 TRANSFORMER_MODELS = {
     'ResNet-50': 'microsoft/resnet-50',
     'ResNet-101': 'microsoft/resnet-101',
+    'Swin Transformer (Tiny)': 'microsoft/swin-tiny-patch4-window7-224',
+    'Swin Transformer (Base)': 'microsoft/swin-base-patch4-window7-224',
+    'ViT (Base)': 'google/vit-base-patch16-224',
+    'ViT (Large)': 'google/vit-large-patch16-224',
     'DINOv2 (Small)': 'facebook/dinov2-small',
     'DINOv2 (Base)': 'facebook/dinov2-base',
     'DINOv2 (Large)': 'facebook/dinov2-large',
     'DINOv2 (Giant)': 'facebook/dinov2-giant',
     'DINOv2 (Giant ImageNet1k)': 'facebook/dinov2-giant-imagenet1k-1-layer',
-    'Swin Transformer (Tiny)': 'microsoft/swin-tiny-patch4-window7-224',
-    'Swin Transformer (Base)': 'microsoft/swin-base-patch4-window7-224',
-    'ViT (Base)': 'google/vit-base-patch16-224',
-    'ViT (Large)': 'google/vit-large-patch16-224',
 }
 
-# Check if HF_TOKEN environment variable is set
-# (if not, user can definitely not access the model)
-hf_token = os.getenv("HF_TOKEN")
+try:
+    from transformers import pipeline
+    from huggingface_hub import snapshot_download
+
+    # Check if HF_TOKEN environment variable is set
+    # (if not, user can definitely not access the model)
+    hf_token = os.getenv("HF_TOKEN")
+            
+    if hf_token and hf_token.strip():
+        # Add the DINOv3 models if the HuggingFace token is set
+        TRANSFORMER_MODELS.update({
+            'DINOv3 ConvNext (Tiny)': 'facebook/dinov3-convnext-tiny-pretrain-lvd1689m',
+            'DINOv3 ConvNext (Small)': 'facebook/dinov3-convnext-small-pretrain-lvd1689m',
+            'DINOv3 ConvNext (Base)': 'facebook/dinov3-convnext-base-pretrain-lvd1689m',
+            'DINOv3 ConvNext (Large)': 'facebook/dinov3-convnext-large-pretrain-lvd1689m',
+            'DINOv3 ViT (Small/16)': 'facebook/dinov3-vits16-pretrain-lvd1689m',
+            'DINOv3 ViT (Small/16+)': 'facebook/dinov3-vits16plus-pretrain-lvd1689m',
+            'DINOv3 ViT (Base/16)': 'facebook/dinov3-vitb16-pretrain-lvd1689m',
+            'DINOv3 ViT (Large/16)': 'facebook/dinov3-vitl16-pretrain-lvd1689m',
+            'DINOv3 ViT (Huge/16+)': 'facebook/dinov3-vith16plus-pretrain-lvd1689m',
+            'DINOv3 ViT (7B/16)': 'facebook/dinov3-vit7b16-pretrain-lvd1689m',
+        })
 
-if hf_token and hf_token.strip():
-    # Add the DINOv3 models if the HuggingFace token is set
-    TRANSFORMER_MODELS.update({
-        'DINOv3 ConvNext (Tiny)': 'facebook/dinov3-convnext-tiny-pretrain-lvd1689m',
-        'DINOv3 ConvNext (Small)': 'facebook/dinov3-convnext-small-pretrain-lvd1689m',
-        'DINOv3 ConvNext (Base)': 'facebook/dinov3-convnext-base-pretrain-lvd1689m',
-        'DINOv3 ConvNext (Large)': 'facebook/dinov3-convnext-large-pretrain-lvd1689m',
-        'DINOv3 ViT (Small/16)': 'facebook/dinov3-vits16-pretrain-lvd1689m',
-        'DINOv3 ViT (Small/16+)': 'facebook/dinov3-vits16plus-pretrain-lvd1689m',
-        'DINOv3 ViT (Base/16)': 'facebook/dinov3-vitb16-pretrain-lvd1689m',
-        'DINOv3 ViT (Large/16)': 'facebook/dinov3-vitl16-pretrain-lvd1689m',
-        'DINOv3 ViT (Huge/16+)': 'facebook/dinov3-vith16plus-pretrain-lvd1689m',
-        'DINOv3 ViT (7B/16)': 'facebook/dinov3-vit7b16-pretrain-lvd1689m',
-    })
+except Exception as e:
+    pass
 
 
 def is_transformer_model(model_name):

coralnet_toolbox/Explorer/yolo_models.py

@@ -30,6 +30,13 @@
     # 'YOLOv12 (Medium)': 'yolo12m-cls.pt',
     # 'YOLOv12 (Large)': 'yolo12l-cls.pt',
     # 'YOLOv12 (X-Large)': 'yolo12x-cls.pt',
+    
+    # YOLO26 classification models
+    'YOLO26 (Nano)': 'yolo26n-cls.pt',
+    'YOLO26 (Small)': 'yolo26s-cls.pt',
+    'YOLO26 (Medium)': 'yolo26m-cls.pt',
+    'YOLO26 (Large)': 'yolo26l-cls.pt',
+    'YOLO26 (X-Large)': 'yolo26x-cls.pt',
 }