From d1aee5450f65d4e65621f679442ea6421cb3e978 Mon Sep 17 00:00:00 2001 From: Eduardo Chiarotti Date: Fri, 23 Aug 2024 10:49:58 -0300 Subject: [PATCH] fix: All files pre commit --- src/crewai/agents/__init__.py | 2 ++ src/crewai/agents/cache/__init__.py | 2 ++ src/crewai/crews/__init__.py | 2 ++ src/crewai/memory/__init__.py | 2 ++ src/crewai/memory/storage/rag_storage.py | 9 +++++---- src/crewai/pipeline/__init__.py | 2 ++ src/crewai/routers/__init__.py | 2 ++ src/crewai/task.py | 4 +++- src/crewai/telemetry/__init__.py | 2 ++ src/crewai/utilities/parser.py | 5 ++++- tests/pipeline/test_pipeline.py | 4 +++- 11 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/crewai/agents/__init__.py b/src/crewai/agents/__init__.py index 2bcc6f28a..cd6883fa5 100644 --- a/src/crewai/agents/__init__.py +++ b/src/crewai/agents/__init__.py @@ -2,3 +2,5 @@ from .cache.cache_handler import CacheHandler from .executor import CrewAgentExecutor from .parser import CrewAgentParser from .tools_handler import ToolsHandler + +__all__ = ["CacheHandler", "CrewAgentExecutor", "CrewAgentParser", "ToolsHandler"] diff --git a/src/crewai/agents/cache/__init__.py b/src/crewai/agents/cache/__init__.py index c91d30c8b..6b4d20081 100644 --- a/src/crewai/agents/cache/__init__.py +++ b/src/crewai/agents/cache/__init__.py @@ -1 +1,3 @@ from .cache_handler import CacheHandler + +__all__ = ["CacheHandler"] diff --git a/src/crewai/crews/__init__.py b/src/crewai/crews/__init__.py index 32dd1158d..92f297d9f 100644 --- a/src/crewai/crews/__init__.py +++ b/src/crewai/crews/__init__.py @@ -1 +1,3 @@ from .crew_output import CrewOutput + +__all__ = ["CrewOutput"] diff --git a/src/crewai/memory/__init__.py b/src/crewai/memory/__init__.py index 91d4db9e8..8182bede7 100644 --- a/src/crewai/memory/__init__.py +++ b/src/crewai/memory/__init__.py @@ -1,3 +1,5 @@ from .entity.entity_memory import EntityMemory from .long_term.long_term_memory import LongTermMemory from .short_term.short_term_memory import ShortTermMemory + +__all__ = ["EntityMemory", "LongTermMemory", "ShortTermMemory"] diff --git a/src/crewai/memory/storage/rag_storage.py b/src/crewai/memory/storage/rag_storage.py index 7d3758ab7..6af196370 100644 --- a/src/crewai/memory/storage/rag_storage.py +++ b/src/crewai/memory/storage/rag_storage.py @@ -5,13 +5,14 @@ import os import shutil from typing import Any, Dict, List, Optional -from crewai.memory.storage.interface import Storage -from crewai.utilities.paths import db_storage_path from embedchain import App from embedchain.llm.base import BaseLlm from embedchain.models.data_type import DataType from embedchain.vectordb.chroma import InvalidDimensionException +from crewai.memory.storage.interface import Storage +from crewai.utilities.paths import db_storage_path + @contextlib.contextmanager def suppress_logging( @@ -77,12 +78,12 @@ class RAGStorage(Storage): self.app.llm = FakeLLM() if allow_reset: self.app.reset() - + def _sanitize_role(self, role: str) -> str: """ Sanitizes agent roles to ensure valid directory names. """ - return role.replace('\n', '').replace(' ', '_').replace('/', '_') + return role.replace("\n", "").replace(" ", "_").replace("/", "_") def save(self, value: Any, metadata: Dict[str, Any]) -> None: self._generate_embedding(value, metadata) diff --git a/src/crewai/pipeline/__init__.py b/src/crewai/pipeline/__init__.py index 573154b25..d9821e34c 100644 --- a/src/crewai/pipeline/__init__.py +++ b/src/crewai/pipeline/__init__.py @@ -1,3 +1,5 @@ from crewai.pipeline.pipeline import Pipeline from crewai.pipeline.pipeline_kickoff_result import PipelineKickoffResult from crewai.pipeline.pipeline_output import PipelineOutput + +__all__ = ["Pipeline", "PipelineKickoffResult", "PipelineOutput"] diff --git a/src/crewai/routers/__init__.py b/src/crewai/routers/__init__.py index b21d76bd2..c53802bef 100644 --- a/src/crewai/routers/__init__.py +++ b/src/crewai/routers/__init__.py @@ -1 +1,3 @@ from crewai.routers.router import Router + +__all__ = ["Router"] diff --git a/src/crewai/task.py b/src/crewai/task.py index ea292772a..573e83c7d 100644 --- a/src/crewai/task.py +++ b/src/crewai/task.py @@ -273,7 +273,9 @@ class Task(BaseModel): content = ( json_output if json_output - else pydantic_output.model_dump_json() if pydantic_output else result + else pydantic_output.model_dump_json() + if pydantic_output + else result ) self._save_file(content) diff --git a/src/crewai/telemetry/__init__.py b/src/crewai/telemetry/__init__.py index 6caed962a..1556f4fa5 100644 --- a/src/crewai/telemetry/__init__.py +++ b/src/crewai/telemetry/__init__.py @@ -1 +1,3 @@ from .telemetry import Telemetry + +__all__ = ["Telemetry"] diff --git a/src/crewai/utilities/parser.py b/src/crewai/utilities/parser.py index 8d286170e..c19cc1133 100644 --- a/src/crewai/utilities/parser.py +++ b/src/crewai/utilities/parser.py @@ -1,5 +1,6 @@ import re + class YamlParser: @staticmethod def parse(file): @@ -16,7 +17,9 @@ class YamlParser: # Replace single { and } with doubled ones, while leaving already doubled ones intact and the other special characters {# and {% modified_content = re.sub(r"(? 80 - else "route2" if x.get("score", 0) > 50 else "default" + else "route2" + if x.get("score", 0) > 50 + else "default" ), ) )