Update app.py

app.py

@@ -5,7 +5,7 @@ import logging
 import time
 import os
 from datetime import datetime
-from typing import List, Dict
+from typing import List, Dict, Any
 import requests
 import gradio as gr
 import atexit
@@ -15,8 +15,10 @@ import urllib.parse
 import warnings
 import torch
 import flask
+from flask import Flask, request, jsonify
 import spaces
 from accelerate import Accelerator
+from threading import Thread
 
 # Constants
 INPUT_DIRECTORY = 'input'
@@ -26,7 +28,7 @@ RESOLUTIONS_DIRECTORY = 'resolutions'
 REPOS_DIRECTORY = 'repos'
 
 # Set up logging
-def initialize_logger():
+def initialize_logger() -> logging.Logger:
     log_file = f"{LOGS_DIRECTORY}/github_bot_{datetime.now().strftime('%Y%m%d_%H%M%S')}.log"
     logging.basicConfig(
         level=logging.INFO,
@@ -40,7 +42,7 @@ def initialize_logger():
 
 # Set up environment
 @spaces.GPU
-def initialize_environment(input_file, output_directory):
+def initialize_environment(input_file: str, output_directory: str) -> logging.Logger:
     directories = [LOGS_DIRECTORY, RESOLUTIONS_DIRECTORY, REPOS_DIRECTORY, input_file, output_directory]
     for directory in directories:
         os.makedirs(directory, exist_ok=True)
@@ -71,7 +73,7 @@ class GitHubAPI:
                     time.sleep(wait_time)
                 return False
             return True
-        except Exception as e:
+        except requests.exceptions.RequestException as e:
             logger.error(f"Error checking rate limit: {str(e)}")
             return True
 
@@ -80,7 +82,7 @@ class GitHubAPI:
             response = requests.get(f"{self.base_url}/repos/{owner}/{repo}", headers=self.headers)
             response.raise_for_status()
             return response.json()
-        except Exception as e:
+        except requests.exceptions.RequestException as e:
             logger.error(f"Error getting repository: {str(e)}")
             return {}
 
@@ -89,7 +91,7 @@ class GitHubAPI:
             response = requests.get(f"{self.base_url}/repos/{owner}/{repo}/issues", headers=self.headers)
             response.raise_for_status()
             return response.json()
-        except Exception as e:
+        except requests.exceptions.RequestException as e:
             logger.error(f"Error getting issues: {str(e)}")
             return []
 
@@ -98,7 +100,7 @@ class GitHubAPI:
             response = requests.post(f"{self.base_url}/repos/{owner}/{repo}/issues", headers=self.headers, json={'title': title, 'body': body})
             response.raise_for_status()
             return response.json()
-        except Exception as e:
+        except requests.exceptions.RequestException as e:
             logger.error(f"Error creating issue: {str(e)}")
             return {}
 
@@ -107,22 +109,24 @@ class GitHubAPI:
             response = requests.patch(f"{self.base_url}/repos/{owner}/{repo}/issues/{issue_number}", headers=self.headers, json={'title': title, 'body': body})
             response.raise_for_status()
             return response.json()
-        except Exception as e:
+        except requests.exceptions.RequestException as e:
             logger.error(f"Error updating issue: {str(e)}")
             return {}
 
+app = Flask(__name__)
+
 @app.route('/fetch-issues', methods=['POST'])
-def fetch_issues():
+def fetch_issues() -> Dict[str, Any]:
     data = request.get_json()
     github_token = data['githubToken']
     repo_url = data['repoUrl']
     owner, repo = repo_url.split('/')[-2:]
     github_api = GitHubAPI(github_token)
-    issues = github_api.get_issues(owner, repo)
+    issues = github_api.get_issues(owner , repo)
     return jsonify({'issues': issues})
 
 @app.route('/resolve-issue', methods=['POST'])
-def resolve_issue():
+def resolve_issue() -> Dict[str, Any]:
     data = request.get_json()
     github_token = data['githubToken']
     repo_url = data['repoUrl']
@@ -136,13 +140,13 @@ def resolve_issue():
     return jsonify({'output': f"Issue {issue_number} resolved"})
 
 @app.route('/extract-info', methods=['POST'])
-def extract_info():
+def extract_info() -> Dict[str, Any]:
     data = request.get_json()
     url = data['url']
     # Extract info from URL
     return jsonify({'output': f"Info extracted from {url}"})
 
-def run_flask_app():
+def run_flask_app() -> None:
     app.run(debug=True, use_reloader=False)
 
 # HTML and CSS integration
@@ -161,7 +165,6 @@ custom_html = """
             color: #e0e0e0;
             font-family: 'Roboto', sans-serif;
             overflow-x: hidden; /* Prevent horizontal scrollbar */
-            
         }
         .card {
             border-radius: 1.5rem;
@@ -173,12 +176,10 @@ custom_html = """
             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;
@@ -187,7 +188,6 @@ custom_html = """
             border-radius: 0.75rem;
             padding-block: 0.75rem;
             padding-inline: 1.5rem;
-
         }
         .btn-primary {
             background-color: #7928CA;
@@ -199,13 +199,14 @@ custom_html = """
             color: white;
             border: 2px solid #22c55e;
         }
