Refactor

hupe1980 · Apr 14, 2024 · ce7c37e · ce7c37e
1 parent 792c94a
commit ce7c37e
Show file tree

Hide file tree

Showing 25 changed files with 15 additions and 15 deletions.
diff --git a/aisploit/classifier/__init__.py → aisploit/classifiers/__init__.py b/aisploit/classifier/__init__.py → aisploit/classifiers/__init__.py
diff --git a/aisploit/classifier/huggingface/__init__.py → aisploit/classifiers/huggingface/__init__.py b/aisploit/classifier/huggingface/__init__.py → aisploit/classifiers/huggingface/__init__.py
diff --git a/...e/pipeline_prompt_injection_identifier.py → ...e/pipeline_prompt_injection_identifier.py b/...e/pipeline_prompt_injection_identifier.py → ...e/pipeline_prompt_injection_identifier.py
diff --git a/aisploit/classifier/openai/__init__.py → aisploit/classifiers/openai/__init__.py b/aisploit/classifier/openai/__init__.py → aisploit/classifiers/openai/__init__.py
diff --git a/aisploit/classifier/openai/moderation.py → aisploit/classifiers/openai/moderation.py b/aisploit/classifier/openai/moderation.py → aisploit/classifiers/openai/moderation.py
diff --git a/aisploit/classifier/text.py → aisploit/classifiers/text.py b/aisploit/classifier/text.py → aisploit/classifiers/text.py
diff --git a/aisploit/converter/__init__.py → aisploit/converters/__init__.py b/aisploit/converter/__init__.py → aisploit/converters/__init__.py
diff --git a/aisploit/converter/base64.py → aisploit/converters/base64.py b/aisploit/converter/base64.py → aisploit/converters/base64.py
diff --git a/aisploit/converter/gender.py → aisploit/converters/gender.py b/aisploit/converter/gender.py → aisploit/converters/gender.py
diff --git a/aisploit/converter/join.py → aisploit/converters/join.py b/aisploit/converter/join.py → aisploit/converters/join.py
diff --git a/aisploit/converter/keyboard_typo.py → aisploit/converters/keyboard_typo.py b/aisploit/converter/keyboard_typo.py → aisploit/converters/keyboard_typo.py
diff --git a/aisploit/converter/no_op.py → aisploit/converters/no_op.py b/aisploit/converter/no_op.py → aisploit/converters/no_op.py
diff --git a/aisploit/converter/remove_punctuation.py → aisploit/converters/remove_punctuation.py b/aisploit/converter/remove_punctuation.py → aisploit/converters/remove_punctuation.py
@@ -4,5 +4,5 @@
 
 class RemovePunctuationConverter(BaseConverter):
     def _convert(self, prompt: str) -> str:
-        translator = str.maketrans('', '', string.punctuation)
+        translator = str.maketrans("", "", string.punctuation)
         return prompt.translate(translator)
diff --git a/aisploit/converter/sequence.py → aisploit/converters/sequence.py b/aisploit/converter/sequence.py → aisploit/converters/sequence.py
diff --git a/aisploit/scanner/plugins/many_shot_plugin.py b/aisploit/scanner/plugins/many_shot_plugin.py
@@ -4,7 +4,7 @@
 
 from ...core import BaseTarget, BaseConverter, BaseTextClassifier
 from ...sender import SenderJob
-from ...converter import NoOpConverter
+from ...converters import NoOpConverter
 from ...datasets import SampleDataset
 from ..plugin import Plugin
 from ..report import Issue, IssueCategory

diff --git a/aisploit/scanner/plugins/prompt_injection_plugin.py b/aisploit/scanner/plugins/prompt_injection_plugin.py
@@ -3,9 +3,9 @@
 
 from ...core import BaseTarget, BaseConverter
 from ...datasets import JailbreakPromptDataset
-from ...classifier import SubstringClassifier
+from ...classifiers import SubstringClassifier
 from ...sender import SenderJob
-from ...converter import NoOpConverter
+from ...converters import NoOpConverter
 from ..plugin import Plugin
 from ..report import Issue, IssueCategory
 

diff --git a/aisploit/sender/job.py b/aisploit/sender/job.py
@@ -10,7 +10,7 @@
     Callbacks,
     CallbackManager,
 )
-from ..converter import NoOpConverter
+from ..converters import NoOpConverter
 from .report import SendReport, SendReportEntry
 
 

