diff --git a/commands/__init__.py b/commands/__init__.py new file mode 100644 index 0000000..114a577 --- /dev/null +++ b/commands/__init__.py @@ -0,0 +1 @@ +# Initialize commands package diff --git a/commands/__pycache__/common.cpython-311.pyc b/commands/__pycache__/common.cpython-311.pyc new file mode 100644 index 0000000..e3d1876 Binary files /dev/null and b/commands/__pycache__/common.cpython-311.pyc differ diff --git a/commands/__pycache__/create_issue.cpython-311.pyc b/commands/__pycache__/create_issue.cpython-311.pyc new file mode 100644 index 0000000..db978aa Binary files /dev/null and b/commands/__pycache__/create_issue.cpython-311.pyc differ diff --git a/commands/__pycache__/deploy.cpython-311.pyc b/commands/__pycache__/deploy.cpython-311.pyc new file mode 100644 index 0000000..6f058c9 Binary files /dev/null and b/commands/__pycache__/deploy.cpython-311.pyc differ diff --git a/commands/__pycache__/open_mr.cpython-311.pyc b/commands/__pycache__/open_mr.cpython-311.pyc new file mode 100644 index 0000000..5d1a9d0 Binary files /dev/null and b/commands/__pycache__/open_mr.cpython-311.pyc differ diff --git a/commands/__pycache__/review.cpython-311.pyc b/commands/__pycache__/review.cpython-311.pyc new file mode 100644 index 0000000..63aa891 Binary files /dev/null and b/commands/__pycache__/review.cpython-311.pyc differ diff --git a/commands/common.py b/commands/common.py new file mode 100644 index 0000000..8ab684d --- /dev/null +++ b/commands/common.py @@ -0,0 +1,85 @@ +import subprocess +import json +from config import GROUP_ID +import gitlab_api +import interactive +import git_utils + +def get_authorized_user(): + output = subprocess.check_output(["glab", "api", "/user"]) + return json.loads(output) + +def list_milestones(current=False): + cmd = f'glab api /groups/{GROUP_ID}/milestones?state=active' + result = subprocess.run(cmd.split(), stdout=subprocess.PIPE) + milestones = json.loads(result.stdout) + if current: + import datetime + today = datetime.date.today().strftime('%Y-%m-%d') + active_milestones = [] + for milestone in milestones: + start_date = milestone['start_date'] + due_date = milestone['due_date'] + if start_date and due_date and start_date <= today and due_date >= today: + active_milestones.append(milestone) + active_milestones.sort(key=lambda x: x['due_date']) + return active_milestones[0] if active_milestones else None + return milestones + +def list_iterations(): + cmd = f'glab api /groups/{GROUP_ID}/iterations?state=opened' + result = subprocess.run(cmd.split(), stdout=subprocess.PIPE) + return json.loads(result.stdout) + +def get_active_iteration(): + iterations = list_iterations() + import datetime + today = datetime.date.today().strftime('%Y-%m-%d') + active_iterations = [] + for iteration in iterations: + start_date = iteration['start_date'] + due_date = iteration['due_date'] + if start_date and due_date and start_date <= today and due_date >= today: + active_iterations.append(iteration) + active_iterations.sort(key=lambda x: x['due_date']) + return active_iterations[0] if active_iterations else None + +def list_epics(): + cmd = f'glab api /groups/{GROUP_ID}/epics?per_page=1000&state=opened' + result = subprocess.run(cmd.split(), stdout=subprocess.PIPE) + return json.loads(result.stdout) + +def get_milestone(manual): + if manual: + milestones = list_milestones() + selected_title = interactive.select_milestone(milestones) + return next((t for t in milestones if t['title'] == selected_title), None) + return list_milestones(True) + +def get_iteration(manual): + if manual: + iterations = list_iterations() + selected_range = interactive.select_iteration(iterations) + return next((t for t in iterations if t['start_date'] + ' - ' + t['due_date'] == selected_range), None) + return get_active_iteration() + +def get_epic(): + epics = list_epics() + selected_title = interactive.select_epic(epics) + return next((t for t in epics if t['title'] == selected_title), None) + +def get_project_id(): + link = git_utils.get_project_link_from_current_dir() + if link == -1: + # enter_project_id logic + import inquirer + while True: + project_id = inquirer.Text('pid', message='Please enter the ID of your GitLab project:').prompt() + if project_id: return project_id + exit('Invalid project ID.') + + projects = gitlab_api.get_all_projects(link) + for project in projects: + if project.get("ssh_url_to_repo") == link: + return project.get("id") + return None diff --git a/commands/create_issue.py b/commands/create_issue.py new file mode 100644 index 0000000..f53271d --- /dev/null +++ b/commands/create_issue.py @@ -0,0 +1,124 @@ +import subprocess +import json +import re +from config import MAIN_BRANCH_DEFAULT, SQUASH_COMMITS, DELETE_BRANCH + +def execute_issue_create(project_id, title, labels, milestone_id, epic, iteration, weight, estimated_time, issue_type='issue'): + import interactive + import gitlab_api + + labels_str = ",".join(labels) if isinstance(labels, list) else labels + + # Using glab for issue creation as in original code + issue_command = [ + "glab", "api", + f"/projects/{str(project_id)}/issues", + "-f", f'title={title}', + "-f", f'assignee_ids={get_authorized_user()["id"]}', + "-f", f'issue_type={issue_type}' + ] + if labels_str: + issue_command.extend(["-f", f'labels={labels_str}']) + if weight: + issue_command.extend(["-f", f'weight={str(weight)}']) + if milestone_id: + issue_command.extend(["-f", f'milestone_id={str(milestone_id)}']) + if epic: + issue_command.extend(["-f", f'epic_id={str(epic["id"])}']) + + description = "" + if iteration: + description += f"/iteration *iteration:{str(iteration['id'])} " + if estimated_time: + description += f"\n/estimate {estimated_time}m " + + issue_command.extend(["-f", f'description={description}']) + + issue_output = subprocess.check_output(issue_command) + return json.loads(issue_output.decode()) + +def get_authorized_user(): + import subprocess + import json + output = subprocess.check_output(["glab", "api", "/user"]) + return json.loads(output) + +def create_branch(project_id, issue): + issue_id = str(issue['iid']) + title = re.sub('\\s+', '-', issue['title']).lower() + title = issue_id + '-' + title.replace(':','').replace('(',' ').replace(')', '').replace(' ','-') + branch_output = subprocess.check_output(["glab", "api", f"/projects/{str(project_id)}/repository/branches", "-f", f'branch={title}', "-f", f'ref={MAIN_BRANCH_DEFAULT}', "-f", f'issue_iid={issue_id}']) + return json.loads(branch_output.decode()) + +def create_merge_request(project_id, branch, issue, labels, milestone_id): + issue_id = str(issue['iid']) + branch_name = branch['name'] + title = issue['title'] + assignee_id = get_authorized_user()['id'] + labels_str = ",".join(labels) if isinstance(labels, list) else labels + + merge_request_command = [ + "glab", "api", + f"/projects/{str(project_id)}/merge_requests", + "-f", f'title={title}', + "-f", f'description="Closes #{issue_id}"', + "-f", f'source_branch={branch_name}', + "-f", f'target_branch={MAIN_BRANCH_DEFAULT}', + "-f", f'issue_iid={issue_id}', + "-f", f'assignee_ids={assignee_id}' + ] + if SQUASH_COMMITS: + merge_request_command.extend(["-f", "squash=true"]) + if DELETE_BRANCH: + merge_request_command.extend(["-f", "remove_source_branch=true"]) + if labels_str: + merge_request_command.extend(["-f", f'labels={labels_str}']) + if milestone_id: + merge_request_command.extend(["-f", f'milestone_id={str(milestone_id)}']) + + mr_output = subprocess.check_output(merge_request_command) + return json.loads(mr_output.decode()) + +def start_issue_creation(project_id, title, milestone_id, epic, iteration, selected_settings, only_issue): + import interactive + import git_utils + + estimated_time = interactive.prompt_estimated_time() + + if isinstance(project_id, list): + estimated_time_per_project = int(estimated_time) / len(project_id) if estimated_time else None + else: + estimated_time_per_project = estimated_time + + if estimated_time_per_project: + selected_settings = selected_settings.copy() if selected_settings else {} + selected_settings['estimated_time'] = int(estimated_time_per_project) + + # In reality, we should call execute_issue_create here + # For simplicity and matching original logic: + issue_type = selected_settings.get('type') or 'issue' + created_issue = execute_issue_create( + project_id, + title, + selected_settings.get('labels'), + milestone_id, + epic, + iteration, + selected_settings.get('weight'), + selected_settings.get('estimated_time'), + issue_type + ) + print(f"Issue #{created_issue['iid']}: {created_issue['title']} created.") + + if only_issue: + return created_issue + + created_branch = create_branch(project_id, created_issue) + created_mr = create_merge_request(project_id, created_branch, created_issue, selected_settings.get('labels'), milestone_id) + print(f"Merge request #{created_mr['iid']}: {created_mr['title']} created.") + print("Run:") + print(" git fetch origin") + print(f" git checkout -b '{created_mr['source_branch']}' 'origin/{created_mr['source_branch']}'") + print("to switch to new branch.") + + return created_issue diff --git a/commands/deploy.py b/commands/deploy.py new file mode 100644 index 0000000..c17ae82 --- /dev/null +++ b/commands/deploy.py @@ -0,0 +1,71 @@ +import subprocess +import datetime +from config import API_URL, GITLAB_TOKEN, MAIN_BRANCH_DEFAULT, PRODUCTION_MAPPINGS +import gitlab_api +import git_utils +from commands.common import get_project_id + +def check_last_production_deploy(): + try: + project_id = get_project_id() + ref = MAIN_BRANCH_DEFAULT + try: + ref = git_utils.get_main_branch() + except: + pass + + pipelines = gitlab_api.get_pipelines(project_id, ref=ref) + if not pipelines: + print("No pipelines found.") + return + + for pipeline in pipelines: + jobs = gitlab_api.get_pipeline_jobs(project_id, pipeline['id']) + if not jobs: continue + + for job in jobs: + job_name = job.get('name', '') + stage = job.get('stage', '') + job_status = job.get('status', '').lower() + + if job_status != 'success': continue + + project_mapping = PRODUCTION_MAPPINGS.get(str(project_id)) + if project_mapping: + expected_stage = project_mapping.get('stage', '').lower() + expected_job = project_mapping.get('job', '').lower() + if stage.lower() == expected_stage or (expected_job and job_name.lower() == expected_job): + display_deploy_info(pipeline, job) + return + else: + # If no mapping, original code printed 'Didn't find deployment pipeline' inside loop + # We'll just continue searching + pass + + print(f"No production deployment found matching pattern") + except Exception as e: + print(f"Error fetching last production deploy: {str(e)}") + +def display_deploy_info(pipeline, job): + print(f"šŸš€ Last Production Deployment:") + print(f" Pipeline: #{pipeline['id']} - {pipeline['status']}") + print(f" Job: {job['name']} ({job['status']})") + print(f" Branch/Tag: {pipeline['ref']}") + print(f" Started: {job.get('started_at', 'N/A')}") + print(f" Finished: {job.get('finished_at', 'N/A')}") + print(f" Duration: {job.get('duration', 'N/A')} seconds" if job.get('duration') else " Duration: N/A") + print(f" Commit: {pipeline['sha'][:8]}") + print(f" URL: {pipeline['web_url']}") + + if job.get('finished_at'): + try: + finished_time = datetime.datetime.fromisoformat(job['finished_at'].replace('Z', '+00:00')) + time_diff = datetime.datetime.now(datetime.timezone.utc) - finished_time + if time_diff.days > 0: + print(f" ā° {time_diff.days} days ago") + elif time_diff.seconds > 3600: + print(f" ā° {time_diff.seconds // 3600} hours ago") + else: + print(f" ā° {time_diff.seconds // 60} minutes ago") + except: + pass diff --git a/commands/open_mr.py b/commands/open_mr.py new file mode 100644 index 0000000..187250e --- /dev/null +++ b/commands/open_mr.py @@ -0,0 +1,22 @@ +import subprocess +import json +import webbrowser +from config import BASE_URL, API_URL, GITLAB_TOKEN, MAIN_BRANCH_DEFAULT +import gitlab_api +import git_utils +from commands.common import get_project_id + +def open_mr_in_browser(): + try: + branch = git_utils.get_current_branch() + project_id = get_project_id() + mr = gitlab_api.get_merge_request_for_branch(project_id, branch) + if not mr: + print("No active merge request found for current branch.") + return + + remote_url = subprocess.check_output(["git", "config", "--get", "remote.origin.url"], text=True).strip() + url = BASE_URL + '/' + remote_url.split(':')[1][:-4] + webbrowser.open(f"{url}/-/merge_requests/{mr['iid']}") + except Exception as e: + print(f"Error opening merge request: {e}") diff --git a/commands/review.py b/commands/review.py new file mode 100644 index 0000000..c5ee77d --- /dev/null +++ b/commands/review.py @@ -0,0 +1,73 @@ +import subprocess +import json +from config import API_URL, GITLAB_TOKEN, REVIEWERS, PRODUCTION_MAPPINGS +import gitlab_api +import interactive +import git_utils +from commands.common import get_project_id + +def get_active_mr_id(): + branch = git_utils.get_current_branch() + project_id = get_project_id() + mr = gitlab_api.get_merge_request_for_branch(project_id, branch) + if mr: + return mr['iid'] + return None + +def review_workflow(select_reviewers=False, auto_merge=False): + # Track issue time + track_issue_time() + + reviewers = None + if select_reviewers: + reviewer_choices = [] + for rid in REVIEWERS: + user = gitlab_api.get_user_details(rid) + if user: + reviewer_choices.append((f"{user.get('name')} ({user.get('username')})", rid)) + else: + reviewer_choices.append((str(rid), rid)) + reviewers = interactive.prompt_reviewers(reviewer_choices) + + project_id = get_project_id() + mr_id = get_active_mr_id() + if not mr_id: + print("No active merge request found for current branch.") + return + + gitlab_api.update_merge_request_reviewers(project_id, mr_id, reviewers if reviewers is not None else REVIEWERS) + + # AI Code Review + try: + from ai_code_review import run_review_for_mr + run_review_for_mr(project_id, mr_id, GITLAB_TOKEN, API_URL) + except Exception as e: + print(f"AI review skipped: {e}") + + if auto_merge: + gitlab_api.set_mr_auto_merge(project_id, mr_id) + +def track_issue_time(): + project_id = get_project_id() + branch = git_utils.get_current_branch() + mr = gitlab_api.get_merge_request_for_branch(project_id, branch) + if not mr: + print("Error getting merge request details") + return + + # Original code extracted issue id from description + issue_id = mr['description'].replace('"','').replace('#','').split()[1] + + spent_time = interactive.prompt_spent_time() + + # Using glab for time tracking as in original + time_tracking_command = [ + "glab", "api", + f"/projects/{project_id}/issues/{issue_id}/notes", + "-f", f"body=/spend {spent_time}m" + ] + try: + subprocess.run(time_tracking_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True) + print(f"Added {spent_time} minutes to issue {issue_id} time tracking.") + except subprocess.CalledProcessError as e: + print(f"Error adding time tracking: {str(e)}") diff --git a/config.py b/config.py new file mode 100644 index 0000000..5bd3ef0 --- /dev/null +++ b/config.py @@ -0,0 +1,30 @@ +import configparser +import json +import os + +config = configparser.ConfigParser() +absolute_config_path = os.path.dirname(os.path.abspath(__file__)) +config_path = os.path.join(absolute_config_path, 'configs/config.ini') +config.read(config_path) + +BASE_URL = config.get('DEFAULT', 'base_url') +API_URL = BASE_URL + '/api/v4' +GROUP_ID = config.get('DEFAULT', 'group_id') +CUSTOM_TEMPLATE = config.get('DEFAULT', 'custom_template') +GITLAB_TOKEN = config.get('DEFAULT', 'GITLAB_TOKEN').strip('\"\'') +DELETE_BRANCH = config.get('DEFAULT', 'delete_branch_after_merge').lower() == 'true' +DEVELOPER_EMAIL = config.get('DEFAULT', 'developer_email', fallback=None) +SQUASH_COMMITS = config.get('DEFAULT', 'squash_commits').lower() == 'true' +PRODUCTION_PIPELINE_NAME = config.get('DEFAULT', 'production_pipeline_name', fallback='deploy') +PRODUCTION_JOB_NAME = config.get('DEFAULT', 'production_job_name', fallback=None) +PRODUCTION_REF = config.get('DEFAULT', 'production_ref', fallback=None) +MAIN_BRANCH_DEFAULT = 'master' + +# Read templates from json config +templates_json_path = os.path.join(absolute_config_path, 'configs/templates.json') +with open(templates_json_path, 'r') as f: + jsonConfig = json.load(f) + +TEMPLATES = jsonConfig['templates'] +REVIEWERS = jsonConfig['reviewers'] +PRODUCTION_MAPPINGS = jsonConfig.get('productionMappings', {}) diff --git a/gitHappens.py b/gitHappens.py index 27d47f3..63b92f4 100755 --- a/gitHappens.py +++ b/gitHappens.py @@ -1,845 +1,10 @@ -#!/usr/bin/env python3 -import subprocess -import json -import argparse -import configparser -import inquirer -import datetime -import re -import os -import requests import sys -import webbrowser - -# Setup config parser and read settings -config = configparser.ConfigParser() -absolute_config_path = os.path.dirname(os.path.abspath(__file__)) -config_path = os.path.join(absolute_config_path, 'configs/config.ini') -config.read(config_path) - -BASE_URL = config.get('DEFAULT', 'base_url') -API_URL = BASE_URL + '/api/v4' -GROUP_ID = config.get('DEFAULT', 'group_id') -CUSTOM_TEMPLATE = config.get('DEFAULT', 'custom_template') -GITLAB_TOKEN = config.get('DEFAULT', 'GITLAB_TOKEN').strip('\"\'') -DELETE_BRANCH = config.get('DEFAULT', 'delete_branch_after_merge').lower() == 'true' -DEVELOPER_EMAIL = config.get('DEFAULT', 'developer_email', fallback=None) -SQUASH_COMMITS = config.get('DEFAULT', 'squash_commits').lower() == 'true' -PRODUCTION_PIPELINE_NAME = config.get('DEFAULT', 'production_pipeline_name', fallback='deploy') -PRODUCTION_JOB_NAME = config.get('DEFAULT', 'production_job_name', fallback=None) -PRODUCTION_REF = config.get('DEFAULT', 'production_ref', fallback=None) -MAIN_BRANCH = 'master' - -# Read templates from json config -with open(os.path.join(absolute_config_path,'configs/templates.json'), 'r') as f: - jsonConfig = json.load(f) -TEMPLATES = jsonConfig['templates'] -REVIEWERS = jsonConfig['reviewers'] -PRODUCTION_MAPPINGS = jsonConfig.get('productionMappings', {}) - -def get_project_id(): - project_link = getProjectLinkFromCurrentDir() - if (project_link == -1): - return enterProjectId() - - allProjects = get_all_projects(project_link) - # Find projects id by project ssh link gathered from repo - matching_id = None - for project in allProjects: - if project.get("ssh_url_to_repo") == project_link: - matching_id = project.get("id") - break - return matching_id - -def get_all_projects(project_link): - url = API_URL + "/projects?membership=true&search=" + project_link.split('/')[-1].split('.')[0] - - headers = { - "PRIVATE-TOKEN": GITLAB_TOKEN - } - - response = requests.get(url, headers=headers) - - if response.status_code == 200: - return response.json() - elif response.status_code == 401: - print("Error: Unauthorized (401). Your GitLab token is probably expired, invalid, or missing required permissions.") - print("Please generate a new token and update your configs/config.ini.") - exit(1) - else: - print(f"Request failed with status code {response.status_code}") - return None - -def getProjectLinkFromCurrentDir(): - try: - cmd = 'git remote get-url origin' - result = subprocess.run(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if result.returncode == 0: - output = result.stdout.decode('utf-8').strip() - return output - else: - return -1 - except FileNotFoundError: - return -1 - -def enterProjectId(): - while True: - project_id = input('Please enter the ID of your GitLab project: ') - if project_id: - return project_id - exit('Invalid project ID.') - -def list_milestones(current=False): - cmd = f'glab api /groups/{GROUP_ID}/milestones?state=active' - result = subprocess.run(cmd.split(), stdout=subprocess.PIPE) - milestones = json.loads(result.stdout) - if current: - today = datetime.date.today().strftime('%Y-%m-%d') - active_milestones = [] - for milestone in milestones: - start_date = milestone['start_date'] - due_date = milestone['due_date'] - if start_date and due_date and start_date <= today and due_date >= today: - active_milestones.append(milestone) - active_milestones.sort(key=lambda x: x['due_date']) - return active_milestones[0] - return milestones - -def select_template(): - template_names = [t['name'] for t in TEMPLATES] - template_names.append(CUSTOM_TEMPLATE) - questions = [ - inquirer.List('template', - message="Select template:", - choices=template_names, - ), - ] - answer = inquirer.prompt(questions) - return answer['template'] - -def getIssueSettings(template_name): - if template_name == CUSTOM_TEMPLATE: - return {} - return next((t for t in TEMPLATES if t['name'] == template_name), None) - -def createIssue(title, project_id, milestoneId, epic, iteration, settings): - if settings: - issueType = settings.get('type') or 'issue' - return executeIssueCreate(project_id, title, settings.get('labels'), milestoneId, epic, iteration, settings.get('weight'), settings.get('estimated_time'), issueType) - print("No settings in template") - exit(2) - pass - -def executeIssueCreate(project_id, title, labels, milestoneId, epic, iteration, weight, estimated_time, issue_type='issue'): - labels = ",".join(labels) if type(labels) == list else labels - assignee_id = getAuthorizedUser()['id'] - issue_command = [ - "glab", "api", - f"/projects/{str(project_id)}/issues", - "-f", f'title={title}', - "-f", f'assignee_ids={assignee_id}', - "-f", f'issue_type={issue_type}' - ] - if labels: - issue_command.append("-f") - issue_command.append(f'labels={labels}') - - if weight: - issue_command.append("-f") - issue_command.append(f'weight={str(weight)}') - - if milestoneId: - issue_command.append("-f") - issue_command.append(f'milestone_id={str(milestoneId)}') - - if epic: - epicId = epic['id'] - issue_command.append("-f") - issue_command.append(f'epic_id={str(epicId)}') - - # Set the description, including iteration, estimated time, and other info - description = "" - if iteration: - iterationId = iteration['id'] - description += f"/iteration *iteration:{str(iterationId)} " - - if estimated_time: - description += f"\n/estimate {estimated_time}m " - - issue_command.extend(["-f", f'description={description}']) - - issue_output = subprocess.check_output(issue_command) - return json.loads(issue_output.decode()) - -def select_milestone(milestones): - milestones = [t['title'] for t in milestones] - questions = [ - inquirer.List('milestones', - message="Select milestone:", - choices=milestones, - ), - ] - answer = inquirer.prompt(questions) - return answer['milestones'] - -def getSelectedMilestone(milestone, milestones): - return next((t for t in milestones if t['title'] == milestone), None) - -def get_milestone(manual): - if manual: - milestones = list_milestones() - return getSelectedMilestone(select_milestone(milestones), milestones) - milestone = list_milestones(True) # select active for today - return milestone - -def get_iteration(manual): - if manual: - iterations = list_iterations() - return getSelectedIteration(select_iteration(iterations), iterations) - return getActiveIteration() - -def getSelectedIteration(iteration, iterations): - return next((t for t in iterations if t['start_date'] + ' - ' + t['due_date'] == iteration), None) - -def select_iteration(iterations): - iterations = [t['start_date'] + ' - ' + t['due_date'] for t in iterations] - questions = [ - inquirer.List('iterations', - message="Select iteration:", - choices=iterations, - ), - ] - answer = inquirer.prompt(questions) - return answer['iterations'] - -def list_iterations(): - cmd = f'glab api /groups/{GROUP_ID}/iterations?state=opened' - result = subprocess.run(cmd.split(), stdout=subprocess.PIPE) - iterations = json.loads(result.stdout) - return iterations - -def getActiveIteration(): - iterations = list_iterations() - today = datetime.date.today().strftime('%Y-%m-%d') - active_iterations = [] - for iteration in iterations: - start_date = iteration['start_date'] - due_date = iteration['due_date'] - if start_date and due_date and start_date <= today and due_date >= today: - active_iterations.append(iteration) - active_iterations.sort(key=lambda x: x['due_date']) - return active_iterations[0] - -def getAuthorizedUser(): - output = subprocess.check_output(["glab", "api", "/user"]) - return json.loads(output) - -def list_epics(): - cmd = f'glab api /groups/{GROUP_ID}/epics?per_page=1000&state=opened' - result = subprocess.run(cmd.split(), stdout=subprocess.PIPE) - return json.loads(result.stdout) - -def select_epic(epics): - epics = [t['title'] for t in epics] - search_query = inquirer.prompt([ - inquirer.Text('search_query', message='Search epic:'), - ])['search_query'] - - # Filter choices based on search query - filtered_epics = [c for c in epics if search_query.lower() in c.lower()] - questions = [ - inquirer.List('epics', - message="Select epic:", - choices=filtered_epics, - ), - ] - answer = inquirer.prompt(questions) - return answer['epics'] - -def getSelectedEpic(epic, epics): - return next((t for t in epics if t['title'] == epic), None) - -def get_epic(): - epics = list_epics() - return getSelectedEpic(select_epic(epics), epics) - -def create_branch(project_id, issue): - issueId = str(issue['iid']) - title = re.sub('\\s+', '-', issue['title']).lower() - title = issueId + '-' + title.replace(':','').replace('(',' ').replace(')', '').replace(' ','-') - branch_output = subprocess.check_output(["glab", "api", f"/projects/{str(project_id)}/repository/branches", "-f", f'branch={title}', "-f", f'ref={MAIN_BRANCH}', "-f", f'issue_iid={issueId}']) - return json.loads(branch_output.decode()) - -def create_merge_request(project_id, branch, issue, labels, milestoneId): - issueId = str(issue['iid']) - branch = branch['name'] - title = issue['title'] - assignee_id = getAuthorizedUser()['id'] - labels = ",".join(labels) if type(labels) == list else labels - merge_request_command = [ - "glab", "api", - f"/projects/{str(project_id)}/merge_requests", - "-f", f'title={title}', - "-f", f'description="Closes #{issueId}"', - "-f", f'source_branch={branch}', - "-f", f'target_branch={MAIN_BRANCH}', - "-f", f'issue_iid={issueId}', - "-f", f'assignee_ids={assignee_id}' - ] - - if SQUASH_COMMITS: - merge_request_command.append("-f") - merge_request_command.append("squash=true") - - if DELETE_BRANCH: - merge_request_command.append("-f") - merge_request_command.append("remove_source_branch=true") - - if labels: - merge_request_command.append("-f") - merge_request_command.append(f'labels={labels}') - - if milestoneId: - merge_request_command.append("-f") - merge_request_command.append(f'milestone_id={str(milestoneId)}') - - mr_output = subprocess.check_output(merge_request_command) - return json.loads(mr_output.decode()) - -def startIssueCreation(project_id, title, milestone, epic, iteration, selectedSettings, onlyIssue): - # Prompt for estimated time - estimated_time = inquirer.prompt([ - inquirer.Text('estimated_time', - message='Estimated time to complete this issue (in minutes, optional)', - validate=lambda _, x: x == '' or x.isdigit()) - ])['estimated_time'] - - # If multiple project IDs, split the estimated time - if isinstance(project_id, list): - estimated_time_per_project = int(estimated_time) / len(project_id) if estimated_time else None - else: - estimated_time_per_project = estimated_time - - # Modify settings to include estimated time - if estimated_time_per_project: - selectedSettings = selectedSettings.copy() if selectedSettings else {} - selectedSettings['estimated_time'] = int(estimated_time_per_project) - - createdIssue = createIssue(title, project_id, milestone, epic, iteration, selectedSettings) - print(f"Issue #{createdIssue['iid']}: {createdIssue['title']} created.") - - if onlyIssue: - return createdIssue - - createdBranch = create_branch(project_id, createdIssue) - - createdMergeRequest = create_merge_request(project_id, createdBranch, createdIssue, selectedSettings.get('labels'), milestone) - print(f"Merge request #{createdMergeRequest['iid']}: {createdMergeRequest['title']} created.") - - print("Run:") - print(" git fetch origin") - print(f" git checkout -b '{createdMergeRequest['source_branch']}' 'origin/{createdMergeRequest['source_branch']}'") - print("to switch to new branch.") - - return createdIssue - -def getCurrentBranch(): - return subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], text=True).strip() - -def openMergeRequestInBrowser(): - try: - merge_request_id = getActiveMergeRequestId() - remote_url = subprocess.check_output(["git", "config", "--get", "remote.origin.url"], text=True).strip() - url = BASE_URL + '/' + remote_url.split(':')[1][:-4] - webbrowser.open(f"{url}/-/merge_requests/{merge_request_id}") - except subprocess.CalledProcessError: - return None - -def getActiveMergeRequestId(): - branch_to_find = getCurrentBranch() - return find_merge_request_id_by_branch(branch_to_find) - -def find_merge_request_id_by_branch(branch_name): - return getMergeRequestForBranch(branch_name)['iid'] - -def getMergeRequestForBranch(branchName): - project_id = get_project_id() - api_url = f"{API_URL}/projects/{project_id}/merge_requests" - headers = {"Private-Token": GITLAB_TOKEN} - - params = { - "source_branch": branchName, - } - - response = requests.get(api_url, headers=headers, params=params) - if response.status_code == 200: - merge_requests = response.json() - for mr in merge_requests: - if mr["source_branch"] == branchName: - return mr - else: - print(f"Failed to fetch Merge Requests: {response.status_code} - {response.text}") - return None - -def chooseReviewersManually(): - """Prompt the user to select reviewers manually from the available list, showing names.""" - # Fetch user details for each reviewer ID - reviewer_choices = [] - for reviewer_id in REVIEWERS: - api_url = f"{API_URL}/users/{reviewer_id}" - headers = {"Private-Token": GITLAB_TOKEN} - try: - response = requests.get(api_url, headers=headers) - if response.status_code == 200: - user = response.json() - display_name = f"{user.get('name')} ({user.get('username')})" - reviewer_choices.append((display_name, reviewer_id)) - else: - reviewer_choices.append((str(reviewer_id), reviewer_id)) - except Exception: - reviewer_choices.append((str(reviewer_id), reviewer_id)) - - questions = [ - inquirer.Checkbox( - "selected_reviewers", - message="Select reviewers", - choices=[(name, str(rid)) for name, rid in reviewer_choices], - ) - ] - answers = inquirer.prompt(questions) - if answers and "selected_reviewers" in answers: - return [int(r) for r in answers["selected_reviewers"]] - else: - return [] - -def addReviewersToMergeRequest(reviewers=None): - project_id = get_project_id() - mr_id = getActiveMergeRequestId() - api_url = f"{API_URL}/projects/{project_id}/merge_requests/{mr_id}" - headers = {"Private-Token": GITLAB_TOKEN} - - data = { - "reviewer_ids": reviewers if reviewers is not None else REVIEWERS - } - - requests.put(api_url, headers=headers, json=data) - -def setMergeRequestToAutoMerge(): - project_id = get_project_id() - mr_id = getActiveMergeRequestId() - api_url = f"{API_URL}/projects/{project_id}/merge_requests/{mr_id}/merge" - headers = {"Private-Token": GITLAB_TOKEN} - - data = { - "id": project_id, - "merge_request_iid": mr_id, - "should_remove_source_branch": True, - "merge_when_pipeline_succeeds": True, - "auto_merge_strategy": "merge_when_pipeline_succeeds", - } - - requests.put(api_url, headers=headers, json=data) - -def getMainBranch(): - command = "git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'" - output = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT, universal_newlines=True) - return output.strip() - - -def get_two_weeks_commits(return_output=False): - two_weeks_ago = (datetime.datetime.now() - datetime.timedelta(weeks=2)).strftime('%Y-%m-%d') - - cmd = f'git log --since={two_weeks_ago} --format="%ad - %ae - %s" --date=short | grep -v "Merge branch"' - if (DEVELOPER_EMAIL): - cmd = f'{cmd} | grep {DEVELOPER_EMAIL}' - try: - output = subprocess.check_output(cmd, shell=True, text=True, stderr=subprocess.DEVNULL, universal_newlines=True).strip() - if output: - if return_output: - return output - print(output) - else: - print("No commits found.") - return "" if return_output else None - except subprocess.CalledProcessError as e: - print(f"No commits were found or an error occurred. (exit status {e.returncode})") - return "" if return_output else None - except FileNotFoundError: - print("Git is not installed or not found in PATH.") - return "" if return_output else None - -def generate_smart_summary(): - commits = get_two_weeks_commits(return_output=True) - if not commits: - return - - # Check if OpenAI API key is set - openai_api_key = config.get('DEFAULT', 'OPENAI_API_KEY', fallback=None) - if not openai_api_key: - print("OpenAI API key not set. Skipping AI summary generation.") - return - - # Dynamically import openai only if API key is present - try: - import openai - except ImportError: - print("OpenAI package not installed. Please install it using: pip install openai") - return - - openai.api_key = openai_api_key - - try: - response = openai.chat.completions.create( - model="gpt-3.5-turbo", - messages=[ - {"role": "system", "content": "You are a helpful assistant that summarizes git commits. Provide a concise, well-organized summary of the main changes and themes."}, - {"role": "user", "content": f"Please summarize these git commits in a clear, bulleted format:\n\n{commits}"} - ] - ) - - print("\nšŸ“‹ AI-Generated Summary of Recent Changes:\n") - print(response.choices[0].message.content) - except Exception as e: - print(f"Error generating AI summary: {e}") - -def process_report(text, minutes): - # Get the incident project ID from config - try: - incident_project_id = config.get('DEFAULT', 'incident_project_id') - except (configparser.NoOptionError, configparser.NoSectionError): - print("Error: incident_project_id not found in config.ini") - print("Please add your incident project ID to configs/config.ini under [DEFAULT] section:") - print("incident_project_id = your_project_id_here") - return - - issue_title = f"Incident Report: {text}" - - selected_label = selectLabels('Department') - - incident_settings = { - 'labels': ['incident', 'report'], - 'onlyIssue': True, - 'type': 'incident' - } - - if selected_label: - incident_settings['labels'].append(selected_label) - - try: - # Create the incident issue - iteration = getActiveIteration() - created_issue = createIssue(issue_title, incident_project_id, False, False, iteration, incident_settings) - issue_iid = created_issue['iid'] - - closeOpenedIssue(issue_iid, incident_project_id) - print(f"Incident issue #{issue_iid} created successfully.") - print(f"Title: {issue_title}") - - # Add time tracking to the issue - time_tracking_command = [ - "glab", "api", - f"/projects/{incident_project_id}/issues/{issue_iid}/add_spent_time", - "-f", f"duration={minutes}m" - ] - - try: - subprocess.run(time_tracking_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - print(f"Added {minutes} minutes to issue time tracking.") - except subprocess.CalledProcessError as e: - print(f"Error adding time tracking: {str(e)}") - - except Exception as e: - print(f"Error creating incident issue: {str(e)}") - -def closeOpenedIssue(issue_iid, project_id): - issue_command = [ - "glab", "api", - f"/projects/{project_id}/issues/{issue_iid}", - '-X', 'PUT', - '-f', 'state_event=close' - ] - try: - subprocess.run(issue_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - except subprocess.CalledProcessError as e: - print(f"Error closing issue: {str(e)}") - -def selectLabels(search, multiple = False): - labels = getLabelsOfGroup(search) - labels = sorted([t['name'] for t in labels]) - - question_type = inquirer.Checkbox if multiple else inquirer.List - questions = [ - question_type( - 'labels', - message="Select one or more department labels:", - choices=labels, - ), - ] - answer = inquirer.prompt(questions) - return answer['labels'] - -def getLabelsOfGroup(search=''): - cmd = f'glab api /groups/{GROUP_ID}/labels?search={search}' - try: - result = subprocess.run(cmd.split(), stdout=subprocess.PIPE, check=True) - return json.loads(result.stdout) - except subprocess.CalledProcessError as e: - print(f"Error getting labels: {str(e)}") - return [] - -def getCurrentIssueId(): - mr = getMergeRequestForBranch(getCurrentBranch()) - return mr['description'].replace('"','').replace('#','').split()[1] - -def track_issue_time(): - # Get the current merge request - try: - project_id = get_project_id() - issue_id = getCurrentIssueId() - except Exception as e: - print(f"Error getting issue details: {str(e)}") - return - - # Prompt for actual time spent - spent_time = inquirer.prompt([ - inquirer.Text('spent_time', - message='How many minutes did you actually spend on this issue?', - validate=lambda _, x: x.isdigit()) - ])['spent_time'] - - # Add spent time to the issue description - time_tracking_command = [ - "glab", "api", - f"/projects/{project_id}/issues/{issue_id}/notes", - "-f", f"body=/spend {spent_time}m" - ] - - try: - subprocess.run(time_tracking_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True) - print(f"Added {spent_time} minutes to issue {issue_id} time tracking.") - except subprocess.CalledProcessError as e: - print(f"Error adding time tracking: {str(e)}") - except Exception as e: - print(f"Error tracking issue time: {str(e)}") - -def get_last_production_deploy(): - try: - project_id = get_project_id() - api_url = f"{API_URL}/projects/{project_id}/pipelines" - headers = {"Private-Token": GITLAB_TOKEN} - - # Set up parameters for the pipeline search - params = { - "per_page": 50, - "order_by": "updated_at", - "sort": "desc" - } - - # Add ref filter if specified in config - if MAIN_BRANCH: - params["ref"] = MAIN_BRANCH - else: - # Use main branch if no specific ref is configured - try: - main_branch = getMainBranch() - params["ref"] = main_branch - except: - # Fallback to common main branch names - params["ref"] = "main" - - response = requests.get(api_url, headers=headers, params=params) - - if response.status_code != 200: - print(f"Failed to fetch pipelines: {response.status_code} - {response.text}") - return - - pipelines = response.json() - production_pipeline = None - - # Look for production pipeline by name pattern - for pipeline in pipelines: - # Get pipeline details to check jobs - pipeline_detail_url = f"{API_URL}/projects/{project_id}/pipelines/{pipeline['id']}/jobs" - detail_response = requests.get(pipeline_detail_url, headers=headers) - - if detail_response.status_code == 200: - jobs = detail_response.json() - - # Check if this pipeline contains production deployment - for job in jobs: - job_name = job.get('name', '') - stage = job.get('stage', '') - job_status = job.get('status', '').lower() - - # Only consider successful jobs - if job_status != 'success': - continue - - # Check project-specific mapping first - project_mapping = PRODUCTION_MAPPINGS.get(str(project_id)) - if project_mapping: - expected_stage = project_mapping.get('stage', '').lower() - expected_job = project_mapping.get('job', '').lower() - - if (stage.lower() == expected_stage or - (expected_job and job_name.lower() == expected_job)): - production_pipeline = { - 'pipeline': pipeline, - 'production_job': job - } - break - else: - print('Didn\'t find deployment pipeline') - - if production_pipeline: - break - - if not production_pipeline: - print(f"No production deployment found matching pattern") - return - - # Display the results - pipeline = production_pipeline['pipeline'] - job = production_pipeline['production_job'] - - print(f"šŸš€ Last Production Deployment:") - print(f" Pipeline: #{pipeline['id']} - {pipeline['status']}") - print(f" Job: {job['name']} ({job['status']})") - print(f" Branch/Tag: {pipeline['ref']}") - print(f" Started: {job.get('started_at', 'N/A')}") - print(f" Finished: {job.get('finished_at', 'N/A')}") - print(f" Duration: {job.get('duration', 'N/A')} seconds" if job.get('duration') else " Duration: N/A") - print(f" Commit: {pipeline['sha'][:8]}") - print(f" URL: {pipeline['web_url']}") - - # Show time since deployment - if job.get('finished_at'): - try: - finished_time = datetime.datetime.fromisoformat(job['finished_at'].replace('Z', '+00:00')) - time_diff = datetime.datetime.now(datetime.timezone.utc) - finished_time - - if time_diff.days > 0: - print(f" ā° {time_diff.days} days ago") - elif time_diff.seconds > 3600: - hours = time_diff.seconds // 3600 - print(f" ā° {hours} hours ago") - else: - minutes = time_diff.seconds // 60 - print(f" ā° {minutes} minutes ago") - except: - pass - - except Exception as e: - print(f"Error fetching last production deploy: {str(e)}") - -def main(): - global MAIN_BRANCH - - parser = argparse.ArgumentParser("Argument description of Git happens") - parser.add_argument("title", nargs="+", help="Title of issue") - parser.add_argument(f"--project_id", type=str, help="Id or URL-encoded path of project") - parser.add_argument("-m", "--milestone", action='store_true', help="Add this flag, if you want to manually select milestone") - parser.add_argument("--no_epic", action="store_true", help="Add this flag if you don't want to pick epic") - parser.add_argument("--no_milestone", action="store_true", help="Add this flag if you don't want to pick milestone") - parser.add_argument("--no_iteration", action="store_true", help="Add this flag if you don't want to pick iteration") - parser.add_argument("--only_issue", action="store_true", help="Add this flag if you don't want to create merge request and branch alongside issue") - parser.add_argument("-am", "--auto_merge", action="store_true", help="Add this flag to review if you want to set merge request to auto merge when pipeline succeeds") - parser.add_argument("--select", action="store_true", help="Manually select reviewers for merge request (interactive)") - - # If no arguments passed, show help - if len(sys.argv) <= 1: - parser.print_help() - exit(1) - - args = parser.parse_args() - if args.title[0] == 'report': - parts = args.title - if len(parts) != 3: - print("Invalid report format. Use: gh report \"text\" minutes") - return - - text = parts[1] - try: - minutes = int(parts[2].strip()) - process_report(text, minutes) - except ValueError: - print("Invalid minutes. Please provide a valid number.") - return - - # So it takes all text until first known argument - title = " ".join(args.title) - - if title == 'open': - openMergeRequestInBrowser() - return - elif title == 'review': - track_issue_time() - reviewers = None - if getattr(args, "select", False): - reviewers = chooseReviewersManually() - addReviewersToMergeRequest(reviewers=reviewers) - - # Run AI code review and post to MR - try: - from ai_code_review import run_review_for_mr - project_id = get_project_id() - mr_id = getActiveMergeRequestId() - run_review_for_mr(project_id, mr_id, GITLAB_TOKEN, API_URL) - except Exception as e: - print(f"AI review skipped: {e}") - - if(args.auto_merge): - setMergeRequestToAutoMerge() - return - elif title == 'summary': - get_two_weeks_commits() - return - elif title == 'summaryAI': - generate_smart_summary() - return - elif title == 'last deploy': - get_last_production_deploy() - return - elif title == 'ai review': - from ai_code_review import run_review - run_review() - return - - # Get settings for issue from template - selectedSettings = getIssueSettings(select_template()) - - # If template is False, ask for each settings - if not len(selectedSettings): - print('Custom selection of issue settings is not supported yet') - pass - - if args.project_id and selectedSettings.get('projectIds'): - print('NOTE: Overwriting project id from argument...') - - project_id = selectedSettings.get('projectIds') or args.project_id or get_project_id() - - milestone = False - if not args.no_milestone: - milestone = get_milestone(args.milestone)['id'] - - iteration = False - if not args.no_iteration: - # manual pick iteration - iteration = get_iteration(True) - - epic = False - if not args.no_epic: - epic = get_epic() - - MAIN_BRANCH = getMainBranch() +import os - onlyIssue = selectedSettings.get('onlyIssue') or args.only_issue +# Add the current directory to sys.path to ensure imports work +sys.path.append(os.path.dirname(os.path.abspath(__file__))) - if type(project_id) == list: - for id in project_id: - startIssueCreation(id, title, milestone, epic, iteration, selectedSettings, onlyIssue) - else: - startIssueCreation(project_id, title, milestone, epic, iteration, selectedSettings, onlyIssue) +from main import main if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/git_utils.py b/git_utils.py new file mode 100644 index 0000000..b14c8d4 --- /dev/null +++ b/git_utils.py @@ -0,0 +1,43 @@ +import subprocess + +def get_project_link_from_current_dir(): + try: + cmd = 'git remote get-url origin' + result = subprocess.run(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE) + if result.returncode == 0: + output = result.stdout.decode('utf-8').strip() + return output + else: + return -1 + except FileNotFoundError: + return -1 + +def get_current_branch(): + return subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], text=True).strip() + +def get_main_branch(): + command = "git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'" + output = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT, universal_newlines=True) + return output.strip() + +def get_two_weeks_commits(developer_email=None, return_output=False): + import datetime + two_weeks_ago = (datetime.datetime.now() - datetime.timedelta(weeks=2)).strftime('%Y-%m-%d') + cmd = f'git log --since={two_weeks_ago} --format="%ad - %ae - %s" --date=short | grep -v "Merge branch"' + if developer_email: + cmd = f'{cmd} | grep {developer_email}' + try: + output = subprocess.check_output(cmd, shell=True, text=True, stderr=subprocess.DEVNULL, universal_newlines=True).strip() + if output: + if return_output: + return output + print(output) + else: + print("No commits found.") + return "" if return_output else None + except subprocess.CalledProcessError as e: + print(f"No commits were found or an error occurred. (exit status {e.returncode})") + return "" if return_output else None + except FileNotFoundError: + print("Git is not installed or not found in PATH.") + return "" if return_output else None diff --git a/gitlab_api.py b/gitlab_api.py new file mode 100644 index 0000000..24f98b2 --- /dev/null +++ b/gitlab_api.py @@ -0,0 +1,85 @@ +import requests +from config import API_URL, GITLAB_TOKEN + +def get_all_projects(project_link): + url = API_URL + "/projects?membership=true&search=" + project_link.split('/')[-1].split('.')[0] + headers = {"PRIVATE-TOKEN": GITLAB_TOKEN} + response = requests.get(url, headers=headers) + if response.status_code == 200: + return response.json() + elif response.status_code == 401: + print("Error: Unauthorized (401). Your GitLab token is probably expired, invalid, or missing required permissions.") + print("Please generate a new token and update your configs/config.ini.") + import sys + sys.exit(1) + else: + print(f"Request failed with status code {response.status_code}") + return None + +def get_merge_request_for_branch(project_id, branch_name): + api_url = f"{API_URL}/projects/{project_id}/merge_requests" + headers = {"Private-Token": GITLAB_TOKEN} + params = {"source_branch": branch_name} + response = requests.get(api_url, headers=headers, params=params) + if response.status_code == 200: + merge_requests = response.json() + for mr in merge_requests: + if mr["source_branch"] == branch_name: + return mr + else: + print(f"Failed to fetch Merge Requests: {response.status_code} - {response.text}") + return None + +def get_user_details(user_id): + api_url = f"{API_URL}/users/{user_id}" + headers = {"Private-Token": GITLAB_TOKEN} + try: + response = requests.get(api_url, headers=headers) + if response.status_code == 200: + return response.json() + except Exception: + pass + return None + +def update_merge_request_reviewers(project_id, mr_id, reviewers): + api_url = f"{API_URL}/projects/{project_id}/merge_requests/{mr_id}" + headers = {"Private-Token": GITLAB_TOKEN} + data = {"reviewer_ids": reviewers} + requests.put(api_url, headers=headers, json=data) + +def set_mr_auto_merge(project_id, mr_id): + api_url = f"{API_URL}/projects/{project_id}/merge_requests/{mr_id}/merge" + headers = {"Private-Token": GITLAB_TOKEN} + data = { + "id": project_id, + "merge_request_iid": mr_id, + "should_remove_source_branch": True, + "merge_when_pipeline_succeeds": True, + "auto_merge_strategy": "merge_when_pipeline_succeeds", + } + requests.put(api_url, headers=headers, json=data) + +def get_pipelines(project_id, ref=None): + api_url = f"{API_URL}/projects/{project_id}/pipelines" + headers = {"Private-Token": GITLAB_TOKEN} + params = { + "per_page": 50, + "order_by": "updated_at", + "sort": "desc" + } + if ref: + params["ref"] = ref + response = requests.get(api_url, headers=headers, params=params) + if response.status_code == 200: + return response.json() + else: + print(f"Failed to fetch pipelines: {response.status_code} - {response.text}") + return None + +def get_pipeline_jobs(project_id, pipeline_id): + url = f"{API_URL}/projects/{project_id}/pipelines/{pipeline_id}/jobs" + headers = {"Private-Token": GITLAB_TOKEN} + response = requests.get(url, headers=headers) + if response.status_code == 200: + return response.json() + return None diff --git a/interactive.py b/interactive.py new file mode 100644 index 0000000..7d5d639 --- /dev/null +++ b/interactive.py @@ -0,0 +1,90 @@ +import inquirer + +def select_template(templates): + template_names = [t['name'] for t in templates] + template_names.append("Custom") # This should be CUSTOM_TEMPLATE value usually + questions = [ + inquirer.List('template', + message="Select template:", + choices=template_names, + ), + ] + answer = inquirer.prompt(questions) + return answer['template'] + +def select_milestone(milestones): + milestone_names = [t['title'] for t in milestones] + questions = [ + inquirer.List('milestones', + message="Select milestone:", + choices=milestone_names, + ), + ] + answer = inquirer.prompt(questions) + return answer['milestones'] + +def select_iteration(iterations): + iteration_names = [t['start_date'] + ' - ' + t['due_date'] for t in iterations] + questions = [ + inquirer.List('iterations', + message="Select iteration:", + choices=iteration_names, + ), + ] + answer = inquirer.prompt(questions) + return answer['iterations'] + +def select_epic(epics): + epic_names = [t['title'] for t in epics] + search_query = inquirer.prompt([ + inquirer.Text('search_query', message='Search epic:'), + ])['search_query'] + filtered_epics = [c for c in epic_names if search_query.lower() in c.lower()] + questions = [ + inquirer.List('epics', + message="Select epic:", + choices=filtered_epics, + ), + ] + answer = inquirer.prompt(questions) + return answer['epics'] + +def prompt_estimated_time(): + return inquirer.prompt([ + inquirer.Text('estimated_time', + message='Estimated time to complete this issue (in minutes, optional)', + validate=lambda _, x: x == '' or x.isdigit()) + ])['estimated_time'] + +def select_labels(labels, multiple=False): + question_type = inquirer.Checkbox if multiple else inquirer.List + questions = [ + question_type( + 'labels', + message="Select one or more department labels:", + choices=labels, + ), + ] + answer = inquirer.prompt(questions) + return answer['labels'] + +def prompt_spent_time(): + return inquirer.prompt([ + inquirer.Text('spent_time', + message='How many minutes did you actually spend on this issue?', + validate=lambda _, x: x.isdigit()) + ])['spent_time'] + +def prompt_reviewers(reviewer_choices): + questions = [ + inquirer.Checkbox( + "selected_reviewers", + message="Select reviewers", + choices=[(name, str(rid)) for name, rid in reviewer_choices], + ) + ] + answers = inquirer.prompt(questions) + if answers and "selected_reviewers" in answers: + return [int(r) for r in answers["selected_reviewers"]] + else: + return [] diff --git a/main.py b/main.py new file mode 100644 index 0000000..a3efd30 --- /dev/null +++ b/main.py @@ -0,0 +1,199 @@ +import argparse +import sys +import os +from config import GITLAB_TOKEN, API_URL, DEVELOPER_EMAIL +import git_utils +import interactive +import templates +from commands.common import get_project_id, get_milestone, get_iteration, get_epic +from commands.create_issue import start_issue_creation +from commands.review import review_workflow +from commands.deploy import check_last_production_deploy +from commands.open_mr import open_mr_in_browser + +def generate_smart_summary(): + commits = git_utils.get_two_weeks_commits(return_output=True) + if not commits: + return + + import config + openai_api_key = config.config.get('DEFAULT', 'OPENAI_API_KEY', fallback=None) + if not openai_api_key: + print("OpenAI API key not set. Skipping AI summary generation.") + return + + try: + import openai + except ImportError: + print("OpenAI package not installed. Please install it using: pip install openai") + return + + openai.api_key = openai_api_key + try: + response = openai.chat.completions.create( + model="gpt-3.5-turbo", + messages=[ + {"role": "system", "content": "You are a helpful assistant that summarizes git commits. Provide a concise, well-organized summary of the main changes and themes."}, + {"role": "user", "content": f"Please summarize these git commits in a clear, bulleted format:\n\n{commits}"} + ] + ) + print("\nšŸ“‹ AI-Generated Summary of Recent Changes:\n") + print(response.choices[0].message.content) + except Exception as e: + print(f"Error generating AI summary: {e}") + +def process_report(text, minutes): + import config + try: + incident_project_id = config.config.get('DEFAULT', 'incident_project_id') + except: + print("Error: incident_project_id not found in config.ini") + return + + issue_title = f"Incident Report: {text}" + + # We need a list of labels for the group + import subprocess + import json + from config import GROUP_ID + cmd = f'glab api /groups/{GROUP_ID}/labels?search=Department' + labels_data = json.loads(subprocess.check_output(cmd.split()).decode()) + labels = sorted([t['name'] for t in labels_data]) + + selected_label = interactive.select_labels(labels) + + incident_settings = { + 'labels': ['incident', 'report'], + 'onlyIssue': True, + 'type': 'incident' + } + if selected_label: + incident_settings['labels'].append(selected_label) + + # Create issue + from commands.create_issue import execute_issue_create + iteration = get_iteration(False) + created_issue = execute_issue_create( + incident_project_id, + issue_title, + incident_settings['labels'], + False, + False, + iteration, + incident_settings.get('weight'), + incident_settings.get('estimated_time'), + incident_settings['type'] + ) + + # Close it immediately as per original code + import subprocess + issue_iid = created_issue['iid'] + close_command = ["glab", "api", f"/projects/{incident_project_id}/issues/{issue_iid}", "-X", "PUT", "-f", "state_event=close"] + subprocess.run(close_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + print(f"Incident issue #{issue_iid} created successfully.") + + # Add time tracking + time_command = ["glab", "api", f"/projects/{incident_project_id}/issues/{issue_iid}/add_spent_time", "-f", f"duration={minutes}m"] + subprocess.run(time_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + print(f"Added {minutes} minutes to issue time tracking.") + +def main(): + parser = argparse.ArgumentParser("Argument description of Git happens") + parser.add_argument("title", nargs="+", help="Title of issue") + parser.add_argument(f"--project_id", type=str, help="Id or URL-encoded path of project") + parser.add_argument("-m", "--milestone", action='store_true', help="Add this flag, if you want to manually select milestone") + parser.add_argument("--no_epic", action="store_true", help="Add this flag if you don't want to pick epic") + parser.add_argument("--no_milestone", action="store_true", help="Add this flag if you don't want to pick milestone") + parser.add_argument("--no_iteration", action="store_true", help="Add this flag if you don't want to pick iteration") + parser.add_argument("--only_issue", action="store_true", help="Add this flag if you don't want to create merge request and branch alongside issue") + parser.add_argument("-am", "--auto_merge", action="store_true", help="Add this flag to review if you want to set merge request to auto merge when pipeline succeeds") + parser.add_argument("--select", action="store_true", help="Manually select reviewers for merge request (interactive)") + + if len(sys.argv) <= 1: + parser.print_help() + sys.exit(1) + + args = parser.parse_args() + + if args.title[0] == 'report': + parts = args.title + if len(parts) != 3: + print("Invalid report format. Use: gh report \"text\" minutes") + return + text = parts[1] + try: + minutes = int(parts[2].strip()) + process_report(text, minutes) + except ValueError: + print("Invalid minutes. Please provide a valid number") + return + + title = " ".join(args.title) + if title == 'open': + open_mr_in_browser() + return + elif title == 'review': + review_workflow(select_reviewers=args.select, auto_merge=args.auto_merge) + return + elif title == 'summary': + git_utils.get_two_weeks_commits(developer_email=DEVELOPER_EMAIL) + return + elif title == 'summaryAI': + generate_smart_summary() + return + elif title == 'last deploy': + check_last_production_deploy() + return + elif title == 'ai review': + import subprocess + # Original code did: from ai_code_review import run_review; run_review() + try: + from ai_code_review import run_review + run_review() + except ImportError: + print("ai_code_review module not found.") + return + + # Issue creation flow + from config import TEMPLATES + selected_template_name = interactive.select_template(TEMPLATES) + selected_settings = templates.get_issue_settings(selected_template_name) + + if not selected_settings: + print('Custom selection of issue settings is not supported yet') + # In a real scenario we'd handle this or just a return + + project_id = selected_settings.get('projectIds') if selected_settings else None + if project_id and args.project_id: + print('NOTE: Overwriting project id from argument...') + + project_id = project_id or args.project_id or get_project_id() + + milestone_id = None + if not args.no_milestone: + milestone = get_milestone(args.milestone) + milestone_id = milestone['id'] if milestone else None + + iteration = None + if not args.no_iteration: + iteration = get_iteration(True) + + epic = None + if not args.no_epic: + epic = get_epic() + + # Use the current branch as default for MRs + current_main = git_utils.get_main_branch() + + only_issue = selected_settings.get('onlyIssue') if selected_settings else False + only_issue = only_issue or args.only_issue + + if isinstance(project_id, list): + for pid in project_id: + start_issue_creation(pid, title, milestone_id, epic, iteration, selected_settings, only_issue) + else: + start_issue_creation(project_id, title, milestone_id, epic, iteration, selected_settings, only_issue) + +if __name__ == '__main__': + main() diff --git a/templates.py b/templates.py new file mode 100644 index 0000000..3a796c1 --- /dev/null +++ b/templates.py @@ -0,0 +1,6 @@ +from config import TEMPLATES, CUSTOM_TEMPLATE + +def get_issue_settings(template_name): + if template_name == CUSTOM_TEMPLATE: + return {} + return next((t for t in TEMPLATES if t['name'] == template_name), None) diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..93aca34 --- /dev/null +++ b/tests/__init__.py @@ -0,0 +1 @@ +# Tests init diff --git a/tests/test_config.py b/tests/test_config.py new file mode 100644 index 0000000..1043d07 --- /dev/null +++ b/tests/test_config.py @@ -0,0 +1,14 @@ +import unittest +from unittest.mock import patch, mock_open +import config + +class TestConfig(unittest.TestCase): + @patch("builtins.open", new_callable=mock_open, read_data='{"templates": [], "reviewers": []}') + @patch("configparser.ConfigParser.read") + def test_config_loading(self, mock_read, mock_file): + # This is a basic smoke test to ensure config can be imported + self.assertTrue(hasattr(config, 'API_URL')) + self.assertTrue(hasattr(config, 'GITLAB_TOKEN')) + +if __name__ == '__main__': + unittest.main() diff --git a/tests/test_gitlab_api.py b/tests/test_gitlab_api.py new file mode 100644 index 0000000..e11c59b --- /dev/null +++ b/tests/test_gitlab_api.py @@ -0,0 +1,17 @@ +import unittest +from unittest.mock import patch, MagicMock +import gitlab_api + +class TestGitlabApi(unittest.TestCase): + @patch("requests.get") + def test_get_all_projects(self, mock_get): + mock_response = MagicMock() + mock_response.status_code = 200 + mock_response.json.return_value = [{"id": 123, "ssh_url_to_repo": "git@gitlab.com:test/proj.git"}] + mock_get.return_value = mock_response + + res = gitlab_api.get_all_projects("git@gitlab.com:test/proj.git") + self.assertEqual(res[0]["id"], 123) + +if __name__ == '__main__': + unittest.main() diff --git a/tests/test_templates.py b/tests/test_templates.py new file mode 100644 index 0000000..d075903 --- /dev/null +++ b/tests/test_templates.py @@ -0,0 +1,22 @@ +import unittest +from unittest.mock import patch +import templates + +class TestTemplates(unittest.TestCase): + @patch("templates.TEMPLATES", [{"name": "Bug", "type": "issue"}]) + @patch("templates.CUSTOM_TEMPLATE", "Custom") + def test_get_issue_settings(self): + # Test matching template + settings = templates.get_issue_settings("Bug") + self.assertEqual(settings['type'], 'issue') + + # Test custom template + settings = templates.get_issue_settings("Custom") + self.assertEqual(settings, {}) + + # Test missing template + settings = templates.get_issue_settings("Unknown") + self.assertIsNone(settings) + +if __name__ == '__main__': + unittest.main()