jupytergis-core 0.5.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

jupytergis_core/_version.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = VERSION = '0.5.0'
+__version__ = VERSION = '0.6.1'

jupytergis_core/handler.py

@@ -1,45 +1,321 @@
-from os import environ
+import json
+import logging
+import os
+import time
+from dataclasses import dataclass
+from typing import Any, Dict, Optional, Set
+from urllib.parse import urlparse
 
+import tornado
 from jupyter_server.base.handlers import APIHandler
 from jupyter_server.utils import url_path_join
-import tornado
-import requests
+from tornado.httpclient import AsyncHTTPClient, HTTPRequest, HTTPResponse
+
+
+@dataclass
+class ProxyConfig:
+    """Configuration for the proxy handler."""
+
+    default_timeout: int
+    max_redirects: int
+    max_body_size: int
+    rate_limit_requests: int
+    rate_limit_window: int
+    cors_origin: str
+    exempt_domains: Set[str]
+
+
+def load_config() -> ProxyConfig:
+    """Load configuration from environment variables with defaults."""
+    return ProxyConfig(
+        default_timeout=int(os.environ.get("JGIS_TIMEOUT", "30")),
+        max_redirects=int(os.environ.get("JGIS_MAX_REDIRECTS", "3")),
+        max_body_size=int(os.environ.get("JGIS_MAX_BODY_SIZE", str(10 * 1024 * 1024))),
+        rate_limit_requests=int(os.environ.get("JGIS_RATE_LIMIT_REQUESTS", "100")),
+        rate_limit_window=int(os.environ.get("JGIS_RATE_LIMIT_WINDOW", "60")),
+        cors_origin=os.environ.get("JGIS_CORS_ORIGIN", "*"),
+        exempt_domains=os.environ.get(
+            "JGIS_EXEMPT_DOMAINS",
+            {
+                "https://geodes.cnes.fr",
+                "https://gdh-portal-prod.cnes.fr",
+                "https://geodes-portal.cnes.fr/api/stac/",
+            },
+        ),
+    )
+
+
+# Configure logging
+logger = logging.getLogger(__name__)
+
+
+class ProxyError(Exception):
+    """Base exception for proxy-related errors."""
+
+    pass
+
+
+class ValidationError(ProxyError):
+    """Raised when request validation fails."""
+
+    pass
+
+
+class RateLimitError(ProxyError):
+    """Raised when rate limit is exceeded."""
+
+    pass
 
 
 class ProxyHandler(APIHandler):
+    """Secure proxy handler with enhanced validation and async processing."""
+
+    def initialize(self) -> None:
+        """Initialize the handler with configuration and HTTP client."""
+        self.proxy_config = load_config()
+        self._request_timestamps = []
+        self.http_client = AsyncHTTPClient(
+            defaults={
+                "connect_timeout": self.proxy_config.default_timeout,
+                "request_timeout": self.proxy_config.default_timeout,
+                "max_redirects": self.proxy_config.max_redirects,
+                "max_body_size": self.proxy_config.max_body_size,
+            }
+        )
+
+    def _check_rate_limit(self) -> None:
+        """Check if the current request exceeds rate limits.
+
+        Raises:
+            RateLimitError: If rate limit is exceeded
+        """
+        current_time = time.time()
+        window_start = current_time - self.proxy_config.rate_limit_window
+
+        # Remove old timestamps
+        self._request_timestamps = [
+            ts for ts in self._request_timestamps if ts > window_start
+        ]
+
+        if len(self._request_timestamps) >= self.proxy_config.rate_limit_requests:
+            raise RateLimitError("Rate limit exceeded")
+
+        self._request_timestamps.append(current_time)
+
     @tornado.web.authenticated
