Refactor directory structure

agent/agent_config/prompts.py

@@ -0,0 +1,25 @@
+system_message = {
+    "role": "system",
+    "content": (
+        "You are a senior developer assistant bot for GitHub issues.\n\n"
+
+        "Your job is to respond to GitHub issues **professionally** and **helpfully**, but never repeat the issue description verbatim.\n\n"
+        "First, classify the issue as one of the following:\n"
+        "- Bug report\n"
+        "- Implementation question\n"
+        "- Feature request\n"
+        "- Incomplete or unclear\n\n"
+
+        "Then, based on the classification, write a clear, concise, and friendly response.\n\n"
+        "The comment should be well formatted and readable, using Markdown for code blocks and lists where appropriate.\n\n"
+        "DO NOT paste or repeat the issue description. DO NOT quote it. Respond entirely in your own words.\n"
+        "You can only use the following tools: fetch_github_issue, get_issue_details, retrieve_context, post_comment.\n"
+        "Do not attempt to use any other tools such as web_search."
+        "DO NOT HALLUCINATE OR MAKE UP TOOLS."
+    )
+}
+
+user_message = {
+    "role": "user",
+    "content": "Please suggest a fix on this issue https://github.com/aditi-dsi/testing-cryptope/issues/4."
+}

agent/{mistral.py → agent_config/tool_schema.py}

@@ -1,9 +1,3 @@
-import json
-from mistralai import Mistral
-from agent.function_calling import fetch_github_issue, get_issue_details, post_comment
-from agent.code_index import retrieve_context
-from config import MISTRAL_API_KEY
-
 tools = [
     {
         "type": "function",
@@ -105,94 +99,4 @@ tools = [
             },
         },
     },
-]
-
-names_to_functions = {
-    "fetch_github_issue": fetch_github_issue,
-    "get_issue_details": get_issue_details,
-    "retrieve_context": retrieve_context,
-    "post_comment": post_comment,
-}
-
-allowed_tools = set(names_to_functions.keys())
-
-system_message = {
-    "role": "system",
-    "content": (
-        "You are a senior developer assistant bot for GitHub issues.\n\n"
-
-        "Your job is to respond to GitHub issues **professionally** and **helpfully**, but never repeat the issue description verbatim.\n\n"
-        "First, classify the issue as one of the following:\n"
-        "- Bug report\n"
-        "- Implementation question\n"
-        "- Feature request\n"
-        "- Incomplete or unclear\n\n"
-
-        "Then, based on the classification, write a clear, concise, and friendly response.\n\n"
-        "The comment should be well formatted and readable, using Markdown for code blocks and lists where appropriate.\n\n"
-        "DO NOT paste or repeat the issue description. DO NOT quote it. Respond entirely in your own words.\n"
-        "You can only use the following tools: fetch_github_issue, get_issue_details, retrieve_context, post_comment.\n"
-        "Do not attempt to use any other tools such as web_search."
-        "DO NOT HALLUCINATE OR MAKE UP TOOLS."
-    )
-}
-
-user_message = {
-    "role": "user",
-    "content": "Please suggest a fix on this issue https://github.com/aditi-dsi/testing-cryptope/issues/4."
-}
-
-messages = [system_message, user_message]
-
-api_key = MISTRAL_API_KEY
-model = "devstral-small-latest"
-client = Mistral(api_key=api_key)
-
-MAX_STEPS = 5
-tool_calls = 0
-
-while True:
-    response = client.chat.complete(
-        model=model,
-        messages=messages,
-        tools=tools,
-        tool_choice="any",
-    )
-    msg = response.choices[0].message
-    messages.append(msg)
-
-    if hasattr(msg, "tool_calls") and msg.tool_calls:
-        for tool_call in msg.tool_calls:
-            function_name = tool_call.function.name
-            function_params = json.loads(tool_call.function.arguments)
-            if function_name in allowed_tools:
-                function_result = names_to_functions[function_name](**function_params)
-                print(f"Agent is calling tool: {function_name}")
-                tool_calls += 1
-                messages.append({
-                    "role": "tool",
-                    "tool_call_id": tool_call.id,
-                    "content": str(function_result)
-                })
-
-                if function_name == "post_comment":
-                    print("OpenSorus (final): ✅ Comment posted successfully. No further action needed.")
-                    exit(0)
-
-            else:
-                print(f"LLM tried to call unknown tool: {function_name}")
-                tool_error_msg = (
-                    f"Error: Tool '{function_name}' is not available. "
-                    "You can only use the following tools: fetch_github_issue, get_issue_details, post_comment."
-                )
-                messages.append({
-                    "role": "tool",
-                    "tool_call_id": tool_call.id,
-                    "content": tool_error_msg
-                })
-        if tool_calls >= MAX_STEPS:
-            print(f"Agent stopped after {MAX_STEPS} tool calls to protect against rate limiting.")
-            break
-    else:
-        print("OpenSorus (final):", msg.content)
-        break
+]

