PyBugReporter 1.0.13__tar.gz → 1.0.18__tar.gz

{pybugreporter-1.0.13 → pybugreporter-1.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyBugReporter
-Version: 1.0.13
+Version: 1.0.18
 Summary: A python library for catching thrown exceptions and automatically creating issues on a GitHub repo.
 Home-page: https://github.com/byuawsfhtl/PyBugReporter.git
 Author: Record Linking Lab

pybugreporter-1.0.18/PyBugReporter/_version.py

@@ -0,0 +1 @@
+__version__ = '1.0.18'

{pybugreporter-1.0.13 → pybugreporter-1.0.18}/PyBugReporter/src/BugReporter.py

@@ -7,6 +7,11 @@ from PyBugReporter.src.DiscordBot import DiscordBot
 
 from python_graphql_client import GraphqlClient
 
+BUG_LABEL_NAME: str = "bug"
+AUTO_LABEL_NAME: str = "auto generated"
+BUG_LABEL_COLOR: str = "d73a4a"
+AUTO_LABEL_COLOR: str = "ededed"
+
 class NotCreatedError(Exception):
     """Raised when someone tries to report a bug to a repo that has not been set up as a reporting destination through setVars.
     """
@@ -226,8 +231,8 @@ class BugReporter:
 
         # query variables
         repoId = await self._getRepoId_async(self.handlers[repoName])
-        bugLabel = "LA_kwDOJ3JPj88AAAABU1q15w"
-        autoLabel = "LA_kwDOJ3JPj88AAAABU1q2DA"
+        bugLabel = await self._get_or_create_label_id_async(self.handlers[repoName], repoId, BUG_LABEL_NAME, BUG_LABEL_COLOR)
+        autoLabel = await self._get_or_create_label_id_async(self.handlers[repoName], repoId, AUTO_LABEL_NAME, AUTO_LABEL_COLOR)
         
         # Create new issue
         createIssue = """
@@ -264,7 +269,7 @@ class BugReporter:
         # Send to Discord if applicable
         if self.handlers[repoName].useDiscord:
             discordBot = DiscordBot(self.handlers[repoName].botToken, self.handlers[repoName].channelId)
-            await discordBot.send_message(shortErrorMessage, issueExists)
+            await discordBot.send_message(shortErrorMessage, issueExists, errorTitle)
 
         if (not issueExists):
             result = await client.execute_async(query=createIssue, variables=variables, headers=headers)
@@ -344,7 +349,7 @@ class BugReporter:
         headers = {"Authorization": f"Bearer {handler.githubKey}"}
 
         # query variables
-        autoLabel = "auto generated"
+        autoLabel = AUTO_LABEL_NAME
 
         # Query to return all issues with auto gen label
         findIssue = """
@@ -413,6 +418,64 @@ class BugReporter:
         repoID = await client.execute_async(query=getID, variables=variables, headers=headers)
         return repoID['data']['repository']['id']
 
+    @classmethod
+    async def _get_or_create_label_id_async(cls, handler: BugHandler, repo_id: str, label_name: str, color: str = "ededed") -> str:
+        """Gets a label ID from the repository, creating it if it does not exist.
+
+        Args:
+            handler (BugHandler): the object of reporting details
+            repo_id (str): the repository ID
+            label_name (str): the name of the label
+            color (str): the hex color code for creating the label
+
+        Returns:
+            str: the label ID
+        """
+        client = GraphqlClient(endpoint="https://api.github.com/graphql")
+        headers = {"Authorization": f"Bearer {handler.githubKey}"}
+
+        getLabelQuery = """
+            query getLabel($owner: String!, $name: String!, $labelName: String!) {
+                repository(owner: $owner, name: $name) {
+                    label(name: $labelName) {
+                        id
+                    }
+                }
+            }
+        """
+
+        variables = {
+            "owner": handler.orgName,
+            "name": handler.repoName,
+            "labelName": label_name
+        }
+
+        result = await client.execute_async(query=getLabelQuery, variables=variables, headers=headers)
+        labelData = result.get("data", {}).get("repository", {}).get("label")
+        if labelData and labelData.get("id"):
+            return labelData["id"]
+
+        createLabelMutation = """
+            mutation createLabel($input: CreateLabelInput!) {
+                createLabel(input: $input) {
+                    label {
+                        id
+                    }
+                }
+            }
+        """
+
+        createVariables = {
+            "input": {
+                "repositoryId": repo_id,
+                "name": label_name,
+                "color": color
+            }
+        }
+
+        createResult = await client.execute_async(query=createLabelMutation, variables=createVariables, headers=headers)
+        return createResult["data"]["createLabel"]["label"]["id"]
+
     @classmethod
     def manualBugReport(cls, repoName: str, errorTitle: str, errorMessage: str) -> None:
         """Manually sends a bug report to the Github repository.
@@ -444,8 +507,8 @@ class BugReporter:
 
         # query variables
         repoId = await cls._getRepoId_async(cls, handler)
-        bugLabel = "LA_kwDOJ3JPj88AAAABU1q15w"
-        autoLabel = "LA_kwDOJ3JPj88AAAABU1q2DA"
+        bugLabel = await cls._get_or_create_label_id_async(handler, repoId, BUG_LABEL_NAME, BUG_LABEL_COLOR)
+        autoLabel = await cls._get_or_create_label_id_async(handler, repoId, AUTO_LABEL_NAME, AUTO_LABEL_COLOR)
         
         # Create new issue
         createIssue = """
@@ -481,7 +544,7 @@ class BugReporter:
         # Send to Discord if applicable
         if cls.handlers[repoName].useDiscord:
             discordBot = DiscordBot(cls.handlers[repoName].botToken, cls.handlers[repoName].channelId)
-            await discordBot.send_message(f"## {repoName}: {errorTitle}\n{errorMessage}", issueExists)
+            await discordBot.send_message(f"## {repoName}: {errorTitle}\n{errorMessage}", issueExists, errorTitle)
 
         if (issueExists == False):
             result = await client.execute_async(query=createIssue, variables=variables, headers=headers)

{pybugreporter-1.0.13 → pybugreporter-1.0.18}/PyBugReporter/src/DiscordBot.py

@@ -27,6 +27,7 @@ class DiscordBot(discord.Client):
         self.channelId = int(channelId)
         self._message = None
         self._alreadySent = False
+        self._title = None
         self._doneFuture = None
 
         intents = discord.Intents(emojis = True,
@@ -36,16 +37,18 @@ class DiscordBot(discord.Client):
                                   guilds = True)
         super().__init__(intents=intents)
 
-    async def send_message(self, message, alreadySent = False):
+    async def send_message(self, message, alreadySent = False, title = None):
         """
         Sends a message to the specified channel by setting the variables and starting the bot, then turning it off when finished.
 
         Args:
             message (str): The message to send.
             alreadySent (bool): Whether the message has already been sent.
+            title (str): The stable error title used to find the original message when reacting.
         """
         self._message = message
         self._alreadySent = alreadySent
+        self._title = title
         self._doneFuture = asyncio.get_running_loop().create_future()
         print("Starting bot...")
         # Start the bot as a background task
@@ -64,7 +67,7 @@ class DiscordBot(discord.Client):
                 print(f"Sent message to channel {self.channelId}")
             elif channel and self._alreadySent:
                 async for message in channel.history(limit=HISTORY_LIMIT):
-                    if message.content == self._message:
+                    if self._title and self._title in message.content:
                         await message.add_reaction(EMOJI)
                         break
             else:

{pybugreporter-1.0.13 → pybugreporter-1.0.18}/PyBugReporter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyBugReporter
-Version: 1.0.13
+Version: 1.0.18
 Summary: A python library for catching thrown exceptions and automatically creating issues on a GitHub repo.
 Home-page: https://github.com/byuawsfhtl/PyBugReporter.git
 Author: Record Linking Lab

pybugreporter-1.0.13/PyBugReporter/_version.py

@@ -1 +0,0 @@
-__version__ = '1.0.13'