diff --git a/examples/classifier.ipynb b/examples/classifier.ipynb
@@ -26,8 +26,8 @@
    "source": [
     "import textwrap\n",
     "from dotenv import load_dotenv\n",
-    "from aisploit.classifier.huggingface import PipelinePromptInjectionIdentifier\n",
-    "from aisploit.classifier.openai import ModerationClassifier\n",
+    "from aisploit.classifiers.huggingface import PipelinePromptInjectionIdentifier\n",
+    "from aisploit.classifiers.openai import ModerationClassifier\n",
     "\n",
     "load_dotenv()"
    ]

diff --git a/examples/converter.ipynb b/examples/converter.ipynb
@@ -28,7 +28,7 @@
     "import os\n",
     "import textwrap\n",
     "from dotenv import load_dotenv\n",
-    "from aisploit.converter import (\n",
+    "from aisploit.converters import (\n",
     "    Base64Converter,\n",
     "    KeyboardTypoConverter,\n",
     "    JoinConverter,\n",

diff --git a/examples/sender.ipynb b/examples/sender.ipynb
@@ -8,7 +8,7 @@
    "source": [
     "from aisploit.sender import SenderJob\n",
     "from aisploit.targets import StdOutTarget\n",
-    "from aisploit.converter import Base64Converter, JoinConverter, KeyboardTypoConverter"
+    "from aisploit.converters import Base64Converter, JoinConverter, KeyboardTypoConverter"
    ]
   },
   {

diff --git a/examples/target.ipynb b/examples/target.ipynb
@@ -39,7 +39,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "ImagesResponse(created=1713102814, data=[Image(b64_json=None, revised_prompt=None, url='https://oaidalleapiprodscus.blob.core.windows.net/private/org-hQ7KRgz5Vomr6fPJrIUS789k/user-WXtTIx0ozo4TqkMvP9AIJA6F/img-v0UWWmedcePkBkvsMFbzoqzh.png?st=2024-04-14T12%3A53%3A34Z&se=2024-04-14T14%3A53%3A34Z&sp=r&sv=2021-08-06&sr=b&rscd=inline&rsct=image/png&skoid=6aaadede-4fb3-4698-a8f6-684d7786b067&sktid=a48cca56-e6da-484e-a814-9c849652bcb3&skt=2024-04-14T08%3A11%3A05Z&ske=2024-04-15T08%3A11%3A05Z&sks=b&skv=2021-08-06&sig=hH%2BZ7%2BsysK8Ia8MVQAZtvLz94kqGV0AkZ7LMmoirEfs%3D')])\n"
+      "ImagesResponse(created=1713104041, data=[Image(b64_json=None, revised_prompt=None, url='https://oaidalleapiprodscus.blob.core.windows.net/private/org-hQ7KRgz5Vomr6fPJrIUS789k/user-WXtTIx0ozo4TqkMvP9AIJA6F/img-vAyzvA8irq1RU7dgUQAVuhuS.png?st=2024-04-14T13%3A14%3A01Z&se=2024-04-14T15%3A14%3A01Z&sp=r&sv=2021-08-06&sr=b&rscd=inline&rsct=image/png&skoid=6aaadede-4fb3-4698-a8f6-684d7786b067&sktid=a48cca56-e6da-484e-a814-9c849652bcb3&skt=2024-04-14T08%3A00%3A32Z&ske=2024-04-15T08%3A00%3A32Z&sks=b&skv=2021-08-06&sig=K0B4TXwMOxGwIGsTL5P6RrVw97aPG6h5HQt27%2BxQ19I%3D')])\n"
      ]
     },
     {
@@ -60,7 +60,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [

diff --git a/tests/classifier/test_text.py b/tests/classifier/test_text.py
@@ -1,6 +1,6 @@
 import re
 import pytest
-from aisploit.classifier import RegexClassifier, SubstringClassifier
+from aisploit.classifiers import RegexClassifier, SubstringClassifier
 
 
 @pytest.fixture

diff --git a/tests/converter/test_base64.py b/tests/converter/test_base64.py
@@ -1,6 +1,6 @@
 import base64
 from langchain_core.prompt_values import StringPromptValue
-from aisploit.converter import Base64Converter
+from aisploit.converters import Base64Converter
 
 
 def test_convert_single_prompt():

diff --git a/tests/converter/test_join.py b/tests/converter/test_join.py
@@ -1,5 +1,5 @@
 from langchain_core.prompt_values import StringPromptValue
-from aisploit.converter import JoinConverter
+from aisploit.converters import JoinConverter
 
 
 def test_join_with_default_value():

diff --git a/tests/converter/test_keyboard_typo.py b/tests/converter/test_keyboard_typo.py
@@ -1,6 +1,6 @@
 import random
 from langchain_core.prompt_values import StringPromptValue
-from aisploit.converter import KeyboardTypoConverter
+from aisploit.converters import KeyboardTypoConverter
 
 
 def test_convert_no_typo():