agent/core.py

@@ -0,0 +1,78 @@
+import json
+from mistralai import Mistral
+from agent.agent_config import prompts
+from agent.agent_config import tool_schema
+from config import MISTRAL_API_KEY
+from tools.code_index import retrieve_context
+from tools.github_tools import fetch_github_issue, get_issue_details, post_comment
+
+tools = tool_schema.tools
+names_to_functions = {
+    "fetch_github_issue": fetch_github_issue,
+    "get_issue_details": get_issue_details,
+    "retrieve_context": retrieve_context,
+    "post_comment": post_comment,
+}
+
+allowed_tools = set(names_to_functions.keys())
+
+system_message = prompts.system_message
+user_message = {
+    "role": "user",
+    "content": "Please suggest a fix on this issue https://github.com/aditi-dsi/testing-cryptope/issues/4."
+}
+
+messages = [system_message, user_message]
+
+api_key = MISTRAL_API_KEY
+model = "devstral-small-latest"
+client = Mistral(api_key=api_key)
+
+MAX_STEPS = 5
+tool_calls = 0
+
+while True:
+    response = client.chat.complete(
+        model=model,
+        messages=messages,
+        tools=tools,
+        tool_choice="any",
+    )
+    msg = response.choices[0].message
+    messages.append(msg)
+
+    if hasattr(msg, "tool_calls") and msg.tool_calls:
+        for tool_call in msg.tool_calls:
+            function_name = tool_call.function.name
+            function_params = json.loads(tool_call.function.arguments)
+            if function_name in allowed_tools:
+                function_result = names_to_functions[function_name](**function_params)
+                print(f"Agent is calling tool: {function_name}")
+                tool_calls += 1
+                messages.append({
+                    "role": "tool",
+                    "tool_call_id": tool_call.id,
+                    "content": str(function_result)
+                })
+
+                if function_name == "post_comment":
+                    print("OpenSorus (final): ✅ Comment posted successfully. No further action needed.")
+                    exit(0)
+
+            else:
+                print(f"LLM tried to call unknown tool: {function_name}")
+                tool_error_msg = (
+                    f"Error: Tool '{function_name}' is not available. "
+                    "You can only use the following tools: fetch_github_issue, get_issue_details, post_comment."
+                )
+                messages.append({
+                    "role": "tool",
+                    "tool_call_id": tool_call.id,
+                    "content": tool_error_msg
+                })
+        if tool_calls >= MAX_STEPS:
+            print(f"Agent stopped after {MAX_STEPS} tool calls to protect against rate limiting.")
+            break
+    else:
+        print("OpenSorus (final):", msg.content)
+        break

requirements.txt

@@ -0,0 +1,5 @@
+llama_index==0.12.40
+mistralai==1.8.1
+PyJWT==2.10.1
+python-dotenv==1.1.0
+requests==2.32.3

tools/__init__.py

@@ -0,0 +1,4 @@
+__all__ = [
+    "code_index",
+    "github_tools",
+]

{agent → tools}/code_index.py

@@ -1,4 +1,3 @@
-import base64
 import os
 import re
 import time
@@ -9,55 +8,13 @@ from llama_index.core.postprocessor import SimilarityPostprocessor
 from llama_index.embeddings.mistralai import MistralAIEmbedding
 from llama_index.llms.mistralai import MistralAI
 from mistralai import Mistral
-from agent.function_calling import github_request, get_installation_id, get_installation_token
 from config import MISTRAL_API_KEY
+from tools.utils import fetch_repo_files, fetch_file_content
+
 
 repo_indices_cache: Dict[str, VectorStoreIndex] = {}
 INCLUDE_FILE_EXTENSIONS = {".py", ".js", ".ts", ".json", ".md", ".txt"}
 
