Merge branch 'main' of https://github.com/natzar/ai-developer into main

# Conflicts:
#	ai_developer/task_handler.py

ai_developer/actions.py

@@ -191,28 +191,35 @@ def git_pull(sandbox: Sandbox, args: Dict[str, Any]) -> str:
     except Exception as e:
         return f"Error: {e}"
 
+
 def git_reset(sandbox: Sandbox, args: Dict[str, Any]) -> str:
     repo_directory = "/home/user/repo"
     working_branch = args.get("working_branch", "main")
     print_sandbox_action("Resetting repo to branch in origin", working_branch)
 
     try:
         # Fetch the latest changes from origin
-        git_fetch_proc = sandbox.process.start_and_wait(f"git -C {repo_directory} fetch origin")
+        git_fetch_proc = sandbox.process.start_and_wait(
+            f"git -C {repo_directory} fetch origin"
+        )
         if git_fetch_proc.exit_code != 0:
             error = f"Error fetching from origin: {git_fetch_proc.stdout}\n\t{git_fetch_proc.stderr}"
             console.print("\t[bold red]Error:[/bold red]", error)
             return error
 
         # Reset the local branch to match the origin branch
-        git_reset_proc = sandbox.process.start_and_wait(f"git -C {repo_directory} reset --hard origin/{working_branch}")
+        git_reset_proc = sandbox.process.start_and_wait(
+            f"git -C {repo_directory} reset --hard origin/{working_branch}"
+        )
         if git_reset_proc.exit_code != 0:
             error = f"Error resetting branch '{working_branch}': {git_reset_proc.stdout}\n\t{git_reset_proc.stderr}"
             console.print("\t[bold red]Error:[/bold red]", error)
             return error
 
         # Clean up any untracked files
-        git_clean_proc = sandbox.process.start_and_wait(f"git -C {repo_directory} clean -fd")
+        git_clean_proc = sandbox.process.start_and_wait(
+            f"git -C {repo_directory} clean -fd"
+        )
         if git_clean_proc.exit_code != 0:
             error = f"Error cleaning untracked files: {git_clean_proc.stdout}\n\t{git_clean_proc.stderr}"
             console.print("\t[bold red]Error:[/bold red]", error)
@@ -222,11 +229,12 @@ def git_reset(sandbox: Sandbox, args: Dict[str, Any]) -> str:
     except Exception as e:
         return f"Error: {e}"
 
+
 def execute_pylint(sandbox: Sandbox, args: Dict[str, Any]) -> str:
     path = args.get("path", REPO_DIRECTORY)
     print_sandbox_action("Running pylint on", path)
 
-    pylint_cmd = f'pylint {path}'
+    pylint_cmd = f"pylint {path}"
     pylint_proc = sandbox.process.start_and_wait(pylint_cmd)
     if pylint_proc.exit_code != 0:
         error = pylint_proc.stderr.strip()
@@ -235,7 +243,9 @@ def execute_pylint(sandbox: Sandbox, args: Dict[str, Any]) -> str:
 
     output = pylint_proc.stdout.strip()
     console.print("[bold green]Pylint Output:[/bold green]\n", output)
-    return output        
+    return output
+
+
 # Ideas for new actions:
 # - Automated code formatting checks
 # - Security vulnerability scanning

ai_developer/assistant.py

@@ -154,26 +154,26 @@ def create_assistant():
                     "required": ["title"],
                 },
             },
-        },        
-	    {
-	        "type": "function",
-	        "function": {
-	            "name": "git_reset",
-	            "description": "Reset a repo to match a remote origin branch.",
-	            "parameters": {
-	                "type": "object",
-	                "properties": {
-	                    "working_branch": {
-	                        "type": "string",
-	                        "description": "The name of the branch to reset to. Defaults to 'main'.",
-	                        "default": "main"
-	                    }
-	                },
-	                "required": []
-	            }
-	        }
-	    },
-	    {
+        },
+        {
+            "type": "function",
+            "function": {
+                "name": "git_reset",
+                "description": "Reset a repo to match a remote origin branch.",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "working_branch": {
+                            "type": "string",
+                            "description": "The name of the branch to reset to. Defaults to 'main'.",
+                            "default": "main",
+                        }
+                    },
+                    "required": [],
+                },
+            },
+        },
+        {
             "type": "function",
             "function": {
                 "name": "execute_pylint",
@@ -184,7 +184,7 @@ def create_assistant():
                         "path": {
                             "type": "string",
                             "description": "The path to the directory or file to run pylint on, defaults to REPO_DIRECTORY",
-                            "default": "REPO_DIRECTORY"
+                            "default": "REPO_DIRECTORY",
                         }
                     },
                     "required": [],

ai_developer/main.py

@@ -23,7 +23,7 @@
     REPO_DIRECTORY,
     git_pull,
     git_reset,
-    execute_pylint
+    execute_pylint,
 )
 
 # Defaults
@@ -175,7 +175,11 @@ def main():
         make_pull_request
     ).add_action(
         git_pull
-    ).add_action(git_reset).add_action(execute_pylint)
+    ).add_action(
+        git_reset
+    ).add_action(
+        execute_pylint
+    )
 
     # Setup git right away so user knows immediatelly if they passed wrong
     # token

ai_developer/plugin.py

@@ -26,4 +26,3 @@ def apply_filters(self, hook_name: str, value, *args) -> Any:
             for function in self.filters[hook_name]:
                 value = function(value, *args)
         return value
-

ai_developer/task_handler.py

@@ -10,7 +10,7 @@ def __init__(self, client, sandbox, assistant, console):
         self.sandbox = sandbox
         self.console = console
         self.assistant = assistant
-        plugin_system.do_action('init_task_handler', self)
+        # plugin_system.do_action("init_task_handler", self)
 
     def handle_new_task(self, user_task, repo_url):
         thread_id = self.create_thread(user_task, repo_url)