Update requirements

Makefile

@@ -4,17 +4,20 @@ GIT_ROOT ?= $(shell git rev-parse --show-toplevel)
 
 format:
 	black .
+	isort .
 
 dev-lint:
 	mypy .
 	black .
 	ruff check . --fix
+	isort .
 
 lint:
 	mypy .
 	black . --check
 	ruff check .
-
+	pylint council/. --max-line-length 120 --disable=R,C,I,W1203,W0107 --fail-under=9
+	isort . --check-only
 
 test:
 	pytest tests

council/agents/agent.py

@@ -125,14 +125,12 @@ def execute_plan(self, iteration_context: AgentContext, plan: Sequence[Execution
         try:
             for group in self._group_units(plan):
                 fs = [executor.submit(self._execute_unit, iteration_context, unit) for unit in group]
-                dones, not_dones = futures.wait(
-                    fs, iteration_context.budget.remaining_duration, futures.FIRST_EXCEPTION
-                )
-
+                dones, _ = futures.wait(fs, iteration_context.budget.remaining_duration, futures.FIRST_EXCEPTION)
                 # rethrow exception if any
                 [d.result(0) for d in dones]
         finally:
-            [f.cancel() for f in fs]
+            for f in fs:
+                f.cancel()
 
     @staticmethod
     def _group_units(plan: Sequence[ExecutionUnit]) -> List[List[ExecutionUnit]]:

dev-requirements.txt

@@ -1,9 +1,19 @@
+# requirements for developers and CI
+-r requirements.txt
+
 hatch==1.7.0
 
+# Types
+types-PyYAML==6.0.12.20240311
+google-api-python-client-stubs==1.26.0
+types-beautifulsoup4~=4.12.0.7
+
 # Lint
-black==24.2.0
-mypy==1.9.0
-ruff==0.1.4
+black==24.4.2
+mypy==1.10.0
+ruff==0.4.6
+pylint==3.2.2
+isort==5.13.2
 
 # Test
 ipykernel==6.26.0

pyproject.toml

@@ -45,3 +45,11 @@ line-length = 120
 exclude = "(?x)(venv|docs)"
 mypy_path= "./stubs"
 explicit_package_bases = "true"
+
+[tool.isort]
+profile = "black"
+line_length = 120
+py_version=39
+src_paths = ["src"]
+skip = ["__init__.py"]
+skip_glob = ["**/venv/*", "**/docs/*", "**/stubs/*", "**/tests/*"]

requirements.txt

@@ -1,26 +1,22 @@
-httpx==0.25.1
+httpx~=0.25.1
 requests~=2.31.0
 Jinja2~=3.1.2
-python-dotenv==1.0.0
-more-itertools==10.1.0
-progressbar==2.5
-tiktoken==0.5.1
+python-dotenv~=1.0.0
+more-itertools~=10.1.0
+progressbar~=2.5
+tiktoken~=0.5.1
 
 # LLMs
-anthropic>=0.20.0
+anthropic~=0.20.0
 
 # Skills
 ## Google
-google-api-python-client==2.106.0
+google-api-python-client>=2.106.0
 GoogleNews>=1.6.10
-google-api-python-client-stubs==1.18.0
 pymediawiki~=0.7.3
 beautifulsoup4~=4.12.2
-types-beautifulsoup4~=4.12.0.7
-
 
 toml~=0.10.2
-nbformat==5.9.2
-nbconvert==7.11.0
-PyYAML==6.0.1
-types-PyYAML==6.0.12.12
+nbformat~=5.9.2
+nbconvert~=7.11.0
+PyYAML~=6.0.1