t-bug-catcher 0.2.0__tar.gz → 0.2.2__tar.gz

{t_bug_catcher-0.2.0 → t_bug_catcher-0.2.2}/PKG-INFO

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

{t_bug_catcher-0.2.0 → t_bug_catcher-0.2.2}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.0
+current_version = 0.2.2
 commit = True
 tag = False
 

{t_bug_catcher-0.2.0 → t_bug_catcher-0.2.2}/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.2.0",
+    version="0.2.2",
     zip_safe=False,
     install_requires=install_requirements,
 )

{t_bug_catcher-0.2.0 → t_bug_catcher-0.2.2}/t_bug_catcher/__init__.py

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

{t_bug_catcher-0.2.0 → t_bug_catcher-0.2.2}/t_bug_catcher/bug_catcher.py

@@ -28,6 +28,7 @@ class Configurator:
         api_token: str,
         project_key: str,
         webhook_url: Optional[str] = None,
+        default_assignee: Optional[str] = None,
     ):
         """Configures the JiraPoster and BugSnag classes.
 
@@ -36,6 +37,7 @@ class Configurator:
             api_token (str): The API token for the Jira account.
             project_key (str): The key of the Jira project.
             webhook_url (str, optional): The webhook URL for the Jira project. Defaults to None.
+            default_assignee (str, optional): The default assignee for the Jira project. Defaults to None.
 
         Returns:
             None
@@ -45,6 +47,7 @@ class Configurator:
             api_token=api_token,
             project_key=project_key,
             webhook_url=webhook_url,
+            default_assignee=default_assignee,
         )
 
     def bugsnag(self, api_key: str):

{t_bug_catcher-0.2.0 → t_bug_catcher-0.2.2}/t_bug_catcher/bug_snag.py

@@ -28,30 +28,34 @@ class BugSnag:
         Returns:
             bool: True if the configuration was successful, False otherwise.
         """
-        bugsnag.configure(api_key=api_key, release_stage=CONFIG.ENVIRONMENT, auto_notify=False)
-        bugsnag.add_metadata_tab(
-            "Metadata",
-            {
-                "run_url": variables.get("processRunUrl", ""),
-                "run_by": variables.get("userEmail", ""),
-            },
-        )
-        response = requests.request(
-            "POST",
-            "https://otlp.bugsnag.com/v1/traces",
-            headers={
-                "Content-Type": "application/json",
-                "Bugsnag-Api-Key": api_key,
-                "Bugsnag-Payload-Version": "4",
-                "Bugsnag-Sent-At": f"{datetime.now().strftime('%Y-%m-%dT%H:%M:%S.%f')}",
-                "Bugsnag-Span-Sampling": "True",
-            },
-            data='{"message": "test"}',
-        )
-        if response.status_code not in [200, 201, 202, 204]:
-            logger.warning(f"Error connecting to Bugsnag: {response.text}")
+        try:
+            bugsnag.configure(api_key=api_key, release_stage=CONFIG.ENVIRONMENT, auto_notify=False)
+            bugsnag.add_metadata_tab(
+                "Metadata",
+                {
+                    "run_url": variables.get("processRunUrl", ""),
+                    "run_by": variables.get("userEmail", ""),
+                },
+            )
+            response = requests.request(
+                "POST",
+                "https://otlp.bugsnag.com/v1/traces",
+                headers={
+                    "Content-Type": "application/json",
+                    "Bugsnag-Api-Key": api_key,
+                    "Bugsnag-Payload-Version": "4",
+                    "Bugsnag-Sent-At": f"{datetime.now().strftime('%Y-%m-%dT%H:%M:%S.%f')}",
+                    "Bugsnag-Span-Sampling": "True",
+                },
+                data='{"message": "test"}',
+            )
+            if response.status_code not in [200, 201, 202, 204]:
+                logger.warning(f"Error connecting to Bugsnag: {response.text}")
+                return False
+            return True
+        except Exception as ex:
+            logger.warning(f"Failed to configure Bugsnag: {ex}")
             return False
