Fixed AttributeError: __aenter__

discord_bot.py

@@ -7,7 +7,7 @@ from discord import app_commands
 from discord.ext import commands
 from threading import Thread
 import json
-import horde
+from horde import HordeAPI
 
 
 
@@ -26,7 +26,7 @@ async def greet(interaction: discord.Interaction, name: str):
 
 @tree.command(name="get-kudos", description="The amount of Kudos this user has.")
 async def getKudos(interaction: discord.Interaction):
-    async with horde.getUserDetails() as details:
+    async with HordeAPI.getUserDetails() as details:
         if "kudos" not in details:
             await interaction.response.send_message(f'Error: {details["code"]} {details["reason"]} {details["rc"]}')
             return
@@ -34,7 +34,7 @@ async def getKudos(interaction: discord.Interaction):
 
 @tree.command(name="generate-status", description="Retrieve the status of an Asynchronous generation request.")
 async def generateStatus(interaction: discord.Interaction, id: str):
-    async with horde.generateCheck(id) as details:
+    async with HordeAPI.generateCheck(id) as details:
         if "kudos" not in details:
             await interaction.response.send_message(f'Check Error: {details["code"]} {details["reason"]} {details["rc"]}')
             return
@@ -45,7 +45,7 @@ async def generateStatus(interaction: discord.Interaction, id: str):
             await interaction.response.send_message("This generation is faulted.")
             return
         if bool(details["done"]) == True:
-            async with horde.generateStatus(id) as generationDetail:
+            async with HordeAPI.generateStatus(id) as generationDetail:
                 if "generations" not in generationDetail:
                     await interaction.response.send_message(f'Status Error: {generationDetail["code"]} {generationDetail["reason"]} {generationDetail["rc"]}')
                 for i in range(len(generationDetail["generations"])):

horde.py

@@ -1,48 +1,62 @@
 import os
-import requests
+import httpx
 
 hordeApiKey = os.environ.get("HORDE_API_KEY")
 baseUrl = "https://aihorde.net/api/v2/"
 
-def getResponseByGet(url):
-    headers = {
-        "Content-Type": "application/json",
-        "apikey": f"{hordeApiKey}"
-    }
-    response = requests.get(url, headers=headers)
-    if response.status_code == 200:
-        return response.json()
-    else:
-        return {
-            "code": response.status_code,
-            "reason": response.reason,
-            "rc": response.rc
-        }
+class HordeAPI:
+    # 省去类初始化，直接在每个方法里创建客户端
 
-def getResponseByPost(url):
-    headers = {
-        "Content-Type": "application/json",
-        "apikey": f"{hordeApiKey}"
-    }
-    response = requests.post(url, headers=headers)
-    if response.status_code == 200:
-        return response.json()
-    else:
-        return {
-            "code": response.status_code,
-            "reason": response.reason,
-            "rc": response.rc
+    async def _fetch(self, url, method="GET"):
+        headers = {
+            "Content-Type": "application/json",
+            "apikey": f"{hordeApiKey}"
         }
 
-async def getUserDetails():
-    url = f"{baseUrl}find_user"
-    return getResponseByGet(url)
+        async with httpx.AsyncClient() as client:
+            if method == "GET":
+                response = await client.get(url, headers=headers)
+            elif method == "POST":
+                response = await client.post(url, headers=headers)
+
+            if response.status_code == 200:
+                return response.json()
+            else:
+                return {
+                    "code": response.status_code,
+                    "reason": response.reason,
+                }
+
+    class APIContextManager:
+        def __init__(self, api_call):
+            self.api_call = api_call
+            self.result = None
+
+        async def __aenter__(self):
+            self.result = await self.api_call()
+            return self.result
+
+        async def __aexit__(self, exc_type, exc_value, traceback):
+            pass
 
-async def generateCheck(id):
-    url = f"{baseUrl}generate/check/{id}"
-    return getResponseByGet(url)
+    # 提供 API 调用方法，直接通过 async with 使用
+    @staticmethod
+    def getUserDetails():
+        async def api_call():
+            url = f"{baseUrl}find_user"
+            return await HordeAPI()._fetch(url)
+        return HordeAPI.APIContextManager(api_call)
 
-async def generateStatus(id):
-    url = f"{baseUrl}generate/status/{id}"
-    return getResponseByGet(url)
+    @staticmethod
+    def generateCheck(id):
+        async def api_call():
+            url = f"{baseUrl}generate/check/{id}"
+            return await HordeAPI()._fetch(url)
+        return HordeAPI.APIContextManager(api_call)
 
+    @staticmethod
+    def generateStatus(id):
+        async def api_call():
+            url = f"{baseUrl}generate/status/{id}"
+            return await HordeAPI()._fetch(url)
+        return HordeAPI.APIContextManager(api_call)