Spaces:

sfun
/

sub

Running

App Files Files Community

sfun commited on Aug 21

Commit

d893114

•

1 Parent(s): 25ef91c

Update app.py

Browse files

Files changed (1) hide show

app.py +14 -10

app.py CHANGED Viewed

@@ -10,19 +10,23 @@ from urllib.parse import parse_qs
 from cachetools import TTLCache
 # 创建一个TTL缓存，最多存储1000个项目，每个项目的有效期为1小时
-cache = TTLCache(maxsize=1000, ttl=1800)
-async def fetch_url(url, session, max_retries=3):
     for attempt in range(max_retries):
         try:
-            async with session.get(url, timeout=ClientTimeout(total=60)) as response:
                 response.raise_for_status()
                 return await response.text()
         except aiohttp.ClientError as e:
             print(f"Attempt {attempt + 1} failed: {str(e)}", flush=True)
-            if attempt == max_retries - 1:
-                raise
-            await asyncio.sleep(1)  # 在重试之前等待1秒
 async def extract_and_transform_proxies(input_text):
     try:
@@ -130,7 +134,7 @@ async def handle_request(request):
             try:
                 print(f"Fetching URL: {url}", flush=True)
                 async with aiohttp.ClientSession(connector=TCPConnector(ssl=False)) as session:
-                    input_text = await fetch_url(url, session)
                 print(f"URL content length: {len(input_text)}", flush=True)
                 result = await extract_and_transform_proxies(input_text)
                 print(f"Transformed result length: {len(result)}", flush=True)
@@ -140,9 +144,9 @@ async def handle_request(request):
                 return web.Response(text=result, content_type='text/plain')
             except Exception as e:
-                print(f"Error processing request: {str(e)}", flush=True)
-                traceback.print_exc()
-                return web.Response(text=f"Error: {str(e)}", status=500)
         else:
             usage_guide = """
             <html>

 from cachetools import TTLCache
 # 创建一个TTL缓存，最多存储1000个项目，每个项目的有效期为1小时
+cache = TTLCache(maxsize=1000, ttl=3600)
+async def fetch_url(url, session, max_retries=3, timeout=180):
     for attempt in range(max_retries):
         try:
+            async with session.get(url, timeout=ClientTimeout(total=timeout)) as response:
                 response.raise_for_status()
                 return await response.text()
+        except asyncio.TimeoutError:
+            print(f"Attempt {attempt + 1} timed out after {timeout} seconds", flush=True)
         except aiohttp.ClientError as e:
             print(f"Attempt {attempt + 1} failed: {str(e)}", flush=True)
+        if attempt < max_retries - 1:
+            await asyncio.sleep(5)  # 在重试之前等待5秒
+    raise Exception(f"Failed to fetch URL after {max_retries} attempts")
 async def extract_and_transform_proxies(input_text):
     try:
             try:
                 print(f"Fetching URL: {url}", flush=True)
                 async with aiohttp.ClientSession(connector=TCPConnector(ssl=False)) as session:
+                    input_text = await fetch_url(url, session, max_retries=3, timeout=180)
                 print(f"URL content length: {len(input_text)}", flush=True)
                 result = await extract_and_transform_proxies(input_text)
                 print(f"Transformed result length: {len(result)}", flush=True)
                 return web.Response(text=result, content_type='text/plain')
             except Exception as e:
+                error_message = f"Error processing request: {str(e)}\n{traceback.format_exc()}"
+                print(error_message, flush=True)
+                return web.Response(text=error_message, status=500)
         else:
             usage_guide = """
             <html>