Merge pull request #780 from marcorosa/deps

Polish dependencies and support python3.11

.github/workflows/check-formatting.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
 
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -49,3 +49,4 @@ checkpoints/
 *.csv
 !tests/sample_outputs/csv_attack_log.csv
 tests/test_command_line/attack_log.txt
+textattack/=22.3.0

requirements.txt

@@ -17,11 +17,7 @@ tqdm
 word2number
 num2words
 more-itertools
-PySocks!=1.5.7,>=1.5.6
 pinyin>=0.4.0
 jieba
 OpenHowNet
-pycld2
-click<8.1.0
-pinyin
-
+click==8.0.2

setup.py

@@ -27,19 +27,19 @@
 ]
 
 extras["tensorflow"] = [
-    "tensorflow==2.9.1",
+    "tensorflow>=2.9.1",
     "tensorflow_hub",
-    "tensorflow_text>=2",
+    "tensorflow_text>=2.9.0",
     "tensorboardX",
-    "tensorflow-estimator==2.9.0",
+    "tensorflow-estimator>=2.9.0",
 ]
 
 extras["optional"] = [
     "sentence_transformers==2.2.0",
     "stanza",
     "visdom",
     "wandb",
-    "gensim==4.1.2",
+    "gensim",
 ]
 
 # For developers, install development tools along with all optional dependencies.
@@ -78,6 +78,6 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     install_requires=open("requirements.txt").readlines(),
 )

tests/test_command_line/update_test_outputs.py

@@ -3,6 +3,8 @@
 This is useful for large changes, but be wary: the outputs still may
 need to be manually edited to account for variance between runs.
 """
+
+
 from helpers import run_command_and_get_result
 from test_attack import attack_test_params
 from test_augment import augment_test_params
@@ -27,6 +29,8 @@ def update_test(command, outfile, add_magic_str=False):
     open(outfile, "w").write(stdout + "\n")
 
 
+
+
 def main():
     #### `textattack attack` tests ####
     for _, command, outfile in attack_test_params:
@@ -39,5 +43,7 @@ def main():
         update_test(command, outfile)
 
 
+
+
 if __name__ == "__main__":
     main()

textattack/__init__.py

@@ -9,6 +9,7 @@
 
 TextAttack provides components for common NLP tasks like sentence encoding, grammar-checking, and word replacement that can be used on their own.
 """
+
 from .attack_args import AttackArgs, CommandLineAttackArgs
 from .augment_args import AugmenterArgs
 from .dataset_args import DatasetArgs

textattack/attack.py

