Eporner_API 2.0__tar.gz → 2.1__tar.gz

{eporner_api-2.0 → eporner_api-2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Eporner_API
-Version: 2.0
+Version: 2.1
 Summary: A Python API for the Porn Site Eporner.com
 Author: Johannes Habel
 Author-email: Johannes Habel <EchterAlsFake@proton.me>
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python
 Requires-Dist: bs4
 Requires-Dist: eaf-base-api
 Requires-Dist: lxml ; extra == 'full'
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Project-URL: Homepage, https://github.com/EchterAlsFake/EPorner_API
 Provides-Extra: full
 Description-Content-Type: text/markdown
@@ -32,6 +32,7 @@ Description-Content-Type: text/markdown
 > and applicable laws. Do not use it to bypass access controls or scrape at disruptive rates.
 
 # Features
+- Asynchronous
 - Fetch videos + metadata
 - Download videos
 - Fetch Pornstars
@@ -40,8 +41,17 @@ Description-Content-Type: text/markdown
 - Built-in caching
 - Easy interface
 - Great type hinting
-- Proxy support
-- Very customizable
+
+#### Networking Features
+- HTTP 2.0 / HTTP 3.0
+- Browser impersonation
+- Custom JA3
+- All proxy types
+- Proxy authentication
+- Speed Limit
+- DNS over HTTPS
+- And even more...
+- All of this is configurable and can be adjusted as you like!
 
 # Supported Platforms
 This API has been tested and confirmed working on:
@@ -67,19 +77,25 @@ pip install --upgrade Eporner-API
 pip install --upgrade git+https://github.com/EchterAlsFake/EPorner_API.git
 ```
 
-
 ```python
+import asyncio
 from eporner_api import Client
 # Initialize a Client object
-client = Client()
 
-# Fetch a video
-video_object = client.get_video("<insert_url_here>")  # Can also be a Video ID
+async def do_something():
+    client = Client()
+
+    # Fetch a video
+    video_object = await client.get_video("<insert_url_here>")  # Can also be a Video ID
+    print(video_object.title)
+
+    # Search for videos
+    videos = client.search_videos(query="Your query here",..sortings..)  # See Documentation!
+    async for video in videos:
+        print(video.title)
+
 
-# Search for videos
-videos = client.search_videos(query="Your query here", ..sortings..) # See Documentation!
-for video in videos:
-    print(video.title)
+asyncio.run(do_something())
 
 # SEE DOCUMENTATION FOR MORE
 ```

{eporner_api-2.0 → eporner_api-2.1}/README.md

@@ -15,6 +15,7 @@
 > and applicable laws. Do not use it to bypass access controls or scrape at disruptive rates.
 
 # Features
+- Asynchronous
 - Fetch videos + metadata
 - Download videos
 - Fetch Pornstars
@@ -23,8 +24,17 @@
 - Built-in caching
 - Easy interface
 - Great type hinting
-- Proxy support
-- Very customizable
+
+#### Networking Features
+- HTTP 2.0 / HTTP 3.0
+- Browser impersonation
+- Custom JA3
+- All proxy types
+- Proxy authentication
+- Speed Limit
+- DNS over HTTPS
+- And even more...
+- All of this is configurable and can be adjusted as you like!
 
 # Supported Platforms
 This API has been tested and confirmed working on:
@@ -50,19 +60,25 @@ pip install --upgrade Eporner-API
 pip install --upgrade git+https://github.com/EchterAlsFake/EPorner_API.git
 ```
 
-
 ```python
+import asyncio
 from eporner_api import Client
 # Initialize a Client object
-client = Client()
 
-# Fetch a video
-video_object = client.get_video("<insert_url_here>")  # Can also be a Video ID
+async def do_something():
+    client = Client()
+
+    # Fetch a video
+    video_object = await client.get_video("<insert_url_here>")  # Can also be a Video ID
+    print(video_object.title)
+
+    # Search for videos
+    videos = client.search_videos(query="Your query here",..sortings..)  # See Documentation!
+    async for video in videos:
+        print(video.title)
+
 
-# Search for videos
-videos = client.search_videos(query="Your query here", ..sortings..) # See Documentation!
-for video in videos:
-    print(video.title)
+asyncio.run(do_something())
 
 # SEE DOCUMENTATION FOR MORE
 ```

{eporner_api-2.0 → eporner_api-2.1}/eporner_api/eporner_api.py

@@ -31,11 +31,14 @@ except (ModuleNotFoundError, ImportError):
     
 
 from bs4 import BeautifulSoup
+from curl_cffi import Response, AsyncSession
 from urllib.parse import urljoin
+from typing import AsyncGenerator
 from functools import cached_property
 from base_api.modules.config import RuntimeConfig
-from typing import AsyncGenerator, Generator, Union, Optional, List
 from base_api.base import BaseCore, setup_logger, Helper
+from base_api.modules.errors import InvalidProxy, BotProtectionDetected, NetworkingError, UnknownError, VideoFetchError, PageFetchError
+from base_api.modules.static_functions import normalize_quality_value, choose_quality_from_list, str_to_bool
 
 """
 Copyright (c) 2024-2026 Johannes Habel
@@ -68,42 +71,36 @@ HTML Content. See the Documentation for more details.
 """
 
 
+async def get_html_content(core: BaseCore, url: str, get_json: bool = False) -> str | None | dict:
+    # What should I do here?
+    try:
+        content = await core.fetch(url)
+        if isinstance(content, str):
+            if get_json:
+                return json.loads(content)
 
-def _normalize_quality_value(q) -> Union[str, int]:
-    if isinstance(q, int):
-        return q
-    s = str(q).lower().strip()
-    if s in {"best", "half", "worst"}:
-        return s
-    m = re.search(r'(\d{3,4})', s)
-    if m:
-        return int(m.group(1))
-    raise ValueError(f"Invalid quality: {q}")
+            return content
 
+        if isinstance(content, Response):
+            if content.status_code == 404:
+                raise NotFound(f"Server returned 404 for: {url}")
 
-def _choose_quality_from_list(available: List[str | int], target: Union[str, int]):
-    # available like ["240", "360", "480", "720", "1080"]
-    av = sorted({int(x) for x in available})
-    if isinstance(target, str):
-        if target == "best":
-            return av[-1]
-        if target == "worst":
-            return av[0]
-        if target == "half":
-            return av[len(av) // 2]
-        raise ValueError("Invalid label.")
-    # numeric: highest ≤ target, else closest
-    le = [h for h in av if h <= target]
-    if le:
-        return le[-1]
-    # fallback closest (ties -> higher)
-    return min(av, key=lambda h: (abs(h - target), -h))
+    except NetworkingError as e:
+        raise NetworkError(str(e)) from e
 
+    except InvalidProxy as e:
+        raise ProxyError(str(e)) from e
+
+    except BotProtectionDetected as e:
+        raise BotDetection(str(e)) from e
+
+    except UnknownError as e:
+        raise UnknownNetworkError(str(e)) from e
 
 
 
 class Video:
-    def __init__(self, url: str, enable_html_scraping: bool = True, core: Optional[BaseCore] = None, html_content=None):
+    def __init__(self, url: str, core: BaseCore, enable_html_scraping: bool = True, html_content=None):
         self.core = core
         self.url = url
         self.enable_html = enable_html_scraping
@@ -125,7 +122,7 @@ class Video:
             self.html_json_data = self.extract_json_from_html()
         return self
 
-    def enable_logging(self, log_file: str, level, log_ip: str = None, log_port: int = None):
+    def enable_logging(self, log_file: str, level, log_ip: str | None = None, log_port: int | None = None):
         self.logger = setup_logger(name="EPorner API - [Video]", log_file=log_file, level=level, http_ip=log_ip, http_port=log_port)
 
     @cached_property
@@ -156,10 +153,10 @@ class Video:
         Uses the V2 API to retrieve information from a video
         :return:
         """
-
-        data = await self.core.fetch(f"{ROOT_URL}{API_VIDEO_ID}?id={self.video_id}&thumbsize=medium&format=json")
-        parsed_data = json.loads(data)
-        return parsed_data
+        url = f"{ROOT_URL}{API_VIDEO_ID}?id={self.video_id}&thumbsize=medium&format=json"
+        data = await get_html_content(url=url, get_json=True, core=self.core)
+        assert isinstance(data, dict)
+        return data
 
     @cached_property
     def tags(self) -> list:
@@ -223,10 +220,11 @@ class Video:
         if not self.enable_html:
             raise HTML_IS_DISABLED("HTML content is disabled! See Documentation for more details")
 
-        self.html_content = html.unescape(await self.core.fetch(self.url))
-
+        self.html_content = await get_html_content(core=self.core, url=self.url)
+        assert isinstance(self.html_content, str)
+        self.html_content = html.unescape(self.html_content)
 
-    def extract_json_from_html(self):
+    def extract_json_from_html(self) -> dict:
         if not self.enable_html:
             raise HTML_IS_DISABLED("HTML content is disabled! See Documentation for more details")
 
@@ -268,13 +266,13 @@ JSONDecodeError: I need your help to fix this error. Please report the URL you'v
         return dict(items)
 
     @cached_property
-    def bitrate(self) -> str:
+    def bitrate(self) -> str | None:
         """Return the bitrate of the video? (I don't know)"""
         return self.html_json_data["bitrate"] if self.enable_html else None
 
 
     @cached_property
-    def source_video_url(self) -> str:
+    def source_video_url(self) -> str | None:
         """
         Returns the .mp4 video location URL
 
@@ -284,7 +282,7 @@ JSONDecodeError: I need your help to fix this error. Please report the URL you'v
 
 
     @cached_property
-    def rating(self) -> str:
+    def rating(self) -> str | None:
         """
         Returns the rating value. Highest (best) is 100, least is zero (worst)
         :return: str
@@ -297,7 +295,7 @@ JSONDecodeError: I need your help to fix this error. Please report the URL you'v
                 raise NotAvailable("No rating available. This isn't an error!")
 
     @cached_property
-    def likes(self) -> str:
+    def likes(self) -> str | None:
         """
         Returns the video likes
         :return: str
@@ -305,7 +303,7 @@ JSONDecodeError: I need your help to fix this error. Please report the URL you'v
         return REGEX_VIDEO_LIKES.search(self.html_content).group(1) if self.enable_html else None
 
     @cached_property
-    def dislikes(self) -> str:
+    def dislikes(self) -> str | None:
         """
         Returns the video dislikes
         :return:
@@ -313,7 +311,7 @@ JSONDecodeError: I need your help to fix this error. Please report the URL you'v
         return REGEX_VIDEO_DISLIKES.search(self.html_content).group(1) if self.enable_html else None
 
     @cached_property
-    def rating_count(self) -> str:
+    def rating_count(self) -> str | None:
         """
         Returns how many people have rated the video
         :return: str
@@ -321,7 +319,7 @@ JSONDecodeError: I need your help to fix this error. Please report the URL you'v
         return self.html_json_data["aggregateRating_ratingCount"] if self.enable_html else None
 
     @cached_property
-    def author(self) -> str:
+    def author(self) -> str | None:
         """
         Returns the Uploader of the Video
         :return: str
@@ -394,8 +392,8 @@ JSONDecodeError: I need your help to fix this error. Please report the URL you'v
 
         # Choose the appropriate height using your helpers
         available_heights = sorted(quality_to_url.keys())  # e.g., [240, 360, 480, 720, 1080]
-        qn = _normalize_quality_value(quality)  # -> 'best' | 'half' | 'worst' | int
-        chosen_height = _choose_quality_from_list(available_heights, qn)
+        qn = normalize_quality_value(quality)  # -> 'best' | 'half' | 'worst' | int
+        chosen_height = choose_quality_from_list(available_heights, qn)
 
         # Map back to URL and return absolute URL
         chosen_url = quality_to_url[chosen_height]
@@ -405,7 +403,7 @@ JSONDecodeError: I need your help to fix this error. Please report the URL you'v
         return full_url
 
     async def download(self, quality, path, callback=None, mode=Encoding.mp4_h264, no_title=False, use_workaround=False,
-                 stop_event: threading.Event = None):
+                 stop_event: threading.Event | None = None):
         if not self.enable_html:
             raise HTML_IS_DISABLED("HTML content is disabled! See Documentation for more details")
 
@@ -432,8 +430,8 @@ JSONDecodeError: I need your help to fix this error. Please report the URL you'v
 
 
 class Pornstar(Helper):
-    def __init__(self, url: str, enable_html_scraping: bool = False, core: Optional[BaseCore] = None, html_content=None):
-        super().__init__(core=core, video=Video)
+    def __init__(self, url: str, core: BaseCore, enable_html_scraping: bool = False, html_content=None):
+        super().__init__(core=core, video_constructor=Video)
         self.core = core
         self.url = url
         self.enable_html_scraping = enable_html_scraping
@@ -442,24 +440,30 @@ class Pornstar(Helper):
         
     async def init(self):
         if not self.html_content:
-            self.html_content = await self.core.fetch(self.url)
+            self.html_content = await get_html_content(core=self.core, url=self.url)
+            assert isinstance(self.html_content, str)
+
         return self
 
-    def enable_logging(self, log_file: str, level, log_ip: str = None, log_port: int = None):
+    def enable_logging(self, log_file: str, level, log_ip: str | None = None, log_port: int | None = None):
         self.logger = setup_logger(name="EPorner API - [Pornstar]", log_file=log_file, level=level, http_ip=log_ip, http_port=log_port)
 
-    async def videos(self, pages: int = 0, videos_concurrency: int = None, pages_concurrency: int = None) -> AsyncGenerator[Video, None]:
+    async def videos(self, pages: int = 0, videos_concurrency: int | None = None, pages_concurrency: int | None = None) -> AsyncGenerator[Video, None]:
         if pages == 0:
             video_amount = str(self.video_amount).replace(",", "")
             pages = round(int(video_amount)) / 37 # One page contains 37 videos
 
-        videos_concurrency = videos_concurrency or self.core.config.videos_concurrency
-        pages_concurrency = pages_concurrency or self.core.config.pages_concurrency
+        videos_concurrency = videos_concurrency or self.core.configuration.videos_concurrency
+        pages_concurrency = pages_concurrency or self.core.configuration.pages_concurrency
+        assert videos_concurrency and pages_concurrency
 
         pages = round(pages) # Dont ask
         page_urls = [urljoin(f"{self.url}/", str(page)) for page in range(1, pages + 1)]
-        async for video in self.iterator(page_urls=page_urls, extractor=extractor, pages_concurrency=pages_concurrency,
-                                 videos_concurrency=videos_concurrency):
+        async for video in self.iterator(target_page_urls=page_urls, video_link_extractor=extractor, max_page_concurrency=pages_concurrency,
+                                 max_video_concurrency=videos_concurrency):
+            if isinstance(video, (VideoFetchError, PageFetchError)):
+                self.logger.error(f"Error during iteration: {video}")
+                continue
             yield await video.init()
 
     @cached_property
@@ -567,14 +571,15 @@ class Pornstar(Helper):
 
 
 class Client(Helper):
-    def __init__(self, core: Optional[BaseCore] = None):
-        super().__init__(core, video=Video)
-        self.core = core or BaseCore(config=RuntimeConfig())
+    def __init__(self, core: BaseCore = BaseCore(RuntimeConfig())):
+        super().__init__(core, video_constructor=Video)
+        self.core = core
         self.core.initialize_session()
+        assert isinstance(self.core.session, AsyncSession)
         self.core.session.headers.update(headers)
         self.logger = setup_logger(name="EPorner API - [Client]", log_file=None, level=logging.CRITICAL)
 
-    def enable_logging(self, log_file: str, level, log_ip: str = None, log_port: int = None):
+    def enable_logging(self, log_file: str, level, log_ip: str | None = None, log_port: int | None = None):
         self.logger = setup_logger(name="EPorner API - [Client]", log_file=log_file, level=level, http_ip=log_ip, http_port=log_port)
 
     async def get_video(self, url: str, enable_html_scraping: bool = True) -> Video:
@@ -583,35 +588,38 @@ class Client(Helper):
         video = Video(url, enable_html_scraping=enable_html_scraping, core=self.core)
         return await video.init()
 
-    async def search_videos(self, query: str, sorting_gay: Union[str, Gay], sorting_order: Union[str, Order],
-                      sorting_low_quality: Union[str, LowQuality],
+    async def search_videos(self, query: str, sorting_gay: str | Gay, sorting_order: str | Order,
+                      sorting_low_quality: str | LowQuality,
                       page: int, per_page: int, enable_html_scraping: bool = True) -> AsyncGenerator[Video, None]:
 
-        response = await self.core.fetch(f"{ROOT_URL}{API_SEARCH}?query={query}&per_page={per_page}&%page={page}"
-                                f"&thumbsize=medium&order={sorting_order}&gay={sorting_gay}&lq="
-                                f"{sorting_low_quality}&format=json")
+        url = f"{ROOT_URL}{API_SEARCH}?query={query}&per_page={per_page}&%page={page}&thumbsize=medium&order={sorting_order}&gay={sorting_gay}&lq={sorting_low_quality}&format=json"
+        json_data = await get_html_content(core=self.core, url=url, get_json=True)
+        assert isinstance(json_data, dict)
 
-        json_data = json.loads(response)
         for video_ in json_data.get("videos", []):  # Don't know why this works lmao
             id_ = video_["url"]
-            video = Video(id_, enable_html_scraping, core=self.core)
+            video = Video(url=id_, core=self.core, enable_html_scraping=enable_html_scraping)
             yield await video.init()
 
-    async def get_videos_by_category(self, category: Union[str, Category], enable_html_scraping: bool = False,
-                               videos_concurrency: int = None, pages_concurrency: int = None) -> AsyncGenerator[Video, None]:
+    async def get_videos_by_category(self, category: str | Category, enable_html_scraping: bool = False,
+                               videos_concurrency: int | None = None, pages_concurrency: int | None = None) -> AsyncGenerator[Video, None]:
 
         page_urls = [f"{ROOT_URL}cat/{category}/{page}" for page in range(1, 100)]
 
-        videos_concurrency = videos_concurrency or self.core.config.videos_concurrency
-        pages_concurrency = pages_concurrency or self.core.config.pages_concurrency
-        async for video in self.iterator(page_urls=page_urls, videos_concurrency=videos_concurrency,
-                                 pages_concurrency=pages_concurrency, extractor=extractor):
+        videos_concurrency = videos_concurrency or self.core.configuration.videos_concurrency
+        pages_concurrency = pages_concurrency or self.core.configuration.pages_concurrency
+        assert videos_concurrency and pages_concurrency
+        async for video in self.iterator(target_page_urls=page_urls, max_video_concurrency=videos_concurrency,
+                                 max_page_concurrency=pages_concurrency, video_link_extractor=extractor):
+            if isinstance(video, (VideoFetchError, PageFetchError)):
+                self.logger.error(f"Error during iteration: {video}")
+                continue
             yield await video.init()
 
 
     async def get_pornstar(self, url: str, enable_html_scraping: bool = True) -> Pornstar:
         self.logger.info(f"Returning Pornstar object for: {url} HTML Scraping -> {enable_html_scraping}")
-        pornstar = Pornstar(url, enable_html_scraping, core=self.core)
+        pornstar = Pornstar(url=url, enable_html_scraping=enable_html_scraping, core=self.core)
         return await pornstar.init()
 
 
@@ -628,7 +636,7 @@ async def run_main():
                         help="Whether to apply video title automatically to output path or not", required=True)
 
     args = parser.parse_args()
-    no_title = BaseCore().str_to_bool(args.no_title)
+    no_title = str_to_bool(args.no_title)
 
     if args.download:
         client = Client()

{eporner_api-2.0 → eporner_api-2.1}/eporner_api/modules/consts.py

@@ -1,8 +1,8 @@
 import re
 
 # ROOT URLs
-ROOT_URL = "https://eporner.com/"
-PORNSTAR = "https://eporner.com/pornstar/"
+ROOT_URL = "https://www.eporner.com/"
+PORNSTAR = "https://www.eporner.com/pornstar/"
 
 # API Calls
 API_V2 = "api/v2/"

eporner_api-2.1/eporner_api/modules/errors.py

@@ -0,0 +1,48 @@
+class InvalidURL(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+
+class HTML_IS_DISABLED(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+
+class NotAvailable(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+
+class VideoDisabled(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+
+class InvalidVideo(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+
+class NotFound(Exception):
+    def __init__(self, msg: str):
+        self.msg = msg
+
+
+class NetworkError(Exception):
+    def __init__(self, msg: str):
+        self.msg = msg
+
+
+class BotDetection(Exception):
+    def __init__(self, msg: str):
+        self.msg = msg
+
+
+class ProxyError(Exception):
+    def __init__(self, msg: str):
+        self.msg = msg
+
+
+class UnknownNetworkError(Exception):
+    def __init__(self, msg):
+        self.msg = msg

{eporner_api-2.0 → eporner_api-2.1}/eporner_api/tests/test_category.py

@@ -5,8 +5,8 @@ from base_api import BaseCore
 @pytest.mark.asyncio
 async def test_category():
     core = BaseCore()
-    core.config.pages_concurrency = 1
-    core.config.videos_concurrency = 1
+    core.configuration.pages_concurrency = 1
+    core.configuration.videos_concurrency = 1
     
     videos_1 = Client(core).get_videos_by_category(category=Category.JAPANESE)
     videos_2 = Client(core).get_videos_by_category(category=Category.HD)

{eporner_api-2.0 → eporner_api-2.1}/eporner_api/tests/test_pornstar.py

@@ -6,8 +6,8 @@ from base_api import BaseCore
 async def test_pornstar():
     url = "https://www.eporner.com/pornstar/riley-reid/"
     core = BaseCore()
-    core.config.pages_concurrency = 1
-    core.config.videos_concurrency = 1
+    core.configuration.pages_concurrency = 1
+    core.configuration.videos_concurrency = 1
     pornstar = await Client(core).get_pornstar(url, enable_html_scraping=True)
 
     videos = pornstar.videos(pages=1)

{eporner_api-2.0 → eporner_api-2.1}/eporner_api/tests/test_video.py

@@ -3,7 +3,7 @@ from ..eporner_api import Client, Encoding, NotAvailable
 
 @pytest.mark.asyncio
 async def test_video():
-    url = "https://www.eporner.com/video-bTwP6vsFj5U/human-anal-sex-toy/"
+    url = "https://www.eporner.com/video-pDRNfJoN7dN/granny-with-young-guy/"
     video = await Client().get_video(url, enable_html_scraping=True)
     assert isinstance(video.title, str) and len(video.title) > 0
     assert isinstance(video.video_id, str) and len(video.video_id) > 0

{eporner_api-2.0 → eporner_api-2.1}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "uv_build"
 
 [project]
 name = "Eporner_API"
-version = "2.0"
+version = "2.1"
 description = "A Python API for the Porn Site Eporner.com"
 readme = { file = "README.md", content-type = "text/markdown" }
-requires-python = ">=3.9" # 3.9 due to httpx requirements
+requires-python = ">=3.10"
 license = "LGPL-3.0-only"
 license-files = ["LICENSE"]
 authors = [

eporner_api-2.0/eporner_api/modules/errors.py

@@ -1,23 +0,0 @@
-class InvalidURL(Exception):
-    def __init__(self, msg):
-        self.msg = msg
-
-
-class HTML_IS_DISABLED(Exception):
-    def __init__(self, msg):
-        self.msg = msg
-
-
-class NotAvailable(Exception):
-    def __init__(self, msg):
-        self.msg = msg
-
-
-class VideoDisabled(Exception):
-    def __init__(self, msg):
-        self.msg = msg
-
-
-class InvalidVideo(Exception):
-    def __init__(self, msg):
-        self.msg = msg