Update app.py

app.py

@@ -13,48 +13,10 @@ import subprocess
 from urllib.parse import urlparse, quote
 import warnings
 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 = False if temperature == 0 else True,
-        top_p = top_p,
-        top_k = top_k,
-        temperature = temperature,
-        eos_token_id=[128001,128008,128009],
-        streamer=streamer,
-    )
+from flask import Flask, request, jsonify
+from threading import Thread
+
+app = Flask(__name__)
 
 # Constants
 INPUT_DIRECTORY = 'input'
@@ -115,129 +77,120 @@ class GitHubAPI:
             logger.error(f"Error checking rate limit: {str(e)}")
             return True
 
-    def get_repository(self, owner: str, repo: str) -> Dict:
+    def get_repository(self, owner: str, repo: str) -> Dict[str, Any]:
         try:
             response = requests.get(f"{self.base_url}/repos/{owner}/{repo}", headers=self.headers)
             response.raise_for_status()
             return response.json()
-        except requests.HTTPError as e:
-            logger.error(f"HTTP error getting repository info: {str(e)}")
-            raise
         except Exception as e:
-            logger.error(f"Error getting repository info: {str(e)}")
-            raise
-
-    def get_issues(self, owner: str, repo: str, state: str = 'open') -> List[Dict]:
-        if not self._check_rate_limit():
-            return []
+            logger.error(f"Error getting repository: {str(e)}")
+            return {}
 
+    def get_issues(self, owner: str, repo: str) -> List[Dict[str, Any]]:
         try:
-            response = requests.get(f"{self.base_url}/repos/{owner}/{repo}/issues", headers=self.headers, params={'state': state})
+            response = requests.get(f"{self.base_url}/repos/{owner}/{repo}/issues", headers=self.headers)
             response.raise_for_status()
-            issues = response.json()
-            return [issue for issue in issues if 'pull_request' not in issue]
+            return response.json()
         except Exception as e:
-            logger.error(f"Error fetching issues: {str(e)}")
+            logger.error(f"Error getting issues: {str(e)}")
             return []
 
-# GitHub Bot
-class GitHubBot:
-    def __init__(self):
-        self.github_api = None
-
-    def initialize_api(self, token: str):
-        self.github_api = GitHubAPI(token)
-
-    def fetch_issues(self, token: str, owner: str, repo: str) -> List[Dict]:
+    def create_issue(self, owner: str, repo: str, title: str, body: str) -> Dict[str, Any]:
         try:
-            self.initialize_api(token)
-            return self.github_api.get_issues(owner, repo)
+            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:
-            logger.error(f"Error fetching issues: {str(e)}")
-            return []
+            logger.error(f"Error creating issue: {str(e)}")
+            return {}
 
-    def resolve_issue(self, token: str, owner: str, repo: str, issue_number: int, resolution: str, forked_repo: str) -> str:
+    def update_issue(self, owner: str, repo: str, issue_number: int, title: str, body: str) -> Dict[str, Any]:
         try:
-            self.initialize_api(token)
-            self.github_api.get_repository(owner, repo)
-
-            # Create resolution file
-            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-            resolution_file = f"{RESOLUTIONS_DIRECTORY}/resolution_{issue_number}_{timestamp}.md"
-
-            with open(resolution_file, "w") as f:
-                f.write(f"# Resolution for Issue #{issue_number}\n\n{resolution}")
-
-            # Clone the forked repo
-            subprocess.run(['git', 'clone', forked_repo, '/tmp/' + forked_repo.split('/')[-1]], check=True)
-
-            # Change to the cloned directory
-            os.chdir('/tmp/' + forked_repo.split('/')[-1])
-
-            # Assuming manual intervention now
-            input(" Apply the fix manually and stage the changes (press ENTER)? ")
-
-            # Commit and push the modifications
-            subprocess.run(['git', 'add', '.'], check=True)
-            subprocess.run(['git', 'commit', '-m', f"Resolved issue #{issue_number} ({quote(resolution)})"], check=True)
-            subprocess.run(['git', 'push', 'origin', 'HEAD'], check=True)
-
-            # Open Pull Request page
-            webbrowser.open(f'https://github.com/{forked_repo.split("/")[-1]}/compare/master...{owner}:{forked_repo.split("/")[-1]}_resolved_issue_{issue_number}')
-
-            return f"Resolution saved: {resolution_file}"
-
+            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:
-            error_msg = f"Error resolving issue: {str(e)}"
-            logger.error(error_msg)
-            return error_msg
-
-def handle_issue_selection(token, owner, repo, issue_number, resolution, forked_repo):
-    bot = GitHubBot()
-    result = bot.resolve_issue(token, owner, repo, issue_number, resolution, forked_repo)
-    return result
-
-def extract_info_from_url(url: str) -> Dict[str, Any]:
-    info = {}
-    try:
-        response = requests.get(url)
-        response.raise_for_status()
-        info['status_code'] = response.status_code
-        info['headers'] = dict(response.headers)
-        info['content'] = response.text[:500]  # Limit content to first 500 characters for brevity
-
-        parsed_url = urlparse(url)
-        if 'github.com' in parsed_url.netloc:
-            parts = parsed_url.path.split('/')
-            if len(parts) > 2:
-                owner = parts[1]
-                repo = parts[2]
-                issues = bot.fetch_issues(github_token, owner, repo)
-                info['issues'] = issues
-        elif 'huggingface.co' in parsed_url.netloc:
-            # Add Hugging Face specific handling if needed
-            pass
-
-    except requests.HTTPError as e:
-        info['error'] = f"HTTP error: {str(e)}"
-    except Exception as e:
-        info['error'] = f"Error: {str(e)}"
-    return info
-
-# Initialize GitHubBot globally
-bot = GitHubBot()
+            logger.error(f"Error updating issue: {str(e)}")
+            return {}
+
+@app.route('/fetch-issues', methods=['POST'])
+def fetch_issues():
+    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)
+    return jsonify({'issues': issues})
+
+@app.route('/resolve-issue', methods=['POST'])
+def resolve_issue():
+    data = request.get_json()
+    github_token = data['githubToken']
+    repo_url = data['repoUrl']
+    issue = data['issue']
+    resolution = data['resolution']
+    forked_repo_url = data['forkedRepoUrl']
+    owner, repo = repo_url.split('/')[-2:]
+    github_api = GitHubAPI(github_token)
+    issue_number = issue['number']
+    github_api.update_issue(owner, repo, issue_number, issue['title'], resolution)
+    return jsonify({'output': f"Issue {issue_number} resolved"})
+
+@app.route('/extract-info', methods=['POST'])
+def extract_info():
+    data = request.get_json()
+    url = data['url']
+    # Extract info from URL
+    return jsonify({'output': f"Info extracted from {url}"})
+
+def run_flask_app():
+    app.run(debug=True, use_reloader=False)
 
 # HTML and CSS integration
 custom_html = """
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
+    <title>GitHub Issue Manager</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>GitHub Issue Manager</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/full.css">
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vue.js"></script>
+    <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;
@@ -250,146 +203,192 @@ custom_html = """
         }
     </style>
 </head>
