PyGeoModel 1.0.14__tar.gz → 1.0.15__tar.gz

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

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

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

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

{pygeomodel-1.0.14 → pygeomodel-1.0.15}/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.15}/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.15}/setup.py

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

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

@@ -124,6 +124,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