swiftshadow 2.2.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

swiftshadow/__init__.py

@@ -19,7 +19,7 @@ def QuickProxy(
     Returns:
         proxyObject (Proxy): A working proxy object if found or else None.
     """
-    for provider in Providers:
+    for provider in Providers.values():
         if protocol not in provider.protocols:
             continue
         if (len(countries) != 0) and (not provider.countryFilter):

swiftshadow/classes.py

@@ -5,16 +5,17 @@ from pathlib import Path
 from pickle import dump, dumps, load, loads
 from random import choice
 from sys import stdout
-from typing import Literal
+from typing import Literal, Any, Callable, Coroutine
 
 import aiofiles
 from appdirs import user_cache_dir
 
 from swiftshadow.cache import checkExpiry, getExpiry
 from swiftshadow.exceptions import UnsupportedProxyProtocol
-from swiftshadow.models import CacheData
+from swiftshadow.helpers import deduplicateProxies
+from swiftshadow.models import CacheData, Provider
 from swiftshadow.models import Proxy as Proxy
-from swiftshadow.providers import Providers
+from swiftshadow.providers import Providers as ProvidersMap
 
 logger = getLogger("swiftshadow")
 logger.setLevel(INFO)
@@ -34,6 +35,7 @@ class ProxyInterface:
     Attributes:
         countries (list[str]): List of ISO country codes to filter proxies by (e.g., ["US", "CA"]).
         protocol (Literal['https', 'http']): Proxy protocol to use. Defaults to 'http'.
+        selectedProviders (Callable[[list[str], Literal["http", "https"]], Coroutine[Any, Any, list[Proxy]]]]): Selected list of providers to fetch proxies from. Defaults to empty meaning all available Providers.
         maxproxies (int): Maximum number of proxies to collect from providers. Defaults to 10.
         autorotate (bool): Whether to automatically rotate proxy on each get() call. Defaults to False.
         autoUpdate (bool): Whether to automatically update proxies upon class initalisation. Defaults to True.
@@ -62,6 +64,11 @@ class ProxyInterface:
         self,
         countries: list[str] = [],
         protocol: Literal["https", "http"] = "http",
+        selectedProviders: list[
+            Callable[
+                [list[str], Literal["http", "https"]], Coroutine[Any, Any, list[Proxy]]
+            ]
+        ] = [],
         maxProxies: int = 10,
         autoRotate: bool = False,
         autoUpdate: bool = True,
@@ -75,6 +82,7 @@ class ProxyInterface:
         Args:
             countries: List of ISO country codes to filter proxies. Empty list = no filtering.
             protocol: Proxy protocol to retrieve. Choose between 'http' or 'https'.
+            selectedProviders (list[Providers]): Selected list of providers to fetch proxies from. Defaults to empty meaning all available Providers.
             maxProxies: Maximum proxies to collect from all providers combined.
             autoRotate: Enable automatic proxy rotation on every get() call.
             autoUpdate (bool): Whether to automatically update proxies upon class initalisation.
@@ -93,6 +101,18 @@ class ProxyInterface:
                 } is not supported by swiftshadow, please choose between HTTP or HTTPS"
             )
         self.protocol: Literal["https", "http"] = protocol
+        if selectedProviders != []:
+            providers: list[Provider] = []
+            for i in selectedProviders:
+                try:
+                    providers.append(ProvidersMap[i])
+                except KeyError:
+                    raise ValueError(
+                        f"Unkown provider {i.__name__} in the list of Selected Providers."
+                    )
+            self.providers: list[Provider] = providers
+        else:
+            self.providers: list[Provider] = list(ProvidersMap.values())
 
         self.maxproxies: int = maxProxies
         self.autorotate: bool = autoRotate
@@ -161,7 +181,7 @@ class ProxyInterface:
 
         self.proxies = []
 
-        for provider in Providers:
+        for provider in self.providers:
             if self.protocol not in provider.protocols:
                 continue
             if (len(self.countries) != 0) and (not provider.countryFilter):
@@ -184,6 +204,7 @@ class ProxyInterface:
                 raise ValueError("No proxies were found for the current filter settings. Tip: https proxies can be rare; recommend setting protocol to http")
             raise ValueError("No proxies were found for the current filter settings.")
 
+        self.proxies = deduplicateProxies(self.proxies)
         async with aiofiles.open(
             self.cacheFolderPath.joinpath("swiftshadow.pickle"), "wb+"
         ) as cacheFile:
@@ -232,7 +253,7 @@ class ProxyInterface:
 
         self.proxies = []
 
-        for provider in Providers:
+        for provider in self.providers:
             if self.protocol not in provider.protocols:
                 continue
             if (len(self.countries) != 0) and (not provider.countryFilter):
@@ -253,6 +274,7 @@ class ProxyInterface:
         if len(self.proxies) == 0:
             raise ValueError("No proxies were found for the current filter settings.")
 
+        self.proxies = deduplicateProxies(self.proxies)
         with open(
             self.cacheFolderPath.joinpath("swiftshadow.pickle"), "wb+"
         ) as cacheFile:

swiftshadow/helpers.py

@@ -46,3 +46,14 @@ async def GenericPlainTextProxyProvider(
     proxies: list[Proxy] = plaintextToProxies(raw, protocol=protocol)
     results = await validate_proxies(proxies)
     return results
+
+
+def deduplicateProxies(proxies: list[Proxy]) -> list[Proxy]:
+    seen: list[str] = []
+    final: list[Proxy] = []
+    for proxy in proxies:
+        proxy_str: str = proxy.as_string()
+        if proxy_str not in seen:
+            final.append(proxy)
+            seen.append(proxy_str)
+    return final

swiftshadow/providers.py

@@ -1,4 +1,4 @@
-from typing import Literal
+from typing import Any, Callable, Coroutine, Literal
 import aiohttp
 
 from requests import get
@@ -168,18 +168,37 @@ async def ProxyDB(
     return proxies
 
 
-Providers: list[Provider] = [
-    Provider(providerFunction=ProxyScrape, countryFilter=True, protocols=["http"]),
-    Provider(providerFunction=Monosans, countryFilter=True, protocols=["http"]),
-    Provider(providerFunction=MuRongPIG, countryFilter=False, protocols=["http"]),
-    Provider(providerFunction=Thespeedx, countryFilter=False, protocols=["http"]),
-    Provider(
+Providers: dict[
+    Callable[[list[str], Literal["http", "https"]], Coroutine[Any, Any, list[Proxy]]],
+    Provider,
+] = {
+    ProxyScrape: Provider(
+        providerFunction=ProxyScrape, countryFilter=True, protocols=["http"]
+    ),
+    Monosans: Provider(
+        providerFunction=Monosans, countryFilter=True, protocols=["http"]
+    ),
+    MuRongPIG: Provider(
+        providerFunction=MuRongPIG, countryFilter=False, protocols=["http"]
+    ),
+    Thespeedx: Provider(
+        providerFunction=Thespeedx, countryFilter=False, protocols=["http"]
+    ),
+    Anonym0usWork1221: Provider(
         providerFunction=Anonym0usWork1221,
         countryFilter=False,
         protocols=["http", "https"],
     ),
-    Provider(providerFunction=Mmpx12, countryFilter=False, protocols=["http", "https"]),
-    Provider(providerFunction=GoodProxy, countryFilter=False, protocols=["http"]),
-    Provider(providerFunction=OpenProxyList, countryFilter=False, protocols=["http"]),
-    Provider(providerFunction=ProxyDB, countryFilter=True, protocols=["http", "https"]),
-]
+    Mmpx12: Provider(
+        providerFunction=Mmpx12, countryFilter=False, protocols=["http", "https"]
+    ),
+    GoodProxy: Provider(
+        providerFunction=GoodProxy, countryFilter=False, protocols=["http"]
+    ),
+    OpenProxyList: Provider(
+        providerFunction=OpenProxyList, countryFilter=False, protocols=["http"]
+    ),
+    ProxyDB: Provider(
+        providerFunction=ProxyDB, countryFilter=True, protocols=["http", "https"]
+    ),
+}

{swiftshadow-2.2.1.dist-info → swiftshadow-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swiftshadow
-Version: 2.2.1
+Version: 2.3.0
 Summary: Free IP Proxy rotator for python
 Author-email: sachin-sankar <mail.sachinsankar@gmail.com>
 License-File: LICENSE

swiftshadow-2.3.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+swiftshadow/__init__.py,sha256=TYzucigrVBJo8derXriXLDnmLpDyyZdyi_7AinO0PqY,931
+swiftshadow/cache.py,sha256=Mg8xsD6K3K012sILBwD2EZH6CE5kWCQNKCfZ5yadalI,800
+swiftshadow/classes.py,sha256=PpAgvaZSWiS7AQVROBPynukgph7EyntRGlGbA5UzT5s,13561
+swiftshadow/exceptions.py,sha256=qu4eXyrkWD9qd4HCIR-8vRfVcqLlTupo4sD72alCdug,129
+swiftshadow/helpers.py,sha256=Yh5sASdlcTueRsGGrv9uIeAZtmLk_BviYzD2In3FzDQ,1597
+swiftshadow/models.py,sha256=rHOuOFc6UYCI8L2pwxAbvS3Fj0Ag89cHod0rt7kQ2Vc,1790
+swiftshadow/providers.py,sha256=ldEdDcGH19ayNtnofy66J81aiPgnq5h9ZRa3FeA1BZ0,6885
+swiftshadow/types.py,sha256=Alyw3n54OESX1vSR-0kTvpYTlJ8LKfy5J9WZbtglHpE,894
+swiftshadow/validator.py,sha256=3qE-99uljtbin1125uOgqAjnLRjuIgNYO5iiUAmaBC8,3102
+swiftshadow-2.3.0.dist-info/METADATA,sha256=_eNIJV9eHNncPgfAQhxj8ajpLBEvZ00uqXZtkj6ww50,3320
+swiftshadow-2.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+swiftshadow-2.3.0.dist-info/entry_points.txt,sha256=yMj0uEagcmXK2dmMmNXWebTpTT9j5K03oaRrd2wkyLA,49
+swiftshadow-2.3.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+swiftshadow-2.3.0.dist-info/RECORD,,

swiftshadow-2.2.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-swiftshadow/__init__.py,sha256=oxJDmG0YO0XyYGQpa9V_o38lZnoie7U_d4Ik_h46UXs,922
-swiftshadow/cache.py,sha256=Mg8xsD6K3K012sILBwD2EZH6CE5kWCQNKCfZ5yadalI,800
-swiftshadow/classes.py,sha256=hXAyvRuGXDvj_TsZxJ-bapK0pL82lhZUBGQZbQiGWN0,12280
-swiftshadow/exceptions.py,sha256=qu4eXyrkWD9qd4HCIR-8vRfVcqLlTupo4sD72alCdug,129
-swiftshadow/helpers.py,sha256=b8my66sBw_lTVLaKu4SaGjYQqEfIaStsuZlmK9Pmy5Y,1294
-swiftshadow/models.py,sha256=rHOuOFc6UYCI8L2pwxAbvS3Fj0Ag89cHod0rt7kQ2Vc,1790
-swiftshadow/providers.py,sha256=6H-PoXTCQUB7Vop0Wu7DBfMhwiYCvXCF1u_iCM7NcU4,6546
-swiftshadow/types.py,sha256=Alyw3n54OESX1vSR-0kTvpYTlJ8LKfy5J9WZbtglHpE,894
-swiftshadow/validator.py,sha256=3qE-99uljtbin1125uOgqAjnLRjuIgNYO5iiUAmaBC8,3102
-swiftshadow-2.2.1.dist-info/METADATA,sha256=4w-4O9PpR8nCpMVihakZrUNBIKH6QhCNq6OggQOpcVk,3320
-swiftshadow-2.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-swiftshadow-2.2.1.dist-info/entry_points.txt,sha256=yMj0uEagcmXK2dmMmNXWebTpTT9j5K03oaRrd2wkyLA,49
-swiftshadow-2.2.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-swiftshadow-2.2.1.dist-info/RECORD,,