Format Python code with psf/black push

1 year ago · 2a57901559
parent dba1f934a5
commit 2a57901559
6 changed files with 135 additions and 79 deletions
--- a/cogs/index_service_cog.py
+++ b/cogs/index_service_cog.py
@ -30,7 +30,13 @@ class IndexService(discord.Cog, name="IndexService"):
        """Command handler to rename a user index"""

        if not new_name:
-            await ctx.respond(await EmbedStatics.get_index_rename_failure_embed(user_index.split("/")[-1], "None", "Please provide a new name for this index"))
+            await ctx.respond(
+                await EmbedStatics.get_index_rename_failure_embed(
+                    user_index.split("/")[-1],
+                    "None",
+                    "Please provide a new name for this index",
+                )
+            )
            return

        if await self.index_handler.rename_index(
@ -38,15 +44,31 @@ class IndexService(discord.Cog, name="IndexService"):
            f"indexes/{ctx.user.id}/{user_index}",
            f"indexes/{ctx.user.id}/{new_name}",
        ):
-            await ctx.respond(embed=EmbedStatics.get_index_rename_success_embed(user_index.split("/")[-1], new_name))
+            await ctx.respond(
+                embed=EmbedStatics.get_index_rename_success_embed(
+                    user_index.split("/")[-1], new_name
+                )
+            )
        else:
-            await ctx.respond(embed=EmbedStatics.get_index_rename_failure_embed(user_index.split("/")[-1], new_name, "Please check the server console for more details."))
+            await ctx.respond(
+                embed=EmbedStatics.get_index_rename_failure_embed(
+                    user_index.split("/")[-1],
+                    new_name,
+                    "Please check the server console for more details.",
+                )
+            )

    async def rename_server_index_command(self, ctx, server_index, new_name):
        """Command handler to rename a user index"""

        if not new_name:
-            await ctx.respond(await EmbedStatics.get_index_rename_failure_embed(server_index.split("/")[-1], "None", "Please provide a new name for this index"))
+            await ctx.respond(
+                await EmbedStatics.get_index_rename_failure_embed(
+                    server_index.split("/")[-1],
+                    "None",
+                    "Please provide a new name for this index",
+                )
+            )
            return

        if await self.index_handler.rename_index(
@ -54,13 +76,29 @@ class IndexService(discord.Cog, name="IndexService"):
            f"indexes/{ctx.guild.id}/{server_index}",
            f"indexes/{ctx.guild.id}/{new_name}",
        ):
-            await ctx.respond(embed=EmbedStatics.get_index_rename_success_embed(server_index.split("/")[-1], new_name))
+            await ctx.respond(
+                embed=EmbedStatics.get_index_rename_success_embed(
+                    server_index.split("/")[-1], new_name
+                )
+            )
        else:
-            await ctx.respond(embed=EmbedStatics.get_index_rename_failure_embed(server_index.split("/")[-1], new_name, "Please check the server console for more details."))
+            await ctx.respond(
+                embed=EmbedStatics.get_index_rename_failure_embed(
+                    server_index.split("/")[-1],
+                    new_name,
+                    "Please check the server console for more details.",
+                )
+            )

    async def rename_search_index_command(self, ctx, search_index, new_name):
        if not new_name:
-            await ctx.respond(await EmbedStatics.get_index_rename_failure_embed(search_index.split("/")[-1], "None", "Please provide a new name for this index"))
+            await ctx.respond(
+                await EmbedStatics.get_index_rename_failure_embed(
+                    search_index.split("/")[-1],
+                    "None",
+                    "Please provide a new name for this index",
+                )
+            )
            return

        if await self.index_handler.rename_index(
@ -68,9 +106,19 @@ class IndexService(discord.Cog, name="IndexService"):
            f"indexes/{ctx.user.id}_search/{search_index}",
            f"indexes/{ctx.user.id}_search/{new_name}",
        ):
