t-bug-catcher 0.5.10__tar.gz → 0.6.1__tar.gz

{t_bug_catcher-0.5.10 → t_bug_catcher-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: t_bug_catcher
-Version: 0.5.10
+Version: 0.6.1
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful

{t_bug_catcher-0.5.10 → t_bug_catcher-0.6.1}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.10
+current_version = 0.6.1
 commit = True
 tag = False
 

{t_bug_catcher-0.5.10 → t_bug_catcher-0.6.1}/setup.py

@@ -26,7 +26,7 @@ setup(
     packages=find_packages(include=["t_bug_catcher", "t_bug_catcher.*"]),
     test_suite="tests",
     url="https://www.thoughtful.ai/",
-    version="0.5.10",
+    version="0.6.1",
     zip_safe=False,
     install_requires=install_requirements,
     include_package_data=True,

{t_bug_catcher-0.5.10 → t_bug_catcher-0.6.1}/t_bug_catcher/__init__.py

@@ -3,7 +3,7 @@
 __author__ = """Thoughtful"""
 __email__ = "support@thoughtful.ai"
 # fmt: off
-__version__ = '0.5.10'
+__version__ = '0.6.1'
 # fmt: on
 
 from .bug_catcher import (

{t_bug_catcher-0.5.10 → t_bug_catcher-0.6.1}/t_bug_catcher/bug_catcher.py

@@ -110,6 +110,7 @@ class BugCatcher:
         metadata: Optional[dict] = None,
         attachments: Optional[List] = None,
         assignee: Optional[str] = None,
+        team: Optional[str] = None,
     ):
         """Reports an error to the Jira project.
 
@@ -119,6 +120,7 @@ class BugCatcher:
             metadata (dict, optional): The metadata to be added to the Jira issue. Defaults to None.
             attachments (List, optional): The attachments to be added to the Jira issue. Defaults to None.
             assignee (str, optional): The assignee to be added to the Jira issue. Defaults to None.
+            team (str, optional): The team to be assigned to the Jira issue. Defaults to None.
 
         Returns:
             None
@@ -175,6 +177,7 @@ class BugCatcher:
             self.__jira.report_error(
                 exception=exception,
                 assignee=assignee,
+                team=team,
                 attachments=attachments,
                 stack_trace=stack_trace,
                 additional_info=description,

{t_bug_catcher-0.5.10 → t_bug_catcher-0.6.1}/t_bug_catcher/jira.py

@@ -21,7 +21,7 @@ from retry import retry
 from .config import CONFIG
 from .exceptions import BadRequestError
 from .utils import logger
-from .utils.common import Encoder, get_frames, retrieve_build_info
+from .utils.common import Encoder, get_frames, remove_holotree_id, retrieve_build_info
 from .workitems import variables
 
 
@@ -216,6 +216,7 @@ class Jira:
         assignee: Optional[str] = None,
         labels: Optional[list] = None,
         priority: Optional[str] = None,
+        team: Optional[str] = None,
     ) -> str:
         """Generates the issue body payload for creating a new issue.
 
@@ -226,6 +227,7 @@ class Jira:
             issue_type (str): The type of the issue.
             labels (list, optional): The labels of the issue. Defaults to None.
             priority (str, optional): The priority of the issue. Defaults to None.
+            team (str, optional): The team to be assigned to the Jira issue. Defaults to None.
 
         Returns:
             The JSON payload for creating a new issue.
@@ -246,6 +248,8 @@ class Jira:
             fields["fields"]["customfield_10077"] = [CONFIG.ADMIN_CODE]
         if priority:
             fields["fields"]["priority"] = {"id": priority}
+        if team:
+            fields["fields"]["customfield_10001"] = team
         payload = json.dumps(fields)
         return payload
 
@@ -1146,6 +1150,7 @@ class Jira:
         attachments: Optional[List] = None,
         labels: Optional[list] = None,
         priority: Optional[str] = None,
+        team: Optional[str] = None,
     ) -> requests.Response:
         """Create a new ticket.
 
@@ -1156,6 +1161,7 @@ class Jira:
             attachments (List, optional): The list of attachments. Defaults to None.
             labels (List, optional): The list of labels. Defaults to None.
             priority (str, optional): The priority of the ticket. Defaults to None.
+            team (str, optional): The team to be assigned to the Jira issue. Defaults to None.
 
         Returns:
             The response from creating the ticket.
@@ -1177,26 +1183,26 @@ class Jira:
                 or self._issue_types.get("epic")
             )
 
-        issue = self.__generate_issue_body(
-            summary=summary[:255].split("\n")[0],
-            description=description,
-            assignee=assignee_id,
-            issue_type=issue_type,
-            project_key=project_key,
-            labels=labels,
-            priority=priority,
-        )
+        issue_body = {
+            "summary": summary[:255].split("\n")[0],
+            "description": description,
+            "assignee": assignee_id,
+            "issue_type": issue_type,
+            "project_key": project_key,
+            "labels": labels,
+            "priority": priority,
+            "team": team,
+        }
+
+        issue = self.__generate_issue_body(**issue_body)
+
         response = self.post_ticket(issue=issue)
 
-        if response.json().get("errors", {}).get("labels"):
-            issue = self.__generate_issue_body(
-                summary=summary[:255].split("\n")[0],
-                description=description,
-                assignee=assignee_id,
-                issue_type=issue_type,
-                project_key=project_key,
-                priority=priority,
-            )
+        errors = response.json().get("errors", {})
+
+        if errors:
+            issue_body = {key: value for key, value in issue_body.items() if key not in errors}
+            issue = self.__generate_issue_body(**issue_body)
             response = self.post_ticket(issue=issue)
 
         if response.status_code != 201:
@@ -1271,6 +1277,7 @@ class Jira:
         self,
         exception: Optional[Exception] = None,
         assignee: Optional[str] = None,
+        team: Optional[str] = None,
         attachments: Union[List, str, Path, None] = None,
         stack_trace: Optional[str] = None,
         metadata: Optional[dict] = None,
@@ -1281,6 +1288,7 @@ class Jira:
         Args:
             exception (Exception, optional): The exception to be added to the Jira issue.
             assignee (str, optional): The assignee to be added to the Jira issue.
+            team (str, optional): The team to be assigned to the Jira issue. Defaults to None.
             attachments (List, optional): List of attachments to be added to the Jira issue.
             stack_trace (str, optional): Stack trace to be added to the Jira issue.
             metadata (dict, optional): Metadata to be added to the Jira issue.
@@ -1349,7 +1357,7 @@ class Jira:
                 metadata=metadata,
             )
 
-            priority = CONFIG.TICKET_PRIORITIES.HIGH if CONFIG.STAGE and CONFIG.STAGE.lower() == "hypercare" else None
+            priority = CONFIG.TICKET_PRIORITIES.HIGH
 
             response = self.__create_new_ticket(
                 summary=summary,
@@ -1358,6 +1366,7 @@ class Jira:
                 attachments=attachments,
                 labels=["bug_catcher"],
                 priority=priority,
+                team=team,
             )
             if stack_trace and os.path.exists(stack_trace):
                 os.remove(stack_trace)
@@ -1412,9 +1421,7 @@ class Jira:
                 error_id=error_id,
             )
 
-            priority = (
-                CONFIG.TICKET_PRIORITIES.HIGHEST if CONFIG.STAGE and CONFIG.STAGE.lower() == "hypercare" else None
-            )
+            priority = CONFIG.TICKET_PRIORITIES.HIGHEST
 
             response = self.__create_new_ticket(
                 summary=summary,
@@ -1638,7 +1645,8 @@ class Jira:
         exception_chain = "-".join([f"{frame.name}" for frame in frames])
         rel_path = os.path.relpath(frames[-1].filename, os.getcwd())
         path = Path(os.path.splitext(rel_path)[0]).as_posix()
-        error_id = f"{path}-{exception_chain}-{frames[-1].line}-" f"{exc_type.__module__}-{exc_type.__name__}"
+        path = remove_holotree_id(path)
+        error_id = f"{path}-{exception_chain}-{frames[-1].line}-{exc_type.__module__}-{exc_type.__name__}"
         return hashlib.md5(error_id.encode()).hexdigest()
 
     @staticmethod

{t_bug_catcher-0.5.10 → t_bug_catcher-0.6.1}/t_bug_catcher/utils/common.py

@@ -1,6 +1,7 @@
 import copy
 import json
 import os
+import re
 import traceback
 import urllib
 from datetime import date, datetime
@@ -101,6 +102,19 @@ def strip_path(path: str):
     return path.replace(os.getcwd(), "").strip(os.sep)
 
 
+def remove_holotree_id(path: str) -> str:
+    """A function to remove the value after 'holotree' from the path.
+
+    Args:
+        path (str): The path from which to remove the value after 'holotree'.
+
+    Returns:
+        str: The modified path.
+    """
+    pattern = r"(holotree\/)[^\/]+\/"
+    return re.sub(pattern, r"\1", path)
+
+
 def retrieve_build_info():
     """Logs build information."""
     if not os.path.exists(CONFIG.BUILD_INFO_FILE):

{t_bug_catcher-0.5.10 → t_bug_catcher-0.6.1}/t_bug_catcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: t_bug_catcher
-Version: 0.5.10
+Version: 0.6.1
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful