jupyterlite-simple-cors-proxy 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

jupyterlite_simple_cors_proxy/__init__.py

@@ -3,5 +3,5 @@ from .cacheproxy import cors_proxy_get, robust_get_request, xurl, furl
 
 # from .fastf1_proxy import enable_cors_proxy as fastf1_cors_proxy
 
-__version__ = "0.1.10"
+__version__ = "0.1.11"
 __all__ = ["cors_proxy_get", "robust_get_request", "xurl", "furl"]

jupyterlite_simple_cors_proxy/cacheproxy.py

@@ -1,16 +1,22 @@
 # File: simple_cors_proxy/proxy.py
 from urllib.parse import urlencode, quote
 import requests
-import requests_cache
+
 import io
 import platform
 from typing import Optional, Union
 
 PLATFORM = platform.system().lower()
+CORS_PROXIES = {
+    "corsproxyio": {"url": "https://corsproxy.io/?url={}", "quote": False},
+    "allorigins": {"url": "https://api.allorigins.win/raw?url={}", "quote": True},
+    "none": {"url": "{}", "quote": False},
+}
+
 
 class CorsProxy:
     """CORS Proxy with optional caching support."""
-    
+
     def __init__(self, use_cache: bool = False, **cache_kwargs):
         """
         Initialize the CORS proxy.
@@ -21,6 +27,7 @@ class CorsProxy:
                           (e.g., cache_name, backend, expire_after)
         """
         if use_cache:
+            import requests_cache
             # Set some sensible defaults if not provided
             if 'cache_name' not in cache_kwargs:
                 cache_kwargs['cache_name'] = 'cors_proxy_cache'
@@ -29,21 +36,61 @@ class CorsProxy:
             self.session = requests_cache.CachedSession(**cache_kwargs)
         else:
             self.session = requests
+        if "proxy" in cache_kwargs:
+            self.proxy = cache_kwargs["proxy"]
+        else:
+            self.proxy = "corsproxyio"
 
-    def xurl(self, url: str, params: Optional[dict] = None, force: bool = False) -> str:
+    def apply_cors_proxy(self, url, proxy="corsproxyio"):
+        """
+        Apply a CORS proxy to the given URL.
+
+        Args:
+            url (str): The original URL to proxy
+            proxy (str): The proxy identifier to use from CORS_PROXIES
+
+        Returns:
+            str: The proxied URL
+        """
+        if proxy not in CORS_PROXIES:
+            raise ValueError(
+                f"Unknown proxy: {proxy}. Available proxies: {', '.join(CORS_PROXIES.keys())}"
+            )
+
+        proxy_config = CORS_PROXIES[proxy]
+
+        if proxy_config["quote"]:
+            url = proxy_config["url"].format(quote(url))
+        else:
+            url = proxy_config["url"].format(url)
+
+        return url
+
+    def xurl(
+        self,
+        url: str,
+        params: Optional[dict] = None,
+        force: bool = False,
+        proxy: str = "",
+    ) -> str:
         """Generate a proxied URL."""
         if PLATFORM == "emscripten" or force:
             if params:
                 url = f"{url}?{urlencode(params)}"
-            url = f"https://corsproxy.io/{quote(url)}"
+            # url = f"https://corsproxy.io/{quote(url)}"
+            if not proxy:
+                proxy = self.proxy
+            url = self.apply_cors_proxy(url, proxy=proxy)
         return url
 
-    def furl(self, url: str, params: Optional[dict] = None, force: bool = False) -> io.BytesIO:
+    def furl(self, url: str, params: Optional[dict] = None, force: bool = False, proxy: str = "") -> io.BytesIO:
         """Return file like object after calling the proxied URL."""
-        r = self.cors_proxy_get(url, params, force)
+        r = self.cors_proxy_get(url, params, force, proxy)
+        # TO DO - something to consider?
+        # https://simonwillison.net/2025/Jan/31/save-memory-with-bytesio/
         return io.BytesIO(r.content)
 
-    def cors_proxy_get(self, url: str, params: Optional[dict] = None, force: bool = False) -> requests.Response:
+    def cors_proxy_get(self, url: str, params: Optional[dict] = None, force: bool = False, proxy: str = "corsproxyio") -> requests.Response:
         """
         CORS proxy for GET resources with requests-like response.
         
@@ -55,19 +102,22 @@ class CorsProxy:
         Returns:
             A requests response object.
         """
-        proxy_url = self.xurl(url, params, force)
+        proxy_url = self.xurl(url, params, force), proxy
         return self.session.get(proxy_url)
 
-    def robust_get_request(self, url: str, params: Optional[dict] = None) -> requests.Response:
+    def robust_get_request(
+        self, url: str, params: Optional[dict] = None, proxy: str = ""
+    ) -> requests.Response:
         """
         Try to make a simple request else fall back to a proxy.
         """
         try:
             r = self.session.get(url, params=params)
         except:
-            r = self.cors_proxy_get(url, params=params)
+            r = self.cors_proxy_get(url, params=params, proxy=proxy)
         return r
 
+
 # Create default instance
 _default_proxy = CorsProxy()
 
@@ -80,4 +130,4 @@ robust_get_request = _default_proxy.robust_get_request
 # Convenience function to create a cached proxy
 def create_cached_proxy(**cache_kwargs):
     """Create a new CorsProxy instance with caching enabled."""
-    return CorsProxy(use_cache=True, **cache_kwargs)
+    return CorsProxy(use_cache=True, **cache_kwargs)

jupyterlite_simple_cors_proxy/proxy.py

@@ -6,27 +6,61 @@ import io
 import platform
 
 PLATFORM = platform.system().lower()
+CORS_PROXIES = {
+    "corsproxyio": {"url": "https://corsproxy.io/?url={}", "quote": False},
+    "allorigins": {"url": "https://api.allorigins.win/raw?url={}", "quote": True},
+    "none": {"url": "{}", "quote": False},
+}
 
 
-def xurl(url, params=None, force=False):
+def apply_cors_proxy(url, proxy="corsproxyio"):
+    """
+    Apply a CORS proxy to the given URL.
+
+    Args:
+        url (str): The original URL to proxy
+        proxy (str): The proxy identifier to use from CORS_PROXIES
+
+    Returns:
+        str: The proxied URL
+    """
+    if proxy not in CORS_PROXIES:
+        raise ValueError(
+            f"Unknown proxy: {proxy}. Available proxies: {', '.join(CORS_PROXIES.keys())}"
+        )
+
+    proxy_config = CORS_PROXIES[proxy]
+
+    if proxy_config["quote"]:
+        url = proxy_config["url"].format(quote(url))
+    else:
+        url = proxy_config["url"].format(url)
+
+    return url
+
+
+def xurl(url, params=None, force=False, proxy="corsproxyio"):
     """Generate a proxied URL."""
     if PLATFORM == "emscripten" or force:
         if params:
             url = f"{url}?{urlencode(params)}"
-        url = f"https://corsproxy.io/{quote(url)}"
+        # url = f"https://corsproxy.io/{quote(url)}"
+        url = apply_cors_proxy(url, proxy=proxy)
 
     return url
 
 
-def furl(url, params=None, force=False):
+def furl(url, params=None, force=False, proxy="corsproxyio"):
     """Return file like object after calling the proxied URL."""
-    r = cors_proxy_get(url, params, force)
+    r = cors_proxy_get(url, params, force, proxy=proxy)
 
     # Return a file-like object from the JSON string
+    # TO DO - something to consider?
+    # https://simonwillison.net/2025/Jan/31/save-memory-with-bytesio/
     return io.BytesIO(r.content)
 
 
-def cors_proxy_get(url, params=None, force=False):
+def cors_proxy_get(url, params=None, force=False, proxy="corsproxyio"):
     """
     CORS proxy for GET resources with requests-like response.
 
@@ -37,19 +71,19 @@ def cors_proxy_get(url, params=None, force=False):
     Returns:
         A requests response object.
     """
-    proxy_url = xurl(url, params, force)
+    proxy_url = xurl(url, params, force, proxy=proxy)
 
     # Do a simple requests get and
     # just pass through the entire response object
     return requests.get(proxy_url)
 
 
-def robust_get_request(url, params=None):
+def robust_get_request(url, params=None, proxy="corsproxyio"):
     """
     Try to make a simple request else fall back to a proxy.
     """
     try:
         r = requests.get(url, params=params)
     except:
-        r = cors_proxy_get(url, params=params)
+        r = cors_proxy_get(url, params=params, proxy=proxy)
     return r

