From 2ac68cec0d1719d42bf6d595488391c44b611655 Mon Sep 17 00:00:00 2001 From: Collin Dutter Date: Fri, 12 Jul 2024 16:46:07 -0700 Subject: [PATCH] Enable flake8-comprehensions ruff rule --- griptape/artifacts/base_artifact.py | 2 +- griptape/drivers/file_manager/base_file_manager_driver.py | 2 +- griptape/drivers/prompt/google_prompt_driver.py | 4 ++-- griptape/drivers/sql/snowflake_sql_driver.py | 2 +- griptape/drivers/sql/sql_driver.py | 2 +- griptape/tasks/actions_subtask.py | 2 +- griptape/tasks/image_query_task.py | 2 +- pyproject.toml | 3 ++- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/griptape/artifacts/base_artifact.py b/griptape/artifacts/base_artifact.py index ef82110aff..abcd54d71e 100644 --- a/griptape/artifacts/base_artifact.py +++ b/griptape/artifacts/base_artifact.py @@ -34,7 +34,7 @@ def value_to_bytes(cls, value: Any) -> bytes: def value_to_dict(cls, value: Any) -> dict: dict_value = value if isinstance(value, dict) else json.loads(value) - return {k: v for k, v in dict_value.items()} + return dict(dict_value.items()) def to_text(self) -> str: return str(self.value) diff --git a/griptape/drivers/file_manager/base_file_manager_driver.py b/griptape/drivers/file_manager/base_file_manager_driver.py index b69aa374d4..71cff8231b 100644 --- a/griptape/drivers/file_manager/base_file_manager_driver.py +++ b/griptape/drivers/file_manager/base_file_manager_driver.py @@ -43,7 +43,7 @@ class BaseFileManagerDriver(ABC): def list_files(self, path: str) -> TextArtifact | ErrorArtifact: try: entries = self.try_list_files(path) - return TextArtifact("\n".join([e for e in entries])) + return TextArtifact("\n".join(list(entries))) except FileNotFoundError: return ErrorArtifact("Path not found") except NotADirectoryError: diff --git a/griptape/drivers/prompt/google_prompt_driver.py b/griptape/drivers/prompt/google_prompt_driver.py index ed85f62293..bc44212298 100644 --- a/griptape/drivers/prompt/google_prompt_driver.py +++ b/griptape/drivers/prompt/google_prompt_driver.py @@ -222,7 +222,7 @@ def __to_prompt_stack_message_content(self, content: Part) -> BaseMessageContent name, path = ToolAction.from_native_tool_name(function_call.name) - args = {k: v for k, v in function_call.args.items()} + args = dict(function_call.args.items()) return ActionCallMessageContent( artifact=ActionArtifact(value=ToolAction(tag=function_call.name, name=name, path=path, input=args)) ) @@ -237,7 +237,7 @@ def __to_prompt_stack_delta_message_content(self, content: Part) -> BaseDeltaMes name, path = ToolAction.from_native_tool_name(function_call.name) - args = {k: v for k, v in function_call.args.items()} + args = dict(function_call.args.items()) return ActionCallDeltaMessageContent( tag=function_call.name, name=name, path=path, partial_input=json.dumps(args) ) diff --git a/griptape/drivers/sql/snowflake_sql_driver.py b/griptape/drivers/sql/snowflake_sql_driver.py index 7af4c78ccb..abe7266ea8 100644 --- a/griptape/drivers/sql/snowflake_sql_driver.py +++ b/griptape/drivers/sql/snowflake_sql_driver.py @@ -58,7 +58,7 @@ def execute_query_raw(self, query: str) -> Optional[list[dict[str, Any]]]: if results is not None: if results.returns_rows: - return [{column: value for column, value in result.items()} for result in results] + return [dict(result.items()) for result in results] else: return None else: diff --git a/griptape/drivers/sql/sql_driver.py b/griptape/drivers/sql/sql_driver.py index d3da01e2ed..5a3a4f5b21 100644 --- a/griptape/drivers/sql/sql_driver.py +++ b/griptape/drivers/sql/sql_driver.py @@ -38,7 +38,7 @@ def execute_query_raw(self, query: str) -> Optional[list[dict[str, Optional[Any] if results is not None: if results.returns_rows: - return [{column: value for column, value in result.items()} for result in results] + return [dict(result.items()) for result in results] else: return None else: diff --git a/griptape/tasks/actions_subtask.py b/griptape/tasks/actions_subtask.py index d384acde97..249388ce36 100644 --- a/griptape/tasks/actions_subtask.py +++ b/griptape/tasks/actions_subtask.py @@ -128,7 +128,7 @@ def execute_actions(self, actions: list[ToolAction]) -> list[tuple[str, BaseArti with self.futures_executor_fn() as executor: results = utils.execute_futures_dict({a.tag: executor.submit(self.execute_action, a) for a in actions}) - return [r for r in results.values()] + return list(results.values()) def execute_action(self, action: ToolAction) -> tuple[str, BaseArtifact]: if action.tool is not None: diff --git a/griptape/tasks/image_query_task.py b/griptape/tasks/image_query_task.py index aac3c655b0..5e5c4fb2bf 100644 --- a/griptape/tasks/image_query_task.py +++ b/griptape/tasks/image_query_task.py @@ -78,7 +78,7 @@ def image_query_engine(self, value: ImageQueryEngine) -> None: def run(self) -> TextArtifact: query = self.input.value[0] - if all([isinstance(input, ImageArtifact) for input in self.input.value[1:]]): + if all(isinstance(input, ImageArtifact) for input in self.input.value[1:]): image_artifacts = [input for input in self.input.value[1:] if isinstance(input, ImageArtifact)] else: raise ValueError("All inputs after the query must be ImageArtifacts.") diff --git a/pyproject.toml b/pyproject.toml index d2cf664fcb..7d5ec2d1dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -213,7 +213,8 @@ select = [ "TCH", # flake8-type-checking "D", # pydocstyle "PGH", # pygrep-hooks - "I" # isort + "I", # isort + "C4" # flake8-comprehensions ] ignore = [ "UP007", # non-pep604-annotation