-        return True
 
     def report_error(self, exception: Optional[Exception] = None, metadata: Optional[dict] = None):
         """Sends an error to BugSnag.

{t_bug_catcher-0.2.0 → t_bug_catcher-0.2.2}/t_bug_catcher/jira.py

@@ -52,6 +52,7 @@ class Jira:
         self._project_key = None
         self._webhook_url = None
         self._auth = None
+        self._default_assignee = None
 
     @staticmethod
     def _is_json_response(response) -> bool:
@@ -88,7 +89,9 @@ class Jira:
                     f"{exc_message}Status Code: {response.status_code}, " f"Headers: {response.headers}"
                 )
 
-    def config(self, login, api_token, project_key, webhook_url: Optional[str]) -> bool:
+    def config(
+        self, login, api_token, project_key, webhook_url: Optional[str] = None, default_assignee: Optional[str] = None
+    ) -> bool:
         """Sets the webhook URL for the Jira project.
 
         Args:
@@ -96,22 +99,28 @@ class Jira:
             api_token (str): The API token for the Jira account.
             project_key (str): The key of the Jira project.
             webhook_url (str): The webhook URL for the Jira project.
+            default_assignee (str, optional): The default assignee for the Jira project. Defaults to None.
 
         Returns:
             bool: True if the configuration was successful, False otherwise.
         """
-        self._project_key = project_key
-        if not webhook_url:
-            logger.warning("No JIRA webhook URL provided. All issues will be posted to backlog.")
-        self._webhook_url = webhook_url
-        self._auth = self._authenticate(login, api_token)
         try:
-            self.get_current_user()
-        except BadRequestError:
-            logger.warning("Failed to authenticate to Jira or incorrect project key.")
+            self._project_key = project_key
+            self._default_assignee = default_assignee
+            if not webhook_url:
+                logger.warning("No JIRA webhook URL provided. All issues will be posted to backlog.")
+            self._webhook_url = webhook_url
+            self._auth = self._authenticate(login, api_token)
+            try:
+                self.get_current_user()
+            except BadRequestError:
+                logger.warning("Failed to authenticate to Jira or incorrect project key.")
+                return False
+            self._issue_types = self.__get_issue_types()
+            return True
+        except Exception as ex:
+            logger.warning(f"Failed to configure Jira: {ex}")
             return False
-        self._issue_types = self.__get_issue_types()
-        return True
 
     def _authenticate(self, login, api_token) -> HTTPBasicAuth:
         """Function to authenticate the user with the provided username and API token.
@@ -395,12 +404,8 @@ class Jira:
                             "text": "Run link: ",
                             "marks": [{"type": "strong"}],
                         },
-                        {
-                            "type": "text",
-                            "text": CONFIG.ENVIRONMENT,
-                            "marks": ([] + self.__link_markup()),
-                        },
-                    ],
+                    ]
+                    + self.__link_markup(),
                 }
             ]
             if CONFIG.ENVIRONMENT != "local"
@@ -520,19 +525,39 @@ class Jira:
         link_markup = {
             variables.get("environment"): [
                 {
-                    "type": "link",
-                    "attrs": {"href": variables.get("processRunUrl")},
-                },
-                {"type": "underline"},
+                    "type": "text",
+                    "text": variables.get("processRunUrl"),
+                    "marks": [
+                        {
+                            "type": "link",
+                            "attrs": {"href": variables.get("processRunUrl")},
+                        },
+                        {"type": "underline"},
+                    ],
+                }
             ],
             "robocloud": [
                 {
-                    "type": "link",
-                    "attrs": {"href": CONFIG.RC_RUN_LINK},
-                },
-                {"type": "underline"},
+                    "type": "text",
+                    "text": "https://cloud.robocorp.com",
+                    "marks": [
+                        {
+                            "type": "link",
+                            "attrs": {"href": CONFIG.RC_RUN_LINK},
+                        },
+                        {"type": "underline"},
+                    ],
+                }
+            ],
+            "local": [
+                {
+                    "type": "text",
+                    "text": "local run",
+                    "marks": [
+                        {"type": "underline"},
+                    ],
+                }
             ],
-            "local": [{"type": "underline"}],
         }
         return link_markup[CONFIG.ENVIRONMENT]
 
@@ -644,28 +669,33 @@ class Jira:
                 if len(error) < CONFIG.LIMITS.MAX_DESCRIPTION_LENGTH
                 else error[: CONFIG.LIMITS.MAX_DESCRIPTION_LENGTH] + "..."
             )