@@ -372,9 +372,9 @@ def filter_transformations(
                 uncached_texts.append(transformed_text)
             else:
                 # promote transformed_text to the top of the LRU cache
-                self.constraints_cache[
-                    (current_text, transformed_text)
-                ] = self.constraints_cache[(current_text, transformed_text)]
+                self.constraints_cache[(current_text, transformed_text)] = (
+                    self.constraints_cache[(current_text, transformed_text)]
+                )
                 if self.constraints_cache[(current_text, transformed_text)]:
                     filtered_texts.append(transformed_text)
         filtered_texts += self._filter_transformations_uncached(

textattack/attack_recipes/bae_garg_2019.py

@@ -3,6 +3,7 @@
 ============================================
 
 """
+
 from textattack.constraints.grammaticality import PartOfSpeech
 from textattack.constraints.pre_transformation import (
     RepeatModification,

textattack/attack_recipes/bert_attack_li_2020.py

@@ -10,6 +10,7 @@
     Consider using smaller values for "max_candidates".
 
 """
+
 from textattack import Attack
 from textattack.constraints.overlap import MaxWordsPerturbed
 from textattack.constraints.pre_transformation import (

textattack/attack_recipes/checklist_ribeiro_2020.py

@@ -5,6 +5,7 @@
 (Beyond Accuracy: Behavioral Testing of NLP models with CheckList)
 
 """
+
 from textattack import Attack
 from textattack.constraints.pre_transformation import RepeatModification
 from textattack.goal_functions import UntargetedClassification

textattack/attack_recipes/hotflip_ebrahimi_2017.py

@@ -5,6 +5,7 @@
 (HotFlip: White-Box Adversarial Examples for Text Classification)
 
 """
+
 from textattack import Attack
 from textattack.constraints.grammaticality import PartOfSpeech
 from textattack.constraints.overlap import MaxWordsPerturbed

textattack/attack_recipes/iga_wang_2019.py

@@ -6,6 +6,7 @@
 (Natural Language Adversarial Attacks and Defenses in Word Level)
 
 """
+
 from textattack import Attack
 from textattack.constraints.overlap import MaxWordsPerturbed
 from textattack.constraints.pre_transformation import StopwordModification

textattack/attack_recipes/input_reduction_feng_2018.py

@@ -5,6 +5,7 @@
 (Pathologies of Neural Models Make Interpretations Difficult)
 
 """
+
 from textattack import Attack
 from textattack.constraints.pre_transformation import (
     RepeatModification,

textattack/attack_recipes/kuleshov_2017.py

@@ -4,6 +4,7 @@
 (Adversarial Examples for Natural Language Classification Problems)
 
 """
+
 from textattack import Attack
 from textattack.constraints.grammaticality.language_models import GPT2
 from textattack.constraints.overlap import MaxWordsPerturbed

textattack/attack_recipes/morpheus_tan_2020.py

@@ -5,6 +5,7 @@
 
 
 """
+
 from textattack import Attack
 from textattack.constraints.pre_transformation import (
     RepeatModification,

textattack/attack_recipes/pruthi_2019.py

@@ -3,6 +3,7 @@
 =================================================================
 
 """
+
 from textattack import Attack
 from textattack.constraints.overlap import MaxWordsPerturbed
 from textattack.constraints.pre_transformation import (

textattack/attack_recipes/pso_zang_2020.py

@@ -6,6 +6,7 @@
 (Word-level Textual Adversarial Attacking as Combinatorial Optimization)
 
 """
+
 from textattack import Attack
 from textattack.constraints.pre_transformation import (
     InputColumnModification,

textattack/attack_recipes/pwws_ren_2019.py

@@ -6,6 +6,7 @@
 (Generating Natural Language Adversarial Examples through Probability Weighted Word Saliency)
 
 """
+
 from textattack import Attack
 from textattack.constraints.pre_transformation import (
     RepeatModification,

textattack/attack_recipes/seq2sick_cheng_2018_blackbox.py

@@ -4,6 +4,7 @@
 ================================================
 (Seq2Sick: Evaluating the Robustness of Sequence-to-Sequence Models with Adversarial Examples)
 """
+
 from textattack import Attack
 from textattack.constraints.overlap import LevenshteinEditDistance
 from textattack.constraints.pre_transformation import (

textattack/attack_results/successful_attack_result.py

@@ -4,7 +4,6 @@
 
 """
 
-
 from .attack_result import AttackResult
 
 

textattack/augment_args.py

@@ -3,7 +3,6 @@
 ===================
 """
 
-
 from dataclasses import dataclass
 
 AUGMENTATION_RECIPE_NAMES = {

textattack/augmentation/__init__.py

@@ -6,7 +6,6 @@
 Transformations and constraints can be used outside of an attack for simple NLP data augmentation with the ``Augmenter`` class that returns all possible transformations for a given string.
 """
 
-
 from .augmenter import Augmenter
 from .recipes import (
     WordNetAugmenter,

textattack/augmentation/augmenter.py

@@ -2,6 +2,7 @@
 Augmenter Class
 ===================
 """
+
 import random
 
 import tqdm

textattack/augmentation/recipes.py

@@ -5,6 +5,7 @@
 Transformations and constraints can be used for simple NLP data augmentations. Here is a list of recipes for NLP data augmentations
 
 """
+
 import random
 
 from textattack.constraints.pre_transformation import (

textattack/commands/__init__.py

@@ -5,7 +5,6 @@
 
 """
 
-
 from abc import ABC, abstractmethod
 from .textattack_command import TextAttackCommand
 from . import textattack_cli

textattack/commands/eval_model_command.py

@@ -5,7 +5,6 @@
 
 """
 
-
 from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
 from dataclasses import dataclass
 

textattack/commands/textattack_cli.py

@@ -5,7 +5,6 @@
 
 """
 
-
 # !/usr/bin/env python
 import argparse
 

textattack/commands/train_model_command.py

@@ -5,7 +5,6 @@
 
 """
 
-
 from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
 
 from textattack import CommandLineTrainingArgs, Trainer

textattack/constraints/grammaticality/cola.py

@@ -3,6 +3,7 @@
 --------------------------
 
 """
+
 import lru
 import nltk
 from transformers import AutoModelForSequenceClassification, AutoTokenizer

textattack/constraints/grammaticality/language_models/__init__.py

@@ -4,7 +4,6 @@
 
 """
 
-
 from .language_model_constraint import LanguageModelConstraint
 
 from .google_language_model import Google1BillionWordsLanguageModel

textattack/constraints/grammaticality/language_models/google_language_model/__init__.py

@@ -4,7 +4,6 @@
 
 """
 
-
 from .google_language_model import (
     GoogleLanguageModel as Google1BillionWordsLanguageModel,
 )

textattack/constraints/grammaticality/language_models/google_language_model/alzantot_goog_lm.py

@@ -7,7 +7,6 @@
     All rights reserved.
 """
 
-
 import os
 
 import lru

textattack/constraints/grammaticality/language_models/google_language_model/google_language_model.py

@@ -3,6 +3,7 @@
 --------------------------------------
 
 """
+
 from collections import defaultdict
 
 import numpy as np

textattack/constraints/grammaticality/language_models/google_language_model/lm_utils.py

@@ -5,6 +5,7 @@
     Author: Moustafa Alzantot ([email protected])
     All rights reserved.
 """
+
 import sys
 
 from textattack.shared.utils import LazyLoader

textattack/constraints/grammaticality/language_models/gpt2.py

@@ -4,7 +4,6 @@
 
 """
 
-
 import os
 
 import torch

textattack/constraints/grammaticality/language_models/learning_to_write/__init__.py

@@ -3,4 +3,5 @@
 --------------------------
 
 """
+
 from .learning_to_write import LearningToWriteLanguageModel

textattack/constraints/grammaticality/language_models/learning_to_write/adaptive_softmax.py

@@ -3,7 +3,6 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 """
 
-
 import torch
 from torch import nn
 from torch.autograd import Variable

textattack/constraints/grammaticality/language_models/learning_to_write/rnn_model.py

@@ -4,7 +4,6 @@
 
 """
 
-
 from torch import nn as nn
 from torch.autograd import Variable
 

textattack/constraints/grammaticality/language_tool.py

@@ -2,6 +2,7 @@
 LanguageTool Grammar Checker
 ------------------------------
 """
+
 import language_tool_python
 
 from textattack.constraints import Constraint

textattack/constraints/grammaticality/part_of_speech.py

@@ -2,6 +2,7 @@
 Part of Speech Constraint
 --------------------------
 """
+
 import flair
 from flair.data import Sentence
 from flair.models import SequenceTagger

textattack/constraints/overlap/meteor_score.py

@@ -6,7 +6,6 @@
 
 """
 
-
 import nltk
 
 from textattack.constraints import Constraint

textattack/constraints/pre_transformation/__init__.py

@@ -5,6 +5,7 @@
 
 Pre-transformation constraints determine if a transformation is valid based on only the original input and the position of the replacement. These constraints are applied before the transformation is even called. For example, these constraints can prevent search methods from swapping words at the same index twice, or from replacing stopwords.
 """
+
 from .stopword_modification import StopwordModification
 from .repeat_modification import RepeatModification
 from .input_column_modification import InputColumnModification

textattack/constraints/pre_transformation/max_modification_rate.py

@@ -4,6 +4,7 @@
 -----------------------------
 
 """
+
 import math
 
 from textattack.constraints import PreTransformationConstraint

textattack/constraints/pre_transformation/max_word_index_modification.py

@@ -4,6 +4,7 @@
 -----------------------------
 
 """
+
 from textattack.constraints import PreTransformationConstraint