-def fetch_repo_files(owner: str, repo: str, ref: str = "main") -> List[str]:
-    """
-    Lists all files in the repository by recursively fetching the Git tree from GitHub API.
-    Returns a list of file paths.
-    """
-    installation_id = get_installation_id(owner, repo)
-    token = get_installation_token(installation_id)
-    url = f"https://api.github.com/repos/{owner}/{repo}/git/trees/{ref}?recursive=1"
-    headers = {
-        "Authorization": f"Bearer {token}",
-        "Accept": "application/vnd.github.v3+json"
-    }
-    response = github_request("GET", url, headers=headers)
-    if response.status_code != 200:
-        raise Exception(f"Failed to list repository files: {response.status_code} {response.text}")
-
-    tree = response.json().get("tree", [])
-    file_paths = [item["path"] for item in tree if item["type"] == "blob"]
-    return file_paths
-
-# print(fetch_repo_files("aditi-dsi", "EvalAI-Starters", "master"))
-
-def fetch_file_content(owner: str, repo: str, path: str, ref: str = "main") -> str:
-    """
-    Fetches the content of a file from the GitHub repository.
-    """
-    installation_id = get_installation_id(owner, repo)
-    token = get_installation_token(installation_id)
-    url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}?ref={ref}"
-    headers = {
-        "Authorization": f"Bearer {token}",
-        "Accept": "application/vnd.github.v3+json"
-    }
-    response = github_request("GET", url, headers=headers)
-    if response.status_code != 200:
-        raise Exception(f"Failed to fetch file content {path}: {response.status_code} {response.text}")
-
-    content_json = response.json()
-    content = base64.b64decode(content_json["content"]).decode("utf-8", errors="ignore")
-    return content
-
-# print(fetch_file_content("aditi-dsi", "testing-cryptope", "frontend/src/lib/buildSwap.ts", "main"))
-
 def clean_line(line: str) -> str:
     line = re.sub(r'^\s*\d+[\.\)]\s*', '', line)
     line = line.strip(' `"\'')

tools/github_tools.py

@@ -0,0 +1,47 @@
+from urllib.parse import urlparse
+from tools.utils import get_installation_id, get_installation_token, github_request
+
+def fetch_github_issue(issue_url):
+    parsed = urlparse(issue_url)
+    path_parts = parsed.path.strip('/').split('/')
+    if len(path_parts) >= 4 and path_parts[2] == 'issues':
+        owner = path_parts[0]
+        repo = path_parts[1]
+        issue_num = path_parts[3]
+        return owner, repo, issue_num
+    else:
+        raise ValueError("Invalid GitHub Issue URL")
+    
+
+def get_issue_details(owner, repo, issue_num):
+    installation_id = get_installation_id(owner, repo)
+    token = get_installation_token(installation_id)
+    url = f"https://api.github.com/repos/{owner}/{repo}/issues/{issue_num}"
+    headers = {
+        "Authorization": f"Bearer {token}",
+        "Accept": "application/vnd.github.v3+json"
+    }
+    response = github_request("GET", url, headers=headers)
+    if response.status_code == 200:
+        return response.json()
+    else:
+        raise Exception(f"Failed to fetch issue: {response.status_code} {response.text}")
+
+# print(get_issue_details("aditi-dsi", "testing-cryptope", "3"))
+
+def post_comment(owner, repo, issue_num, comment_body):
+    installation_id = get_installation_id(owner, repo)
+    token = get_installation_token(installation_id)
+    url = f"https://api.github.com/repos/{owner}/{repo}/issues/{issue_num}/comments"
+    headers = {
+        "Authorization": f"Bearer {token}",
+        "Accept": "application/vnd.github.v3+json"
+    }
+    data = {"body": comment_body}
+    response = github_request("POST", url, headers=headers, json=data)
+    if response.status_code == 201:
+        return response.json()
+    else:
+        raise Exception(f"Failed to post comment: {response.status_code} {response.text}")
+
+# print(post_comment("aditi-dsi", "testing-cryptope", "3", "This is a test comment from OpenSorus."))

agent/function_calling.py → tools/utils.py

@@ -1,14 +1,17 @@
-import requests
-from urllib.parse import urlparse
-from config import APP_ID, APP_PRIVATE_KEY
-import time
-import jwt
+import base64
 from datetime import datetime, timezone, timedelta
+import jwt
 import threading
+import time
+from typing import List
+import requests
+from config import APP_ID, APP_PRIVATE_KEY
+
 
 installation_tokens = {}
 token_lock = threading.Lock()
 
+
 def generate_jwt():
     """Generate a JWT signed with GitHub App private key."""
     now = int(time.time())
@@ -90,121 +93,46 @@ def get_installation_token(installation_id):
 
 # print(get_installation_token(69452220))
 
-def fetch_github_issue(issue_url):
-    parsed = urlparse(issue_url)
-    path_parts = parsed.path.strip('/').split('/')
-    if len(path_parts) >= 4 and path_parts[2] == 'issues':
-        owner = path_parts[0]
-        repo = path_parts[1]
-        issue_num = path_parts[3]
-        return owner, repo, issue_num
-    else:
-        raise ValueError("Invalid GitHub Issue URL")
-    
-
-def get_issue_details(owner, repo, issue_num):
+def fetch_repo_files(owner: str, repo: str, ref: str = "main") -> List[str]:
+    """
+    Lists all files in the repository by recursively fetching the Git tree from GitHub API.
+    Returns a list of file paths.
+    """
     installation_id = get_installation_id(owner, repo)
     token = get_installation_token(installation_id)