-            await ctx.respond(embed=EmbedStatics.get_index_rename_success_embed(search_index.split("/")[-1], new_name))
+            await ctx.respond(
+                embed=EmbedStatics.get_index_rename_success_embed(
+                    search_index.split("/")[-1], new_name
+                )
+            )
        else:
-            await ctx.respond(embed=EmbedStatics.get_index_rename_failure_embed(search_index.split("/")[-1], new_name, "Please check the server console for more details."))
+            await ctx.respond(
+                embed=EmbedStatics.get_index_rename_failure_embed(
+                    search_index.split("/")[-1],
+                    new_name,
+                    "Please check the server console for more details.",
+                )
+            )

    async def set_index_command(
        self, ctx, file: discord.Attachment = None, link: str = None
--- a/cogs/search_service_cog.py
+++ b/cogs/search_service_cog.py
@ -115,7 +115,11 @@ class SearchService(discord.Cog, name="SearchService"):
            not EnvService.get_google_search_api_key()
            or not EnvService.get_google_search_engine_id()
        ):
-            await ctx.respond(embed=EmbedStatics.get_search_failure_embed(str("The search service is not enabled on this server.")),)
+            await ctx.respond(
+                embed=EmbedStatics.get_search_failure_embed(
+                    str("The search service is not enabled on this server.")
+                ),
+            )
            return

        try:
@ -130,7 +134,7 @@ class SearchService(discord.Cog, name="SearchService"):
            return
        except Exception as e:
            await ctx.respond(
-                 embed=EmbedStatics.get_search_failure_embed(str(e)), ephemeral=True
+                embed=EmbedStatics.get_search_failure_embed(str(e)), ephemeral=True
            )
            traceback.print_exc()
            return
@ -227,7 +231,9 @@ class RedoButton(discord.ui.Button["SearchView"]):
    async def callback(self, interaction: discord.Interaction):
        """Redo the search"""
        await interaction.response.send_message(
-            embed=EmbedStatics.get_search_redo_progress_embed(), ephemeral=True, delete_after=15
+            embed=EmbedStatics.get_search_redo_progress_embed(),
+            ephemeral=True,
+            delete_after=15,
        )
        await self.search_cog.search_command(
            self.search_cog.redo_users[self.ctx.user.id].ctx,
--- a/models/embed_statics_model.py
+++ b/models/embed_statics_model.py
@ -90,9 +90,7 @@ class EmbedStatics:
            color=discord.Color.green(),
        )
        # thumbnail of https://i.imgur.com/7JF0oGD.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/7JF0oGD.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/7JF0oGD.png")
        return embed

    @staticmethod
@ -103,9 +101,7 @@ class EmbedStatics:
            color=discord.Color.red(),
        )
        # thumbnail of https://i.imgur.com/VLJ32x7.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/VLJ32x7.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/VLJ32x7.png")
        return embed

    @staticmethod
@ -115,9 +111,7 @@ class EmbedStatics:
            color=discord.Color.green(),
        )
        # thumbnail of https://i.imgur.com/7JF0oGD.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/7JF0oGD.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/7JF0oGD.png")
        return embed

    @staticmethod
@ -128,9 +122,7 @@ class EmbedStatics:
            color=discord.Color.red(),
        )
        # thumbnail of https://i.imgur.com/VLJ32x7.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/VLJ32x7.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/VLJ32x7.png")
        return embed

    @staticmethod
@ -141,9 +133,7 @@ class EmbedStatics:
            color=discord.Color.red(),
        )
        # thumbnail of https://i.imgur.com/VLJ32x7.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/VLJ32x7.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/VLJ32x7.png")
        return embed

    @staticmethod
@ -153,9 +143,7 @@ class EmbedStatics:
            color=discord.Color.green(),
        )
        # thumbnail of https://i.imgur.com/7JF0oGD.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/7JF0oGD.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/7JF0oGD.png")
        return embed

    @staticmethod