-<body>
-    <div id="app" class="container mx-auto p-4">
-        <h1 class="text-4xl md:text-5xl font-extrabold text-center mb-8">GitHub Issue Manager</h1>
-        
-        <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" v-model="githubToken">
-            </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" v-model="repoUrl">
-            </div>
+<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="card bg-gray-800 p-8">
-            <div class="flex justify-between gap-4">
-                <button class="btn btn-primary" @click="fetchIssues">Fetch Issues</button>
-                <select class="select select-primary w-full max-w-xs" v-model="selectedIssue">
-                    <option disabled="" selected="">Select Issue</option>
-                    <option v-for="issue in issues" :key="issue.id" :value="issue">{{ issue.title }}</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" v-model="resolution"></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" v-model="forkedRepoUrl">
-            </div>
-            <div class="form-control mt-4">
-                <button class="btn btn-success" @click="resolveIssue">Resolve Issue</button>
-            </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="card bg-gray-800 p-8 mt-4">
+        <div class="form-control mt-4">
             <label class="label">
-                <span class="label-text">Output</span>
+                <span class="label-text">Forked Repository URL</span>
             </label>
-            <textarea class="textarea textarea-primary h-48" v-model="output" readonly></textarea>
+            <input type="text" placeholder="URL to your forked repository (Optional)" class="input input-bordered input-primary" id="forked-repo-url">
         </div>
-        
-        <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" v-model="url">
-            </div>
-            <div class="form-control">
-                <button class="btn btn-primary" @click="extractInfo">Extract Info</button>
-            </div>
+        <div class="form-control mt-4">
+            <button class="btn btn-success" id="resolve-issue">Resolve Issue</button>
         </div>
     </div>
-    
-    <script>
-        new Vue({
-            el: '#app',
-            data: {
-                githubToken: '',
-                repoUrl: '',
-                issues: [],
-                selectedIssue: '',
-                resolution: '',
-                forkedRepoUrl: '',
-                output: '',
-                url: ''
-            },
-            methods: {
-                fetchIssues() {
-                    fetch('/fetch-issues', {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json'
-                        },
-                        body: JSON.stringify({
-                            githubToken: this.githubToken,
-                            repoUrl: this.repoUrl
-                        })
-                    })
-                    .then(response => response.json())
-                    .then(data => {
-                        this.issues = data.issues;
-                    })
-                    .catch(error => {
-                        console.error(error);
-                    });
-                },
-                resolveIssue() {
-                    fetch('/resolve-issue', {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json'
-                        },
-                        body: JSON.stringify({
-                            githubToken: this.githubToken,
-                            repoUrl: this.repoUrl,
-                            issue: this.selectedIssue,
-                            resolution: this.resolution,
-                            forkedRepoUrl: this.forkedRepoUrl
-                        })
-                    })
-                    .then(response => response.json())
-                    .then(data => {
-                        this.output = data.output;
-                    })
-                    .catch(error => {
-                        console.error(error);
-                    });
-                },
-                extractInfo() {
-                    fetch('/extract-info', {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json'
-                        },
-                        body: JSON.stringify({
-                            url: this.url
-                        })
-                    })
-                    .then(response => response.json())
-                    .then(data => {
-                        this.output = data.output;
-                    })
-                    .catch(error => {
-                        console.error(error);
-                    });
-                }
-            }
+
+    <!-- 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 = JSON.stringify(issue);
+                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 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 }),
         });
-    </script>
+
+        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}`;
+      }
+    });
+
+    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 = data.output;
+        }
+      } catch (error) {
+        outputTextarea.value = `Error extracting info: ${error.message}`;
+      }
+    });
+    
+</script>
 </body>
 </html>
 """
@@ -423,6 +422,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()