diff --git a/CHANGELOG.md b/CHANGELOG.md index de89d844..ebf67ce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Bumped "breaking" dependencies on MTEB and Transformers version and made the corresponding changes in the code - Casted Image dtype in ColPali due to breaking 4.46 transformers update - Added a "num_image_tokens" kwarg to the `ColQwen2Processor` to allow for different image resolutions +- Rename `x_idefics_2_y` files to `x_idefics2_y` to match the `transformers` naming convention ### Fixed diff --git a/colpali_engine/collators/visual_retriever_collator.py b/colpali_engine/collators/visual_retriever_collator.py index 79e7cddd..97476d96 100644 --- a/colpali_engine/collators/visual_retriever_collator.py +++ b/colpali_engine/collators/visual_retriever_collator.py @@ -2,7 +2,7 @@ from PIL.Image import Image -from colpali_engine.models.idefics_2 import ColIdefics2Processor +from colpali_engine.models.idefics2 import ColIdefics2Processor from colpali_engine.models.paligemma import ColPaliProcessor from colpali_engine.utils.processing_utils import BaseVisualRetrieverProcessor diff --git a/colpali_engine/models/__init__.py b/colpali_engine/models/__init__.py index 0594793e..357a0e6b 100644 --- a/colpali_engine/models/__init__.py +++ b/colpali_engine/models/__init__.py @@ -1,3 +1,3 @@ -from .idefics_2 import BiIdefics2, ColIdefics2, ColIdefics2Processor +from .idefics2 import BiIdefics2, BiIdefics2Processor, ColIdefics2, ColIdefics2Processor from .paligemma import BiPali, BiPaliProcessor, BiPaliProj, ColPali, ColPaliProcessor from .qwen2 import BiQwen2, BiQwen2Processor, ColQwen2, ColQwen2Processor diff --git a/colpali_engine/models/idefics2/__init__.py b/colpali_engine/models/idefics2/__init__.py new file mode 100644 index 00000000..3cad694e --- /dev/null +++ b/colpali_engine/models/idefics2/__init__.py @@ -0,0 +1,2 @@ +from .biidefics2 import BiIdefics2, BiIdefics2Processor +from .colidefics2 import ColIdefics2, ColIdefics2Processor diff --git a/colpali_engine/models/idefics2/biidefics2/__init__.py b/colpali_engine/models/idefics2/biidefics2/__init__.py new file mode 100644 index 00000000..5084c86d --- /dev/null +++ b/colpali_engine/models/idefics2/biidefics2/__init__.py @@ -0,0 +1,2 @@ +from .modeling_biidefics2 import BiIdefics2 +from .processing_biidefics2 import BiIdefics2Processor diff --git a/colpali_engine/models/idefics_2/biidefics_2/modeling_biidefics_2.py b/colpali_engine/models/idefics2/biidefics2/modeling_biidefics2.py similarity index 100% rename from colpali_engine/models/idefics_2/biidefics_2/modeling_biidefics_2.py rename to colpali_engine/models/idefics2/biidefics2/modeling_biidefics2.py diff --git a/colpali_engine/models/idefics_2/biidefics_2/processing_biidefics_2.py b/colpali_engine/models/idefics2/biidefics2/processing_biidefics2.py similarity index 86% rename from colpali_engine/models/idefics_2/biidefics_2/processing_biidefics_2.py rename to colpali_engine/models/idefics2/biidefics2/processing_biidefics2.py index 12ac6c47..25e2a21f 100644 --- a/colpali_engine/models/idefics_2/biidefics_2/processing_biidefics_2.py +++ b/colpali_engine/models/idefics2/biidefics2/processing_biidefics2.py @@ -2,7 +2,7 @@ import torch -from colpali_engine.models.idefics_2.colidefics_2.processing_colidefics_2 import ColIdefics2Processor +from colpali_engine.models.idefics2.colidefics2.processing_colidefics2 import ColIdefics2Processor class BiIdefics2Processor(ColIdefics2Processor): diff --git a/colpali_engine/models/idefics2/colidefics2/__init__.py b/colpali_engine/models/idefics2/colidefics2/__init__.py new file mode 100644 index 00000000..da6720c9 --- /dev/null +++ b/colpali_engine/models/idefics2/colidefics2/__init__.py @@ -0,0 +1,2 @@ +from .modeling_colidefics2 import ColIdefics2 +from .processing_colidefics2 import ColIdefics2Processor diff --git a/colpali_engine/models/idefics_2/colidefics_2/modeling_colidefics_2.py b/colpali_engine/models/idefics2/colidefics2/modeling_colidefics2.py similarity index 100% rename from colpali_engine/models/idefics_2/colidefics_2/modeling_colidefics_2.py rename to colpali_engine/models/idefics2/colidefics2/modeling_colidefics2.py diff --git a/colpali_engine/models/idefics_2/colidefics_2/processing_colidefics_2.py b/colpali_engine/models/idefics2/colidefics2/processing_colidefics2.py similarity index 100% rename from colpali_engine/models/idefics_2/colidefics_2/processing_colidefics_2.py rename to colpali_engine/models/idefics2/colidefics2/processing_colidefics2.py diff --git a/colpali_engine/models/idefics_2/__init__.py b/colpali_engine/models/idefics_2/__init__.py deleted file mode 100644 index 9ae42040..00000000 --- a/colpali_engine/models/idefics_2/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .biidefics_2 import BiIdefics2 -from .colidefics_2 import ColIdefics2, ColIdefics2Processor diff --git a/colpali_engine/models/idefics_2/biidefics_2/__init__.py b/colpali_engine/models/idefics_2/biidefics_2/__init__.py deleted file mode 100644 index 36091b2d..00000000 --- a/colpali_engine/models/idefics_2/biidefics_2/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .modeling_biidefics_2 import BiIdefics2 diff --git a/colpali_engine/models/idefics_2/colidefics_2/__init__.py b/colpali_engine/models/idefics_2/colidefics_2/__init__.py deleted file mode 100644 index e1563b0b..00000000 --- a/colpali_engine/models/idefics_2/colidefics_2/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .modeling_colidefics_2 import ColIdefics2 -from .processing_colidefics_2 import ColIdefics2Processor