ai-cr 3.2.1__py3-none-any.whl → 3.3.0__py3-none-any.whl

gito/pipeline_steps/linear.py

@@ -1,85 +1,85 @@
-import logging
-import os
-import requests
-
-import git
-
-from gito.issue_trackers import IssueTrackerIssue, resolve_issue_key
-
-
-def fetch_issue(issue_key: str, api_key: str = None) -> IssueTrackerIssue | None:
-    """
-    Fetch a Linear issue using GraphQL API.
-    """
-    api_key = api_key or os.getenv("LINEAR_API_KEY")
-    try:
-        url = "https://api.linear.app/graphql"
-        headers = {
-            "Authorization": f"{api_key}",
-            "Content-Type": "application/json"
-        }
-
-        query = """
-            query Issues($teamKey: String!, $issueNumber: Float) {
-                issues(filter: {team: {key: {eq: $teamKey}}, number: {eq: $issueNumber}}) {
-                    nodes {
-                        id
-                        identifier
-                        title
-                        description
-                        url
-                    }
-                }
-            }
-        """
-        team_key, issue_number = issue_key.split("-")
-        response = requests.post(
-            url,
-            json={
-                "query": query,
-                "variables": {'teamKey': team_key, 'issueNumber': int(issue_number)}
-            },
-            headers=headers
-        )
-        response.raise_for_status()
-        data = response.json()
-
-        if "errors" in data:
-            logging.error(f"Linear API error: {data['errors']}")
-            return None
-
-        nodes = data.get("data", {}).get("issues", {}).get("nodes", [])
-        if not nodes:
-            logging.error(f"Linear issue {issue_key} not found")
-            return None
-
-        issue = nodes[0]
-        return IssueTrackerIssue(
-            title=issue["title"],
-            description=issue.get("description") or "",
-            url=issue["url"]
-        )
-
-    except requests.HTTPError as e:
-        logging.error(f"Failed to fetch Linear issue {issue_key}: {e}")
-        logging.error(f"Response body: {response.text}")
-        return None
-
-
-def fetch_associated_issue(
-    repo: git.Repo,
-    api_key=None,
-    **kwargs
-):
-    """
-    Pipeline step to fetch a Linear issue based on the current branch name.
-    """
-    api_key = api_key or os.getenv("LINEAR_API_KEY")
-    if not api_key:
-        logging.error("LINEAR_API_KEY environment variable is not set")
-        return
-
-    issue_key = resolve_issue_key(repo)
-    return dict(
-        associated_issue=fetch_issue(issue_key, api_key)
-    ) if issue_key else None
+import logging
+import os
+import requests
+
+import git
+
+from gito.issue_trackers import IssueTrackerIssue, resolve_issue_key
+
+
+def fetch_issue(issue_key: str, api_key: str = None) -> IssueTrackerIssue | None:
+    """
+    Fetch a Linear issue using GraphQL API.
+    """
+    api_key = api_key or os.getenv("LINEAR_API_KEY")
+    try:
+        url = "https://api.linear.app/graphql"
+        headers = {
+            "Authorization": f"{api_key}",
+            "Content-Type": "application/json"
+        }
+
+        query = """
+            query Issues($teamKey: String!, $issueNumber: Float) {
+                issues(filter: {team: {key: {eq: $teamKey}}, number: {eq: $issueNumber}}) {
+                    nodes {
+                        id
+                        identifier
+                        title
+                        description
+                        url
+                    }
+                }
+            }
+        """
+        team_key, issue_number = issue_key.split("-")
+        response = requests.post(
+            url,
+            json={
+                "query": query,
+                "variables": {'teamKey': team_key, 'issueNumber': int(issue_number)}
+            },
+            headers=headers
+        )
+        response.raise_for_status()
+        data = response.json()
+
+        if "errors" in data:
+            logging.error(f"Linear API error: {data['errors']}")
+            return None
+
+        nodes = data.get("data", {}).get("issues", {}).get("nodes", [])
+        if not nodes:
+            logging.error(f"Linear issue {issue_key} not found")
+            return None
+
+        issue = nodes[0]
+        return IssueTrackerIssue(
+            title=issue["title"],
+            description=issue.get("description") or "",
+            url=issue["url"]
+        )
+
+    except requests.HTTPError as e:
+        logging.error(f"Failed to fetch Linear issue {issue_key}: {e}")
+        logging.error(f"Response body: {response.text}")
+        return None
+
+
+def fetch_associated_issue(
+    repo: git.Repo,
+    api_key=None,
+    **kwargs
+):
+    """
+    Pipeline step to fetch a Linear issue based on the current branch name.
+    """
+    api_key = api_key or os.getenv("LINEAR_API_KEY")
+    if not api_key:
+        logging.error("LINEAR_API_KEY environment variable is not set")
+        return
+
+    issue_key = resolve_issue_key(repo)
+    return dict(
+        associated_issue=fetch_issue(issue_key, api_key)
+    ) if issue_key else None

