PyGeoModel 1.0.12__tar.gz → 1.0.13__tar.gz

{pygeomodel-1.0.12 → pygeomodel-1.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.12
+Version: 1.0.13
 Summary: A Python package for integrating OpenGMS geographic model services.
 Home-page: https://github.com/MpLebron/PyGeoModel
 Author: Peilong Ma

{pygeomodel-1.0.12 → pygeomodel-1.0.13}/PyGeoModel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.12
+Version: 1.0.13
 Summary: A Python package for integrating OpenGMS geographic model services.
 Home-page: https://github.com/MpLebron/PyGeoModel
 Author: Peilong Ma

{pygeomodel-1.0.12 → pygeomodel-1.0.13}/pygeomodel/__init__.py

@@ -5,7 +5,7 @@ from .modeler import GeoModeler
 from .models import ModelInput, ModelOutput, ModelService, ModelSummary
 from .results import QAResult, RecommendationResult, TaskResult
 
-__version__ = "1.0.12"
+__version__ = "1.0.13"
 
 __all__ = [
     "GeoModeler",

{pygeomodel-1.0.12 → pygeomodel-1.0.13}/pygeomodel/client.py

@@ -5,13 +5,18 @@ from __future__ import annotations
 import time
 from pathlib import Path
 from typing import Any
-from urllib.parse import quote
+from urllib.parse import quote, urlparse, urlunparse
 
 import requests
 
 from .config import OpenGMSConfig, get_opengms_config
 
 
+PUBLIC_DATA_DOWNLOAD_HOST = "geomodeling.njnu.edu.cn"
+PUBLIC_DATA_DOWNLOAD_PREFIX = "/dataTransferServer"
+INTERNAL_DATA_DOWNLOAD_HOSTS = {"221.224.35.86:38083"}
+
+
 class OpenGMSClient:
     """Thin client around OpenGMS model-service endpoints."""
 
@@ -105,6 +110,7 @@ def download_output_files(outputs: list[dict[str, Any]], output_dir: str | Path)
         url = output.get("url")
         if not url:
             continue
+        url = normalize_download_url(url)
         suffix = output.get("suffix") or "dat"
         tag = output.get("tag") or output.get("event") or f"output_{index + 1}"
         target = output_path / f"{tag}.{suffix}"
@@ -113,3 +119,19 @@ def download_output_files(outputs: list[dict[str, Any]], output_dir: str | Path)
         target.write_bytes(response.content)
         downloaded.append(str(target))
     return downloaded
+
+
+def normalize_download_url(url: str) -> str:
+    parsed = urlparse(url)
+    if parsed.netloc in INTERNAL_DATA_DOWNLOAD_HOSTS and parsed.path.startswith("/data/"):
+        return urlunparse(
+            (
+                "https",
+                PUBLIC_DATA_DOWNLOAD_HOST,
+                f"{PUBLIC_DATA_DOWNLOAD_PREFIX}{parsed.path}",
+                "",
+                parsed.query,
+                parsed.fragment,
+            )
+        )
+    return url

{pygeomodel-1.0.12 → pygeomodel-1.0.13}/pygeomodel/results.py

@@ -30,7 +30,7 @@ class TaskResult:
     params: dict[str, Any] = field(default_factory=dict)
     uploaded_inputs: dict[str, Any] = field(default_factory=dict)
     endpoint: str | None = None
-    pygeomodel_version: str = "1.0.10"
+    pygeomodel_version: str = "1.0.13"
     execution_time: float | None = None
     record_path: str | None = None
     created_at: float = field(default_factory=time.time)

{pygeomodel-1.0.12 → pygeomodel-1.0.13}/setup.py

@@ -11,7 +11,7 @@ def read_readme():
 
 setup(
     name="PyGeoModel",
-    version="1.0.12",
+    version="1.0.13",
     author="Peilong Ma",
     author_email="mpl_gis@nnu.edu.cn",
     description="A Python package for integrating OpenGMS geographic model services.",

{pygeomodel-1.0.12 → pygeomodel-1.0.13}/tests/test_core_api.py

@@ -127,6 +127,47 @@ class CoreApiTests(unittest.TestCase):
             [str(Path(tmpdir) / "outputs" / "SolarCalculation-roofSloar.zip")],
         )
 
+    def test_download_rewrites_internal_data_node_urls_to_public_gateway(self):
+        import pygeomodel.client as client_module
+
+        requested_urls = []
+
+        class FakeResponse:
+            content = b"downloaded-output"
+
+            def raise_for_status(self):
+                return None
+
+        original_get = client_module.requests.get
+        try:
+            def fake_get(url, timeout):
+                requested_urls.append(url)
+                self.assertEqual(timeout, 120)
+                return FakeResponse()
+
+            client_module.requests.get = fake_get
+            with tempfile.TemporaryDirectory() as tmpdir:
+                returned = client_module.download_output_files(
+                    [
+                        {
+                            "url": "http://221.224.35.86:38083/data/687d91a4-f205-4659-ae9d-dd2aed896f8c?pwd=",
+                            "tag": "SolarCalculation-roofSloar",
+                            "suffix": "zip",
+                        }
+                    ],
+                    tmpdir,
+                )
+                self.assertEqual(Path(returned[0]).read_bytes(), b"downloaded-output")
+        finally:
+            client_module.requests.get = original_get
+
+        self.assertEqual(
+            requested_urls,
+            [
+                "https://geomodeling.njnu.edu.cn/dataTransferServer/data/687d91a4-f205-4659-ae9d-dd2aed896f8c?pwd="
+            ],
+        )
+
     def test_model_invocation_preserves_multi_child_internal_params(self):
         from pygeomodel import GeoModeler