update dependencies, fix mypy error

chatflock/code/base.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
-from typing import List, Optional
+from typing import Optional, Sequence
 
 
 class CodeExecutor(ABC):
     @abstractmethod
-    def execute(self, code: str, dependencies: Optional[List[str]] = None) -> str:
+    def execute(self, code: str, dependencies: Optional[Sequence[str]] = None) -> str:
         pass

chatflock/code/docker.py

@@ -1,9 +1,10 @@
 import os
 import tempfile
-from typing import Optional, Set
+from typing import Optional, Set, Sequence
 
 import docker
 from docker.errors import ContainerError
+from docker.models.images import Image
 from halo import Halo
 
 from .base import CodeExecutor
@@ -15,13 +16,13 @@ def __init__(self, client: Optional[docker.DockerClient] = None,
                  base_image: str = 'python:3.11-slim',
                  default_dependencies: Optional[Set[str]] = None,
                  spinner: Optional[Halo] = None):
-        self.client = client or docker.from_env()
+        self.client = client or docker.from_env()  # type: ignore
         self.image_tag = image_tag
         self.base_image = base_image
         self.default_dependencies = default_dependencies or {'requests', 'pytest'}
         self.spinner = spinner
 
-    def create_dockerfile(self, python_code: str, dependencies: Optional[Set[str]] = None):
+    def create_dockerfile(self, python_code: str, dependencies: Optional[Set[str]] = None) -> str:
         run_commands = [f'RUN pip install {package} --trusted-host pypi.org --trusted-host files.pythonhosted.org' for
                         package in dependencies or []]
         run_commands_str = '\n'.join(run_commands)
@@ -39,7 +40,7 @@ def create_dockerfile(self, python_code: str, dependencies: Optional[Set[str]] =
 
         return dockerfile
 
-    def build_image_with_code(self, python_code: str, dependencies: Optional[Set[str]] = None):
+    def build_image_with_code(self, python_code: str, dependencies: Optional[Set[str]] = None) -> Image:
         spinner_text = None
         if self.spinner is not None:
             spinner_text = self.spinner.text
@@ -70,10 +71,10 @@ def build_image_with_code(self, python_code: str, dependencies: Optional[Set[str
 
         return image
 
-    def execute(self, code: str, dependencies: Optional[Set[str]] = None) -> str:
+    def execute(self, code: str, dependencies: Optional[Sequence[str]] = None) -> str:
         try:
             # Ensure the image is built before execution
-            self.build_image_with_code(code, dependencies=dependencies or self.default_dependencies)
+            self.build_image_with_code(code, dependencies=set(dependencies or self.default_dependencies))
         except Exception as e:
             return f'Failed to build Docker image (did not run code yet): {e}'
 
@@ -90,9 +91,11 @@ def execute(self, code: str, dependencies: Optional[Set[str]] = None) -> str:
                 stderr=True,
                 detach=False
             )
-            return container.decode('utf-8')
+            res: str = container.decode('utf-8')
         except ContainerError as e:
-            return e.stderr.decode('utf-8')
-        finally:
-            if self.spinner is not None:
-                self.spinner.stop_and_persist(symbol='🐳', text='Code finished executing.')
+            res = e.stderr.decode('utf-8')
+
+        if self.spinner is not None:
+            self.spinner.stop_and_persist(symbol='🐳', text='Code finished executing.')
+
+        return res

chatflock/code/local.py

@@ -2,7 +2,7 @@
 import sys
 import traceback
 import subprocess
-from typing import Optional, List
+from typing import Optional, Sequence
 
 from halo import Halo
 
@@ -13,7 +13,7 @@ class LocalCodeExecutor(CodeExecutor):
     def __init__(self, spinner: Optional[Halo] = None):
         self.spinner = spinner
 
-    def execute(self, code: str, dependencies: Optional[List[str]] = None) -> str:
+    def execute(self, code: str, dependencies: Optional[Sequence[str]] = None) -> str:
         captured_output = io.StringIO()
         saved_stdout = sys.stdout
         sys.stdout = captured_output

pyproject.toml

@@ -47,6 +47,7 @@ pydantic = "^2.4.2"
 beautifulsoup4 = "^4.12.2"
 tenacity = "^8.2.3"
 questionary = "^2.0.1"
+docker = "^6.1.3"
 [tool.poetry.dev-dependencies]
 bandit = "^1.7.1"
 black = { version = "^23.11.0", allow-prereleases = true }