deps(medcat+medcat-service): CU-869cqbd24 Allow transformers 5

medcat-service/requirements.txt

@@ -4,7 +4,7 @@ simplejson==3.19.3
 setuptools-rust==1.11.0
 medcat[meta-cat,spacy,deid]~=2.6.0
 # pinned because of issues with de-id models and past models (it will not do any de-id)
-transformers>=4.34.0,<5.0.0
+transformers>=4.34.0,<6.0.0
 requests==2.32.4
 fastapi[standard]==0.128.0
 pydantic>=2.11.10,<2.12.5
@@ -17,4 +17,4 @@ opentelemetry-resource-detector-containerid==0.60b0
 opentelemetry-instrumentation-fastapi==0.60b0
 opentelemetry-instrumentation-requests==0.60b0
 opentelemetry-instrumentation-threading==0.60b0
-opentelemetry-instrumentation-httpx==0.60b0
+opentelemetry-instrumentation-httpx==0.60b0

medcat-v2/medcat/components/addons/meta_cat/mctokenizers/bert_tokenizer.py

@@ -1,7 +1,7 @@
 import logging
 import os
 from typing import Optional, Union, overload
-from transformers.models.bert.tokenization_bert_fast import BertTokenizerFast
+from transformers import BertTokenizerFast
 
 from medcat.components.addons.meta_cat.mctokenizers.tokenizers import (
     TokenizerWrapperBase)
@@ -15,7 +15,7 @@ class TokenizerWrapperBERT(TokenizerWrapperBase):
     MetaCAT models.
 
     Args:
-        transformers.models.bert.tokenization_bert_fast.BertTokenizerFast:
+        transformers.BertTokenizerFast:
             A huggingface Fast BERT.
     """
     name = 'bert-tokenizer'

medcat-v2/medcat/components/addons/relation_extraction/bert/config.py

@@ -17,7 +17,10 @@ class RelExtrBertConfig(RelExtrBaseConfig):
 
     name = 'bert-config'
     pretrained_model_name_or_path = "bert-base-uncased"
-    hf_model_config: BertConfig
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.hf_model_config: BertConfig
 
     @classmethod
     def load(cls, pretrained_model_name_or_path: str,

medcat-v2/medcat/components/addons/relation_extraction/bert/model.py

@@ -3,7 +3,7 @@
 import torch
 
 from torch import nn
-from transformers.models.bert.modeling_bert import BertModel
+from transformers import BertModel
 
 from medcat.config.config_rel_cat import ConfigRelCAT
 from medcat.components.addons.relation_extraction.ml_utils import (

medcat-v2/medcat/components/addons/relation_extraction/bert/tokenizer.py

@@ -1,7 +1,7 @@
 import os
 import logging
 
-from transformers.models.bert.tokenization_bert_fast import BertTokenizerFast
+from transformers import BertTokenizerFast
 
 from medcat.config.config_rel_cat import ConfigRelCAT
 from medcat.components.addons.relation_extraction.tokenizer import (

medcat-v2/medcat/components/addons/relation_extraction/llama/model.py

@@ -4,7 +4,7 @@
 
 import torch
 from torch import nn
-from transformers.models.llama import LlamaModel
+from transformers import LlamaModel
 
 from medcat.config.config_rel_cat import ConfigRelCAT
 from medcat.components.addons.relation_extraction.llama.config import (

medcat-v2/medcat/components/addons/relation_extraction/modernbert/config.py

@@ -2,7 +2,7 @@
 import os
 from typing import cast
 
-from transformers.models.modernbert import ModernBertConfig
+from transformers import ModernBertConfig
 
 from medcat.config.config_rel_cat import ConfigRelCAT
 from medcat.components.addons.relation_extraction.config import (

medcat-v2/medcat/components/addons/relation_extraction/modernbert/model.py

@@ -3,7 +3,7 @@
 import os
 
 from torch import nn
-from transformers.models.modernbert import ModernBertModel
+from transformers import ModernBertModel
 
 from medcat.config.config_rel_cat import ConfigRelCAT
 from medcat.components.addons.relation_extraction.ml_utils import (

medcat-v2/medcat/components/addons/relation_extraction/tokenizer.py

@@ -1,6 +1,6 @@
 import os
 from typing import Optional
-from transformers.models.bert.tokenization_bert_fast import BertTokenizerFast
+from transformers import BertTokenizerFast
 from transformers import PreTrainedTokenizerFast
 import logging
 

medcat-v2/pyproject.toml

@@ -91,7 +91,7 @@ spacy = [
   "spacy",
 ]
 meta_cat = [
-  "transformers>=4.41.0,<5.0", # avoid major bump
+  "transformers>=4.41.0,<6.0", # avoid major bump
   "peft>0.8.2,<1.0",
   "torch>=2.4.0,<3.0",
   "scikit-learn>=1.1.3,<2.0",
@@ -104,15 +104,15 @@ dict_ner = [
 ]
 deid = [
   "datasets>=2.2.2,<3.0.0",
-  "transformers>=4.41.0,<5.0", # avoid major bump
+  "transformers>=4.41.0,<6.0", # avoid major bump
   "scikit-learn>=1.1.3,<2.0",
   "torch>=2.4.0,<3.0",
   # since 3.13 we need to use later version of scipy for it
   "scipy<1.14; python_version < '3.13'",
   "scipy>=1.14; python_version >= '3.13'",
 ]
 rel_cat = [
-  "transformers>=4.41.0,<5.0", # avoid major bump
+  "transformers>=4.41.0,<6.0", # avoid major bump
   "scikit-learn>=1.1.3,<2.0",
   "torch>=2.4.0,<3.0",
 ]