Merge remote-tracking branch 'upstream/main' into DAN

NVIDIA · Nov 21, 2024 · 6841060 · 6841060
2 parents 3bf4745 + e599eb0
commit 6841060
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/garak/generators/huggingface.py b/garak/generators/huggingface.py
@@ -80,6 +80,13 @@ def _load_client(self):
 
         pipeline_kwargs = self._gather_hf_params(hf_constructor=pipeline)
         self.generator = pipeline("text-generation", **pipeline_kwargs)
+        if self.generator.tokenizer is None:
+            # account for possible model without a stored tokenizer
+            from transformers import AutoTokenizer
+
+            self.generator.tokenizer = AutoTokenizer.from_pretrained(
+                pipeline_kwargs["model"]
+            )
         if not hasattr(self, "deprefix_prompt"):
             self.deprefix_prompt = self.name in models_to_deprefix
         if _config.loaded:

diff --git a/garak/resources/plugin_cache.json b/garak/resources/plugin_cache.json
@@ -6139,7 +6139,7 @@
       },
       "parallel_capable": false,
       "supports_multiple_generations": true,
-      "mod_time": "2024-11-18 18:23:48 +0000"
+      "mod_time": "2024-11-20 18:59:25 +0000"
     },
     "generators.huggingface.InferenceAPI": {
       "description": "Get text generations from Hugging Face Inference API",
@@ -6164,7 +6164,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": true,
-      "mod_time": "2024-11-18 18:23:48 +0000"
+      "mod_time": "2024-11-20 18:59:25 +0000"
     },
     "generators.huggingface.InferenceEndpoint": {
       "description": "Interface for Hugging Face private endpoints",
@@ -6189,7 +6189,7 @@
       },
       "parallel_capable": true,
       "supports_multiple_generations": false,
-      "mod_time": "2024-11-18 18:23:48 +0000"
+      "mod_time": "2024-11-20 18:59:25 +0000"
     },
     "generators.huggingface.LLaVA": {
       "description": "Get LLaVA ([ text + image ] -> text) generations",
@@ -6217,7 +6217,7 @@
       },
       "parallel_capable": false,
       "supports_multiple_generations": false,
-      "mod_time": "2024-11-18 18:23:48 +0000"
+      "mod_time": "2024-11-20 18:59:25 +0000"
     },
     "generators.huggingface.Model": {
       "description": "Get text generations from a locally-run Hugging Face model",
@@ -6244,7 +6244,7 @@
       },
       "parallel_capable": false,
       "supports_multiple_generations": true,
-      "mod_time": "2024-11-18 18:23:48 +0000"
+      "mod_time": "2024-11-20 18:59:25 +0000"
     },
     "generators.huggingface.OptimumPipeline": {
       "description": "Get text generations from a locally-run Hugging Face pipeline using NVIDIA Optimum",
@@ -6271,7 +6271,7 @@
       },
       "parallel_capable": false,
       "supports_multiple_generations": true,
-      "mod_time": "2024-11-18 18:23:48 +0000"
+      "mod_time": "2024-11-20 18:59:25 +0000"
     },
     "generators.huggingface.Pipeline": {
       "description": "Get text generations from a locally-run Hugging Face pipeline",
@@ -6298,7 +6298,7 @@
       },
       "parallel_capable": false,
       "supports_multiple_generations": true,
-      "mod_time": "2024-11-18 18:23:48 +0000"
+      "mod_time": "2024-11-20 18:59:25 +0000"
     },
     "generators.langchain.LangChainLLMGenerator": {
       "description": "Class supporting LangChain LLM interfaces",