{jupyterlite_simple_cors_proxy-0.1.10.dist-info → jupyterlite_simple_cors_proxy-0.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jupyterlite-simple-cors-proxy
-Version: 0.1.10
+Version: 0.1.12
 Summary: A simple CORS proxy utility with requests-like response
 Home-page: https://github.com/innovationOUtside/jupyterlite-simple-cors-proxy
 Author: Tony Hirst
@@ -87,7 +87,7 @@ Via `claude.ai`, the package is now further enriched.
 
 *Note that `pyodide` sqlite can't write to `/drive` so the cache path dir needs to be something like `/tmp` or a dir created on `/`.*
 
-*I'm not convinced the following works in `pyodide` and `xeus-python` yet - `requests-cache` dependency issues etc.*
+*I'm not convinced the following works in `pyodide` and `xeus-python` yet - `requests-cache` dependency issues etc. `requests-cache` has requirements `attrs`, `cattrs`,`platformdirs`, `url-normalize`.*
 
 ```python
 from simple_cors_proxy.proxy import CorsProxy

jupyterlite_simple_cors_proxy-0.1.12.dist-info/RECORD

@@ -0,0 +1,9 @@
+jupyterlite_simple_cors_proxy/__init__.py,sha256=vE2WKSaR1d-lu1EoKN3obCHFUB-oowD7I1jwEl5qvok,280
+jupyterlite_simple_cors_proxy/cacheproxy.py,sha256=H-PCbg5qQ9Tn-kQzALpIrfkJzQoIuv5ZKR4vK8fzUIk,4472
+jupyterlite_simple_cors_proxy/fastf1_proxy.py,sha256=FglRogTIlSJvHOu6lFS3S-EHDb37M93aYjQpoKc1QYs,7614
+jupyterlite_simple_cors_proxy/proxy.py,sha256=HkPMY1Tq8Cm4w7nNnzdw8uiRpVuCBj0PtW5Dhk5xQ2c,2478
+jupyterlite_simple_cors_proxy-0.1.12.dist-info/LICENSE,sha256=Ogw7GUmeZIxmDNiKWsu_N07svNoGnPB7lWyiXHX_rMY,1074
+jupyterlite_simple_cors_proxy-0.1.12.dist-info/METADATA,sha256=9BU-LuRYblp6muW1R_0GzYRd1OGbIpffkO0O8M5sVLE,3144
+jupyterlite_simple_cors_proxy-0.1.12.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+jupyterlite_simple_cors_proxy-0.1.12.dist-info/top_level.txt,sha256=Oh0oQrSmRnBq5u675coiKMbkb2ASg8AGF8ZiZTzUS5Q,30
+jupyterlite_simple_cors_proxy-0.1.12.dist-info/RECORD,,

{jupyterlite_simple_cors_proxy-0.1.10.dist-info → jupyterlite_simple_cors_proxy-0.1.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

jupyterlite_simple_cors_proxy-0.1.10.dist-info/RECORD

@@ -1,9 +0,0 @@
-jupyterlite_simple_cors_proxy/__init__.py,sha256=QNqJ64TlAKsoaOKeVcRqeaibDiO3SpOyEakvenkuiuU,280
-jupyterlite_simple_cors_proxy/cacheproxy.py,sha256=SzKQrflMbIJdHoDZ2dtRenGCAGMZEBSl_fs7sjIkiHk,2989
-jupyterlite_simple_cors_proxy/fastf1_proxy.py,sha256=FglRogTIlSJvHOu6lFS3S-EHDb37M93aYjQpoKc1QYs,7614
-jupyterlite_simple_cors_proxy/proxy.py,sha256=uFpevhGlkbcNqVb1d43uBrqVdvAbOQ2m1PLqxsML6BE,1346
-jupyterlite_simple_cors_proxy-0.1.10.dist-info/LICENSE,sha256=Ogw7GUmeZIxmDNiKWsu_N07svNoGnPB7lWyiXHX_rMY,1074
-jupyterlite_simple_cors_proxy-0.1.10.dist-info/METADATA,sha256=g2KklCts9AuEwEUEQ7EpaMh9JBAE8Nmb050_yZNqZbs,3059
-jupyterlite_simple_cors_proxy-0.1.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jupyterlite_simple_cors_proxy-0.1.10.dist-info/top_level.txt,sha256=Oh0oQrSmRnBq5u675coiKMbkb2ASg8AGF8ZiZTzUS5Q,30
-jupyterlite_simple_cors_proxy-0.1.10.dist-info/RECORD,,