Update app.py

app.py

@@ -14,48 +14,6 @@ from urllib.parse import urlparse, quote
 import webbrowser
 import spaces
 
-device = "cuda"
-
-@spaces.GPU()
-def stream_chat(
-    message: str,
-    history: list,
-    system_prompt: str,
-    temperature: float = 0.8,
-    max_new_tokens: int = 1024,
-    top_p: float = 1.0,
-    top_k: int = 20,
-    penalty: float = 1.2,
-):
-    print(f'message: {message}')
-    print(f'history: {history}')
-
-    conversation = [
-        {"role": "system", "content": system_prompt}
-    ]
-    for prompt, answer in history:
-        conversation.extend([
-            {"role": "user", "content": prompt},
-            {"role": "assistant", "content": answer},
-        ])
-
-    conversation.append({"role": "user", "content": message})
-
-    input_ids = tokenizer.apply_chat_template(conversation, add_generation_prompt=True, return_tensors="pt").to(model.device)
-
-    streamer = TextIteratorStreamer(tokenizer, timeout=60.0, skip_prompt=True, skip_special_tokens=True)
-
-    generate_kwargs = dict(
-        input_ids=input_ids,
-        max_new_tokens=max_new_tokens,
-        do_sample=temperature != 0,
-        top_p=top_p,
-        top_k=top_k,
-        temperature=temperature,
-        eos_token_id=[128001, 128008, 128009],
-        streamer=streamer,
-    )
-
 # Constants
 INPUT_DIRECTORY = 'input'
 OUTPUT_DIRECTORY = 'output'
@@ -63,14 +21,8 @@ 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():
+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,
@@ -83,7 +35,12 @@ def initialize_logger():
     return logging.getLogger(__name__)
 
 # Initialize environment and logger
-initialize_environment(INPUT_DIRECTORY, OUTPUT_DIRECTORY)
+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()
 logger = initialize_logger()  # Initialize logger globally
 
 # GitHub API handler
@@ -107,12 +64,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...")
+                    logger.warning(f"Rate limit nearly exceeded. Waiting {wait_time} seconds before retrying...")
                     time.sleep(wait_time)
                 return False
             return True
         except requests.exceptions.RequestException as e:
-            logger.error(f"Error checking rate limit: {str(e)}")
+            logger.error(f"Error checking rate limit: {str(e)}. Retrying...")
             return True
 
     def get_repository(self, owner: str, repo: str) -> Dict:
@@ -121,7 +78,7 @@ class GitHubAPI:
             response.raise_for_status()
             return response.json()
         except requests.HTTPError as e:
-            logger.error(f"HTTP error getting repository info: {str(e)}")
+            logger.error(f"HTTP error getting repository info for {owner}/{repo}: {str(e)}. Please check the repository details.")
             raise
         except Exception as e:
             logger.error(f"Error getting repository info: {str(e)}")
@@ -137,7 +94,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: {str(e)}")
+            logger.error(f"Error fetching issues for repository {owner}/{repo}: {str(e)}. Please verify the repository and token.")
             return []
 
 # GitHub Bot
@@ -153,7 +110,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: {str(e)}")
+            logger.error(f"Error fetching issues for repository {owner}/{repo}: {str(e)}")
             return []
 
     def resolve_issue(self, token: str, owner: str, repo: str, issue_number: int, resolution: str, forked_repo: str) -> str:
@@ -175,7 +132,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)
@@ -188,7 +145,7 @@ class GitHubBot:
             return f"Resolution saved: {resolution_file}"
 
         except Exception as e:
-            error_msg = f"Error resolving issue: {str(e)}"
+            error_msg = f"Error resolving issue #{issue_number} in repository {owner}/{repo}: {str(e)}"
             logger.error(error_msg)
             return error_msg
 
@@ -259,18 +216,6 @@ def extract_info(url):
     except Exception as e:
         return str(e)
 
-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'.")
-
-        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)
-
 # HTML and CSS integration
 custom_html = """
 <!DOCTYPE html>
@@ -290,7 +235,7 @@ custom_html = """
         }
         .card {
             border-radius: 1.5rem;
-            box-shadow: 0 15px 25px rgba(0, 0, 0, 0.2);
+            box-shadow: 0 15px 25px rgba (0, 0, 0, 0.2);
             margin-bottom: 20px;
         }
         .input, .select, .textarea {
@@ -330,7 +275,7 @@ custom_html = """
     </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">
@@ -351,7 +296,7 @@ custom_html = """
     <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>
@@ -372,7 +317,7 @@ custom_html = """
         </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>
@@ -394,8 +339,8 @@ custom_html = """
 <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 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');
@@ -404,98 +349,98 @@ custom_html = """
     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({ token: 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 = issue.number;
-                option.text = `${issue.number}: ${issue.title}`;
-                issueDropdown.add(option);
+        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}`;
         }
-      } 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({ token: token, repoUrl: repoUrl, issueNumber: issueNumber, resolution: resolution, forkedRepoUrl: forkedRepoUrl }),
-        });
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
+        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;
         }
-        const data = await response.json();
-        if (data.error) {
-            outputTextarea.value = data.error;
-        } else {
-            outputTextarea.value = data.result;
+        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}`;
         }
-      } 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 = JSON.stringify(data, null, 2);
+        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}`;
         }
-      } catch (error) {
-        outputTextarea.value = `Error extracting info: ${error.message}`;
-      }
     });
 </script>
 </body>
@@ -505,7 +450,6 @@ custom_html = """
 def create_gradio_interface():
     with gr.Blocks(css=None, theme=None) as demo:
         gr.HTML(custom_html)
-
     return demo
 
 # Cleanup function