+        date_markup = [
+            {
+                "type": "text",
+                "text": f" at {str(datetime.datetime.now().strftime('%B %d, %Y %I:%M:%S %p'))}",
+            },
+            {"type": "hardBreak"},
+        ]
 
         error_markup = [
+            {
+                "type": "text",
+                "text": error,
+                "marks": [{"type": "code"}],
+            },
+        ]
+
+        comment_markup = [
             {
                 "type": "paragraph",
-                "content": [
-                    {"type": "text", "text": "Error occures again in "},
-                    {
-                        "type": "text",
-                        "text": CONFIG.ENVIRONMENT,
-                        "marks": ([] + self.__link_markup()),
-                    },
-                    {
-                        "type": "text",
-                        "text": f" at {str(datetime.datetime.now().strftime('%B %d, %Y %I:%M:%S %p'))}",
-                    },
-                    {"type": "hardBreak"},
-                    {
-                        "type": "text",
-                        "text": error,
-                        "marks": [{"type": "code"}],
-                    },
-                ],
+                "content": (
+                    [
+                        {"type": "text", "text": "Error occures again in "},
+                    ]
+                    + self.__link_markup()
+                    + date_markup
+                    + error_markup
+                ),
             }
         ]
 
@@ -702,7 +732,7 @@ class Jira:
                 "type": "doc",
                 "version": 1,
                 "content": []
-                + (error_markup if error else [])
+                + (comment_markup if error else [])
                 + (self.__description_markup(additional_info) if additional_info else [])
                 + (attach_markup if attachments else [])
                 + (self.__metadata_markup(metadata) if metadata else []),
@@ -771,7 +801,13 @@ class Jira:
             posted_attachments = []
         else:
             posted_attachments = (
-                [self.add_attachment(attachment, issue["id"]) for attachment in attachments] if attachments else []
+                [
+                    self.add_attachment(attachment, issue["id"])
+                    for attachment in attachments
+                    if os.path.exists(str(attachment))
+                ]
+                if attachments
+                else []
             )
 
         self.update_comment(
@@ -825,7 +861,8 @@ class Jira:
         ticket_id = ticket["id"]
         if attachments:
             for attachment in attachments:
-                self.add_attachment(attachment, ticket_id)
+                if os.path.exists(str(attachment)):
+                    self.add_attachment(attachment, ticket_id)
         if self._webhook_url:
             self.move_ticket_to_board(ticket_id)
         return response
@@ -834,7 +871,7 @@ class Jira:
         self,
         exception: Optional[Exception] = None,
         assignee: Optional[str] = None,
-        attachments: Optional[List] = None,
+        attachments: Union[List, str, Path, None] = None,
         metadata: Optional[dict] = None,
         additional_info: Optional[str] = None,
     ) -> dict:
@@ -857,6 +894,9 @@ class Jira:
             if attachments is None:
                 attachments = []
 
+            if isinstance(attachments, (str, Path)):
+                attachments = [str(attachments)]
+
             if not isinstance(attachments, List):
                 logger.warning(f"Incorrect type of attachments: {type(attachments)}")
                 attachments = []
@@ -886,6 +926,7 @@ class Jira:
                 return existing_ticket
 
             assignee_id = None
+            assignee = assignee if assignee else self._default_assignee
             if assignee:
                 try:
                     assignee_id = self.__get_assignee(assignee)
@@ -906,6 +947,7 @@ class Jira:
                 description=description,
                 assignee_id=assignee_id,
                 attachments=attachments,
+                labels=["bug_catcher"],
             )
             return response
         except Exception as ex:
@@ -939,6 +981,13 @@ class Jira:
                 )
                 return existing_ticket
 
+            assignee_id = None
+            if self._default_assignee:
+                try:
+                    assignee_id = self.__get_assignee(self._default_assignee)
+                except Exception as ex:
+                    logger.info(f"Failed to get assignee {self._default_assignee} due to: {ex}")
+
             description = self.__create_description_markup(
                 exc_type=exc_type,
                 exc_value=exc_value,
@@ -949,6 +998,7 @@ class Jira:
             response = self.__create_new_ticket(
                 summary=summary,
                 description=description,
+                assignee_id=assignee_id,
                 labels=["fatal_error"],
             )
             return response

{t_bug_catcher-0.2.0 → t_bug_catcher-0.2.2}/t_bug_catcher.egg-info/PKG-INFO

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