MAINT: Moving Identifiers to models (#1858)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: rlundeen2

.github/instructions/converters.instructions.md

@@ -58,9 +58,8 @@ Exclude: retry counts, logging config, timeouts.
 ## Standard Imports
 
 ```python
-from pyrit.models import PromptDataType
-from pyrit.prompt_converter.prompt_converter import ConverterResult, PromptConverter
-from pyrit.identifiers import ComponentIdentifier
+from pyrit.models import ComponentIdentifier, PromptDataType
+from pyrit.prompt_converter import ConverterResult, PromptConverter
 ```
 
 For LLM-based converters, also import:

.gitignore

@@ -59,6 +59,7 @@ coverage.xml
 *.py,cover
 .hypothesis/
 .pytest_cache/
+.mypy_cache/
 cover/
 
 # Translations

doc/code/memory/5_advanced_memory.ipynb

@@ -375,7 +375,7 @@
     }
    ],
    "source": [
-    "from pyrit.identifiers.identifier_filters import IdentifierFilter, IdentifierType\n",
+    "from pyrit.models import IdentifierFilter, IdentifierType\n",
     "\n",
     "filter_target_classes = [\"OpenAIChatTarget\", \"TextTarget\"]\n",
     "\n",

doc/code/memory/5_advanced_memory.py

@@ -129,7 +129,7 @@
 # We can retrieve only the prompts that were sent to a specific target.
 
 # %%
-from pyrit.identifiers.identifier_filters import IdentifierFilter, IdentifierType
+from pyrit.models import IdentifierFilter, IdentifierType
 
 filter_target_classes = ["OpenAIChatTarget", "TextTarget"]
 

pyrit/auxiliary_attacks/gcg/generator.py

@@ -62,7 +62,7 @@
     PromptGeneratorStrategyContext,
     PromptGeneratorStrategyResult,
 )
-from pyrit.identifiers import ComponentIdentifier, Identifiable
+from pyrit.models import ComponentIdentifier, Identifiable
 
 logger = logging.getLogger(__name__)
 

pyrit/backend/models/initializers.py

@@ -11,7 +11,7 @@
 from pydantic import BaseModel, Field
 
 from pyrit.backend.models.common import PaginationInfo
-from pyrit.identifiers.class_name_utils import REGISTRY_NAME_PATTERN
+from pyrit.models import REGISTRY_NAME_PATTERN
 
 
 class InitializerParameterSummary(BaseModel):

pyrit/backend/services/attack_service.py

@@ -49,16 +49,16 @@
 from pyrit.backend.models.common import PaginationInfo
 from pyrit.backend.services.converter_service import get_converter_service
 from pyrit.backend.services.target_service import get_target_service
-from pyrit.identifiers import ComponentIdentifier
-from pyrit.identifiers.atomic_attack_identifier import build_atomic_attack_identifier
 from pyrit.memory import CentralMemory
 from pyrit.models import (
     AttackOutcome,
     AttackResult,
+    ComponentIdentifier,
     ConversationStats,
     ConversationType,
     MessagePiece,
     PromptDataType,
+    build_atomic_attack_identifier,
     data_serializer_factory,
 )
 from pyrit.prompt_normalizer import PromptConverterConfiguration, PromptNormalizer

pyrit/exceptions/exception_context.py

@@ -15,7 +15,7 @@
 from enum import Enum
 from typing import Any, Optional
 
-from pyrit.identifiers.component_identifier import ComponentIdentifier
+from pyrit.models import ComponentIdentifier
 
 
 class ComponentRole(Enum):

pyrit/executor/attack/component/conversation_manager.py

@@ -12,10 +12,9 @@
 from pyrit.executor.attack.component.prepended_conversation_config import (
     PrependedConversationConfig,
 )
-from pyrit.identifiers import ComponentIdentifier
 from pyrit.memory import CentralMemory
 from pyrit.message_normalizer import ConversationContextNormalizer
-from pyrit.models import ChatMessageRole, Message, MessagePiece, Score
+from pyrit.models import ChatMessageRole, ComponentIdentifier, Message, MessagePiece, Score
 from pyrit.prompt_normalizer.prompt_converter_configuration import (
     PromptConverterConfiguration,
 )

pyrit/executor/attack/core/attack_strategy.py

@@ -24,12 +24,13 @@
     StrategyEventData,
     StrategyEventHandler,
 )
-from pyrit.identifiers import ComponentIdentifier, Identifiable
 from pyrit.memory.central_memory import CentralMemory
 from pyrit.models import (
     AttackOutcome,
     AttackResult,
+    ComponentIdentifier,
     ConversationReference,
+    Identifiable,
     Message,
 )
 from pyrit.prompt_target.common.target_requirements import TargetRequirements