-    url = f"https://api.github.com/repos/{owner}/{repo}/issues/{issue_num}"
+    url = f"https://api.github.com/repos/{owner}/{repo}/git/trees/{ref}?recursive=1"
     headers = {
         "Authorization": f"Bearer {token}",
         "Accept": "application/vnd.github.v3+json"
     }
     response = github_request("GET", url, headers=headers)
-    if response.status_code == 200:
-        return response.json()
-    else:
-        raise Exception(f"Failed to fetch issue: {response.status_code} {response.text}")
+    if response.status_code != 200:
+        raise Exception(f"Failed to list repository files: {response.status_code} {response.text}")
+
+    tree = response.json().get("tree", [])
+    file_paths = [item["path"] for item in tree if item["type"] == "blob"]
+    return file_paths
 
-# print(get_issue_details("aditi-dsi", "testing-cryptope", "3"))
+# print(fetch_repo_files("aditi-dsi", "EvalAI-Starters", "master"))
 
-def post_comment(owner, repo, issue_num, comment_body):
+def fetch_file_content(owner: str, repo: str, path: str, ref: str = "main") -> str:
+    """
+    Fetches the content of a file from the GitHub repository.
+    """
     installation_id = get_installation_id(owner, repo)
     token = get_installation_token(installation_id)
-    url = f"https://api.github.com/repos/{owner}/{repo}/issues/{issue_num}/comments"
+    url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}?ref={ref}"
     headers = {
         "Authorization": f"Bearer {token}",
         "Accept": "application/vnd.github.v3+json"
     }
-    data = {"body": comment_body}
-    response = github_request("POST", url, headers=headers, json=data)
-    if response.status_code == 201:
-        return response.json()
-    else:
-        raise Exception(f"Failed to post comment: {response.status_code} {response.text}")
-
-# print(post_comment("aditi-dsi", "testing-cryptope", "3", "This is a test comment from OpenSorus."))
-
-# tools = [
-#     {
-#         "type": "function",
-#         "function": {
-#             "name": "fetch_github_issue",
-#             "description": "Fetch GitHub issue details",
-#             "parameters": {
-#                 "type": "object",
-#                 "properties": {
-#                     "issue_url": {
-#                         "type": "string",
-#                         "description": "The full URL of the GitHub issue"
-#                     }
-#                 },
-#                 "required": ["issue_url"]
-#             },
-#         },
-#     },
-# {
-#         "type": "function",
-#         "function": {
-#             "name": "get_issue_details",
-#             "description": "Get details of a GitHub issue",
-#             "parameters": {
-#                 "type": "object",
-#                 "properties": {
-#                     "owner": {
-#                         "type": "string",
-#                         "description": "The owner of the repository."
-#                     },
-#                     "repo": {
-#                         "type": "string",
-#                         "description": "The name of the repository."
-#                     },
-#                     "issue_num": {
-#                         "type": "string",
-#                         "description": "The issue number."
-#                     }
-#                 },
-#                 "required": ["owner", "repo", "issue_num"],
-#             },
-#         },
-#     },
-# {
-#         "type": "function",
-#         "function": {
-#             "name": "post_comment",
-#             "description": "Post a comment on a GitHub issue",
-#             "parameters": {
-#                 "type": "object",
-#                 "properties": {
-#                     "owner": {
-#                         "type": "string",
-#                         "description": "The owner of the repository."
-#                     },
-#                     "repo": {
-#                         "type": "string",
-#                         "description": "The name of the repository."
-#                     },
-#                     "issue_num": {
-#                         "type": "string",
-#                         "description": "The issue number."
-#                     },
-#                     "comment_body": {
-#                         "type": "string",
-#                         "description": "The body of the comment."
-#                     }
-#                 },
-#                 "required": ["owner", "repo", "issue_num", "comment_body"],
-#             },
-#         },
-#     },
-# ]
+    response = github_request("GET", url, headers=headers)
+    if response.status_code != 200:
+        raise Exception(f"Failed to fetch file content {path}: {response.status_code} {response.text}")
+
+    content_json = response.json()
+    content = base64.b64decode(content_json["content"]).decode("utf-8", errors="ignore")
+    return content
+
+# print(fetch_file_content("aditi-dsi", "testing-cryptope", "frontend/src/lib/buildSwap.ts", "main"))
+