diff --git a/.gitignore b/.gitignore index 1ff4785..84f69ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ configs/templates.json -configs/config.ini \ No newline at end of file +configs/config.ini +__pycache__/ +*.pyc \ No newline at end of file diff --git a/README.md b/README.md index c8fef2e..9fbe8dd 100644 --- a/README.md +++ b/README.md @@ -217,6 +217,32 @@ If you run just `gh` (or whatever alias you set) or `gh --help` you will see all If you get `glab: 401 Unauthorized (HTTP 401)` when using GitHappens, you must repeat `glab auth login` and then reopen your terminal. +## Project structure šŸ—‚ļø + +The CLI is organised into focused modules so each piece is easy to find, test +and extend: + +``` +ā”œā”€ā”€ main.py # Entry point and argument parsing +ā”œā”€ā”€ gitHappens.py # Backwards-compatible shim that delegates to main.py +ā”œā”€ā”€ config.py # Configuration loading (config.ini + templates.json) +ā”œā”€ā”€ gitlab_api.py # GitLab API interactions (HTTP + glab wrappers) +ā”œā”€ā”€ templates.py # Issue-template selection +ā”œā”€ā”€ git_utils.py # Local git operations +ā”œā”€ā”€ interactive.py # User prompts (inquirer) +ā”œā”€ā”€ project.py # Resolve current project id +ā””ā”€ā”€ commands/ + ā”œā”€ā”€ create_issue.py # Issue + branch + MR creation + ā”œā”€ā”€ merge_request.py # MR lookups, reviewers, auto-merge + ā”œā”€ā”€ open_mr.py # Open the active MR in the browser + ā”œā”€ā”€ review.py # Review workflow + AI review hook + ā”œā”€ā”€ deploy.py # Last production deployment lookup + ā”œā”€ā”€ summary.py # Two-week commit summary (raw + AI) + ā””ā”€ā”€ incident.py # Incident report workflow +``` + +Existing aliases pointing at `gitHappens.py` keep working unchanged. + ## Contributing šŸ«‚šŸ«¶ Every contributor is welcome. diff --git a/commands/__init__.py b/commands/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/commands/create_issue.py b/commands/create_issue.py new file mode 100644 index 0000000..2fe3423 --- /dev/null +++ b/commands/create_issue.py @@ -0,0 +1,115 @@ +"""Issue, branch and MR creation logic.""" +import re + +import config +import gitlab_api +import interactive + + +def execute_issue_create(project_id, title, labels, milestone_id, epic, iteration, + weight, estimated_time, issue_type='issue'): + labels = ",".join(labels) if isinstance(labels, list) else labels + assignee_id = gitlab_api.get_authorized_user()['id'] + + fields = [ + ('title', title), + ('assignee_ids', assignee_id), + ('issue_type', issue_type), + ] + if labels: + fields.append(('labels', labels)) + if weight: + fields.append(('weight', str(weight))) + if milestone_id: + fields.append(('milestone_id', str(milestone_id))) + if epic: + fields.append(('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 " + fields.append(('description', description)) + + return gitlab_api.create_issue_via_glab(project_id, fields) + + +def create_issue(title, project_id, milestone_id, epic, iteration, settings): + if not settings: + print("No settings in template") + exit(2) + issue_type = settings.get('type') or 'issue' + return execute_issue_create( + project_id, title, settings.get('labels'), milestone_id, epic, iteration, + settings.get('weight'), settings.get('estimated_time'), issue_type, + ) + + +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(' ', '-') + return gitlab_api.create_branch_via_glab(project_id, title, config.MAIN_BRANCH, issue_id) + + +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 = gitlab_api.get_authorized_user()['id'] + labels = ",".join(labels) if isinstance(labels, list) else labels + + fields = [ + ('title', title), + ('description', f'"Closes #{issue_id}"'), + ('source_branch', branch_name), + ('target_branch', config.MAIN_BRANCH), + ('issue_iid', issue_id), + ('assignee_ids', assignee_id), + ] + if config.SQUASH_COMMITS: + fields.append(('squash', 'true')) + if config.DELETE_BRANCH: + fields.append(('remove_source_branch', 'true')) + if labels: + fields.append(('labels', labels)) + if milestone_id: + fields.append(('milestone_id', str(milestone_id))) + + return gitlab_api.create_merge_request_via_glab(project_id, fields) + + +def start_issue_creation(project_id, title, milestone, epic, iteration, selected_settings, only_issue): + 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) + + created_issue = create_issue(title, project_id, milestone, epic, iteration, selected_settings) + 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, + ) + 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..479b5ce --- /dev/null +++ b/commands/deploy.py @@ -0,0 +1,100 @@ +"""Production deployment lookup.""" +import datetime + +import config +import git_utils +import gitlab_api +from project import get_project_id + + +def _resolve_ref(): + if config.MAIN_BRANCH: + return config.MAIN_BRANCH + try: + return git_utils.get_main_branch() + except Exception: + return "main" + + +def get_last_production_deploy(): + try: + project_id = get_project_id() + params = { + "per_page": 50, + "order_by": "updated_at", + "sort": "desc", + "ref": _resolve_ref(), + } + response = gitlab_api.list_pipelines(project_id, params) + if response.status_code != 200: + print(f"Failed to fetch pipelines: {response.status_code} - {response.text}") + return + + pipelines = response.json() + production_pipeline = None + + for pipeline in pipelines: + detail_response = gitlab_api.list_pipeline_jobs(project_id, pipeline['id']) + if detail_response.status_code != 200: + continue + + jobs = detail_response.json() + 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 = config.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("No production deployment found matching pattern") + return + + pipeline = production_pipeline['pipeline'] + job = production_pipeline['production_job'] + + print("šŸš€ 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 Exception: + pass + + except Exception as e: + print(f"Error fetching last production deploy: {str(e)}") diff --git a/commands/incident.py b/commands/incident.py new file mode 100644 index 0000000..7cc43b0 --- /dev/null +++ b/commands/incident.py @@ -0,0 +1,42 @@ +"""Incident report workflow.""" +import config +import gitlab_api +import interactive +from commands.create_issue import create_issue + + +def process_report(text, minutes): + incident_project_id = config.get_incident_project_id() + if not incident_project_id: + 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 = interactive.select_labels('Department') + + incident_settings = { + 'labels': ['incident', 'report'], + 'onlyIssue': True, + 'type': 'incident', + } + if selected_label: + incident_settings['labels'].append(selected_label) + + try: + iteration = interactive.get_active_iteration() + created_issue = create_issue( + issue_title, incident_project_id, False, False, iteration, incident_settings, + ) + issue_iid = created_issue['iid'] + + gitlab_api.close_issue(incident_project_id, issue_iid) + print(f"Incident issue #{issue_iid} created successfully.") + print(f"Title: {issue_title}") + + if gitlab_api.add_spent_time(incident_project_id, issue_iid, minutes): + print(f"Added {minutes} minutes to issue time tracking.") + + except Exception as e: + print(f"Error creating incident issue: {str(e)}") diff --git a/commands/merge_request.py b/commands/merge_request.py new file mode 100644 index 0000000..0ccc73b --- /dev/null +++ b/commands/merge_request.py @@ -0,0 +1,49 @@ +"""Merge request operations: lookups, reviewers, auto-merge.""" +import git_utils +import gitlab_api +from project import get_project_id + + +def get_merge_request_for_branch(branch_name): + project_id = get_project_id() + merge_requests = gitlab_api.get_merge_requests(project_id, {"source_branch": branch_name}) + if not merge_requests: + return None + for mr in merge_requests: + if mr["source_branch"] == branch_name: + return mr + return None + + +def find_merge_request_id_by_branch(branch_name): + return get_merge_request_for_branch(branch_name)['iid'] + + +def get_active_merge_request_id(): + return find_merge_request_id_by_branch(git_utils.get_current_branch()) + + +def get_current_issue_id(): + mr = get_merge_request_for_branch(git_utils.get_current_branch()) + return mr['description'].replace('"', '').replace('#', '').split()[1] + + +def add_reviewers_to_merge_request(reviewers=None): + import config + project_id = get_project_id() + mr_id = get_active_merge_request_id() + data = {"reviewer_ids": reviewers if reviewers is not None else config.REVIEWERS} + gitlab_api.update_merge_request(project_id, mr_id, data) + + +def set_merge_request_to_auto_merge(): + project_id = get_project_id() + mr_id = get_active_merge_request_id() + 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", + } + gitlab_api.merge_merge_request(project_id, mr_id, data) diff --git a/commands/open_mr.py b/commands/open_mr.py new file mode 100644 index 0000000..8416d7c --- /dev/null +++ b/commands/open_mr.py @@ -0,0 +1,17 @@ +"""Open the active merge request in the browser.""" +import subprocess +import webbrowser + +import config +import git_utils +from commands.merge_request import get_active_merge_request_id + + +def open_merge_request_in_browser(): + try: + merge_request_id = get_active_merge_request_id() + remote_url = git_utils.get_remote_origin_url() + url = config.BASE_URL + '/' + remote_url.split(':')[1][:-4] + webbrowser.open(f"{url}/-/merge_requests/{merge_request_id}") + except subprocess.CalledProcessError: + return None diff --git a/commands/review.py b/commands/review.py new file mode 100644 index 0000000..e56a02d --- /dev/null +++ b/commands/review.py @@ -0,0 +1,46 @@ +"""Review workflow: time tracking, reviewers, AI review.""" +import gitlab_api +import interactive +from commands.merge_request import ( + add_reviewers_to_merge_request, + get_active_merge_request_id, + get_current_issue_id, + set_merge_request_to_auto_merge, +) +from project import get_project_id + + +def track_issue_time(): + try: + project_id = get_project_id() + issue_id = get_current_issue_id() + except Exception as e: + print(f"Error getting issue details: {str(e)}") + return + + spent_time = interactive.prompt_spent_time() + + try: + gitlab_api.add_issue_note(project_id, issue_id, f"/spend {spent_time}m") + print(f"Added {spent_time} minutes to issue {issue_id} time tracking.") + except Exception as e: + print(f"Error tracking issue time: {str(e)}") + + +def run_review(auto_merge=False, manual_select=False): + track_issue_time() + + reviewers = interactive.choose_reviewers_manually() if manual_select else None + add_reviewers_to_merge_request(reviewers=reviewers) + + try: + from ai_code_review import run_review_for_mr + import config + project_id = get_project_id() + mr_id = get_active_merge_request_id() + run_review_for_mr(project_id, mr_id, config.GITLAB_TOKEN, config.API_URL) + except Exception as e: + print(f"AI review skipped: {e}") + + if auto_merge: + set_merge_request_to_auto_merge() diff --git a/commands/summary.py b/commands/summary.py new file mode 100644 index 0000000..7053e01 --- /dev/null +++ b/commands/summary.py @@ -0,0 +1,51 @@ +"""Commit summaries (raw and AI-generated).""" +import config +import git_utils + + +def show_two_weeks_commits(): + git_utils.get_two_weeks_commits() + + +def generate_smart_summary(): + commits = git_utils.get_two_weeks_commits(return_output=True) + if not commits: + return + + openai_api_key = config.get_openai_api_key() + 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": ( + "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}") diff --git a/config.py b/config.py new file mode 100644 index 0000000..7378361 --- /dev/null +++ b/config.py @@ -0,0 +1,49 @@ +"""Configuration management for gitHappens.""" +import configparser +import json +import os + +_BASE_DIR = os.path.dirname(os.path.abspath(__file__)) +_CONFIG_PATH = os.path.join(_BASE_DIR, 'configs/config.ini') +_TEMPLATES_PATH = os.path.join(_BASE_DIR, 'configs/templates.json') + +config = configparser.ConfigParser() +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' + +with open(_TEMPLATES_PATH, 'r') as f: + _json_config = json.load(f) + +TEMPLATES = _json_config['templates'] +REVIEWERS = _json_config['reviewers'] +PRODUCTION_MAPPINGS = _json_config.get('productionMappings', {}) + + +def get_incident_project_id(): + """Return the configured incident project ID or None.""" + try: + return config.get('DEFAULT', 'incident_project_id') + except (configparser.NoOptionError, configparser.NoSectionError): + return None + + +def get_openai_api_key(): + return config.get('DEFAULT', 'OPENAI_API_KEY', fallback=None) + + +def set_main_branch(name): + """Update MAIN_BRANCH at runtime (used by main entry point).""" + global MAIN_BRANCH + MAIN_BRANCH = name diff --git a/gitHappens.py b/gitHappens.py index 27d47f3..98e3699 100755 --- a/gitHappens.py +++ b/gitHappens.py @@ -1,845 +1,11 @@ #!/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 +"""Backwards-compatible entry point. -# 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() - - onlyIssue = selectedSettings.get('onlyIssue') or args.only_issue - - 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) +The CLI implementation has been split into modular files (see main.py and +the commands/ package). This shim is kept so existing aliases/scripts that +invoke `gitHappens.py` keep working. +""" +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..cdc27b1 --- /dev/null +++ b/git_utils.py @@ -0,0 +1,62 @@ +"""Local git operations.""" +import datetime +import subprocess + +import config + + +def get_project_link_from_current_dir(): + try: + result = subprocess.run( + ['git', 'remote', 'get-url', 'origin'], + stdout=subprocess.PIPE, stderr=subprocess.PIPE, + ) + if result.returncode == 0: + return result.stdout.decode('utf-8').strip() + 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_remote_origin_url(): + return subprocess.check_output( + ["git", "config", "--get", "remote.origin.url"], text=True, + ).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 config.DEVELOPER_EMAIL: + cmd = f'{cmd} | grep {config.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..93dfb89 --- /dev/null +++ b/gitlab_api.py @@ -0,0 +1,164 @@ +"""GitLab API interactions (HTTP + glab CLI wrappers).""" +import json +import subprocess + +import requests + +import config + + +def _headers(): + return {"PRIVATE-TOKEN": config.GITLAB_TOKEN} + + +def _private_headers(): + return {"Private-Token": config.GITLAB_TOKEN} + + +def get_all_projects(project_link): + url = config.API_URL + "/projects?membership=true&search=" + project_link.split('/')[-1].split('.')[0] + response = requests.get(url, headers=_headers()) + + if response.status_code == 200: + return response.json() + if 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) + print(f"Request failed with status code {response.status_code}") + return None + + +def get_authorized_user(): + output = subprocess.check_output(["glab", "api", "/user"]) + return json.loads(output) + + +def list_milestones(): + cmd = f'glab api /groups/{config.GROUP_ID}/milestones?state=active' + result = subprocess.run(cmd.split(), stdout=subprocess.PIPE) + return json.loads(result.stdout) + + +def list_iterations(): + cmd = f'glab api /groups/{config.GROUP_ID}/iterations?state=opened' + result = subprocess.run(cmd.split(), stdout=subprocess.PIPE) + return json.loads(result.stdout) + + +def list_epics(): + cmd = f'glab api /groups/{config.GROUP_ID}/epics?per_page=1000&state=opened' + result = subprocess.run(cmd.split(), stdout=subprocess.PIPE) + return json.loads(result.stdout) + + +def get_labels_of_group(search=''): + cmd = f'glab api /groups/{config.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 get_user(user_id): + api_url = f"{config.API_URL}/users/{user_id}" + response = requests.get(api_url, headers=_private_headers()) + if response.status_code == 200: + return response.json() + return None + + +def get_merge_requests(project_id, params): + api_url = f"{config.API_URL}/projects/{project_id}/merge_requests" + response = requests.get(api_url, headers=_private_headers(), params=params) + if response.status_code == 200: + return response.json() + print(f"Failed to fetch Merge Requests: {response.status_code} - {response.text}") + return None + + +def update_merge_request(project_id, mr_id, data): + api_url = f"{config.API_URL}/projects/{project_id}/merge_requests/{mr_id}" + return requests.put(api_url, headers=_private_headers(), json=data) + + +def merge_merge_request(project_id, mr_id, data): + api_url = f"{config.API_URL}/projects/{project_id}/merge_requests/{mr_id}/merge" + return requests.put(api_url, headers=_private_headers(), json=data) + + +def list_pipelines(project_id, params): + api_url = f"{config.API_URL}/projects/{project_id}/pipelines" + return requests.get(api_url, headers=_private_headers(), params=params) + + +def list_pipeline_jobs(project_id, pipeline_id): + api_url = f"{config.API_URL}/projects/{project_id}/pipelines/{pipeline_id}/jobs" + return requests.get(api_url, headers=_private_headers()) + + +def create_issue_via_glab(project_id, fields): + """Run `glab api` to create an issue with -f key=value fields.""" + cmd = ["glab", "api", f"/projects/{str(project_id)}/issues"] + for k, v in fields: + cmd.extend(["-f", f"{k}={v}"]) + output = subprocess.check_output(cmd) + return json.loads(output.decode()) + + +def create_branch_via_glab(project_id, branch_name, ref, issue_iid): + cmd = [ + "glab", "api", + f"/projects/{str(project_id)}/repository/branches", + "-f", f"branch={branch_name}", + "-f", f"ref={ref}", + "-f", f"issue_iid={issue_iid}", + ] + output = subprocess.check_output(cmd) + return json.loads(output.decode()) + + +def create_merge_request_via_glab(project_id, fields): + cmd = ["glab", "api", f"/projects/{str(project_id)}/merge_requests"] + for k, v in fields: + cmd.extend(["-f", f"{k}={v}"]) + output = subprocess.check_output(cmd) + return json.loads(output.decode()) + + +def close_issue(project_id, issue_iid): + cmd = [ + "glab", "api", + f"/projects/{project_id}/issues/{issue_iid}", + "-X", "PUT", + "-f", "state_event=close", + ] + try: + subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + except subprocess.CalledProcessError as e: + print(f"Error closing issue: {str(e)}") + + +def add_spent_time(project_id, issue_iid, minutes): + cmd = [ + "glab", "api", + f"/projects/{project_id}/issues/{issue_iid}/add_spent_time", + "-f", f"duration={minutes}m", + ] + try: + subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + return True + except subprocess.CalledProcessError as e: + print(f"Error adding time tracking: {str(e)}") + return False + + +def add_issue_note(project_id, issue_iid, body): + cmd = [ + "glab", "api", + f"/projects/{project_id}/issues/{issue_iid}/notes", + "-f", f"body={body}", + ] + subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True) diff --git a/interactive.py b/interactive.py new file mode 100644 index 0000000..ea4b198 --- /dev/null +++ b/interactive.py @@ -0,0 +1,155 @@ +"""User prompts and CLI interactions.""" +import datetime + +import inquirer + +import config +import gitlab_api + + +def enter_project_id(): + while True: + project_id = input('Please enter the ID of your GitLab project: ') + if project_id: + return project_id + exit('Invalid project ID.') + + +def select_milestone(milestones): + titles = [t['title'] for t in milestones] + questions = [inquirer.List('milestones', message="Select milestone:", choices=titles)] + answer = inquirer.prompt(questions) + return answer['milestones'] + + +def get_selected_milestone(milestone_title, milestones): + return next((t for t in milestones if t['title'] == milestone_title), None) + + +def get_milestone(manual): + if manual: + milestones = gitlab_api.list_milestones() + return get_selected_milestone(select_milestone(milestones), milestones) + + milestones = gitlab_api.list_milestones() + today = datetime.date.today().strftime('%Y-%m-%d') + active = [ + m for m in milestones + if m.get('start_date') and m.get('due_date') + and m['start_date'] <= today <= m['due_date'] + ] + active.sort(key=lambda x: x['due_date']) + return active[0] if active else None + + +def select_iteration(iterations): + choices = [t['start_date'] + ' - ' + t['due_date'] for t in iterations] + questions = [inquirer.List('iterations', message="Select iteration:", choices=choices)] + answer = inquirer.prompt(questions) + return answer['iterations'] + + +def get_selected_iteration(iteration_label, iterations): + return next( + (t for t in iterations if t['start_date'] + ' - ' + t['due_date'] == iteration_label), + None, + ) + + +def get_active_iteration(): + iterations = gitlab_api.list_iterations() + today = datetime.date.today().strftime('%Y-%m-%d') + active = [ + i for i in iterations + if i.get('start_date') and i.get('due_date') + and i['start_date'] <= today <= i['due_date'] + ] + active.sort(key=lambda x: x['due_date']) + return active[0] if active else None + + +def get_iteration(manual): + if manual: + iterations = gitlab_api.list_iterations() + return get_selected_iteration(select_iteration(iterations), iterations) + return get_active_iteration() + + +def select_epic(epics): + titles = [t['title'] for t in epics] + search_query = inquirer.prompt([ + inquirer.Text('search_query', message='Search epic:'), + ])['search_query'] + + filtered = [c for c in titles if search_query.lower() in c.lower()] + questions = [inquirer.List('epics', message="Select epic:", choices=filtered)] + answer = inquirer.prompt(questions) + return answer['epics'] + + +def get_selected_epic(epic_title, epics): + return next((t for t in epics if t['title'] == epic_title), None) + + +def get_epic(): + epics = gitlab_api.list_epics() + return get_selected_epic(select_epic(epics), epics) + + +def choose_reviewers_manually(): + """Prompt the user to select reviewers from the configured reviewer list.""" + reviewer_choices = [] + for reviewer_id in config.REVIEWERS: + user = gitlab_api.get_user(reviewer_id) + if user: + 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)) + + 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"]] + return [] + + +def select_labels(search, multiple=False): + labels = gitlab_api.get_labels_of_group(search) + label_names = 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=label_names, + ), + ] + answer = inquirer.prompt(questions) + return answer['labels'] + + +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 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'] diff --git a/main.py b/main.py new file mode 100644 index 0000000..8f24330 --- /dev/null +++ b/main.py @@ -0,0 +1,126 @@ +#!/usr/bin/env python3 +"""Entry point and argument parsing for gitHappens.""" +import argparse +import sys + +import config +import git_utils +import interactive +import templates +from commands.create_issue import start_issue_creation +from commands.deploy import get_last_production_deploy +from commands.incident import process_report +from commands.open_mr import open_merge_request_in_browser +from commands.review import run_review +from commands.summary import generate_smart_summary, show_two_weeks_commits +from project import get_project_id + + +def _build_parser(): + parser = argparse.ArgumentParser("Argument description of Git happens") + parser.add_argument("title", nargs="+", help="Title of issue") + parser.add_argument("--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="Set merge request to auto merge when pipeline succeeds") + parser.add_argument("--select", action="store_true", + help="Manually select reviewers for merge request (interactive)") + return parser + + +def _handle_report(parts): + 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.") + + +def _handle_subcommand(title, args): + """Return True if a subcommand was handled.""" + if title == 'open': + open_merge_request_in_browser() + return True + if title == 'review': + run_review(auto_merge=args.auto_merge, manual_select=getattr(args, "select", False)) + return True + if title == 'summary': + show_two_weeks_commits() + return True + if title == 'summaryAI': + generate_smart_summary() + return True + if title == 'last deploy': + get_last_production_deploy() + return True + if title == 'ai review': + from ai_code_review import run_review as run_ai_review + run_ai_review() + return True + return False + + +def main(): + parser = _build_parser() + if len(sys.argv) <= 1: + parser.print_help() + exit(1) + + args = parser.parse_args() + + if args.title[0] == 'report': + _handle_report(args.title) + return + + title = " ".join(args.title) + + if _handle_subcommand(title, args): + return + + selected_settings = templates.get_issue_settings(templates.select_template()) + if not len(selected_settings): + print('Custom selection of issue settings is not supported yet') + + if args.project_id and selected_settings.get('projectIds'): + print('NOTE: Overwriting project id from argument...') + + project_id = selected_settings.get('projectIds') or args.project_id or get_project_id() + + milestone = False + if not args.no_milestone: + milestone = interactive.get_milestone(args.milestone)['id'] + + iteration = False + if not args.no_iteration: + iteration = interactive.get_iteration(True) + + epic = False + if not args.no_epic: + epic = interactive.get_epic() + + config.set_main_branch(git_utils.get_main_branch()) + + only_issue = selected_settings.get('onlyIssue') or args.only_issue + + if isinstance(project_id, list): + for pid in project_id: + start_issue_creation(pid, title, milestone, epic, iteration, selected_settings, only_issue) + else: + start_issue_creation(project_id, title, milestone, epic, iteration, selected_settings, only_issue) + + +if __name__ == '__main__': + main() diff --git a/project.py b/project.py new file mode 100644 index 0000000..bc074e8 --- /dev/null +++ b/project.py @@ -0,0 +1,18 @@ +"""Helpers to resolve the current GitLab project id.""" +import git_utils +import gitlab_api +import interactive + + +def get_project_id(): + project_link = git_utils.get_project_link_from_current_dir() + if project_link == -1: + return interactive.enter_project_id() + + all_projects = gitlab_api.get_all_projects(project_link) + if not all_projects: + return None + for project in all_projects: + if project.get("ssh_url_to_repo") == project_link: + return project.get("id") + return None diff --git a/templates.py b/templates.py new file mode 100644 index 0000000..1f72132 --- /dev/null +++ b/templates.py @@ -0,0 +1,20 @@ +"""Template selection and helpers.""" +import inquirer + +import config + + +def select_template(): + template_names = [t['name'] for t in config.TEMPLATES] + template_names.append(config.CUSTOM_TEMPLATE) + questions = [ + inquirer.List('template', message="Select template:", choices=template_names), + ] + answer = inquirer.prompt(questions) + return answer['template'] + + +def get_issue_settings(template_name): + if template_name == config.CUSTOM_TEMPLATE: + return {} + return next((t for t in config.TEMPLATES if t['name'] == template_name), None)