Skip to content

Conversation

Samoed
Copy link
Member

@Samoed Samoed commented Jan 23, 2025

Checklist

  • Run tests locally to make sure nothing is broken using make test.
  • Run the formatter to format the code using make lint.

KennethEnevoldsen and others added 15 commits January 21, 2025 11:38
* fix: Add additional dataset annotations

* fix: readded public training data

* update voyage annotations
Automatically generated by python-semantic-release
* Added better descriptions to benchmarks and removed beta tags

* Fixed zero-shot filtering on app loading

* Added zero-shot definition in an accordion

* NaN values are now filled with blank

* Added type hints to filter_models
Automatically generated by python-semantic-release
Fixed leaderboard search bar
Automatically generated by python-semantic-release
Fixed public_training_data flag type to include boolean, as this is how all models are annotated
* fix zeta alpha mistral

* update use_instructions

* update training datasets

* Update mteb/models/e5_instruct.py

Co-authored-by: Kenneth Enevoldsen <kennethcenevoldsen@gmail.com>

* update float

* Update mteb/models/e5_instruct.py

---------

Co-authored-by: Kenneth Enevoldsen <kennethcenevoldsen@gmail.com>
* apply additions from #1794

* add annotations for rumodels

* add nomic training data

* fix metadata

* update rest of model meta

* fix bge reranker
Automatically generated by python-semantic-release
* Added CDE models

* Added bge-en-icl

* Updated CDE to bge_full_data

* Fixed public_training_data flag type to include boolean, as this is how all models are annotated

* Added public training data link instead of bool to CDE and BGE

* Added GME models

* Changed Torch to PyTorch

* Added metadata on LENS models

* Added ember_v1

* Added metadata for amazon titan

* Removed GME implementation
Automatically generated by python-semantic-release
Added correct training data annotation to LENS
Automatically generated by python-semantic-release
# Conflicts:
#	mteb/models/e5_models.py
#	mteb/models/gritlm_models.py
#	mteb/models/jina_models.py
#	mteb/models/llm2vec_models.py
#	mteb/models/salesforce_models.py
#	mteb/models/sentence_transformers_models.py
@Samoed Samoed requested a review from isaac-chung January 23, 2025 13:30
@Samoed Samoed changed the base branch from main to v2.0.0 January 23, 2025 13:31
@Samoed
Copy link
Member Author

Samoed commented Jan 23, 2025

@isaac-chung You can try changing to rebase and merge, and you'll see This branch cannot be rebased due to conflicts. I don't have any ideas on how to fix this. Ref #1853 (comment)

@isaac-chung
Copy link
Collaborator

Tried and was able to see the same message. I'm reading this page: https://stackoverflow.com/questions/2427238/what-is-the-difference-between-merge-squash-and-rebase. I think we can stick with squash and merge.

@Samoed
Copy link
Member Author

Samoed commented Jan 24, 2025

FYI, the branch will still have merge conflicts, and conflict resolution will need to be reapplied.

@Samoed Samoed merged commit f1d418c into v2.0.0 Jan 24, 2025
11 checks passed
@Samoed Samoed deleted the update_V2_again branch January 24, 2025 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants