eaf-base-api 2.2.7__tar.gz → 2.2.9__tar.gz

{eaf_base_api-2.2.7/eaf_base_api.egg-info → eaf_base_api-2.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eaf_base_api
-Version: 2.2.7
+Version: 2.2.9
 Summary: A base API for EchterAlsFake's Porn APIs
 Home-page: https://github.com/EchterAlsFake/eaf_base_api
 Author: Johannes Habel
@@ -35,10 +35,12 @@ support, and there was a lot of code that I would have rewritten in every API ag
 package. The `BaseCore` class does all the necessary stuff like m3u8 parsing, a great caching system, network request
 fetching with retry attempts and proxy support.
 
-# Using Proxies / Caching
-There's a small documentation for this project.
-<br>Please have a look at it: https://github.com/EchterAlsFake/API_Docs/blob/master/Porn_APIs/eaf_base_api.md
+# Documentation (IMPORTANT!) 
+> [!IMPORTANT]
+> Configuring eaf_base_api is necessary if you use any of my Porn APIs, because they all depend on this project.
+> Please read through the documentation to learn how `PROXIES`, `CACHING` and `LOGGING` etc... work!
 
+You can find the documentation here ->: https://github.com/EchterAlsFake/API_Docs/blob/master/Porn_APIs/eaf_base_api.md
 
 # Can I use this for myself?
 Yes, you can, but I may change stuff here and there from time to time, and it would maybe break your project.
@@ -47,7 +49,6 @@ I would not recommend you to install and use it as a package, but just copy the
 I can recommend everyone the download functions for HLS streaming since, for example, the threaded preset is very well 
 optimized. If you just use mine, you need to consume less caffeine and brain cells to make such a function :)
 
-
 # License
 Licensed under The [LGPLv3](https://www.gnu.org/licenses/lgpl-3.0.en.html) license.
 <br>Copyright (C) 2024-2025 Johannes Habel

{eaf_base_api-2.2.7 → eaf_base_api-2.2.9}/README.md

@@ -9,10 +9,12 @@ support, and there was a lot of code that I would have rewritten in every API ag
 package. The `BaseCore` class does all the necessary stuff like m3u8 parsing, a great caching system, network request
 fetching with retry attempts and proxy support.
 
-# Using Proxies / Caching
-There's a small documentation for this project.
-<br>Please have a look at it: https://github.com/EchterAlsFake/API_Docs/blob/master/Porn_APIs/eaf_base_api.md
+# Documentation (IMPORTANT!) 
+> [!IMPORTANT]
+> Configuring eaf_base_api is necessary if you use any of my Porn APIs, because they all depend on this project.
+> Please read through the documentation to learn how `PROXIES`, `CACHING` and `LOGGING` etc... work!
 
+You can find the documentation here ->: https://github.com/EchterAlsFake/API_Docs/blob/master/Porn_APIs/eaf_base_api.md
 
 # Can I use this for myself?
 Yes, you can, but I may change stuff here and there from time to time, and it would maybe break your project.
@@ -21,7 +23,6 @@ I would not recommend you to install and use it as a package, but just copy the
 I can recommend everyone the download functions for HLS streaming since, for example, the threaded preset is very well 
 optimized. If you just use mine, you need to consume less caffeine and brain cells to make such a function :)
 
