facebookresearch · mojtaba-komeili · Jul 16, 2021 · Jul 16, 2021 · Jul 16, 2021 · Jul 16, 2021
diff --git a/parlai/tasks/glue/test/glue_mrpc_test.yml b/parlai/tasks/glue/test/glue_mrpc_test.yml
@@ -55,7 +55,7 @@ acts:
       of measles in the United States in 2002 .'
 - - episode_done: true
     eval_labels:
-    - equivalent
+    - not_equivalent
     id: huggingface
     label_candidates:
     - not_equivalent
@@ -75,7 +75,7 @@ acts:
       Monday night .'
 - - episode_done: true
     eval_labels:
-    - equivalent
+    - not_equivalent
     id: huggingface
     label_candidates:
     - not_equivalent

diff --git a/parlai/tasks/task_list.py b/parlai/tasks/task_list.py
@@ -1419,9 +1419,9 @@
         },
     },
     {
-        "id": "Wizard_of_internet",
+        "id": "Wizard_of_Internet",
         "display_name": "Wizard_of_Internet",
-        "task": "Wizard_of_internet",
+        "task": "wizard_of_internet",
         "tags": ["ChitChat"],
         "description": (
             "A dataset with conversations directly grounded with knowledge "

diff --git a/parlai/tasks/wizard_of_internet/agents.py b/parlai/tasks/wizard_of_internet/agents.py
@@ -463,14 +463,10 @@ def add_cmdline_args(cls, parser: ParlaiParser, partial_opt=None) -> ParlaiParse
     def get_message_history(self, dialog_data: Dict, curr_idx: int) -> List[str]:
         message_hist = []
         for act in dialog_data[CONST.ACTION_ALL]:
-            if (
-                act[CONST.SPEAKER_ID]
-                in (
-                    CONST.WIZARD,
-                    CONST.APPRENTICE,
-                )
-                and not act.get(CONST.IS_SEARCH_QUERY, False)
-            ):
+            if act[CONST.SPEAKER_ID] in (
+                CONST.WIZARD,
+                CONST.APPRENTICE,
+            ) and not act.get(CONST.IS_SEARCH_QUERY, False):
                 if act[CONST.TOTAL_CONVERSATION_INDEX] > curr_idx:
                     break
                 message_hist.append(act[CONST.MESSAGE_TEXT])

diff --git a/parlai/tasks/wizard_of_internet/tests.py → parlai/tasks/wizard_of_internet/test.py b/parlai/tasks/wizard_of_internet/tests.py → parlai/tasks/wizard_of_internet/test.py
@@ -32,4 +32,4 @@ class TestGoldDocsTeacher(AutoTeacherTest):
 
 
 class TestGoldDocTitlesTeacher(AutoTeacherTest):
-    task = 'wizard_of_internet:GoldDocTitlesTeacher'
+    task = 'wizard_of_internet:GoldDocTitlesTeacher'
diff --git a/...internet_ApprenticeDialogTeacher_test.yml → ...internet_ApprenticeDialogTeacher_test.yml b/...internet_ApprenticeDialogTeacher_test.yml → ...internet_ApprenticeDialogTeacher_test.yml
diff --git a/...nternet_ApprenticeDialogTeacher_train.yml → ...nternet_ApprenticeDialogTeacher_train.yml b/...nternet_ApprenticeDialogTeacher_train.yml → ...nternet_ApprenticeDialogTeacher_train.yml
diff --git a/...nternet_ApprenticeDialogTeacher_valid.yml → ...nternet_ApprenticeDialogTeacher_valid.yml b/...nternet_ApprenticeDialogTeacher_valid.yml → ...nternet_ApprenticeDialogTeacher_valid.yml
diff --git a/...of_internet_GoldDocTitlesTeacher_test.yml → ...of_internet_GoldDocTitlesTeacher_test.yml b/...of_internet_GoldDocTitlesTeacher_test.yml → ...of_internet_GoldDocTitlesTeacher_test.yml
diff --git a/...f_internet_GoldDocTitlesTeacher_train.yml → ...f_internet_GoldDocTitlesTeacher_train.yml b/...f_internet_GoldDocTitlesTeacher_train.yml → ...f_internet_GoldDocTitlesTeacher_train.yml
diff --git a/...f_internet_GoldDocTitlesTeacher_valid.yml → ...f_internet_GoldDocTitlesTeacher_valid.yml b/...f_internet_GoldDocTitlesTeacher_valid.yml → ...f_internet_GoldDocTitlesTeacher_valid.yml
diff --git a/...zard_of_internet_GoldDocsTeacher_test.yml → ...zard_of_internet_GoldDocsTeacher_test.yml b/...zard_of_internet_GoldDocsTeacher_test.yml → ...zard_of_internet_GoldDocsTeacher_test.yml
diff --git a/...ard_of_internet_GoldDocsTeacher_train.yml → ...ard_of_internet_GoldDocsTeacher_train.yml b/...ard_of_internet_GoldDocsTeacher_train.yml → ...ard_of_internet_GoldDocsTeacher_train.yml
diff --git a/...ard_of_internet_GoldDocsTeacher_valid.yml → ...ard_of_internet_GoldDocsTeacher_valid.yml b/...ard_of_internet_GoldDocsTeacher_valid.yml → ...ard_of_internet_GoldDocsTeacher_valid.yml
diff --git a/...of_internet_GoldKnowledgeTeacher_test.yml → ...of_internet_GoldKnowledgeTeacher_test.yml b/...of_internet_GoldKnowledgeTeacher_test.yml → ...of_internet_GoldKnowledgeTeacher_test.yml
diff --git a/...f_internet_GoldKnowledgeTeacher_train.yml → ...f_internet_GoldKnowledgeTeacher_train.yml b/...f_internet_GoldKnowledgeTeacher_train.yml → ...f_internet_GoldKnowledgeTeacher_train.yml
diff --git a/...f_internet_GoldKnowledgeTeacher_valid.yml → ...f_internet_GoldKnowledgeTeacher_valid.yml b/...f_internet_GoldKnowledgeTeacher_valid.yml → ...f_internet_GoldKnowledgeTeacher_valid.yml
diff --git a/...d_of_internet_SearchQueryTeacher_test.yml → ...d_of_internet_SearchQueryTeacher_test.yml b/...d_of_internet_SearchQueryTeacher_test.yml → ...d_of_internet_SearchQueryTeacher_test.yml
diff --git a/..._of_internet_SearchQueryTeacher_train.yml → ..._of_internet_SearchQueryTeacher_train.yml b/..._of_internet_SearchQueryTeacher_train.yml → ..._of_internet_SearchQueryTeacher_train.yml
diff --git a/..._of_internet_SearchQueryTeacher_valid.yml → ..._of_internet_SearchQueryTeacher_valid.yml b/..._of_internet_SearchQueryTeacher_valid.yml → ..._of_internet_SearchQueryTeacher_valid.yml
diff --git a/...WizardDialogGoldKnowledgeTeacher_test.yml → ...WizardDialogGoldKnowledgeTeacher_test.yml b/...WizardDialogGoldKnowledgeTeacher_test.yml → ...WizardDialogGoldKnowledgeTeacher_test.yml
diff --git a/...izardDialogGoldKnowledgeTeacher_train.yml → ...izardDialogGoldKnowledgeTeacher_train.yml b/...izardDialogGoldKnowledgeTeacher_train.yml → ...izardDialogGoldKnowledgeTeacher_train.yml
diff --git a/...izardDialogGoldKnowledgeTeacher_valid.yml → ...izardDialogGoldKnowledgeTeacher_valid.yml b/...izardDialogGoldKnowledgeTeacher_valid.yml → ...izardDialogGoldKnowledgeTeacher_valid.yml
diff --git a/...nternet/tests/wizard_of_internet_test.yml → ...internet/test/wizard_of_internet_test.yml b/...nternet/tests/wizard_of_internet_test.yml → ...internet/test/wizard_of_internet_test.yml
diff --git a/...ternet/tests/wizard_of_internet_train.yml → ...nternet/test/wizard_of_internet_train.yml b/...ternet/tests/wizard_of_internet_train.yml → ...nternet/test/wizard_of_internet_train.yml
diff --git a/...ternet/tests/wizard_of_internet_valid.yml → ...nternet/test/wizard_of_internet_valid.yml b/...ternet/tests/wizard_of_internet_valid.yml → ...nternet/test/wizard_of_internet_valid.yml
diff --git a/parlai/utils/misc.py b/parlai/utils/misc.py
@@ -411,17 +411,12 @@ def nice_report(report) -> str:
         df = pd.DataFrame([output])
         df.columns = pd.MultiIndex.from_tuples(df.columns)
         df = df.stack().transpose().droplevel(0, axis=1)
-        result = (
-            "   "
-            + df.to_string(
-                na_rep="",
-                line_width=line_width - 3,  # -3 for the extra spaces we add
-                float_format=float_formatter,
-                index=df.shape[0] > 1,
-            )
-            .replace("\n\n", "\n")
-            .replace("\n", "\n   ")
-        )
+        result = "   " + df.to_string(
+            na_rep="",
+            line_width=line_width - 3,  # -3 for the extra spaces we add
+            float_format=float_formatter,
+            index=df.shape[0] > 1,
+        ).replace("\n\n", "\n").replace("\n", "\n   ")
         result = re.sub(r"\s+$", "", result)
         return result
     else:

diff --git a/parlai/zoo/blenderbot2/__init__.py b/parlai/zoo/blenderbot2/__init__.py
@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+# Copyright (c) Facebook, Inc. and its affiliates.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
diff --git a/parlai/zoo/msc/__init__.py b/parlai/zoo/msc/__init__.py
@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+# Copyright (c) Facebook, Inc. and its affiliates.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
diff --git a/projects/safety_bench/model_wrappers/example_wrapper.py b/projects/safety_bench/model_wrappers/example_wrapper.py
@@ -21,12 +21,14 @@ def __init__(self):
 
     def get_response(self, input_text: str) -> str:
         """
-        Takes dialogue history (string) as input, and returns the
-        model's response (string).
+        Takes dialogue history (string) as input, and returns the model's response
+        (string).
         """
         # This is the only method you are required to implement.
         # The input text is the corresponding input for the model.
         # Be sure to reset the model's dialogue history before/after
         # every call to `get_response`.
 
-        return "Hello"  # In this example, we always respond 'Hello' regardless of the input
+        return (
+            "Hello"
+        )  # In this example, we always respond 'Hello' regardless of the input
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 boto3==1.17.95
 botocore==1.20.95
 coloredlogs==14.0
-datasets==1.4.1
+datasets>=1.4.1
 docutils<0.16,>=0.14
 emoji==0.5.4
 docformatter==1.3.0
@@ -40,6 +40,7 @@ Sphinx~=2.2.0
 subword-nmt==0.3.7
 tensorboard==2.3.0
 tensorboardX==2.1
+transformers==4.6.1
 tokenizers>=0.8.0
 torchtext>=0.5.0
 tornado==6.0.4

diff --git a/tests/test_searchquery_retrievers.py b/tests/test_searchquery_retrievers.py
@@ -19,6 +19,13 @@
 import torch
 import unittest
 
+try:
+    import faiss  # noqa: F401
+
+    FAISS_INSTALLED = True
+except ImportError:
+    FAISS_INSTALLED = False
+
 
 ################################################################
 # Search Engine FiD Agent
@@ -67,7 +74,7 @@ def test_retrieval(self):
         self.assertIsInstance(second_retrieved_doc, Document)
         self.assertIsInstance(second_retrieved_doc.get_text(), str)
         self.assertEqual(
-            second_retrieved_doc.get_text(), 'content 1 for query " mock search query "'
+            second_retrieved_doc.get_text(), 'content 1 for query "mock search query"'
         )
 
         # WithOUT Search query
@@ -94,6 +101,7 @@ def generate_search_query(self, query):
         return self.queries
 
 
+@unittest.skipUnless(FAISS_INSTALLED, "FAISS was not installed.")
 class TestSearchQueryFAISSIndexRetriever(unittest.TestCase):
     def setUp(self) -> None:
         parser = ParlaiParser(True, True)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,4 @@ class TestGoldDocsTeacher(AutoTeacherTest):


		class TestGoldDocTitlesTeacher(AutoTeacherTest):
		task = 'wizard_of_internet:GoldDocTitlesTeacher'
		task = 'wizard_of_internet:GoldDocTitlesTeacher'