PyGeoModel 1.0.14__tar.gz → 1.0.16__tar.gz

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

@@ -1,10 +1,12 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.14
+Version: 1.0.16
 Summary: A Python package for integrating OpenGMS geographic model services.
 Home-page: https://github.com/MpLebron/PyGeoModel
 Author: Peilong Ma
 Author-email: mpl_gis@nnu.edu.cn
+Project-URL: Documentation, https://mplebron.github.io/PyGeoModel-docs/
+Project-URL: Source, https://github.com/MpLebron/PyGeoModel
 Keywords: geographic modeling,GIS,OpenGMS,model services,geospatial analysis,jupyter
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: GIS
@@ -38,6 +40,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license-file
+Dynamic: project-url
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{pygeomodel-1.0.14 → pygeomodel-1.0.16}/PyGeoModel.egg-info/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.14
+Version: 1.0.16
 Summary: A Python package for integrating OpenGMS geographic model services.
 Home-page: https://github.com/MpLebron/PyGeoModel
 Author: Peilong Ma
 Author-email: mpl_gis@nnu.edu.cn
+Project-URL: Documentation, https://mplebron.github.io/PyGeoModel-docs/
+Project-URL: Source, https://github.com/MpLebron/PyGeoModel
 Keywords: geographic modeling,GIS,OpenGMS,model services,geospatial analysis,jupyter
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: GIS
@@ -38,6 +40,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license-file
+Dynamic: project-url
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{pygeomodel-1.0.14 → pygeomodel-1.0.16}/ogmsServer2/openUtils/http_client.py

