corrections to config format for TAP internal generators (#796)

* corrections to config format for TAP internal generators

* ensure `name` is set
* wrap config in required `Configurable` structure

Signed-off-by: Jeffrey Martin <jemartin@nvidia.com>

* ensure device is passed for huggingface generator

Signed-off-by: Jeffrey Martin <jemartin@nvidia.com>

---------

Signed-off-by: Jeffrey Martin <jemartin@nvidia.com>

garak/resources/tap/generator_utils.py

@@ -46,6 +46,7 @@ def load_generator(
     """
 
     config = {
+        "name": model_name,
         "generations": generations,
         "max_tokens": max_tokens,
     }
@@ -55,12 +56,22 @@ def load_generator(
 
     if model_name.lower() in hf_dict.keys():
         config["name"] = hf_dict[model_name]
-        config["device"] = device
 
     if model_name in supported_openai:
-        generator = OpenAIGenerator(config_root=config)
+        config_root = {
+            "generators": {
+                OpenAIGenerator.__module__.split(".")[-1]: {
+                    OpenAIGenerator.__name__: config
+                }
+            }
+        }
+        generator = OpenAIGenerator(config_root=config_root)
     elif model_name in supported_huggingface:
-        generator = Model(config_root=config)
+        config["hf_args"] = {"device": device}
+        config_root = {
+            "generators": {Model.__module__.split(".")[-1]: {Model.__name__: config}}
+        }
+        generator = Model(config_root=config_root)
     else:
         msg = (
             f"{model_name} is not currently supported for TAP generation. Support is available for the following "