server client

.gitignore

@@ -1,6 +1,7 @@
 .env
-*.txt
 db
 images
 merge_dev.bat
-__pycache__
+__pycache__
+*.png
+*.txt

API/app.py

@@ -2,7 +2,6 @@ from fastapi import FastAPI, Query
 import aiohttp
 import asyncio
 import time
-import os
 from pydantic import BaseModel
 from typing import List, Dict
 
@@ -11,16 +10,11 @@ img_base = 'https://i.pximg.net/img-original/img/'
 
 class pixifModel(BaseModel):
     post_ids: List[int]
+    phpsessid: str
 
 class PixifDownloadModel(BaseModel):
     posts: Dict[str, str]
 
-env_path = os.path.dirname(os.path.realpath(__file__)) + "/../.env"
-
-PHPSESSID = os.getenv("PHPSESSID", "122422917_9wy3h18GPbbwJRCYrPDyAYI9eNu0lYA1")
-
-cookies = {"PHPSESSID": PHPSESSID}
-
 headers = {
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:126.0) Gecko/20100101 Firefox/126.0",
     'referer': 'https://www.pixiv.net/',
@@ -33,6 +27,9 @@ async def fetch_page(session, url):
         data = await response.json()
         return data
 
+def build_cookies(phpsessid: str) -> Dict[str, str]:
+    return {"PHPSESSID": phpsessid}
+
 def base26(n):
     if n == 0:
         return "A"
@@ -135,8 +132,10 @@ async def process_post(post_id, session, semaphore):
 @app.get("/allimages")
 async def all_images(
     only_first = Query("0", description="Only fetch the first image of each post."),
-    post_ids: List[int] = Query(..., alias='post_ids')
+    post_ids: List[int] = Query(..., alias='post_ids'),
+    phpsessid: str = Query(..., description="Pixiv PHPSESSID value.")
 ):
+    cookies = build_cookies(phpsessid)
     async with aiohttp.ClientSession(cookies=cookies, headers=headers) as session:
         tasks = []
         for pid in post_ids:
@@ -157,7 +156,11 @@ async def all_images(
     return {"image_urls": all_image_urls}
 
 @app.get("/allimage")
-async def all_image(post_id: int = Query(..., description="The post ID to fetch all images from.")):
+async def all_image(
+    post_id: int = Query(..., description="The post ID to fetch all images from."),
+    phpsessid: str = Query(..., description="Pixiv PHPSESSID value.")
+):
+    cookies = build_cookies(phpsessid)
     async with aiohttp.ClientSession(cookies=cookies, headers=headers) as session:
         try:
             data = await fetch_page(session, f"https://www.pixiv.net/ajax/illust/{post_id}/pages")
@@ -172,6 +175,7 @@ async def pixif(
 ):
     post_ids = items.post_ids
     semaphore = asyncio.Semaphore(8)
+    cookies = build_cookies(items.phpsessid)
 
     async with aiohttp.ClientSession(cookies=cookies, headers=headers) as session:
         tasks = [process_post(post_id, session, semaphore) for post_id in post_ids]
@@ -187,4 +191,4 @@ async def read_root():
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="127.0.0.1", port=7860)
+    uvicorn.run(app, host="127.0.0.1", port=7860)

Client/hunt.py

@@ -8,6 +8,32 @@ local = 0
 endpoint = "http://127.0.0.1:7860" if local else "https://q6-p.hf.space"
 img_base = 'https://i.pximg.net/img-original/img/'
 
+def read_dotenv_value(path, key):
+    try:
+        with open(path, "r") as env_file:
+            for line in env_file:
+                line = line.strip()
+                if not line or line.startswith("#") or "=" not in line:
+                    continue
+                k, v = line.split("=", 1)
+                if k == key:
+                    return v
+    except FileNotFoundError:
+        return None
+    return None
+
+def get_phpsessid():
+    phpsessid = os.getenv("PHPSESSID")
+    if phpsessid:
+        return phpsessid
+    env_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".env"))
+    phpsessid = read_dotenv_value(env_path, "PHPSESSID")
+    if phpsessid:
+        return phpsessid
+    raise RuntimeError("PHPSESSID is not set in the environment or .env")
+
+phpsessid = get_phpsessid()
+
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 os.makedirs("images/Stash", exist_ok=True)
 
@@ -55,7 +81,7 @@ for index in indexs:
         print(f"Group: {group_name}\nFiltered: {len(filtered)}/{len(post_ids)}")
 
         if filtered:
-            data = requests.post(f'{endpoint}/pixif', json={"post_ids": filtered})
+            data = requests.post(f'{endpoint}/pixif', json={"post_ids": filtered, "phpsessid": phpsessid})
             print(data)
             data = data.json()
             for post_id, url in data.items():
@@ -85,4 +111,4 @@ for index in indexs:
     if not os.listdir(f'images/{group_name}'):
         os.rmdir(f"images/{group_name}")
 
-db.close()
+db.close()

Client/run_pixif_single.py

@@ -12,11 +12,36 @@ if PROJECT_ROOT not in sys.path:
 from API import app as pixif_app  # noqa: E402
 
 
+def read_dotenv_value(path, key):
+    try:
+        with open(path, "r") as env_file:
+            for line in env_file:
+                line = line.strip()
+                if not line or line.startswith("#") or "=" not in line:
+                    continue
+                k, v = line.split("=", 1)
+                if k == key:
+                    return v
+    except FileNotFoundError:
+        return None
+    return None
+
+def get_phpsessid():
+    phpsessid = os.getenv("PHPSESSID")
+    if phpsessid:
+        return phpsessid
+    env_path = os.path.join(PROJECT_ROOT, ".env")
+    phpsessid = read_dotenv_value(env_path, "PHPSESSID")
+    if phpsessid:
+        return phpsessid
+    raise RuntimeError("PHPSESSID is not set in the environment or .env")
+
 async def run_local() -> dict:
     post_id = 138954885
     semaphore = asyncio.Semaphore(8)
+    cookies = pixif_app.build_cookies(get_phpsessid())
 
-    async with aiohttp.ClientSession(cookies=pixif_app.cookies, headers=pixif_app.headers) as session:
+    async with aiohttp.ClientSession(cookies=cookies, headers=pixif_app.headers) as session:
         _, image_url = await pixif_app.process_post(post_id, session, semaphore)
 
     if not image_url: