From 53357e819675491f29f1e8721f672053b28bad4e Mon Sep 17 00:00:00 2001 From: Nicolas Patry Date: Mon, 12 Dec 2022 15:39:13 +0100 Subject: [PATCH] Adding ValueError when imcompatible parameters are used. (#20729) --- src/transformers/pipelines/text_generation.py | 2 ++ tests/pipelines/test_pipelines_text_generation.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/transformers/pipelines/text_generation.py b/src/transformers/pipelines/text_generation.py index 2ac4cdeaf5..c560e3b208 100644 --- a/src/transformers/pipelines/text_generation.py +++ b/src/transformers/pipelines/text_generation.py @@ -130,6 +130,8 @@ class TextGenerationPipeline(Pipeline): postprocess_params = {} if return_full_text is not None and return_type is None: + if return_text is not None: + raise ValueError("`return_text` is mutually exclusive with `return_full_text`") return_type = ReturnType.FULL_TEXT if return_full_text else ReturnType.NEW_TEXT if return_tensors is not None and return_type is None: return_type = ReturnType.TENSORS diff --git a/tests/pipelines/test_pipelines_text_generation.py b/tests/pipelines/test_pipelines_text_generation.py index ca0e101158..4796241109 100644 --- a/tests/pipelines/test_pipelines_text_generation.py +++ b/tests/pipelines/test_pipelines_text_generation.py @@ -201,6 +201,9 @@ class TextGenerationPipelineTests(unittest.TestCase, metaclass=PipelineTestCaseM ], ) + with self.assertRaises(ValueError): + outputs = text_generator("test", return_full_text=True, return_text=True) + # Empty prompt is slighly special # it requires BOS token to exist. # Special case for Pegasus which will always append EOS so will