gito/project_config.py

@@ -1,85 +1,85 @@
-import logging
-import tomllib
-from dataclasses import dataclass, field
-from pathlib import Path
-
-import microcore as mc
-from gito.utils import detect_github_env
-from microcore import ui
-from git import Repo
-
-from .constants import PROJECT_CONFIG_BUNDLED_DEFAULTS_FILE, PROJECT_CONFIG_FILE_PATH
-from .pipeline import PipelineStep
-
-
-@dataclass
-class ProjectConfig:
-    prompt: str = ""
-    summary_prompt: str = ""
-    answer_prompt: str = ""
-    report_template_md: str = ""
-    """Markdown report template"""
-    report_template_cli: str = ""
-    """Report template for CLI output"""
-    post_process: str = ""
-    retries: int = 3
-    """LLM retries for one request"""
-    max_code_tokens: int = 32000
-    prompt_vars: dict = field(default_factory=dict)
-    mention_triggers: list[str] = field(default_factory=list)
-    answer_github_comments: bool = field(default=True)
-    """
-    Defines the keyword or mention tag that triggers bot actions
-    when referenced in code review comments.
-    """
-    aux_files: list[str] = field(default_factory=list)
-    pipeline_steps: dict[str, dict | PipelineStep] = field(default_factory=dict)
-    collapse_previous_code_review_comments: bool = field(default=True)
-    """
-    If True, previously added code review comments in the pull request
-    will be collapsed automatically when a new comment is added.
-    """
-
-    def __post_init__(self):
-        self.pipeline_steps = {
-            k: PipelineStep(**v) if isinstance(v, dict) else v
-            for k, v in self.pipeline_steps.items()
-        }
-
-    @staticmethod
-    def _read_bundled_defaults() -> dict:
-        with open(PROJECT_CONFIG_BUNDLED_DEFAULTS_FILE, "rb") as f:
-            config = tomllib.load(f)
-        return config
-
-    @staticmethod
-    def load_for_repo(repo: Repo):
-        return ProjectConfig.load(Path(repo.working_tree_dir) / PROJECT_CONFIG_FILE_PATH)
-
-    @staticmethod
-    def load(config_path: str | Path | None = None) -> "ProjectConfig":
-        config = ProjectConfig._read_bundled_defaults()
-        github_env = detect_github_env()
-        config["prompt_vars"] |= github_env | dict(github_env=github_env)
-
-        config_path = Path(config_path or PROJECT_CONFIG_FILE_PATH)
-        if config_path.exists():
-            logging.info(
-                f"Loading project-specific configuration from {mc.utils.file_link(config_path)}...")
-            default_prompt_vars = config["prompt_vars"]
-            default_pipeline_steps = config["pipeline_steps"]
-            with open(config_path, "rb") as f:
-                config.update(tomllib.load(f))
-            # overriding prompt_vars config section will not empty default values
-            config["prompt_vars"] = default_prompt_vars | config["prompt_vars"]
-            # merge individual pipeline steps
-            for k, v in config["pipeline_steps"].items():
-                config["pipeline_steps"][k] = default_pipeline_steps.get(k, {}) | v
-            # merge pipeline steps dict
-            config["pipeline_steps"] = default_pipeline_steps | config["pipeline_steps"]
-        else:
-            logging.info(
-                f"No project config found at {ui.blue(config_path)}, using defaults"
-            )
-
-        return ProjectConfig(**config)
+import logging
+import tomllib
+from dataclasses import dataclass, field
+from pathlib import Path
+
+import microcore as mc
+from gito.utils import detect_github_env
+from microcore import ui
+from git import Repo
+
+from .constants import PROJECT_CONFIG_BUNDLED_DEFAULTS_FILE, PROJECT_CONFIG_FILE_PATH
+from .pipeline import PipelineStep
+
+
+@dataclass
+class ProjectConfig:
+    prompt: str = ""
+    summary_prompt: str = ""
+    answer_prompt: str = ""
+    report_template_md: str = ""
+    """Markdown report template"""
+    report_template_cli: str = ""
+    """Report template for CLI output"""
+    post_process: str = ""
+    retries: int = 3
+    """LLM retries for one request"""
+    max_code_tokens: int = 32000
+    prompt_vars: dict = field(default_factory=dict)
+    mention_triggers: list[str] = field(default_factory=list)
+    answer_github_comments: bool = field(default=True)
+    """
+    Defines the keyword or mention tag that triggers bot actions
+    when referenced in code review comments.
+    """
+    aux_files: list[str] = field(default_factory=list)
+    pipeline_steps: dict[str, dict | PipelineStep] = field(default_factory=dict)
+    collapse_previous_code_review_comments: bool = field(default=True)
+    """
+    If True, previously added code review comments in the pull request
+    will be collapsed automatically when a new comment is added.
+    """
+
+    def __post_init__(self):
+        self.pipeline_steps = {
+            k: PipelineStep(**v) if isinstance(v, dict) else v
+            for k, v in self.pipeline_steps.items()
+        }
+
+    @staticmethod
+    def _read_bundled_defaults() -> dict:
+        with open(PROJECT_CONFIG_BUNDLED_DEFAULTS_FILE, "rb") as f:
+            config = tomllib.load(f)
+        return config
+
+    @staticmethod
+    def load_for_repo(repo: Repo):
+        return ProjectConfig.load(Path(repo.working_tree_dir) / PROJECT_CONFIG_FILE_PATH)
+
+    @staticmethod
+    def load(config_path: str | Path | None = None) -> "ProjectConfig":
+        config = ProjectConfig._read_bundled_defaults()
+        github_env = detect_github_env()
+        config["prompt_vars"] |= github_env | dict(github_env=github_env)
+
+        config_path = Path(config_path or PROJECT_CONFIG_FILE_PATH)
+        if config_path.exists():
+            logging.info(
+                f"Loading project-specific configuration from {mc.utils.file_link(config_path)}...")
+            default_prompt_vars = config["prompt_vars"]
+            default_pipeline_steps = config["pipeline_steps"]
+            with open(config_path, "rb") as f:
+                config.update(tomllib.load(f))
+            # overriding prompt_vars config section will not empty default values
+            config["prompt_vars"] = default_prompt_vars | config["prompt_vars"]
+            # merge individual pipeline steps
+            for k, v in config["pipeline_steps"].items():
+                config["pipeline_steps"][k] = default_pipeline_steps.get(k, {}) | v
+            # merge pipeline steps dict
+            config["pipeline_steps"] = default_pipeline_steps | config["pipeline_steps"]
+        else:
+            logging.info(
+                f"No project config found at {ui.blue(config_path)}, using defaults"
+            )
+
+        return ProjectConfig(**config)