-    def get(self):
-        url = self.get_argument("url")
-        print(f"Proxy request received for: {url}")
+    async def get(self) -> None:
+        """Process GET requests with validation and error handling."""
+        await self._handle_request("GET")
+
+    @tornado.web.authenticated
+    async def post(self) -> None:
+        """Process POST requests with validation and error handling."""
+        await self._handle_request("POST")
+
+    async def _handle_request(self, method: str) -> None:
+        """Central request handling method.
+
+        Args:
+            method: The HTTP method to use (GET or POST)
+
+        Raises:
+            tornado.web.HTTPError: If the request fails validation or processing
+        """
         try:
-            response = requests.get(url)
-            response.raise_for_status()
+            # Check rate limit
+            self._check_rate_limit()
+
+            # Validate and parse input
+            url = self._validate_url(self.get_argument("url"))
+            body = await self._validate_body(method)
+
+            logger.info("Proxying %s request to: %s", method, url)
+
+            # Make async HTTP request
+            response = await self._make_request(url, method, body)
+
+            # Forward response
+            self._set_response_headers(response)
+            self.finish(response.body)
 
-            self.set_header("Access-Control-Allow-Origin", "*")
-            self.set_header(
-                "Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS"
+        except RateLimitError as e:
+            logger.warning("Rate limit exceeded: %s", e)
+            self.set_status(429)
+            self.finish(
+                json.dumps(
+                    {
+                        "error": "Rate limit exceeded",
+                        "code": "rate_limit_error",
+                        "message": str(e),
+                    }
+                )
             )
-            self.set_header(
-                "Access-Control-Allow-Headers",
-                "X-Requested-With, Content-Type, Authorization",
+
+        except ValidationError as e:
+            logger.warning("Validation error: %s", e)
+            self.set_status(400)
+            self.finish(
+                json.dumps(
+                    {
+                        "error": "Validation error",
+                        "code": "validation_error",
+                        "message": str(e),
+                    }
+                )
             )
 
-            self.set_header("Content-Type", response.headers["Content-Type"])
+        except tornado.web.HTTPError as e:
+            logger.warning("Client error: %s", e)
+            raise
 
-            self.finish(response.content)
-        except requests.exceptions.RequestException as e:
-            self.set_status(500)
-            self.finish(str(e))
+        except Exception as e:
+            logger.exception("Proxy request failed")
+            self._handle_error_response(e)
 
+    def _validate_url(self, url: str) -> str:
+        """Validate and sanitize target URL.
 
-def setup_handlers(web_app):
-    host_pattern = ".*$"
+        Args:
+            url: The URL to validate
+
+        Returns:
+            The validated URL
+
+        Raises:
+            ValidationError: If the URL is invalid
+        """
+        parsed = urlparse(url)
+
+        if parsed.scheme not in ("http", "https"):
+            raise ValidationError("Invalid protocol")
+
+        return url
+
+    async def _validate_body(self, method: str) -> Optional[str]:
+        """Validate and prepare request body.
+
+        Args:
+            method: The HTTP method being used
+
+        Returns:
+            The validated and prepared request body, or None for GET requests
+
+        Raises:
+            ValidationError: If the body is invalid
+        """
+        if method == "POST":
+            try:
+                body = self.get_json_body()
+                if not body or not isinstance(body, Dict):
+                    raise ValidationError("Invalid JSON body")
+
+                # Validate body size
+                body_str = json.dumps(body)
+                if len(body_str.encode("utf-8")) > self.proxy_config.max_body_size:
+                    raise ValidationError("Request body too large")
+
+                return body_str
+            except json.JSONDecodeError as e:
+                raise ValidationError("Malformed JSON payload") from e
+
+        return None
+
+    async def _make_request(
+        self, url: str, method: str, body: Optional[str] = None
+    ) -> HTTPResponse:
+        """Execute proxy request with safety controls.
+
+        Args:
+            url: The target URL
+            method: The HTTP method to use
+            body: Optional request body
+
+        Returns:
+            The HTTP response
+
+        Raises:
+            tornado.web.HTTPError: If the request fails
+        """
+        try:
+            parsed_url = urlparse(url)
+            host = parsed_url.netloc.split(":")[0]  # Remove port if present
+
+            # Disable SSL verification for exempt domains
+            validate_cert = host not in self.proxy_config.exempt_domains
+            logger.info("validate_cert: %s", validate_cert)
+
+            request = HTTPRequest(
+                url=url,
+                method=method,
+                body=body,
+                headers={"Content-Type": "application/json"} if body else None,
+                validate_cert=validate_cert,
+                allow_nonstandard_methods=False,
+                decompress_response=True,
+            )
+
+            return await self.http_client.fetch(request)
+
+        except tornado.httpclient.HTTPClientError as e:
+            logger.error("Upstream error: %d %s", e.code, e.message)
+            raise tornado.web.HTTPError(e.code, "Upstream service error") from e
+
+        except tornado.httpclient.HTTPError as e:
+            logger.error("Network error: %s", str(e))
+            raise tornado.web.HTTPError(503, "Service unavailable") from e
+
+    def _set_response_headers(self, response: HTTPResponse) -> None:
+        """Set secure CORS and content headers.
+
+        Args:
+            response: The HTTP response to get headers from
+        """
+        self.set_header("Access-Control-Allow-Origin", self.proxy_config.cors_origin)
+        self.set_header("Access-Control-Allow-Methods", "GET, POST")
+        self.set_header(
+            "Access-Control-Allow-Headers",
+            "Content-Type, Authorization, X-Requested-With",
+        )
+        self.set_header("Content-Security-Policy", "default-src 'none'")
+        self.set_header(
+            "Content-Type", response.headers.get("Content-Type", "application/json")
+        )
 
+    def _handle_error_response(self, error: Exception) -> None:
+        """Standardized error response handling.
+
+        Args:
+            error: The exception that occurred
+        """
+        self.set_status(500)
+        self.finish(
+            json.dumps(
+                {
+                    "error": "Internal server error",
+                    "code": "internal_error",
+                    "message": str(error),
+                }
+            )
+        )
+
+
+def setup_handlers(web_app: Any) -> None:
+    """Register handlers with configuration validation.
+
+    Args:
+        web_app: The Jupyter web application instance
+    """
+    host_pattern = ".*$"
     base_url = web_app.settings["base_url"]
-    proxy_route_pattern = url_path_join(base_url, "jupytergis_core", "proxy")
 
-    print(f"Setting up proxy handler at: {proxy_route_pattern}")
-    handlers = [(proxy_route_pattern, ProxyHandler)]
-    if environ.get("JGIS_EXPOSE_MAPS", False):
+    # Configure proxy route
+    proxy_route = url_path_join(base_url, "jupytergis_core", "proxy")
+    handlers = [(proxy_route, ProxyHandler)]
+
+    # Add feature flags
+    if os.environ.get("JGIS_EXPOSE_MAPS", False):
+        web_app.settings.setdefault("page_config_data", {})
         web_app.settings["page_config_data"]["jgis_expose_maps"] = True
+
     web_app.add_handlers(host_pattern, handlers)
+    logger.info("JupyterGIS proxy endpoint initialized at: %s", proxy_route)

jupytergis_core/schema/__init__.py

@@ -1,16 +1,16 @@
 from .interfaces.project.jgis import *  # noqa
 
-from .interfaces.project.layers.rasterlayer import IRasterLayer  # noqa
-from .interfaces.project.layers.vectorlayer import IVectorLayer  # noqa
+from .interfaces.project.layers.rasterLayer import IRasterLayer  # noqa
+from .interfaces.project.layers.vectorLayer import IVectorLayer  # noqa
 from .interfaces.project.layers.vectorTileLayer import IVectorTileLayer  # noqa
 from .interfaces.project.layers.hillshadeLayer import IHillshadeLayer  # noqa
 from .interfaces.project.layers.imageLayer import IImageLayer  # noqa
 from .interfaces.project.layers.webGlLayer import IWebGlLayer  # noqa
 from .interfaces.project.layers.heatmapLayer import IHeatmapLayer  # noqa
 
-from .interfaces.project.sources.vectortilesource import IVectorTileSource  # noqa
-from .interfaces.project.sources.rastersource import IRasterSource  # noqa
-from .interfaces.geojsonsource import IGeoJSONSource  # noqa
+from .interfaces.project.sources.vectorTileSource import IVectorTileSource  # noqa
+from .interfaces.project.sources.rasterSource import IRasterSource  # noqa
+from .interfaces.project.sources.geoJsonSource import IGeoJSONSource  # noqa
 from .interfaces.project.sources.videoSource import IVideoSource  # noqa
 from .interfaces.project.sources.imageSource import IImageSource  # noqa
 from .interfaces.project.sources.geoTiffSource import IGeoTiffSource  # noqa
@@ -18,7 +18,7 @@ from .interfaces.project.sources.rasterDemSource import IRasterDemSource  # noqa
 
 from .interfaces.processing.buffer import IBuffer  # noqa
 
-from .interfaces.export.exportGeojson import IExportGeoJSON  # noqa
-from .interfaces.export.exportGeotiff import IExportGeoTIFF  # noqa
+from .interfaces.export.exportGeoJson import IExportGeoJSON  # noqa
+from .interfaces.export.exportGeoTiff import IExportGeoTIFF  # noqa
 
 SCHEMA_VERSION = IJGISContent.model_fields["schemaVersion"].default  # noqa

jupytergis_core/schema/interfaces/__init__.py

@@ -1,3 +1,3 @@
 # generated by datamodel-codegen:
-#   filename:  schema
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   filename:  temp-schema
+#   timestamp: 2025-07-15T16:15:24+00:00

jupytergis_core/schema/interfaces/export/__init__.py

@@ -1,3 +1,3 @@
 # generated by datamodel-codegen:
-#   filename:  schema
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   filename:  temp-schema
+#   timestamp: 2025-07-15T16:15:24+00:00

jupytergis_core/schema/interfaces/export/{exportGeojson.py → exportGeoJson.py}

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
-#   filename:  export/exportGeojson.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   filename:  export/exportGeoJson.json
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 

jupytergis_core/schema/interfaces/export/{exportGeotiff.py → exportGeoTiff.py}

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
-#   filename:  export/exportGeotiff.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   filename:  export/exportGeoTiff.json
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 

jupytergis_core/schema/interfaces/geojson.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  geojson.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 

jupytergis_core/schema/interfaces/processing/__init__.py

@@ -1,3 +1,3 @@
 # generated by datamodel-codegen:
-#   filename:  schema
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   filename:  temp-schema
+#   timestamp: 2025-07-15T16:15:24+00:00

jupytergis_core/schema/interfaces/processing/boundingBoxes.py

@@ -0,0 +1,14 @@
+# generated by datamodel-codegen:
+#   filename:  processing/boundingBoxes.json
+#   timestamp: 2025-07-15T16:15:24+00:00
+
+from __future__ import annotations
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class IBoundingBoxes(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    inputLayer: str = Field(..., description='The input layer for bounding boxes.')

jupytergis_core/schema/interfaces/processing/buffer.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  processing/buffer.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 

jupytergis_core/schema/interfaces/processing/centroids.py

@@ -0,0 +1,14 @@
+# generated by datamodel-codegen:
+#   filename:  processing/centroids.json
+#   timestamp: 2025-07-15T16:15:24+00:00
+
+from __future__ import annotations
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class ICentroids(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    inputLayer: str = Field(..., description='The input layer for centroids.')

jupytergis_core/schema/interfaces/processing/concaveHull.py

@@ -0,0 +1,21 @@
+# generated by datamodel-codegen:
+#   filename:  processing/concaveHull.json
+#   timestamp: 2025-07-15T16:15:24+00:00
+
+from __future__ import annotations
+
+from typing import Optional
+
+from pydantic import BaseModel, ConfigDict, Field, confloat
+
+
+class IConcaveHull(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    inputLayer: str = Field(..., description='The input layer for Concave Hull.')
+    pctconvex: Optional[confloat(ge=0.0, le=1.0, multiple_of=0.1)] = Field(
+        0.5,
+        description='Controls the concaveness of the computed hull, vary from 0 to 1, 0 corresponds to the maximum concavity.',
+    )
+    allowHoles: Optional[bool] = Field(False, title='Allow holes in the hull')

jupytergis_core/schema/interfaces/processing/convexHull.py

@@ -0,0 +1,14 @@
+# generated by datamodel-codegen:
+#   filename:  processing/convexHull.json
+#   timestamp: 2025-07-15T16:15:24+00:00
+
+from __future__ import annotations
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class IConvexHull(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    inputLayer: str = Field(..., description='The input layer for Convex Hull.')

jupytergis_core/schema/interfaces/processing/dissolve.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  processing/dissolve.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 

jupytergis_core/schema/interfaces/project/__init__.py

@@ -1,3 +1,3 @@
 # generated by datamodel-codegen:
-#   filename:  schema
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   filename:  temp-schema
+#   timestamp: 2025-07-15T16:15:24+00:00

jupytergis_core/schema/interfaces/project/jgis.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  project/jgis.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 
@@ -18,6 +18,7 @@ class LayerType(Enum):
     WebGlLayer = 'WebGlLayer'
     ImageLayer = 'ImageLayer'
     HeatmapLayer = 'HeatmapLayer'
+    StacLayer = 'StacLayer'
 
 
 class SourceType(Enum):

jupytergis_core/schema/interfaces/project/layers/__init__.py

@@ -1,3 +1,3 @@
 # generated by datamodel-codegen:
-#   filename:  schema
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   filename:  temp-schema
+#   timestamp: 2025-07-15T16:15:24+00:00

jupytergis_core/schema/interfaces/project/layers/heatmapLayer.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  project/layers/heatmapLayer.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 

jupytergis_core/schema/interfaces/project/layers/hillshadeLayer.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  project/layers/hillshadeLayer.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 

jupytergis_core/schema/interfaces/project/layers/imageLayer.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  project/layers/imageLayer.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 

jupytergis_core/schema/interfaces/project/layers/{rasterlayer.py → rasterLayer.py}

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
-#   filename:  project/layers/rasterlayer.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   filename:  project/layers/rasterLayer.json
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 

jupytergis_core/schema/interfaces/project/layers/stacLayer.py

@@ -0,0 +1,19 @@
+# generated by datamodel-codegen:
+#   filename:  project/layers/stacLayer.json
+#   timestamp: 2025-07-15T16:15:24+00:00
+
+from __future__ import annotations
+
+from typing import Any, Dict, Optional
+
+from pydantic import BaseModel, ConfigDict, Field, confloat
+
+
+class IStacLayer(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    data: Dict[str, Any] = Field(..., description='The data of the source')
+    opacity: Optional[confloat(ge=0.0, le=1.0, multiple_of=0.1)] = Field(
+        1, description='The opacity of the source'
+    )

jupytergis_core/schema/interfaces/project/layers/{vectorlayer.py → vectorLayer.py}

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
-#   filename:  project/layers/vectorlayer.json
-#   timestamp: 2025-05-08T01:23:34+00:00
+#   filename:  project/layers/vectorLayer.json
+#   timestamp: 2025-07-15T16:15:24+00:00
 
 from __future__ import annotations
 
@@ -10,12 +10,6 @@ from typing import Any, Dict, Optional
 from pydantic import BaseModel, ConfigDict, Field, confloat
 
 
-class Type(Enum):
-    circle = 'circle'
-    fill = 'fill'
-    line = 'line'
-
-
 class RenderType(Enum):
     Single_Symbol = 'Single Symbol'
     Graduated = 'Graduated'
@@ -52,7 +46,6 @@ class IVectorLayer(BaseModel):
         extra='forbid',
     )
     source: str = Field(..., description='The id of the source')
-    type: Type = Field(..., description='The type of vector layer')
     color: Optional[Dict[str, Any]] = Field(
         None, description='The color of the the object'
     )