@@ -12,7 +12,7 @@ class HttpClient:
     def _make_sync_request(
         method: str,
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         data: Optional[Union[Dict[str, Any], str, bytes]] = None,
         json: Optional[Dict[str, Any]] = None,
         files: Optional[Files] = None,
@@ -76,7 +76,7 @@ class HttpClient:
     @staticmethod
     def get_sync(
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         params: Optional[Dict[str, Any]] = None,
         headers: Optional[Headers] = None,
     ) -> Dict[str, Any]:
@@ -87,7 +87,7 @@ class HttpClient:
     @staticmethod
     def get_file_sync(
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         params: Optional[Dict[str, Any]] = None,
         headers: Optional[Headers] = None,
     ):
@@ -104,7 +104,7 @@ class HttpClient:
     @staticmethod
     def post_sync(
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         data: Optional[Union[Dict[str, Any], str, bytes]] = None,
         json: Optional[Dict[str, Any]] = None,
         files: Optional[Files] = None,
@@ -123,7 +123,7 @@ class HttpClient:
     @staticmethod
     def put_sync(
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         data: Optional[Union[Dict[str, Any], str, bytes]] = None,
         json: Optional[Dict[str, Any]] = None,
         headers: Optional[Headers] = None,
@@ -135,7 +135,7 @@ class HttpClient:
     @staticmethod
     def delete_sync(
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         params: Optional[Dict[str, Any]] = None,
         headers: Optional[Headers] = None,
     ) -> Dict[str, Any]:
@@ -147,7 +147,7 @@ class HttpClient:
     async def _make_async_request(
         method: str,
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         data: Optional[Union[Dict[str, Any], str, bytes]] = None,
         json: Optional[Dict[str, Any]] = None,
         files: Optional[Files] = None,
@@ -196,7 +196,7 @@ class HttpClient:
     @staticmethod
     async def get_async(
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         params: Optional[Dict[str, Any]] = None,
         headers: Optional[Headers] = None,
     ) -> Dict[str, Any]:
@@ -207,7 +207,7 @@ class HttpClient:
     @staticmethod
     async def post_async(
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         data: Optional[Union[Dict[str, Any], str, bytes]] = None,
         json: Optional[Dict[str, Any]] = None,
         files: Optional[Files] = None,
@@ -226,7 +226,7 @@ class HttpClient:
     @staticmethod
     async def put_async(
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         data: Optional[Union[Dict[str, Any], str, bytes]] = None,
         json: Optional[Dict[str, Any]] = None,
         headers: Optional[Headers] = None,
@@ -238,7 +238,7 @@ class HttpClient:
     @staticmethod
     async def delete_async(
         url: str,
-        timeout: int = 10,
+        timeout: int = 60,
         params: Optional[Dict[str, Any]] = None,
         headers: Optional[Headers] = None,
     ) -> Dict[str, Any]:

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

{pygeomodel-1.0.14 → pygeomodel-1.0.16}/pygeomodel/client.py

@@ -33,7 +33,7 @@ class OpenGMSClient:
         response = requests.get(
             f"{self.portal_url}/sdk/check_test/",
             params={"token": self.token},
-            timeout=10,
+            timeout=60,
         )
         response.raise_for_status()
         return response.json().get("data") == 1
@@ -41,7 +41,7 @@ class OpenGMSClient:
     def check_model(self, model_name: str) -> dict[str, Any]:
         response = requests.get(
             f"{self.portal_url}/computableModel/ModelInfo_name/{quote(model_name)}",
-            timeout=15,
+            timeout=60,
         )
         response.raise_for_status()
         return response.json().get("data", {})
@@ -53,7 +53,7 @@ class OpenGMSClient:
             return False
         response = requests.get(
             f"{self.manager_url}/GeoModeling/task/verify/{md5}",
-            timeout=10,
+            timeout=60,
         )
         response.raise_for_status()
         return response.json().get("data") is True

{pygeomodel-1.0.14 → pygeomodel-1.0.16}/pygeomodel/modeler.py

@@ -29,6 +29,7 @@ class GeoModeler:
         self._uses_custom_data_path = data_path is not None
         self.data_path = self._resolve_data_path(data_path)
         self._models_data = self._load_catalog()
+        self._model_aliases = self._build_model_aliases()
         self.model_names = list(self._models_data.keys())
         self.client = client or OpenGMSClient()
         self.last_result: TaskResult | None = None
@@ -68,9 +69,25 @@ class GeoModeler:
         return [summary for _, _, summary in scored[:limit]]
 
     def get_model(self, model_name: str) -> ModelService:
-        if model_name not in self._models_data:
+        canonical_name = self._canonical_model_name(model_name)
+        return ModelService.from_raw(canonical_name, self._models_data[canonical_name])
+
+    def _canonical_model_name(self, model_name: str) -> str:
+        requested_name = str(model_name or "").strip()
+        canonical_name = self._model_aliases.get(requested_name)
+        if canonical_name is None:
             raise KeyError(f"Model '{model_name}' was not found in the local OpenGMS catalog")
-        return ModelService.from_raw(model_name, self._models_data[model_name])
+        return canonical_name
+
+    def _build_model_aliases(self) -> dict[str, str]:
+        aliases: dict[str, str] = {}
+        for original_name, raw in self._models_data.items():
+            service = ModelService.from_raw(original_name, raw)
+            for alias in (original_name, service.display_name):
+                clean_alias = str(alias or "").strip()
+                if clean_alias:
+                    aliases.setdefault(clean_alias, original_name)
+        return aliases
 
     def invoke(
         self,
@@ -83,7 +100,7 @@ class GeoModeler:
         model = self.get_model(model_name)
         normalized_params = model.normalize_params(params)
         started = time.time()
-        response = self.client.create_task(model_name, normalized_params, wait=wait)
+        response = self.client.create_task(model.name, normalized_params, wait=wait)
         result = TaskResult(
             model_name=model.name,
             model_id=model.model_id,

{pygeomodel-1.0.14 → pygeomodel-1.0.16}/setup.py

@@ -11,13 +11,17 @@ def read_readme():
 
 setup(
     name="PyGeoModel",
-    version="1.0.14",
+    version="1.0.16",
     author="Peilong Ma",
     author_email="mpl_gis@nnu.edu.cn",
     description="A Python package for integrating OpenGMS geographic model services.",
     long_description=read_readme(),
     long_description_content_type="text/markdown",
     url="https://github.com/MpLebron/PyGeoModel",
+    project_urls={
+        "Documentation": "https://mplebron.github.io/PyGeoModel-docs/",
+        "Source": "https://github.com/MpLebron/PyGeoModel",
+    },
     py_modules=["scripts"],
     packages=find_packages(include=["pygeomodel", "pygeomodel.*", "ogmsServer2", "ogmsServer2.*"]),
     package_data={

{pygeomodel-1.0.14 → pygeomodel-1.0.16}/tests/test_core_api.py

@@ -2,6 +2,7 @@ import json
 import os
 import tempfile
 import unittest
+import asyncio
 from pathlib import Path
 
 
@@ -27,6 +28,90 @@ class FakeClient:
 
 
 class CoreApiTests(unittest.TestCase):
+    def test_http_client_sync_methods_use_sixty_second_default_timeout(self):
+        from ogmsServer2.openUtils.http_client import HttpClient
+
+        calls = []
+
+        def fake_make_sync_request(method, url, timeout=60, **kwargs):
+            calls.append((method, timeout, kwargs))
+            return {"status_code": 200, "headers": {}, "json": {}}
+
+        original_make_sync_request = HttpClient._make_sync_request
+        try:
+            HttpClient._make_sync_request = staticmethod(fake_make_sync_request)
+            HttpClient.get_sync("https://example.test/get")
+            HttpClient.get_file_sync("https://example.test/file")
+            HttpClient.post_sync("https://example.test/post")
+            HttpClient.put_sync("https://example.test/put")
+            HttpClient.delete_sync("https://example.test/delete")
+        finally:
+            HttpClient._make_sync_request = original_make_sync_request
+
+        self.assertEqual([call[1] for call in calls], [60, 60, 60, 60, 60])
+
+    def test_http_client_async_methods_use_sixty_second_default_timeout(self):
+        from ogmsServer2.openUtils.http_client import HttpClient
+
+        calls = []
+
+        async def fake_make_async_request(method, url, timeout=60, **kwargs):
+            calls.append((method, timeout, kwargs))
+            return {"status_code": 200, "headers": {}, "json": {}}
+
+        async def run_requests():
+            await HttpClient.get_async("https://example.test/get")
+            await HttpClient.post_async("https://example.test/post")
+            await HttpClient.put_async("https://example.test/put")
+            await HttpClient.delete_async("https://example.test/delete")
+
+        original_make_async_request = HttpClient._make_async_request
+        try:
+            HttpClient._make_async_request = staticmethod(fake_make_async_request)
+            asyncio.run(run_requests())
+        finally:
+            HttpClient._make_async_request = original_make_async_request
+
+        self.assertEqual([call[1] for call in calls], [60, 60, 60, 60])
+
+    def test_opengms_client_metadata_requests_use_sixty_second_timeout(self):
+        import pygeomodel.client as client_module
+        from pygeomodel.client import OpenGMSClient
+
+        calls = []
+
+        class FakeResponse:
+            def __init__(self, payload):
+                self._payload = payload
+
+            def raise_for_status(self):
+                return None
+
+            def json(self):
+                return self._payload
+
+        def fake_get(url, params=None, timeout=None):
+            calls.append((url, params, timeout))
+            if url.endswith("/sdk/check_test/"):
+                return FakeResponse({"data": 1})
+            if "/computableModel/ModelInfo_name/" in url:
+                return FakeResponse({"data": {"md5": "model-md5"}})
+            if url.endswith("/GeoModeling/task/verify/model-md5"):
+                return FakeResponse({"data": True})
+            raise AssertionError(f"Unexpected URL: {url}")
+
+        original_get = client_module.requests.get
+        try:
+            client_module.requests.get = fake_get
+            client = OpenGMSClient(token="token")
+            self.assertTrue(client.validate_token())
+            self.assertEqual(client.check_model("Demo Model"), {"md5": "model-md5"})
+            self.assertTrue(client.check_model_service("Demo Model"))
+        finally:
+            client_module.requests.get = original_get
+
+        self.assertEqual([call[2] for call in calls], [60, 60, 60, 60])
+
     def test_catalog_loading_uses_executable_registry_when_available(self):
         from pygeomodel import GeoModeler
 
@@ -124,6 +209,42 @@ class CoreApiTests(unittest.TestCase):
         self.assertEqual(model.display_name, "BES Land Surface Temperature Algorithm")
         self.assertEqual(model.inputs[0].description, "Satellite Brightness of Channel 4")
 
+    def test_english_display_name_resolves_to_original_opengms_name(self):
+        from pygeomodel import GeoModeler
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            tmp_path = Path(tmpdir)
+            catalog_path = tmp_path / "computeModel.json"
+            registry_path = tmp_path / "modellist_2070.csv"
+            catalog_path.write_text(
+                json.dumps(
+                    {
+                        "中文模型": {
+                            "md5": "md5-demo",
+                            "_id": "uid-demo",
+                            "description": "Demo model",
+                            "mdlJson": {"mdl": {"states": []}},
+                        }
+                    }
+                ),
+                encoding="utf-8",
+            )
+            registry_path.write_text(
+                "\ufeff序号,MD5,名称,介绍,模型UID,模型参数及说明,是否有示例数据（资源）,display_name_en\n"
+                "1,md5-demo,中文模型,,uid-demo,,,English Demo Model\n",
+                encoding="utf-8",
+            )
+
+            client = FakeClient()
+            modeler = GeoModeler(data_path=catalog_path, client=client)
+            model = modeler.get_model("English Demo Model")
+            result = modeler.invoke("English Demo Model", params={})
+
+        self.assertEqual(model.name, "中文模型")
+        self.assertEqual(model.display_name, "English Demo Model")
+        self.assertEqual(result.model_name, "中文模型")
+        self.assertEqual(client.calls[0][0], "中文模型")
+
     def test_search_and_get_model_parse_metadata(self):
         from pygeomodel import GeoModeler, ModelService