gito/report_struct.py

@@ -1,136 +1,136 @@
-import json
-import logging
-from dataclasses import dataclass, field, asdict
-from datetime import datetime
-from enum import StrEnum
-from pathlib import Path
-
-import microcore as mc
-from colorama import Fore, Style, Back
-from microcore.utils import file_link
-import textwrap
-
-from .constants import JSON_REPORT_FILE_NAME, HTML_TEXT_ICON, HTML_CR_COMMENT_MARKER
-from .project_config import ProjectConfig
-from .utils import syntax_hint, block_wrap_lr, max_line_len, remove_html_comments
-
-
-@dataclass
-class Issue:
-    @dataclass
-    class AffectedCode:
-        start_line: int = field()
-        end_line: int | None = field(default=None)
-        file: str = field(default="")
-        proposal: str = field(default="")
-        affected_code: str = field(default="")
-
-        @property
-        def syntax_hint(self) -> str:
-            return syntax_hint(self.file)
-
-    id: str = field()
-    title: str = field()
-    details: str = field(default="")
-    severity: int | None = field(default=None)
-    confidence: int | None = field(default=None)
-    tags: list[str] = field(default_factory=list)
-    file: str = field(default="")
-    affected_lines: list[AffectedCode] = field(default_factory=list)
-
-    def __post_init__(self):
-        self.affected_lines = [
-            Issue.AffectedCode(**dict(file=self.file) | i)
-            for i in self.affected_lines
-        ]
-
-    def github_code_link(self, github_env: dict) -> str:
-        url = (
-            f"https://github.com/{github_env['github_repo']}"
-            f"/blob/{github_env['github_pr_sha_or_branch']}"
-            f"/{self.file}"
-        )
-        if self.affected_lines:
-            url += f"#L{self.affected_lines[0].start_line}"
-            if self.affected_lines[0].end_line:
-                url += f"-L{self.affected_lines[0].end_line}"
-        return url
-
-
-@dataclass
-class Report:
-    class Format(StrEnum):
-        MARKDOWN = "md"
-        CLI = "cli"
-
-    issues: dict[str, list[Issue]] = field(default_factory=dict)
-    summary: str = field(default="")
-    number_of_processed_files: int = field(default=0)
-    total_issues: int = field(init=False)
-    created_at: str = field(default_factory=lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
-    model: str = field(default_factory=lambda: mc.config().MODEL)
-    pipeline_out: dict = field(default_factory=dict)
-
-    @property
-    def plain_issues(self):
-        return [
-            issue
-            for file, issues in self.issues.items()
-            for issue in issues
-        ]
-
-    def __post_init__(self):
-        issue_id: int = 0
-        for file in self.issues.keys():
-            self.issues[file] = [
-                Issue(
-                    **{
-                        "id": (issue_id := issue_id + 1),
-                        "file": file,
-                    } | issue
-                )
-                for issue in self.issues[file]
-            ]
-        self.total_issues = issue_id
-
-    def save(self, file_name: str = ""):
-        file_name = file_name or JSON_REPORT_FILE_NAME
-        with open(file_name, "w") as f:
-            json.dump(asdict(self), f, indent=4)
-        logging.info(f"Report saved to {mc.utils.file_link(file_name)}")
-
-    @staticmethod
-    def load(file_name: str | Path = ""):
-        with open(file_name or JSON_REPORT_FILE_NAME, "r") as f:
-            data = json.load(f)
-        data.pop("total_issues", None)
-        return Report(**data)
-
-    def render(
-        self,
-        config: ProjectConfig = None,
-        report_format: Format = Format.MARKDOWN,
-    ) -> str:
-        config = config or ProjectConfig.load()
-        template = getattr(config, f"report_template_{report_format}")
-        return mc.prompt(
-            template,
-            report=self,
-            ui=mc.ui,
-            Fore=Fore,
-            Style=Style,
-            Back=Back,
-            file_link=file_link,
-            textwrap=textwrap,
-            block_wrap_lr=block_wrap_lr,
-            max_line_len=max_line_len,
-            HTML_TEXT_ICON=HTML_TEXT_ICON,
-            HTML_CR_COMMENT_MARKER=HTML_CR_COMMENT_MARKER,
-            remove_html_comments=remove_html_comments,
-            **config.prompt_vars
-        )
-
-    def to_cli(self, report_format=Format.CLI):
-        output = self.render(report_format=report_format)
-        print("")
-        print(output)
+import json
+import logging
+from dataclasses import dataclass, field, asdict
+from datetime import datetime
+from enum import StrEnum
+from pathlib import Path
+
+import microcore as mc
+from colorama import Fore, Style, Back
+from microcore.utils import file_link
+import textwrap
+
+from .constants import JSON_REPORT_FILE_NAME, HTML_TEXT_ICON, HTML_CR_COMMENT_MARKER
+from .project_config import ProjectConfig
+from .utils import syntax_hint, block_wrap_lr, max_line_len, remove_html_comments, filter_kwargs
+
+
+@dataclass
+class Issue:
+    @dataclass
+    class AffectedCode:
+        start_line: int = field()
+        end_line: int | None = field(default=None)
+        file: str = field(default="")
+        proposal: str = field(default="")
+        affected_code: str = field(default="")
+
+        @property
+        def syntax_hint(self) -> str:
+            return syntax_hint(self.file)
+
+    id: str = field()
+    title: str = field()
+    details: str = field(default="")
+    severity: int | None = field(default=None)
+    confidence: int | None = field(default=None)
+    tags: list[str] = field(default_factory=list)
+    file: str = field(default="")
+    affected_lines: list[AffectedCode] = field(default_factory=list)
+
+    def __post_init__(self):
+        self.affected_lines = [
+            Issue.AffectedCode(**filter_kwargs(Issue.AffectedCode, dict(file=self.file) | i))
+            for i in self.affected_lines
+        ]
+
+    def github_code_link(self, github_env: dict) -> str:
+        url = (
+            f"https://github.com/{github_env['github_repo']}"
+            f"/blob/{github_env['github_pr_sha_or_branch']}"
+            f"/{self.file}"
+        )
+        if self.affected_lines:
+            url += f"#L{self.affected_lines[0].start_line}"
+            if self.affected_lines[0].end_line:
+                url += f"-L{self.affected_lines[0].end_line}"
+        return url
+
+
+@dataclass
+class Report:
+    class Format(StrEnum):
+        MARKDOWN = "md"
+        CLI = "cli"
+
+    issues: dict[str, list[Issue | dict]] = field(default_factory=dict)
+    summary: str = field(default="")
+    number_of_processed_files: int = field(default=0)
+    total_issues: int = field(init=False)
+    created_at: str = field(default_factory=lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+    model: str = field(default_factory=lambda: mc.config().MODEL)
+    pipeline_out: dict = field(default_factory=dict)
+
+    @property
+    def plain_issues(self):
+        return [
+            issue
+            for file, issues in self.issues.items()
+            for issue in issues
+        ]
+
+    def __post_init__(self):
+        issue_id: int = 0
+        for file in self.issues.keys():
+            self.issues[file] = [
+                Issue(
+                    **filter_kwargs(Issue, {
+                        "id": (issue_id := issue_id + 1),
+                        "file": file,
+                    } | issue)
+                )
+                for issue in self.issues[file]
+            ]
+        self.total_issues = issue_id
+
+    def save(self, file_name: str = ""):
+        file_name = file_name or JSON_REPORT_FILE_NAME
+        with open(file_name, "w") as f:
+            json.dump(asdict(self), f, indent=4)
+        logging.info(f"Report saved to {mc.utils.file_link(file_name)}")
+
+    @staticmethod
+    def load(file_name: str | Path = ""):
+        with open(file_name or JSON_REPORT_FILE_NAME, "r") as f:
+            data = json.load(f)
+        data.pop("total_issues", None)
+        return Report(**data)
+
+    def render(
+        self,
+        config: ProjectConfig = None,
+        report_format: Format = Format.MARKDOWN,
+    ) -> str:
+        config = config or ProjectConfig.load()
+        template = getattr(config, f"report_template_{report_format}")
+        return mc.prompt(
+            template,
+            report=self,
+            ui=mc.ui,
+            Fore=Fore,
+            Style=Style,
+            Back=Back,
+            file_link=file_link,
+            textwrap=textwrap,
+            block_wrap_lr=block_wrap_lr,
+            max_line_len=max_line_len,
+            HTML_TEXT_ICON=HTML_TEXT_ICON,
+            HTML_CR_COMMENT_MARKER=HTML_CR_COMMENT_MARKER,
+            remove_html_comments=remove_html_comments,
+            **config.prompt_vars
+        )
+
+    def to_cli(self, report_format=Format.CLI):
+        output = self.render(report_format=report_format)
+        print("")
+        print(output)

gito/tpl/answer.j2

@@ -1,26 +1,26 @@
-{{ self_id }}
-----TASK----
-Answer the following user question:
---USER QUESTION--
-{{ question }}
-----
-----RELATED CODEBASE CHANGES----
-{% for part in diff %}{{ part }}\n{% endfor %}
-
-----FULL FILE CONTENT AFTER APPLYING CHANGES----
-{% for file, file_lines in all_file_lines.items() %}
---FILE: {{ file }}--
-{{ file_lines }}
-{% endfor %}
-
-{% include "partial/aux_files.j2" %}
-
-{%- if pipeline_out.associated_issue and pipeline_out.associated_issue.title %}
-----ASSOCIATED ISSUE----
-# {{ pipeline_out.associated_issue.title }}
-{{ pipeline_out.associated_issue.description }}
-URL: {{ pipeline_out.associated_issue.url }}
-{%- endif -%}{{ '\n' }}
-
-----ANSWERING INSTRUCTIONS----
+{{ self_id }}
+----TASK----
+Answer the following user question:
+--USER QUESTION--
+{{ question }}
+----
+----RELATED CODEBASE CHANGES----
+{% for part in diff %}{{ part }}\n{% endfor %}
+
+----FULL FILE CONTENT AFTER APPLYING CHANGES----
+{% for file, file_lines in all_file_lines.items() %}
+--FILE: {{ file }}--
+{{ file_lines }}
+{% endfor %}
+
+{% include "partial/aux_files.j2" %}
+
+{%- if pipeline_out.associated_issue and pipeline_out.associated_issue.title %}
+----ASSOCIATED ISSUE----
+# {{ pipeline_out.associated_issue.title }}
+{{ pipeline_out.associated_issue.description }}
+URL: {{ pipeline_out.associated_issue.url }}
+{%- endif -%}{{ '\n' }}
+
+----ANSWERING INSTRUCTIONS----
 {{ answering_instructions }}