+        .loading {
+            display: none;
+        }
     </style>
 </head>
 <body class="bg-gray-900">
-<div class="container mx-auto p-4" >
-
+<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">
@@ -221,19 +222,15 @@ custom_html = """
             <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" >
+            <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">
+        <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>
@@ -248,15 +245,13 @@ custom_html = """
             <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" >
+    <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">
@@ -269,7 +264,7 @@ custom_html = """
             <button class="btn btn-primary" id="extract-info">Extract Info</button>
         </div>
     </div>
-
+    <div class="loading" id="loading-indicator">Loading...</div>
 </div>
 <script>
     const githubTokenInput = document.getElementById('github-token');
@@ -282,123 +277,137 @@ custom_html = """
     const outputTextarea = document.getElementById('output-textarea');
     const urlTextbox = document.getElementById('url-textbox');
     const extractInfoButton = document.getElementById('extract-info');
+    const loadingIndicator = document.getElementById('loading-indicator');
+
+    const showLoading = () => {
+        loadingIndicator.style.display = 'block';
+        fetchIssuesButton.disabled = true;
+        resolveIssueButton.disabled = true;
+        extractInfoButton.disabled = true;
+    };
+
+    const hideLoading = () => {
+        loadingIndicator.style.display = 'none';
+        fetchIssuesButton.disabled = false;
+        resolveIssueButton.disabled = false;
+        extractInfoButton.disabled = false;
+    };
 
     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 token = githubTokenInput.value;
+        const repoUrl = repoUrlInput.value;
+        if (!token || !repoUrl) {
+            outputTextarea.value = "Please provide both GitHub Token and Repository URL.";
+            return;
         }
-
-        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 = JSON.stringify(issue);
-                option.text = `${issue.number}: ${issue.title}`;
-                issueDropdown.add(option);
+        showLoading();
+        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 = JSON.stringify(issue);
+                    option.text = `${issue.number}: ${issue.title}`;
+                    issueDropdown.add(option);
+                });
+            }
+        } catch (error) {
+            outputTextarea.value = `Error fetching issues: ${error.message}`;
+        } finally {
+            hideLoading();
         }
-
-      } catch (error) {
-        outputTextarea.value = `Error fetching issues: ${error.message}`;
-      }
     });
 
     resolveIssueButton.addEventListener('click', async () => {
-      const token = githubTokenInput.value;
-      const repoUrl = repoUrlInput.value;
-      const issue = JSON.parse(issueDropdown.value);
-      const resolution = resolutionTextarea.value;
-      const forkedRepoUrl = forkedRepoUrlInput.value;
-
-      if (!token || !repoUrl || !issue || !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, issue: issue, resolution: resolution, forkedRepoUrl: forkedRepoUrl }),
-        });
-
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
+        const token = githubTokenInput.value;
+        const repoUrl = repoUrlInput.value;
+        const issue = JSON.parse(issueDropdown.value);
+        const resolution = resolutionTextarea.value;
+        const forkedRepoUrl = forkedRepoUrlInput.value;
+        if (!token || !repoUrl || !issue || !resolution) {
+            outputTextarea.value = "Please provide all required fields.";
+            return;
         }
-
-        const data = await response.json();
-        if (data.error) {
-            outputTextarea.value = data.error;
-        } else {
-            outputTextarea.value = data.output;
+        show Loading();
+        try {
+            const response = await fetch('/resolve-issue', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ githubToken: token, repoUrl: repoUrl, issue: issue, 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}`;
+        } finally {
+            hideLoading();
         }
-      } catch (error) {
-        outputTextarea.value = `Error resolving issue: ${error.message}`;
-      }
     });
 
     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 url = urlTextbox.value;
+        if (!url) {
+            outputTextarea.value = "Please provide a URL.";
+            return;
         }
-
-        const data = await response.json();
-        if (data.error) {
-            outputTextarea.value = data.error;
-        } else {
-            outputTextarea.value = data.output;
+        showLoading();
+        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 = data.output;
+            }
+        } catch (error) {
+            outputTextarea.value = `Error extracting info: ${error.message}`;
+        } finally {
+            hideLoading();
         }
-      } catch (error) {
-        outputTextarea.value = `Error extracting info: ${error.message}`;
-      }
     });
-    
 </script>
 </body>
 </html>
 """
 
-def create_gradio_interface():
+def create_gradio_interface() -> gr.Blocks:
     with gr.Blocks(css=None, theme=None) as demo:
         gr.HTML(custom_html)
-
     return demo
 
 # Cleanup function
-def cleanup():
+def cleanup() -> None:
     try:
         temp_dirs = [REPOS_DIRECTORY]
         for dir_name in temp_dirs:
@@ -409,7 +418,7 @@ def cleanup():
         print(f"Error during cleanup: {str(e)}")
 
 # Signal handler
-def signal_handler(signum, frame):
+def signal_handler(signum: int, frame) -> None:
     logger.info(f"Received signal {signum}")
     cleanup()
     sys.exit(0)