@ -166,9 +154,7 @@ class EmbedStatics:
            color=discord.Color.red(),
        )
        # thumbnail of https://i.imgur.com/VLJ32x7.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/VLJ32x7.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/VLJ32x7.png")
        return embed

    @staticmethod
@ -179,9 +165,7 @@ class EmbedStatics:
            color=discord.Color.blurple(),
        )
        # thumbnail of https://i.imgur.com/VLJ32x7.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/txHhNzL.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/txHhNzL.png")
        return embed

    @staticmethod
@ -192,9 +176,7 @@ class EmbedStatics:
            color=discord.Color.green(),
        )
        # thumbnail of https://i.imgur.com/7JF0oGD.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/7JF0oGD.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/7JF0oGD.png")
        return embed

    @staticmethod
@ -205,9 +187,7 @@ class EmbedStatics:
            color=discord.Color.red(),
        )
        # thumbnail of https://i.imgur.com/VLJ32x7.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/VLJ32x7.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/VLJ32x7.png")
        return embed

    @staticmethod
@ -227,9 +207,7 @@ class EmbedStatics:
            color=discord.Color.red(),
        )
        # thumbnail of https://i.imgur.com/VLJ32x7.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/VLJ32x7.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/VLJ32x7.png")
        return embed

    @staticmethod
@ -240,7 +218,5 @@ class EmbedStatics:
            color=discord.Color.blurple(),
        )
        # thumbnail of https://i.imgur.com/VLJ32x7.png
-        embed.set_thumbnail(
-            url="https://i.imgur.com/txHhNzL.png"
-        )
+        embed.set_thumbnail(url="https://i.imgur.com/txHhNzL.png")
        return embed
--- a/models/index_model.py
+++ b/models/index_model.py
@ -360,7 +360,9 @@ class Index_handler:
                pass  # No suffix change
            else:
                await ctx.respond(
-                    embed=EmbedStatics.get_index_set_failure_embed("Only accepts text, pdf, images, spreadheets, powerpoint, and audio/video files.")
+                    embed=EmbedStatics.get_index_set_failure_embed(
+                        "Only accepts text, pdf, images, spreadheets, powerpoint, and audio/video files."
+                    )
                )
                return
            async with aiofiles.tempfile.TemporaryDirectory() as temp_path:
@ -402,12 +404,20 @@ class Index_handler:
                        if response.status == 200:
                            content_type = response.headers.get("content-type")
                        else:
-                            await ctx.respond(embed=EmbedStatics.get_index_set_failure_embed("Invalid URL or could not connect to the provided URL."))
+                            await ctx.respond(
+                                embed=EmbedStatics.get_index_set_failure_embed(
+                                    "Invalid URL or could not connect to the provided URL."
+                                )
+                            )
                            return
            except Exception as e:
                traceback.print_exc()
-                await ctx.respond(embed=EmbedStatics.get_index_set_failure_embed(
-                    "Invalid URL or could not connect to the provided URL. "+str(e)))
+                await ctx.respond(
+                    embed=EmbedStatics.get_index_set_failure_embed(
+                        "Invalid URL or could not connect to the provided URL. "
+                        + str(e)
+                    )
+                )
                return

            # Check if the link contains youtube in it
@ -724,7 +734,9 @@ class Index_handler:
        except Exception:
            traceback.print_exc()
            await ctx.respond(
-                embed=EmbedStatics.get_index_query_failure_embed("Failed to send query. You may not have an index set, load an index with /index load"),
+                embed=EmbedStatics.get_index_query_failure_embed(
+                    "Failed to send query. You may not have an index set, load an index with /index load"
+                ),
                delete_after=10,
            )

@ -813,7 +825,11 @@ class Index_handler:
            os.environ["OPENAI_API_KEY"] = user_api_key

        if not self.index_storage[ctx.user.id].has_indexes(ctx.user.id):
