Fix import sorting and toggle pyupgrade (#6)

* Set ruff target version to py311
* Set package sources in ruff to properly sort imports
* Toggle pyupgrade on in ruff config

pyproject.toml

@@ -32,8 +32,10 @@ exclude = [".cache"]
 [tool.ruff]
 # https://beta.ruff.rs/docs/configuration/
 line-length = 120
-select = ['E', 'W', 'F', 'I', 'B', 'C4', 'ARG', 'SIM']
+select = ['E', 'W', 'F', 'I', 'B', 'C4', 'ARG', 'SIM', 'UP']
 ignore = ['W291', 'W292', 'W293']
+src = ["src", "tests"]
+target-version = "py311"
 
 [tool.ruff.lint.isort]
 combine-as-imports = true

src/nalgonda/agency_manager.py

@@ -3,6 +3,7 @@
 import time
 
 from agency_swarm import Agency, Agent
+
 from nalgonda.config import AgencyConfig
 from nalgonda.custom_tools import TOOL_MAPPING
 

src/nalgonda/config.py

@@ -2,10 +2,11 @@
 
 from agency_config_lock_manager import AgencyConfigLockManager
 from agency_swarm import Agent
-from nalgonda.constants import CONFIG_FILE, DEFAULT_CONFIG_FILE
 from pydantic import BaseModel, Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
+from nalgonda.constants import CONFIG_FILE, DEFAULT_CONFIG_FILE
+
 LATEST_GPT_MODEL = "gpt-4-1106-preview"
 
 

src/nalgonda/custom_tools/__init__.py

@@ -1,5 +1,6 @@
 # Mapping tool names to actual tool classes
 from agency_swarm.tools import CodeInterpreter, Retrieval
+
 from nalgonda.custom_tools.build_directory_tree import BuildDirectoryTree
 from nalgonda.custom_tools.generate_proposal import GenerateProposal
 from nalgonda.custom_tools.print_all_files_in_directory import PrintAllFilesInDirectory

src/nalgonda/custom_tools/generate_proposal.py

@@ -1,7 +1,8 @@
 from agency_swarm import BaseTool
-from nalgonda.custom_tools.utils import get_chat_completion
 from pydantic import Field
 
+from nalgonda.custom_tools.utils import get_chat_completion
+
 USER_PROMPT_PREFIX = "Please draft a proposal for the following project brief: "
 SYSTEM_MESSAGE = """\
 You are a professional proposal drafting assistant. \

src/nalgonda/custom_tools/print_all_files_in_directory.py

@@ -38,5 +38,5 @@ def read_file(file_path: Path):
         """Read and return the contents of a file."""
         try:
             return file_path.read_text()
-        except IOError as e:
+        except OSError as e:
             return f"Error reading file {file_path}: {e}"

src/nalgonda/custom_tools/write_and_save_program.py

@@ -3,9 +3,10 @@
 
 from agency_swarm import BaseTool
 from fastapi import WebSocket
-from nalgonda.constants import DATA_DIR
 from pydantic import Field
 
+from nalgonda.constants import DATA_DIR
+
 
 class File(BaseTool):
     """

src/nalgonda/main.py

@@ -6,9 +6,10 @@
 from agency_swarm import Agency
 from agency_swarm.messages import MessageOutput
 from fastapi import FastAPI, WebSocket, WebSocketDisconnect
-from nalgonda.constants import DATA_DIR
 from websockets import ConnectionClosedOK
 
+from nalgonda.constants import DATA_DIR
+
 # Ensure directories exist
 DATA_DIR.mkdir(exist_ok=True)
 

tests/custom_tools/test_build_directory_tree.py

@@ -34,5 +34,3 @@ def test_build_directory_tree_default_settings():
     bdt = BuildDirectoryTree()
     assert bdt.start_directory == Path.cwd()
     assert bdt.file_extensions == set()
-
-

tests/custom_tools/test_utils.py

@@ -2,6 +2,7 @@
 
 from nalgonda.custom_tools.utils import check_directory_traversal
 
+
 @pytest.mark.parametrize("path", ["..", "/", "/sbin"])
 def test_check_directory_traversal_raises_for_attempts(path):
     with pytest.raises(ValueError) as e: