itw-python-builder 0.2.12__tar.gz → 0.2.13__tar.gz

{itw_python_builder-0.2.12 → itw_python_builder-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.2.12
+Version: 0.2.13
 Summary: Standardized Django deployment pipeline with Docker, testing, and SonarQube integration
 Author-email: IT-Works <contact@it-works.io>
 License: MIT

{itw_python_builder-0.2.12 → itw_python_builder-0.2.13}/itw_python_builder/task_utils.py

@@ -1,7 +1,13 @@
 import re
+from difflib import SequenceMatcher
 
 from itw_python_builder.utils import _gitlab_api_call
 
+SIMILARITY_THRESHOLD = 0.95
+
+DATE_PLACEHOLDER = 'YYYY-MM-DD'
+
+DEFAULT_LABEL_COLOR = '#428BCA'
 
 DEFAULT_ACCEPTANCE_CRITERIA = (
     '- [ ] U kryen testet manuale në ndërfaqe\n'
@@ -10,7 +16,6 @@ DEFAULT_ACCEPTANCE_CRITERIA = (
     '- [ ] U kontrollua cilësia e kodit'
 )
 
-
 _RE_AC_HEADER = re.compile(r'(?im)^##\s*acceptance\s+criteria\s*$')
 _RE_COMMENT_HEADER = re.compile(r'(?im)^##\s*comment\s*$')
 _RE_AC_BLOCK = re.compile(
@@ -20,9 +25,9 @@ _RE_COMMENT_BLOCK = re.compile(
     r'(?ims)^##\s*comment\s*$(.*?)^##\s*comment\s*$'
 )
 
-
 _COLOR_GREEN = '\033[92m'
 _COLOR_RED = '\033[91m'
+_COLOR_WHITE = '\033[97m'
 _COLOR_RESET = '\033[0m'
 
 
@@ -34,10 +39,37 @@ def log_red(msg: str) -> None:
     print(f'{_COLOR_RED}{msg}{_COLOR_RESET}')
 
 
+def log_white(msg: str) -> None:
+    print(f'{_COLOR_WHITE}{msg}{_COLOR_RESET}')
+
+
 def log_info(msg: str) -> None:
     print(msg)
 
 
+def _normalize_title(value: str) -> str:
+    return ' '.join((value or '').lower().split())
+
+
+def is_similar(left: str, right: str, threshold: float = SIMILARITY_THRESHOLD) -> bool:
+    """True when two titles are at least `threshold` similar (default 95%)."""
+    a = _normalize_title(left)
+    b = _normalize_title(right)
+    if not a or not b:
+        return False
+    if a == b:
+        return True
+    return SequenceMatcher(None, a, b).ratio() >= threshold
+
+
+def find_similar(value: str, items: list, key: str = 'title', threshold: float = SIMILARITY_THRESHOLD):
+    """Return the first item whose `key` is ~threshold similar to `value`, else None."""
+    for item in items:
+        if is_similar(value, item.get(key, ''), threshold):
+            return item
+    return None
+
+
 def _list_group_projects(api_host: str, group_path: str, token: str) -> list:
     from urllib.parse import quote
     encoded = quote(group_path, safe='')
@@ -87,26 +119,30 @@ def get_project_by_path(api_host: str, project_path: str, token: str) -> dict:
 
 
 def find_project_milestone(api_host: str, project_id: int, title: str, token: str):
-    from urllib.parse import quote
-    encoded = quote(title, safe='')
     results = _gitlab_api_call(
         api_host,
-        f'/projects/{project_id}/milestones?search={encoded}',
+        f'/projects/{project_id}/milestones?per_page=100',
         token,
     )
-    for m in results:
-        if m.get('title') == title:
-            return m
-    return None
+    return find_similar(title, results)
+
+
+def find_project_issue(api_host: str, project_id: int, title: str, token: str, milestone: str = None):
+    """Look for a ~matching title within this milestone ('None' = the no-milestone bucket)."""
+    from urllib.parse import quote
+    endpoint = f'/projects/{project_id}/issues?per_page=100'
+    endpoint += f'&milestone={quote(milestone, safe="") if milestone else "None"}'
+    results = _gitlab_api_call(api_host, endpoint, token)
+    return find_similar(title, results)
 
 
 def create_project_milestone(
-    api_host: str,
-    project_id: int,
-    title: str,
-    start_date: str = None,
-    due_date: str = None,
-    token: str = None,
+        api_host: str,
+        project_id: int,
+        title: str,
+        start_date: str = None,
+        due_date: str = None,
+        token: str = None,
 ) -> dict:
     payload = {'title': title}
     if start_date:
@@ -122,6 +158,20 @@ def create_project_milestone(
     )
 
 
+def list_project_labels(api_host: str, project_id: int, token: str) -> list:
+    return _gitlab_api_call(api_host, f'/projects/{project_id}/labels?per_page=100', token)
+
+
+def create_project_label(api_host: str, project_id: int, name: str, token: str) -> dict:
+    return _gitlab_api_call(
+        api_host,
+        f'/projects/{project_id}/labels',
+        token,
+        method='POST',
+        payload={'name': name, 'color': DEFAULT_LABEL_COLOR},
+    )
+
+
 def create_issue_note(api_host: str, project_id: int, issue_iid: int, body: str, token: str) -> dict:
     return _gitlab_api_call(
         api_host,
@@ -132,6 +182,21 @@ def create_issue_note(api_host: str, project_id: int, issue_iid: int, body: str,
     )
 
 
+def _normalize_repo(raw: str) -> str:
+    value = (raw or '').strip()
+    if not value:
+        return ''
+    m = re.match(r'^[a-z][a-z0-9+.-]*://[^/]+/(.*)$', value, re.IGNORECASE)
+    if m:
+        value = m.group(1)
+    else:
+        m = re.match(r'^[^/\s]+@[^:/\s]+:(.*)$', value)
+        if m:
+            value = m.group(1)
+    value = re.sub(r'\.git$', '', value.strip(), flags=re.IGNORECASE)
+    return value.strip('/')
+
+
 def _strip_milestone_wrap(raw: str) -> str:
     raw = raw.strip()
     if raw.startswith('%"') and raw.endswith('"'):
@@ -143,6 +208,30 @@ def _strip_milestone_wrap(raw: str) -> str:
 
 _CRED_KEYS = ('glab_host', 'glab_username', 'glab_token')
 
+_RE_MARKER_COMMENT = re.compile(r'^<!--.*-->$')
+_RE_EMPTY_CHECKBOX = re.compile(r'^[-*]\s*\[[ xX]?\]\s*$')
+
+
+def _block_has_content(text: str) -> bool:
+    """False when a section holds only blank lines or empty checklist placeholders."""
+    for line in (text or '').splitlines():
+        stripped = line.strip()
+        if not stripped or _RE_EMPTY_CHECKBOX.match(stripped):
+            continue
+        return True
+    return False
+
+
+def _match_directive(line: str, name: str):
+    """None when the line is not this directive, '' when it carries no value."""
+    m = re.match(rf'^/{name}(?![\w-])\s*(.*)$', line, re.IGNORECASE)
+    if not m:
+        return None
+    value = m.group(1).strip()
+    if value.upper() == DATE_PLACEHOLDER:
+        return ''
+    return value
+
 
 def extract_glab_credentials(file_path: str) -> dict:
     """Scan md file for /glab_host, /glab_username, /glab_token top-level directives."""
@@ -152,9 +241,9 @@ def extract_glab_credentials(file_path: str) -> dict:
     for line in content.splitlines():
         stripped = line.strip()
         for key in _CRED_KEYS:
-            m = re.match(rf'^/{key}\s+(\S+)\s*$', stripped, re.IGNORECASE)
-            if m:
-                creds[key] = m.group(1)
+            value = _match_directive(stripped, key)
+            if value is not None:
+                creds[key] = value or None
                 break
     return creds
 
@@ -162,7 +251,7 @@ def extract_glab_credentials(file_path: str) -> dict:
 def strip_glab_credentials_lines(content: str) -> str:
     """Remove /glab_* lines so they don't leak into issue bodies."""
     pattern = re.compile(
-        rf'(?im)^\s*/(?:{"|".join(_CRED_KEYS)})\s+\S+\s*$\n?'
+        rf'(?im)^[ \t]*/(?:{"|".join(_CRED_KEYS)})(?![\w-])[^\n]*(?:\n|$)'
     )
     return pattern.sub('', content)
 
@@ -204,14 +293,16 @@ def _parse_single_issue(block: str, idx: int, file_path: str) -> dict:
     if len(cm_headers) >= 2:
         m = _RE_COMMENT_BLOCK.search(remaining)
         if m:
-            comment_text = m.group(1).strip()
+            if _block_has_content(m.group(1)):
+                comment_text = m.group(1).strip()
             remaining = _RE_COMMENT_BLOCK.sub('', remaining, count=1)
 
     acceptance_text = None
     if len(ac_headers) >= 2:
         m = _RE_AC_BLOCK.search(remaining)
         if m:
-            acceptance_text = m.group(1).strip()
+            if _block_has_content(m.group(1)):
+                acceptance_text = m.group(1).strip()
             remaining = _RE_AC_BLOCK.sub('', remaining, count=1)
 
     title = None
@@ -220,6 +311,7 @@ def _parse_single_issue(block: str, idx: int, file_path: str) -> dict:
     milestone_start = None
     milestone_end = None
     assignee = None
+    labels = []
     has_estimate = False
     has_due = False
     body_lines = []
@@ -227,35 +319,52 @@ def _parse_single_issue(block: str, idx: int, file_path: str) -> dict:
     for line in remaining.splitlines():
         stripped = line.strip()
 
-        m = re.match(r'^/title\s+(.+)$', stripped, re.IGNORECASE)
-        if m:
-            title = m.group(1).strip()
+        if _RE_MARKER_COMMENT.match(stripped):
             continue
-        m = re.match(r'^/repo\s+(\S+)\s*$', stripped, re.IGNORECASE)
-        if m:
-            repo = m.group(1)
+
+        value = _match_directive(stripped, 'title')
+        if value is not None:
+            title = value or None
             continue
-        m = re.match(r'^/milestone-start\s+(\S+)\s*$', stripped, re.IGNORECASE)
-        if m:
-            milestone_start = m.group(1)
+        value = _match_directive(stripped, 'repo')
+        if value is not None:
+            repo = _normalize_repo(value) or None
             continue
-        m = re.match(r'^/milestone-end\s+(\S+)\s*$', stripped, re.IGNORECASE)
-        if m:
-            milestone_end = m.group(1)
+        value = _match_directive(stripped, 'milestone-start')
+        if value is not None:
+            milestone_start = value or None
             continue
-        m = re.match(r'^/milestone\s+(.+)$', stripped, re.IGNORECASE)
-        if m:
-            milestone = _strip_milestone_wrap(m.group(1))
+        value = _match_directive(stripped, 'milestone-end')
+        if value is not None:
+            milestone_end = value or None
             continue
-        m = re.match(r'^/assignee\s+(.+)$', stripped, re.IGNORECASE)
-        if m:
-            assignee = m.group(1).strip()
-            body_lines.append(f'/assign {assignee}')
+        value = _match_directive(stripped, 'milestone')
+        if value is not None:
+            milestone = _strip_milestone_wrap(value) or None
+            continue
+        value = _match_directive(stripped, 'label')
+        if value is not None:
+            labels = [p.strip().lstrip('~').strip('"') for p in value.split(',') if p.strip()]
+            labels = [p for p in labels if p]
+            continue
+        value = _match_directive(stripped, 'assignee')
+        if value is not None:
+            if value:
+                assignee = value
+                body_lines.append(f'/assign {assignee}')
+            continue
+        value = _match_directive(stripped, 'estimate')
+        if value is not None:
+            if value:
+                has_estimate = True
+                body_lines.append(f'/estimate {value}')
+            continue
+        value = _match_directive(stripped, 'due')
+        if value is not None:
+            if value:
+                has_due = True
+                body_lines.append(f'/due {value}')
             continue
-        if re.match(r'^/estimate\s+\S+', stripped, re.IGNORECASE):
-            has_estimate = True
-        if re.match(r'^/due\s+\S+', stripped, re.IGNORECASE):
-            has_due = True
 
         body_lines.append(line)
 
@@ -273,6 +382,7 @@ def _parse_single_issue(block: str, idx: int, file_path: str) -> dict:
         'milestone_start': milestone_start,
         'milestone_end': milestone_end,
         'assignee': assignee,
+        'labels': labels,
         'has_estimate': has_estimate,
         'has_due': has_due,
         'has_acceptance_criteria': acceptance_text is not None,

{itw_python_builder-0.2.12 → itw_python_builder-0.2.13}/itw_python_builder/tasks.py

@@ -38,11 +38,16 @@ from itw_python_builder.task_utils import (
     build_issue_description,
     get_project_by_path,
     find_project_milestone,
+    find_project_issue,
     create_project_milestone,
+    list_project_labels,
+    create_project_label,
     create_issue_note,
     log_green,
     log_red,
     log_info,
+    log_white,
+    find_similar,
 )
 from itw_python_builder.version import Version
 
@@ -201,12 +206,27 @@ def create_task(ctx: Context, file=None):
             if not issue['has_due']:
                 log_red('No due date is defined for this issue. Use /due in you md file to define a due date')
 
-            milestone_id = _resolve_milestone(api_host, project['id'], issue, token)
+            milestone_id, milestone_title = _resolve_milestone(api_host, project['id'], issue, token)
+
+            duplicate = find_project_issue(
+                api_host, project['id'], issue['title'], token, milestone_title
+            )
+            if duplicate:
+                scope = f'milestone {milestone_title}' if milestone_title else 'issues without a milestone'
+                log_white(
+                    f'Issue "{issue["title"]}" was not created because it already exists '
+                    f'in this project for {scope}: {duplicate["web_url"]}'
+                )
+                continue
+
+            labels = _resolve_labels(api_host, project['id'], issue, token)
 
             description = build_issue_description(issue)
             payload = {'title': issue['title'], 'description': description}
             if milestone_id is not None:
                 payload['milestone_id'] = milestone_id
+            if labels:
+                payload['labels'] = ','.join(labels)
 
             result = create_gitlab_issue(api_host, project['id'], payload, token)
             print(f'[itw] Created: {result["web_url"]}')
@@ -264,6 +284,24 @@ def _resolve_target_project(api_host: str, project_path: str, issue: dict, token
         print('Invalid choice, try again.')
 
 
+def _resolve_labels(api_host: str, project_id: int, issue: dict, token: str) -> list:
+    if not issue['labels']:
+        return []
+    existing = list_project_labels(api_host, project_id, token)
+    resolved = []
+    for name in issue['labels']:
+        match = find_similar(name, existing, key='name')
+        if match:
+            log_white(f'Using existing label {match["name"]}')
+            resolved.append(match['name'])
+            continue
+        created = create_project_label(api_host, project_id, name, token)
+        log_green(f'Created new label {created["name"]}')
+        resolved.append(created['name'])
+        existing.append(created)
+    return resolved
+
+
 def _resolve_milestone(api_host: str, project_id: int, issue: dict, token: str):
     title = issue['milestone']
     if not title:
@@ -271,12 +309,12 @@ def _resolve_milestone(api_host: str, project_id: int, issue: dict, token: str):
             'There is no milestone defined for this issue. '
             'Use /milestone in your md file to define a milestone'
         )
-        return None
+        return None, None
 
     existing = find_project_milestone(api_host, project_id, title, token)
     if existing:
-        log_info(f'Using existing milestone {title}')
-        return existing['id']
+        log_info(f'Using existing milestone {existing["title"]}')
+        return existing['id'], existing['title']
 
     start = issue['milestone_start']
     end = issue['milestone_end']
@@ -289,7 +327,7 @@ def _resolve_milestone(api_host: str, project_id: int, issue: dict, token: str):
             f'Created new milestone {title} | No start date or end date is defined for this '
             'new milestone. Use /milestone-start and /milestone-end in your md file to define them '
         )
-    return created['id']
+    return created['id'], created['title']
 
 
 def build_frontend(ctx: Context, branch: str, ssr: bool = False) -> None:
@@ -743,10 +781,20 @@ def pipelinelocal(ctx: Context, settings='backend.test_settings', pylintrc=None)
     print("=" * 60)
 
 
+def _ensure_changelog() -> None:
+    if os.path.exists('CHANGELOG.md'):
+        return
+    with open('CHANGELOG.md', 'w') as f:
+        f.write('# Changelog\n')
+    log_green('Created CHANGELOG.md')
+
+
 @task
 def changelog(ctx: Context, version: Version = None):
     """Generate changelog from commits with Changelog trailer"""
 
+    _ensure_changelog()
+
     exclude = f'--exclude={version}' if version else ''
     last_tag_result = ctx.run(f'git describe --tags --abbrev=0 {exclude}', hide=True, warn=True)
     if last_tag_result.ok and last_tag_result.stdout.strip():
@@ -831,9 +879,7 @@ def changelog(ctx: Context, version: Version = None):
                 changelog_entry += f"{commit}\n"
             changelog_entry += "\n"
 
-    if not os.path.exists('CHANGELOG.md'):
-        with open('CHANGELOG.md', 'w') as f:
-            f.write('# Changelog\n')
+    _ensure_changelog()
 
     with open('CHANGELOG.md', 'r') as f:
         existing = f.read()

{itw_python_builder-0.2.12 → itw_python_builder-0.2.13}/itw_python_builder/templates/task_template.md

@@ -1,18 +1,19 @@
 <!-- OPTIONAL -->
-/glab_host <gitlab-host>
-/glab_username <gitlab-username>
-/glab_token <personal-access-token>
+/glab_host 
+/glab_username 
+/glab_token 
 
 <!-- REQUIRED -->
-/title <issue title>
+/title 
 
 <!-- OPTIONAL -->
-/repo namespace/project
-/milestone %"Milestone name"
+/repo 
+/milestone 
 /milestone-start YYYY-MM-DD
 /milestone-end YYYY-MM-DD
-/assignee @username
-/estimate 2h
+/assignee 
+/label 
+/estimate 
 /due YYYY-MM-DD
 
 <!-- OPTIONAL -->

{itw_python_builder-0.2.12 → itw_python_builder-0.2.13}/itw_python_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.2.12
+Version: 0.2.13
 Summary: Standardized Django deployment pipeline with Docker, testing, and SonarQube integration
 Author-email: IT-Works <contact@it-works.io>
 License: MIT

{itw_python_builder-0.2.12 → itw_python_builder-0.2.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itw_python_builder"
-version = "0.2.12"
+version = "0.2.13"
 description = "Standardized Django deployment pipeline with Docker, testing, and SonarQube integration"
 readme = "README.md"
 requires-python = ">=3.10"