Update app.py

app.py

@@ -12,7 +12,8 @@ import atexit
 import subprocess
 from urllib.parse import urlparse, quote
 import webbrowser
-import spaces
+from flask import Flask, request, jsonify, send_from_directory
+from threading import Thread
 
 device = "cuda"
 
@@ -63,8 +64,14 @@ LOGS_DIRECTORY = 'logs'
 RESOLUTIONS_DIRECTORY = 'resolutions'
 REPOS_DIRECTORY = 'repos'
 
+# Set up environment
+def initialize_environment(input_file, output_directory):
+    directories = [LOGS_DIRECTORY, RESOLUTIONS_DIRECTORY, REPOS_DIRECTORY, input_file, output_directory]
+    for directory in directories:
+        os.makedirs(directory, exist_ok=True)
+
 # Set up logging
-def initialize_logger() -> logging.Logger:
+def initialize_logger():
     log_file = f"{LOGS_DIRECTORY}/github_bot_{datetime.now().strftime('%Y%m%d_%H%M%S')}.log"
     logging.basicConfig(
         level=logging.INFO,
@@ -77,12 +84,7 @@ def initialize_logger() -> logging.Logger:
     return logging.getLogger(__name__)
 
 # Initialize environment and logger
-def initialize_environment():
-    directories = [LOGS_DIRECTORY, RESOLUTIONS_DIRECTORY, REPOS_DIRECTORY, INPUT_DIRECTORY, OUTPUT_DIRECTORY]
-    for directory in directories:
-        os.makedirs(directory, exist_ok=True)
-
-initialize_environment()
+initialize_environment(INPUT_DIRECTORY, OUTPUT_DIRECTORY)
 logger = initialize_logger()  # Initialize logger globally
 
 # GitHub API handler
@@ -106,12 +108,12 @@ class GitHubAPI:
             if remaining < 10:
                 wait_time = max(0, reset_time - int(time.time()))
                 if wait_time > 0:
-                    logger.warning(f"Rate limit nearly exceeded. Waiting {wait_time} seconds before retrying...")
+                    logger.warning(f"Rate limit nearly exceeded. Waiting {wait_time} seconds...")
                     time.sleep(wait_time)
                 return False
             return True
         except requests.exceptions.RequestException as e:
-            logger.error(f"Error checking rate limit: {str(e)}. Retrying...")
+            logger.error(f"Error checking rate limit: {str(e)}")
             return True
 
     def get_repository(self, owner: str, repo: str) -> Dict:
@@ -120,7 +122,7 @@ class GitHubAPI:
             response.raise_for_status()
             return response.json()
         except requests.HTTPError as e:
-            logger.error(f"HTTP error getting repository info for {owner}/{repo}: {str(e)}. Please check the repository details.")
+            logger.error(f"HTTP error getting repository info: {str(e)}")
             raise
         except Exception as e:
             logger.error(f"Error getting repository info: {str(e)}")
@@ -136,7 +138,7 @@ class GitHubAPI:
             issues = response.json()
             return [issue for issue in issues if 'pull_request' not in issue]
         except Exception as e:
-            logger.error(f"Error fetching issues for repository {owner}/{repo}: {str(e)}. Please verify the repository and token.")
+            logger.error(f"Error fetching issues: {str(e)}")
             return []
 
 # GitHub Bot
@@ -152,7 +154,7 @@ class GitHubBot:
             self.initialize_api(token)
             return self.github_api.get_issues(owner, repo)
         except Exception as e:
-            logger.error(f"Error fetching issues for repository {owner}/{repo}: {str(e)}")
+            logger.error(f"Error fetching issues: {str(e)}")
             return []
 
     def resolve_issue(self, token: str, owner: str, repo: str, issue_number: int, resolution: str, forked_repo: str) -> str:
@@ -174,7 +176,7 @@ class GitHubBot:
             os.chdir('/tmp/' + forked_repo.split('/')[-1])
 
             # Assuming manual intervention now
-            input("Apply the fix manually and stage the changes (press ENTER)? ")
+            input(" Apply the fix manually and stage the changes (press ENTER)? ")
 
             # Commit and push the modifications
             subprocess.run(['git', 'add', '.'], check=True)
@@ -187,7 +189,7 @@ class GitHubBot:
             return f"Resolution saved: {resolution_file}"
 
         except Exception as e:
-            error_msg = f"Error resolving issue #{issue_number} in repository {owner}/{repo}: {str(e)}"
+            error_msg = f"Error resolving issue: {str(e)}"
             logger.error(error_msg)
             return error_msg
 
@@ -258,240 +260,63 @@ def extract_info(url):
     except Exception as e:
         return str(e)
 
-# HTML and CSS integration
-custom_html = """
-<!DOCTYPE html>
-<html>
-<head>
-    <title>GitHub Issue Manager</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/tailwind.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/full.css" rel="stylesheet" type="text/css" />
-    <style>
-        body {
-            background: linear-gradient(to bottom right, #121212, #303030) !important;
-            color: #e0e0e0;
-            font-family: 'Roboto', sans-serif;
-            overflow-x: hidden; /* Prevent horizontal scrollbar */
-        }
-        .card {
-            border-radius: 1.5rem;
-            box-shadow: 0 15px 25px rgba (0, 0, 0, 0.2);
-            margin-bottom: 20px;
-        }
-        .input, .select, .textarea {
-            border: 2px solid #4a4a4a;
-            border-radius: 0.75rem;
-            padding-inline: 1.5rem;
-            padding-block: 0.75rem;
-        }
-        h1, h2, h3 {
-            color: #e0e0e0;
-        }
-        .output-area {
-            padding: 1.5rem;
-            border-radius: 0.75rem;
-        }
-        .btn {
-            border-radius: 0.75rem;
-            padding-block: 0.75rem;
-            padding-inline: 1.5rem;
-        }
-        .btn-primary {
-            background-color: #7928CA;
-            color: white;
-            border: 2px solid #7928CA;
-        }
-        .btn-primary:hover {
-            background-color: #5e22a1;
-        }
-        .btn-success {
-            background-color: #22c55e;
-            color: white;
-            border: 2px solid #22c55e;
-        }
-        .btn-success:hover {
-            background-color: #1a9a46;
-        }
-    </style>
-</head>
-<body class="bg-gray-900">
-<div class="container mx-auto p-4">
-    <h1 class="text-4xl md:text-5xl font-extrabold text-center mb-8">GitHub Issue Manager</h1>
-    <!-- GitHub Token & Repo URL -->
-    <div class="card bg-gray-800 p-8">
-        <div class="form-control">
-            <label class="label">
-                <span class="label-text">GitHub Token</span>
-            </label>
-            <input type="password" placeholder="Enter your GitHub Personal Access Token" class="input input-bordered input-primary" id="github-token">
-        </div>
-        <div class="form-control">
-            <label class="label">
-                <span class="label-text">Repository URL</span>
-            </label>
-            <input type="text" placeholder="Enter the full GitHub repository URL" class="input input-bordered input-primary" id="repo-url">
-        </div>
-    </div>
-    <!-- Fetch & Resolve Section -->
-    <div class="card bg-gray-800 p-8">
-        <div class="flex justify-between gap-4">
-            <button class="btn btn-primary" id="fetch-issues">Fetch Issues</button>
-            <select class="select select-primary w-full max-w-xs" id="issue-dropdown">
-                <option disabled selected>Select Issue</option>
-            </select>
-        </div>
-        <div class="form-control mt-4">
-            <label class="label">
-                <span class="label-text">Resolution</span>
-            </label>
-            <textarea class="textarea textarea-primary" placeholder="Enter the resolution details" id="resolution-textarea"></textarea>
-        </div>
-        <div class="form-control mt-4">
-            <label class="label">
-                <span class="label-text">Forked Repository URL</span>
-            </label>
-            <input type="text" placeholder="URL to your forked repository (Optional)" class="input input-bordered input-primary" id="forked-repo-url">
-        </div>
-        <div class="form-control mt-4">
-            <button class="btn btn-success" id="resolve-issue">Resolve Issue</button>
-        </div>
-    </div>
-    <!-- Output Area -->
-    <div class="card bg-gray-800 p-8 mt-4">
-        <label class="label">
-            <span class="label-text">Output</span>
-        </label>
-        <textarea class="textarea textarea-primary h-48" id="output-textarea" readonly></textarea>
-    </div>
-    <!-- URL to Extract -->
-    <div class="card bg-gray-800 p-8 mt-4">
-        <div class="form-control">
-            <label class="label">
-                <span class="label-text">URL</span>
-            </label>
-            <input type="text" placeholder="Enter a URL to extract information" class="input input-bordered input-primary" id="url-textbox">
-        </div>
-        <div class="form-control">
-            <button class="btn btn-primary" id="extract-info">Extract Info</button>
-        </div>
-    </div>
-</div>
-<script>
-    const githubTokenInput = document.getElementById('github-token');
-    const repoUrlInput = document.getElementById('repo-url');
-const fetchIssuesButton = document.getElementById('fetch-issues');
-const issueDropdown = document.getElementById('issue-dropdown');
-    const resolutionTextarea = document.getElementById('resolution-textarea');
-    const forkedRepoUrlInput = document.getElementById('forked-repo-url');
-    const resolveIssueButton = document.getElementById('resolve-issue');
-    const outputTextarea = document.getElementById('output-textarea');
-    const urlTextbox = document.getElementById('url-textbox');
-    const extractInfoButton = document.getElementById('extract-info');
-
-    fetchIssuesButton.addEventListener('click', async () => {
-        const token = githubTokenInput.value;
-        const repoUrl = repoUrlInput.value;
-        if (!token || !repoUrl) {
-            outputTextarea.value = "Please provide both GitHub Token and Repository URL.";
-            return;
-        }
-        try {
-            const response = await fetch('/fetch-issues', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({ githubToken: token, repoUrl: repoUrl }),
-            });
-            if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}`);
-            }
-            const data = await response.json();
-            if (data.error) {
-                outputTextarea.value = data.error;
-            } else {
-                issueDropdown.innerHTML = '';
-                data.issues.forEach(issue => {
-                    const option = document.createElement('option');
-                    option.value = issue.number;
-                    option.text = `${issue.number}: ${issue.title}`;
-                    issueDropdown.add(option);
-                });
-            }
-        } catch (error) {
-            outputTextarea.value = `Error fetching issues: ${error.message}`;
-        }
-    });
-
-    resolveIssueButton.addEventListener('click', async () => {
-        const token = githubTokenInput.value;
-        const repoUrl = repoUrlInput.value;
-        const issueNumber = issueDropdown.value;
-        const resolution = resolutionTextarea.value;
-        const forkedRepoUrl = forkedRepoUrlInput.value;
-        if (!token || !repoUrl || !issueNumber || !resolution) {
-            outputTextarea.value = "Please provide all required fields.";
-            return;
-        }
-        try {
-            const response = await fetch('/resolve-issue', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({ githubToken: token, repoUrl: repoUrl, issueNumber: issueNumber, resolution: resolution, forkedRepoUrl: forkedRepoUrl }),
-            });
-            if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}`);
-            }
-            const data = await response.json();
-            if (data.error) {
-                outputTextarea.value = data.error;
-            } else {
-                outputTextarea.value = data.output;
-            }
-        } catch (error) {
-            outputTextarea.value = `Error resolving issue: ${error.message}`;
-        }
-    });
+def submit_issue(token, repo_url, issue_number, resolution, forked_repo_url):
+    try:
+        parts = repo_url.split('/')
+        if len(parts) < 2:
+            raise ValueError("Repository URL is not in the correct format. Expected format: 'owner/repo'.")
 
-    extractInfoButton.addEventListener('click', async () => {
-        const url = urlTextbox.value;
-        if (!url) {
-            outputTextarea.value = "Please provide a URL.";
-            return;
-        }
-        try {
-            const response = await fetch('/extract-info', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({ url: url }),
-            });
-            if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}`);
-            }
-            const data = await response.json();
-            if (data.error) {
-                outputTextarea.value = data.error;
-            } else {
-                outputTextarea.value = JSON.stringify(data, null, 2);
-            }
-        } catch (error) {
-            outputTextarea.value = `Error extracting info: ${error.message}`;
-        }
-    });
-</script>
-</body>
-</html>
-"""
+        owner, repo = parts[-2], parts[-1]
+        result = bot.resolve_issue(token, owner, repo, issue_number, resolution, forked_repo_url)
+        return result
+    except Exception as e:
+        return str(e)
+
+app = Flask(__name__)
+
+@app.route('/index')
+def serve_index():
+    return send_from_directory('.', 'index.html')
+
+@app.route('/fetch_issues', methods=['POST'])
+def fetch_issues_route():
+    data = request.get_json()
+    token = data.get('token')
+    repo_url = data.get('repoUrl')
+    if not token or not repo_url:
+        return jsonify({'error': 'Missing token or repoUrl'}), 400
+    issues = fetch_issues(token, repo_url)
+    return jsonify({'issues': issues})
+
+@app.route('/resolve_issue', methods=['POST'])
+def resolve_issue_route():
+    data = request.get_json()
+    token = data.get('token')
+    repo_url = data.get('repoUrl')
+    issue_number = data.get('issueNumber')
+    resolution = data.get('resolution')
+    forked_repo_url = data.get('forkedRepoUrl')
+    if not token or not repo_url or not issue_number or not resolution:
+        return jsonify({'error': 'Missing required fields'}), 400
+    result = resolve_issue(token, repo_url, issue_number, resolution, forked_repo_url)
+    return jsonify({'result': result})
+
+@app.route('/extract_info', methods=['POST'])
+def extract_info_route():
+    data = request.get_json()
+    url = data.get('url')
+    if not url:
+        return jsonify({'error': 'Missing URL'}), 400
+    info = extract_info(url)
+    return jsonify(info)
+
+def run_flask_app():
+    app.run(debug=True, use_reloader=False)
 
 def create_gradio_interface():
     with gr.Blocks(css=None, theme=None) as demo:
         gr.HTML(custom_html)
+
     return demo
 
 # Cleanup function
@@ -517,6 +342,10 @@ if __name__ == "__main__":
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGTERM, signal_handler)
 
+    # Run Flask app in a separate thread
+    flask_thread = Thread(target=run_flask_app)
+    flask_thread.start()
+
     # Create Gradio interface
     demo = create_gradio_interface()
     demo.launch()