PyGeoModel 1.0.12__tar.gz → 1.0.14__tar.gz

{pygeomodel-1.0.12 → pygeomodel-1.0.14}/MANIFEST.in

@@ -1,6 +1,6 @@
 include README.md
 include LICENSE
-recursive-include pygeomodel/data *.json *.txt
+recursive-include pygeomodel/data *.json *.txt *.csv
 global-exclude __pycache__/*
 global-exclude *.py[co]
 global-exclude *.pyd

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.12
+Version: 1.0.14
 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.14}/PyGeoModel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.12
+Version: 1.0.14
 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.14}/PyGeoModel.egg-info/SOURCES.txt

@@ -31,5 +31,7 @@ pygeomodel/recommendation.py
 pygeomodel/results.py
 pygeomodel/data/__init__.py
 pygeomodel/data/computeModel.json
+pygeomodel/data/description_translations_en.json
 pygeomodel/data/modelContext.txt
+pygeomodel/data/modellist_2070.csv
 tests/test_core_api.py

{pygeomodel-1.0.12 → pygeomodel-1.0.14}/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.14"
 
 __all__ = [
     "GeoModeler",

{pygeomodel-1.0.12 → pygeomodel-1.0.14}/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.14}/pygeomodel/config.py

@@ -52,13 +52,13 @@ def get_llm_config() -> LLMConfig:
     dify = local.get("dify", {})
     consensus = local.get("consensus", {})
     return LLMConfig(
-        openai_api_key=os.environ.get("OPENAI_API_KEY") or openai.get("api_key") or PUBLIC_DEMO_OPENAI_API_KEY,
-        openai_base_url=os.environ.get("OPENAI_BASE_URL") or openai.get("base_url") or PUBLIC_DEMO_OPENAI_BASE_URL,
-        openai_model=os.environ.get("OPENAI_MODEL") or openai.get("model") or PUBLIC_DEMO_OPENAI_MODEL,
-        dify_api_key=os.environ.get("DIFY_API_KEY") or dify.get("api_key") or PUBLIC_DEMO_DIFY_API_KEY,
-        dify_base_url=os.environ.get("DIFY_BASE_URL") or dify.get("base_url") or PUBLIC_DEMO_DIFY_BASE_URL,
-        consensus_api_key=consensus.get("api_key") or os.environ.get("CONSENSUS_API_KEY"),
-        consensus_base_url=consensus.get("base_url") or os.environ.get("CONSENSUS_BASE_URL") or LLMConfig.consensus_base_url,
+        openai_api_key=os.environ.get("PYGEOMODEL_OPENAI_API_KEY") or openai.get("api_key") or PUBLIC_DEMO_OPENAI_API_KEY,
+        openai_base_url=os.environ.get("PYGEOMODEL_OPENAI_BASE_URL") or openai.get("base_url") or PUBLIC_DEMO_OPENAI_BASE_URL,
+        openai_model=os.environ.get("PYGEOMODEL_OPENAI_MODEL") or openai.get("model") or PUBLIC_DEMO_OPENAI_MODEL,
+        dify_api_key=os.environ.get("PYGEOMODEL_DIFY_API_KEY") or dify.get("api_key") or PUBLIC_DEMO_DIFY_API_KEY,
+        dify_base_url=os.environ.get("PYGEOMODEL_DIFY_BASE_URL") or dify.get("base_url") or PUBLIC_DEMO_DIFY_BASE_URL,
+        consensus_api_key=consensus.get("api_key") or os.environ.get("PYGEOMODEL_CONSENSUS_API_KEY"),
+        consensus_base_url=consensus.get("base_url") or os.environ.get("PYGEOMODEL_CONSENSUS_BASE_URL") or LLMConfig.consensus_base_url,
     )