eaf-base-api 2.3.6__tar.gz → 2.3.8__tar.gz

{eaf_base_api-2.3.6/eaf_base_api.egg-info → eaf_base_api-2.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eaf_base_api
-Version: 2.3.6
+Version: 2.3.8
 Summary: A base API for EchterAlsFake's Porn APIs
 Home-page: https://github.com/EchterAlsFake/eaf_base_api
 Author: Johannes Habel

{eaf_base_api-2.3.6 → eaf_base_api-2.3.8}/base_api/base.py

@@ -168,15 +168,16 @@ class BaseCore:
     """
     The base class which has all necessary functions for other API packages
     """
-    def __init__(self, config=config):
+    def __init__(self, config=config, auto_init: bool = True):
         self.last_request_time = time.time()
         self.total_requests = 0 # Tracks how many requests have been made
         self.session = None
         self.kill_switch = False
         self.config = config
         self.cache = Cache(self.config)
-        self.initialize_session()
         self.logger = setup_logger("BASE API - [BaseCore]", log_file=False, level=logging.ERROR)
+        if auto_init:
+            self.initialize_session()
 
     def enable_logging(self, log_file=None, level=logging.DEBUG, log_ip=None, log_port=None):
         """
@@ -232,13 +233,13 @@ class BaseCore:
             raise KillSwitch("CRITICAL PROXY ERROR, CHECK LOGS!")
 
 
-    def initialize_session(self, verify=True): # Disable SSL verification only if you really need it....
+    def initialize_session(self): # 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,
             follow_redirects=True,
-            verify=verify
+            verify=self.config.verify_ssl
         )
 
     def update_headers(self, headers: dict):
@@ -368,8 +369,12 @@ class BaseCore:
                 self.logger.error(f"Attempt {attempt}: The connection has been unexpectedly closed by: {url}. Retrying...")
                 continue
 
-            except httpx.RequestError as e:
+            except (httpx.RequestError, httpx.ConnectError) as e:
                 self.logger.error(f"Attempt {attempt}: Request error for URL {url}: {e}")
+
+                if "CERTIFICATE_VERIFY_FAILED" in str(e):
+                    raise ProxySSLError("Proxy has an invalid SSL certificate, to get around this error, set 'verify = False' in config")
+
                 self.logger.info(f"Retrying ({attempt}/{self.config.max_retries}) for URL: {url}")
                 continue # Continuing even failed requests, because they may succeed on another try (maybe idk)
 

{eaf_base_api-2.3.6 → eaf_base_api-2.3.8}/base_api/modules/errors.py

@@ -42,3 +42,10 @@ class NetworkingError(Exception):
     def __init__(self, message):
         self.message = message
 
+
+class ProxySSLError(Exception):
+    """
+    Raises if a proxy request fails due to self-signed certificates or invalid TLS verification
+    """
+    def __init__(self, message):
+        self.message = message

{eaf_base_api-2.3.6 → eaf_base_api-2.3.8/eaf_base_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eaf_base_api
-Version: 2.3.6
+Version: 2.3.8
 Summary: A base API for EchterAlsFake's Porn APIs
 Home-page: https://github.com/EchterAlsFake/eaf_base_api
 Author: Johannes Habel

{eaf_base_api-2.3.6 → eaf_base_api-2.3.8}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="eaf_base_api",
-    version="2.3.6",
+    version="2.3.8",
     packages=find_packages(),
     install_requires=["m3u8", "httpx"],
     extras_require={