proxyproviders 0.2.0__tar.gz → 0.2.2__tar.gz

{proxyproviders-0.2.0 → proxyproviders-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxyproviders
-Version: 0.2.0
+Version: 0.2.2
 Summary: A unified interface for different proxy providers
 License: MIT License
          
@@ -85,6 +85,8 @@ python -m pip install proxyproviders
 
 Here's a quick bit of code to get you started! There's also a few [examples in the folder](https://github.com/davidteather/proxyproviders/tree/main/examples). 
 
+**📺 Video Tutorial:** [Watch the quick start guide on YouTube](https://youtu.be/h-JouO_orYo) for a walkthrough of getting started with ProxyProviders.
+
 **Note:** If you want to learn how to web scrape websites check my [free and open-source course for learning everything web scraping](https://github.com/davidteather/everything-web-scraping)
 
 ### Choose a Proxy Provider

{proxyproviders-0.2.0 → proxyproviders-0.2.2}/README.md

@@ -41,6 +41,8 @@ python -m pip install proxyproviders
 
 Here's a quick bit of code to get you started! There's also a few [examples in the folder](https://github.com/davidteather/proxyproviders/tree/main/examples). 
 
+**📺 Video Tutorial:** [Watch the quick start guide on YouTube](https://youtu.be/h-JouO_orYo) for a walkthrough of getting started with ProxyProviders.
+
 **Note:** If you want to learn how to web scrape websites check my [free and open-source course for learning everything web scraping](https://github.com/davidteather/everything-web-scraping)
 
 ### Choose a Proxy Provider

{proxyproviders-0.2.0 → proxyproviders-0.2.2}/proxyproviders/__init__.py

@@ -1,13 +1,15 @@
 from . import algorithms
-from .models.proxy import Proxy
+from .models.proxy import Proxy, ProxyFormat
 from .providers.brightdata import BrightData
 from .providers.webshare import Webshare
 from .proxy_provider import ProxyConfig, ProxyProvider
+from .version import __version__
 
 __all__ = [
     "ProxyProvider",
     "ProxyConfig",
     "Proxy",
+    "ProxyFormat",
     "Webshare",
     "BrightData",
     "algorithms",

{proxyproviders-0.2.0 → proxyproviders-0.2.2}/proxyproviders/models/proxy.py

@@ -19,6 +19,9 @@ class ProxyFormat(Enum):
     AIOHTTP = "aiohttp"
     """AIOHTTP format, for use in aiohttp library HTTP calls"""
 
+    PLAYWRIGHT = "playwright"
+    """Playwright format, for use in Playwright browser automation"""
+
     URL = "url"
     """URL format, for use in URL strings"""
 
@@ -90,29 +93,57 @@ class Proxy:
             >>> proxy.format(ProxyFormat.HTTPX)
             {'http://': 'http://user:pass@192.168.1.1:8080', 'https://': 'http://user:pass@192.168.1.1:8080'}
         """
+        # Convert to ProxyFormat enum, handling both string and enum inputs
         if isinstance(format_type, str):
-            format_type = ProxyFormat(format_type)
-
-        if format_type == ProxyFormat.URL:
-            protocol = kwargs.get("protocol", "http")
-            return self.to_url(protocol)
-
-        elif format_type == ProxyFormat.REQUESTS:
-            protocols = kwargs.get("protocols", self.protocols or ["http", "https"])
-            proxy_url = self.to_url("http")
-            return {protocol: proxy_url for protocol in protocols}
-
-        elif format_type == ProxyFormat.CURL:
-            return ["-x", self.to_url("http")]
-
-        elif format_type == ProxyFormat.HTTPX:
-            # httpx uses 'http://' and 'https://' as keys
-            proxy_url = self.to_url("http")
-            return {"http://": proxy_url, "https://": proxy_url}
-
-        elif format_type == ProxyFormat.AIOHTTP:
-            # aiohttp takes a single URL string
-            return self.to_url("http")
-
-        else:
-            raise ValueError(f"Unsupported format: {format_type}")
+            try:
+                format_type = ProxyFormat(format_type)
+            except ValueError:
+                raise ValueError(
+                    f"Invalid format type: '{format_type}'. Valid options are: {[f.value for f in ProxyFormat]}"
+                )
+        elif not isinstance(format_type, ProxyFormat):
+            raise ValueError(  # pyright: ignore[reportUnreachable] this is actually reachable
+                f"Invalid format type: {type(format_type).__name__}. Expected ProxyFormat enum or string."
+            )
+
+        format_handlers = {
+            ProxyFormat.URL: lambda: self.to_url(kwargs.get("protocol", "http")),
+            ProxyFormat.REQUESTS: lambda: self._format_requests(kwargs),
+            ProxyFormat.CURL: lambda: ["-x", self.to_url("http")],
+            ProxyFormat.HTTPX: lambda: self._format_httpx(),
+            ProxyFormat.AIOHTTP: lambda: self.to_url("http"),
+            ProxyFormat.PLAYWRIGHT: lambda: self._format_playwright(**kwargs),
+        }
+
+        handler = format_handlers[format_type]
+        return handler()
+
+    def _format_requests(self, kwargs):
+        """Format proxy for requests library."""
+        protocols = kwargs.get("protocols", self.protocols or ["http", "https"])
+        proxy_url = self.to_url("http")
+        return {protocol: proxy_url for protocol in protocols}
+
+    def _format_httpx(self):
+        """Format proxy for httpx library."""
+        proxy_url = self.to_url("http")
+        return {"http://": proxy_url, "https://": proxy_url}
+
+    def _format_playwright(self, **kwargs):
+        """Format proxy for Playwright."""
+        # Playwright expects server with protocol (e.g., 'http://ip:port', 'socks5://ip:port')
+        # Allow protocol selection via kwargs, default to http
+        protocol = kwargs.get("protocol", "http")
+
+        # Validate protocol is supported by the proxy
+        if self.protocols and protocol not in self.protocols:
+            # If proxy has specific protocols, use the first available one
+            protocol = self.protocols[0]
+
+        playwright_proxy = {"server": f"{protocol}://{self.proxy_address}:{self.port}"}
+
+        if self.username and self.password:
+            playwright_proxy["username"] = self.username
+            playwright_proxy["password"] = self.password
+
+        return playwright_proxy

{proxyproviders-0.2.0 → proxyproviders-0.2.2}/proxyproviders/providers/webshare.py

@@ -92,7 +92,7 @@ class Webshare(ProxyProvider):
 
             all_proxies.extend([self._convert_to_proxy(proxy) for proxy in proxy_data])
 
-            if data.get("next") is None:  # no more pages
+            if "page" in self.search_params or data.get("next") is None:
                 break
 
         return all_proxies

proxyproviders-0.2.2/proxyproviders/version.py

@@ -0,0 +1,3 @@
+"""Version information for proxyproviders package."""
+
+__version__ = "0.2.2"

{proxyproviders-0.2.0 → proxyproviders-0.2.2}/pyproject.toml

@@ -2,9 +2,18 @@
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
+[tool.poetry]
+name = "proxyproviders"
+version = "0.2.2"
+description = "A unified interface for different proxy providers"
+authors = ["David Teather <contact.davidteather@gmail.com>"]
+
+[tool.poetry.dependencies]
+python = ">=3.9"
+
 [project]
 name = "proxyproviders"
-version = "0.2.0"
+version = "0.2.2"
 description = "A unified interface for different proxy providers"
 readme = "README.md"
 authors = [{ name = "David Teather", email = "contact.davidteather@gmail.com" }]