-            await ctx.respond(embed=EmbedStatics.get_index_compose_failure_embed("You must have at least one index to compose."))
+            await ctx.respond(
+                embed=EmbedStatics.get_index_compose_failure_embed(
+                    "You must have at least one index to compose."
+                )
+            )
            return

        await ctx.respond(
@ -925,7 +941,10 @@ class ComposeModal(discord.ui.View):

            if len(indexes) < 1:
                await interaction.response.send_message(
-                    embed=EmbedStatics.get_index_compose_failure_embed("You must select at least 1 index"), ephemeral=True
+                    embed=EmbedStatics.get_index_compose_failure_embed(
+                        "You must select at least 1 index"
+                    ),
+                    ephemeral=True,
                )
            else:
                composing_message = await interaction.response.send_message(
@ -950,14 +969,18 @@ class ComposeModal(discord.ui.View):
                    return False
                except Exception as e:
                    await interaction.followup.send(
-                        embed=EmbedStatics.get_index_compose_failure_embed("An error occurred while composing the indexes: " + str(e)),
+                        embed=EmbedStatics.get_index_compose_failure_embed(
+                            "An error occurred while composing the indexes: " + str(e)
+                        ),
                        ephemeral=True,
                        delete_after=180,
                    )
                    return False

                await interaction.followup.send(
-                    embed=EmbedStatics.get_index_compose_success_embed(), ephemeral=True, delete_after=180
+                    embed=EmbedStatics.get_index_compose_success_embed(),
+                    ephemeral=True,
+                    delete_after=180,
                )

                # Try to direct message the user that their composed index is ready
@ -969,7 +992,7 @@ class ComposeModal(discord.ui.View):
                    pass

                try:
-                    composing_message : Interaction
+                    composing_message: Interaction
                    await composing_message.delete_original_response()

                except:
--- a/models/search_model.py
+++ b/models/search_model.py
@ -22,7 +22,7 @@ from gpt_index import (
    SimpleDirectoryReader,
    GPTTreeIndex,
    MockLLMPredictor,
-    MockEmbedding
+    MockEmbedding,
 )
 from gpt_index.indices.knowledge_graph import GPTKnowledgeGraphIndex
 from gpt_index.prompts.prompt_type import PromptType
@ -89,8 +89,7 @@ class Search:
    def build_search_links_retrieved_embed(self, refined_query):
        embed = discord.Embed(
            title="Searching the web...",
-            description="Refined query:\n"
-                        + f"`{refined_query}`"
+            description="Refined query:\n" + f"`{refined_query}`"
            "\nRetrieving webpages...",
            color=discord.Color.blurple(),
        )
@ -101,9 +100,7 @@ class Search:
    def build_search_webpages_retrieved_embed(self, refined_query):
        embed = discord.Embed(
            title="Searching the web...",
-            description="Refined query:\n"
-            + f"`{refined_query}`"
-            "\nIndexing...",
+            description="Refined query:\n" + f"`{refined_query}`" "\nIndexing...",
            color=discord.Color.blurple(),
        )
        embed.set_thumbnail(url="https://i.imgur.com/txHhNzL.png")
@ -113,8 +110,7 @@ class Search:
    def build_search_indexed_embed(self, refined_query):
        embed = discord.Embed(
            title="Searching the web...",
-            description="Refined query:\n"
-            + f"`{refined_query}`"
+            description="Refined query:\n" + f"`{refined_query}`"
            "\nThinking about your question...",
            color=discord.Color.blurple(),
        )
@ -122,12 +118,11 @@ class Search:

        return embed

-    def build_search_final_embed(self, refined_query,price):
+    def build_search_final_embed(self, refined_query, price):
        embed = discord.Embed(
            title="Searching the web...",
-            description="Refined query:\n"
-            + f"`{refined_query}`"
-            "\nDone!\n||The total price was $"+price+"||",
+            description="Refined query:\n" + f"`{refined_query}`"
+            "\nDone!\n||The total price was $" + price + "||",
            color=discord.Color.blurple(),
        )
        embed.set_thumbnail(url="https://i.imgur.com/txHhNzL.png")
@ -222,10 +217,9 @@ class Search:
                max_tokens=50,
                temperature=0.25,
                presence_penalty=0.65,
-                model_name="text-davinci-003"
+                model_name="text-davinci-003",
            )

-
            # Refine a query to send to google custom search API
            prompt = f"You are to be given a search query for google. Change the query such that putting it into the Google Custom Search API will return the most relevant websites to assist in answering the original query. If the original query is inferring knowledge about the current day, insert the current day into the refined prompt. If the original query is inferring knowledge about the current month, insert the current month and year into the refined prompt. If the original query is inferring knowledge about the current year, insert the current year into the refined prompt. Generally, if the original query is inferring knowledge about something that happened recently, insert the current month into the refined query. Avoid inserting a day, month, or year for queries that purely ask about facts and about things that don't have much time-relevance. The current date is {str(datetime.now().date())}. Do not insert the current date if not neccessary. Respond with only the refined query for the original query. Don’t use punctuation or quotation marks.\n\nExamples:\n---\nOriginal Query: ‘Who is Harald Baldr?’\nRefined Query: ‘Harald Baldr biography’\n---\nOriginal Query: ‘What happened today with the Ohio train derailment?’\nRefined Query: ‘Ohio train derailment details {str(datetime.now().date())}’\n---\nOriginal Query: ‘Is copper in drinking water bad for you?’\nRefined Query: ‘copper in drinking water adverse effects’\n---\nOriginal Query: What's the current time in Mississauga?\nRefined Query: current time Mississauga\nNow, refine the user input query.\nOriginal Query: {query}\nRefined Query:"
            query_refined = await llm_predictor_presearch.agenerate(
@ -233,7 +227,9 @@ class Search:
            )
            query_refined_text = query_refined.generations[0][0].text

-            price += await self.usage_service.get_price(query_refined.llm_output.get("token_usage").get("total_tokens"))
+            price += await self.usage_service.get_price(
+                query_refined.llm_output.get("token_usage").get("total_tokens")
+            )

        except Exception as e:
            traceback.print_exc()
@ -470,11 +466,14 @@ class Search:
        await self.usage_service.update_usage(
            embedding_model.last_token_usage, embeddings=True
        )
-        price += await self.usage_service.get_price(llm_predictor.last_token_usage) + await self.usage_service.get_price(
-            embedding_model.last_token_usage, True
-        )
+        price += await self.usage_service.get_price(
+            llm_predictor.last_token_usage
+        ) + await self.usage_service.get_price(embedding_model.last_token_usage, True)

        if ctx:
-            await self.try_edit(in_progress_message, self.build_search_final_embed(query_refined_text, str(price)))
+            await self.try_edit(
+                in_progress_message,
+                self.build_search_final_embed(query_refined_text, str(price)),
+            )

        return response, query_refined_text
--- a/services/text_service.py
+++ b/services/text_service.py
@ -411,7 +411,9 @@ class TextService:
                        )
                    elif from_edit_command:
                        response_message = await ctx.respond(
-                            embed=EmbedStatics.get_edit_command_output_embed(response_text),
+                            embed=EmbedStatics.get_edit_command_output_embed(
+                                response_text
+                            ),
                            view=ConversationView(
                                ctx,
                                converser_cog,
@ -473,7 +475,9 @@ class TextService:
                        await response_message.edit(content=response_text)
                    else:
                        await response_message.edit(
-                            embed=EmbedStatics.get_edit_command_output_embed(response_text)
+                            embed=EmbedStatics.get_edit_command_output_embed(
+                                response_text
+                            )
                        )

            await converser_cog.send_debug_message(