chore: Adjust amazon bedrock helper classes names (#297)

* Adjust amazon bedrock helper classes names * Linting * Update tests * More linting * Small update
deepset-ai · Jan 30, 2024 · b6115c2 · b6115c2
1 parent 9014494
commit b6115c2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/...amazon_bedrock/amazon_bedrock_adapters.py → ...nts/generators/amazon_bedrock/adapters.py b/...amazon_bedrock/amazon_bedrock_adapters.py → ...nts/generators/amazon_bedrock/adapters.py
@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional
 
-from .amazon_bedrock_handlers import TokenStreamingHandler
+from .handlers import TokenStreamingHandler
 
 
 class BedrockModelAdapter(ABC):

diff --git a/...mazon_bedrock/src/haystack_integrations/components/generators/amazon_bedrock/generator.py b/...mazon_bedrock/src/haystack_integrations/components/generators/amazon_bedrock/generator.py
@@ -7,24 +7,24 @@
 from botocore.exceptions import BotoCoreError, ClientError
 from haystack import component, default_from_dict, default_to_dict
 
-from .amazon_bedrock_adapters import (
+from .adapters import (
     AI21LabsJurassic2Adapter,
     AmazonTitanAdapter,
     AnthropicClaudeAdapter,
     BedrockModelAdapter,
     CohereCommandAdapter,
     MetaLlama2ChatAdapter,
 )
-from .amazon_bedrock_handlers import (
-    DefaultPromptHandler,
-    DefaultTokenStreamingHandler,
-    TokenStreamingHandler,
-)
 from .errors import (
     AmazonBedrockConfigurationError,
     AmazonBedrockInferenceError,
     AWSConfigurationError,
 )
+from .handlers import (
+    DefaultPromptHandler,
+    DefaultTokenStreamingHandler,
+    TokenStreamingHandler,
+)
 
 logger = logging.getLogger(__name__)
 

diff --git a/...amazon_bedrock/amazon_bedrock_handlers.py → ...nts/generators/amazon_bedrock/handlers.py b/...amazon_bedrock/amazon_bedrock_handlers.py → ...nts/generators/amazon_bedrock/handlers.py
diff --git a/integrations/amazon_bedrock/tests/test_amazon_bedrock.py b/integrations/amazon_bedrock/tests/test_amazon_bedrock.py
@@ -5,7 +5,7 @@
 from botocore.exceptions import BotoCoreError
 
 from haystack_integrations.components.generators.amazon_bedrock import AmazonBedrockGenerator
-from haystack_integrations.components.generators.amazon_bedrock.amazon_bedrock_adapters import (
+from haystack_integrations.components.generators.amazon_bedrock.adapters import (
     AI21LabsJurassic2Adapter,
     AmazonTitanAdapter,
     AnthropicClaudeAdapter,
@@ -34,7 +34,7 @@ def mock_boto3_session():
 @pytest.fixture
 def mock_prompt_handler():
     with patch(
-        "haystack_integrations.components.generators.amazon_bedrock.amazon_bedrock_handlers.DefaultPromptHandler"
+        "haystack_integrations.components.generators.amazon_bedrock.handlers.DefaultPromptHandler"
     ) as mock_prompt_handler:
         yield mock_prompt_handler