-
 # License
 Licensed under The [LGPLv3](https://www.gnu.org/licenses/lgpl-3.0.en.html) license.
 <br>Copyright (C) 2024-2025 Johannes Habel

eaf_base_api-2.2.9/base_api/__init__.py

@@ -0,0 +1,5 @@
+__all__ = ["BaseCore", "Callback", "config"]
+
+from base_api.base import BaseCore
+from base_api.modules.progress_bars import Callback
+from base_api.modules.config import config

{eaf_base_api-2.2.7 → eaf_base_api-2.2.9}/base_api/base.py

@@ -5,7 +5,6 @@ import time
 import m3u8
 import json
 import httpx
-import random
 import logging
 import traceback
 import threading
@@ -18,11 +17,11 @@ from ffmpeg_progress_yield import FfmpegProgress
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
 try:
-    from modules import config
+    from modules.config import config
     from modules.progress_bars import Callback
 
 except (ModuleNotFoundError, ImportError):
-    from .modules import config
+    from .modules.config import config
     from .modules.progress_bars import Callback
 
 loggers = {}
@@ -62,7 +61,7 @@ class ColoredFormatter(logging.Formatter):
 def send_log_message(ip, port, message):
     """Sends a log message to a remote server via HTTP."""
     try:
-        conn = http.client.HTTPConnection(ip, port, timeout=2)
+        conn = http.client.HTTPConnection(ip, port, timeout=5)
         headers = {'Content-Type': 'application/json'}
         data = json.dumps({"message": message})
         conn.request("POST", "/log", body=data, headers=headers)
@@ -143,12 +142,13 @@ class Cache:
         self.cache_dictionary = {}
         self.lock = threading.Lock()
         self.logger = setup_logger("BASE API - [Cache]", level=logging.CRITICAL)
+        self.config = config
 
-    def enable_logging(self, log_file=None, level=logging.DEBUG):
+    def enable_logging(self, log_file=None, level=logging.DEBUG, log_ip=None, log_port=None):
         """
         Enables logging dynamically for this module.
         """
-        self.logger = setup_logger(name="BASE API - [Cache]", log_file=log_file, level=level)
+        self.logger = setup_logger(name="BASE API - [Cache]", log_file=log_file, level=level, http_ip=log_ip, http_port=log_port)
 
     def handle_cache(self, url):
         if url is None:
@@ -160,7 +160,7 @@ class Cache:
 
     def save_cache(self, url, content):
         with self.lock:
-            if len(self.cache_dictionary.keys()) >= config.config.MAX_CACHE_ITEMS:
+            if len(self.cache_dictionary.keys()) >= self.config.max_cache_items:
                 first_key = next(iter(self.cache_dictionary))
                 # Delete the first item
                 del self.cache_dictionary[first_key]
@@ -172,7 +172,7 @@ class BaseCore:
     """
     The base class which has all necessary functions for other API packages
     """
-    def __init__(self, config=config.config):
+    def __init__(self, config=config):
         self.last_request_time = time.time()
         self.total_requests = 0 # Tracks how many requests have been made
         self.session = None
@@ -182,12 +182,12 @@ class BaseCore:
         self.initialize_session()
         self.logger = setup_logger("BASE API - [BaseCore]", log_file=False, level=logging.ERROR)
 
-    def enable_logging(self, log_file=None, level=logging.DEBUG):
+    def enable_logging(self, log_file=None, level=logging.DEBUG, log_ip=None, log_port=None):
         """
         Enables logging dynamically for this module.
         """
-        self.logger = setup_logger(name="BASE API - [BaseCore]", log_file=log_file, level=level)
-        self.cache.logger = setup_logger(name="BASE API - [Cache]", log_file=log_file, level=level)
+        self.logger = setup_logger(name="BASE API - [BaseCore]", log_file=log_file, level=level, http_ip=log_ip, http_port=log_port)
+        self.cache.logger = setup_logger(name="BASE API - [Cache]", log_file=log_file, level=level, http_ip=log_ip, http_port=log_port)
 
     def update_user_agent(self):
         """Updates the User-Agent"""
@@ -200,7 +200,7 @@ class BaseCore:
         self.kill_switch = True
 
     def check_kill_switch(self):
-        proxy_ip = self.config.PROXY
+        proxy_ip = self.config.proxy
         pattern = re.compile(
             r'^(?P<scheme>http|socks5)://'
             r'(?:(?:\w+:\w+)@)?'  # optional user:pass@
@@ -233,16 +233,16 @@ class BaseCore:
 
     def initialize_session(self, verify=True): # Disable SSL verification only if you really need it....
         self.session = httpx.Client(
-            proxy=self.config.PROXY,
-            headers=self.config.HEADERS,
-            timeout=self.config.TIMEOUT,
+            proxy=self.config.proxy,
+            headers=self.config.headers,
+            timeout=self.config.timeout,
             follow_redirects=True,
             verify=verify
         )
 
     def enforce_delay(self):
         """Enforces the specified delay in consts.REQUEST_DELAY"""
-        delay = self.config.REQUEST_DELAY
+        delay = self.config.request_delay
         if delay > 0:
             time_since_last_request = time.time() - self.last_request_time
             self.logger.debug(f"Time since last request: {time_since_last_request:.2f} seconds.")
@@ -276,7 +276,7 @@ class BaseCore:
             self.logger.info(f"Fetched content for: {url} from cache!")
             return content
 
-        for attempt in range(1, self.config.MAX_RETRIES + 1):
+        for attempt in range(1, self.config.max_retries + 1):
             if attempt != 1:
                 time.sleep(1.5) # Sleeping for 1.5 seconds to minimize site overload when doing a lot of requests
 
@@ -342,9 +342,9 @@ class BaseCore:
             except Exception:
                 self.logger.error(f"Attempt {attempt}: Unexpected error for URL {url}: {traceback.format_exc()}")
 
-            self.logger.info(f"Retrying ({attempt}/{self.config.MAX_RETRIES}) for URL: {url}")
+            self.logger.info(f"Retrying ({attempt}/{self.config.max_retries}) for URL: {url}")
 
-        self.logger.error(f"Failed to fetch URL {url} after {self.config.MAX_RETRIES} attempts.")
+        self.logger.error(f"Failed to fetch URL {url} after {self.config.max_retries} attempts.")
         return None  # Return None if all attempts fail
 
     @classmethod

{eaf_base_api-2.2.7 → eaf_base_api-2.2.9/eaf_base_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eaf_base_api
-Version: 2.2.7
+Version: 2.2.9
 Summary: A base API for EchterAlsFake's Porn APIs
 Home-page: https://github.com/EchterAlsFake/eaf_base_api
 Author: Johannes Habel
@@ -35,10 +35,12 @@ support, and there was a lot of code that I would have rewritten in every API ag
 package. The `BaseCore` class does all the necessary stuff like m3u8 parsing, a great caching system, network request
 fetching with retry attempts and proxy support.
 
-# Using Proxies / Caching
-There's a small documentation for this project.
-<br>Please have a look at it: https://github.com/EchterAlsFake/API_Docs/blob/master/Porn_APIs/eaf_base_api.md
+# Documentation (IMPORTANT!) 
+> [!IMPORTANT]
+> Configuring eaf_base_api is necessary if you use any of my Porn APIs, because they all depend on this project.
+> Please read through the documentation to learn how `PROXIES`, `CACHING` and `LOGGING` etc... work!
 
+You can find the documentation here ->: https://github.com/EchterAlsFake/API_Docs/blob/master/Porn_APIs/eaf_base_api.md
 
 # Can I use this for myself?
 Yes, you can, but I may change stuff here and there from time to time, and it would maybe break your project.
@@ -47,7 +49,6 @@ I would not recommend you to install and use it as a package, but just copy the
 I can recommend everyone the download functions for HLS streaming since, for example, the threaded preset is very well 
 optimized. If you just use mine, you need to consume less caffeine and brain cells to make such a function :)
 
-
 # License
 Licensed under The [LGPLv3](https://www.gnu.org/licenses/lgpl-3.0.en.html) license.
 <br>Copyright (C) 2024-2025 Johannes Habel

{eaf_base_api-2.2.7 → eaf_base_api-2.2.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="eaf_base_api",
-    version="2.2.7",
+    version="2.2.9",
     packages=find_packages(),
     install_requires=["ffmpeg-progress-yield", "m3u8", "httpx"],
     entry_points={

eaf_base_api-2.2.7/base_api/__init__.py

@@ -1,4 +0,0 @@
-__all__ = ["BaseCore", "Callback"]
-
-from base_api.base import BaseCore
-from base_api.modules.progress_bars import Callback