PyGeoModel 1.0.9__tar.gz → 1.0.11__tar.gz

{pygeomodel-1.0.9 → pygeomodel-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.9
+Version: 1.0.11
 Summary: A Python package for integrating OpenGMS geographic model services.
 Home-page: https://github.com/MpLebron/PyGeoModel
 Author: Peilong Ma
@@ -45,7 +45,7 @@ Dynamic: summary
 
 # PyGeoModel
 
-PyGeoModel is a Python package for integrating OpenGMS geographic model services into Python-based urban data science workflows. It provides programmatic access to model-service discovery, metadata inspection, service invocation, task records, and result management. For exploratory notebook-based analysis, PyGeoModel also provides an optional Jupyter interface built on the same core API.
+PyGeoModel is a Python package for integrating OpenGMS geographic model services into Python-based urban data science workflows. It provides programmatic access to model-service discovery, metadata inspection, service invocation, and result management. For exploratory notebook-based analysis, PyGeoModel also provides an optional Jupyter interface built on the same core API.
 
 ## Installation
 
@@ -81,23 +81,25 @@ result = modeler.invoke(
     "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
     params={
         "system_efficiency": 0.8,
-        "start_time": 201801,
-        "end_time": 201812,
+        "start_time": "2018-01",
+        "end_time": "2018-12",
         "roof_vector_path": "data/rooftops.zip",
     },
 )
 
-result.to_json("execution_record.json")
+saved_files = result.save(output_dir="data/result/live_run")
 ```
 
+The model configuration is recorded directly in the Python cell through the explicit `params` dictionary, while `TaskResult.save()` stores the downloadable model outputs for subsequent analysis.
+
 ## Notebook Interface
 
 ```python
 modeler.show_models()
-modeler.invoke_model("SWAT_Model")
+modeler.invoke_model("Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model")
 ```
 
-The notebook interface renders model search, metadata inspection, parameter entry, task execution, and output display. It uses the same `search_models()`, `get_model()`, and `invoke()` functions as the programmatic API so GUI operations can be converted into Python dictionaries and execution records.
+The notebook interface renders model search, metadata inspection, parameter entry, task execution, and output display. It uses the same `search_models()`, `get_model()`, and `invoke()` functions as the programmatic API so GUI operations can be converted into explicit Python parameters and saved model outputs when needed.
 
 ## Recommendation and Q&A Records
 
@@ -105,12 +107,14 @@ The notebook interface renders model search, metadata inspection, parameter entr
 recommendation = modeler.suggest_model(return_result=True)
 recommendation.to_json("recommendation_record.json")
 
-answer = modeler.ask_model("SWAT_Model", "What input data are required?")
-answer.to_json("qa_record.json")
+answer = modeler.ask_model(
+    "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
+    "What input data are required?",
+)
 ```
 
 The recommendation service automatically builds notebook/data context and calls the configured recommendation workflow. Q&A uses OpenGMS model metadata and an OpenAI-compatible web-enabled model. The main notebook workflow is designed to run out of the box for demonstration use.
 
 ## Relation to OpenGMS
 
-OpenGMS provides the model-service platform and online execution infrastructure. PyGeoModel is a Python client package that exposes OpenGMS model-service discovery, metadata inspection, task invocation, and result records to Python and notebook workflows.
+OpenGMS provides the model-service platform and online execution infrastructure. PyGeoModel is a Python client package that exposes OpenGMS model-service discovery, metadata inspection, task invocation, and result management to Python and notebook workflows.

{pygeomodel-1.0.9 → pygeomodel-1.0.11}/PyGeoModel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.9
+Version: 1.0.11
 Summary: A Python package for integrating OpenGMS geographic model services.
 Home-page: https://github.com/MpLebron/PyGeoModel
 Author: Peilong Ma
@@ -45,7 +45,7 @@ Dynamic: summary
 
 # PyGeoModel
 
-PyGeoModel is a Python package for integrating OpenGMS geographic model services into Python-based urban data science workflows. It provides programmatic access to model-service discovery, metadata inspection, service invocation, task records, and result management. For exploratory notebook-based analysis, PyGeoModel also provides an optional Jupyter interface built on the same core API.
+PyGeoModel is a Python package for integrating OpenGMS geographic model services into Python-based urban data science workflows. It provides programmatic access to model-service discovery, metadata inspection, service invocation, and result management. For exploratory notebook-based analysis, PyGeoModel also provides an optional Jupyter interface built on the same core API.
 
 ## Installation
 
@@ -81,23 +81,25 @@ result = modeler.invoke(
     "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
     params={
         "system_efficiency": 0.8,
-        "start_time": 201801,
-        "end_time": 201812,
+        "start_time": "2018-01",
+        "end_time": "2018-12",
         "roof_vector_path": "data/rooftops.zip",
     },
 )
 
-result.to_json("execution_record.json")
+saved_files = result.save(output_dir="data/result/live_run")
 ```
 
+The model configuration is recorded directly in the Python cell through the explicit `params` dictionary, while `TaskResult.save()` stores the downloadable model outputs for subsequent analysis.
+
 ## Notebook Interface
 
 ```python
 modeler.show_models()
-modeler.invoke_model("SWAT_Model")
+modeler.invoke_model("Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model")
 ```
 
-The notebook interface renders model search, metadata inspection, parameter entry, task execution, and output display. It uses the same `search_models()`, `get_model()`, and `invoke()` functions as the programmatic API so GUI operations can be converted into Python dictionaries and execution records.
+The notebook interface renders model search, metadata inspection, parameter entry, task execution, and output display. It uses the same `search_models()`, `get_model()`, and `invoke()` functions as the programmatic API so GUI operations can be converted into explicit Python parameters and saved model outputs when needed.
 
 ## Recommendation and Q&A Records
 
@@ -105,12 +107,14 @@ The notebook interface renders model search, metadata inspection, parameter entr
 recommendation = modeler.suggest_model(return_result=True)
 recommendation.to_json("recommendation_record.json")
 
-answer = modeler.ask_model("SWAT_Model", "What input data are required?")
-answer.to_json("qa_record.json")
+answer = modeler.ask_model(
+    "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
+    "What input data are required?",
+)
 ```
 
 The recommendation service automatically builds notebook/data context and calls the configured recommendation workflow. Q&A uses OpenGMS model metadata and an OpenAI-compatible web-enabled model. The main notebook workflow is designed to run out of the box for demonstration use.
 
 ## Relation to OpenGMS
 
-OpenGMS provides the model-service platform and online execution infrastructure. PyGeoModel is a Python client package that exposes OpenGMS model-service discovery, metadata inspection, task invocation, and result records to Python and notebook workflows.
+OpenGMS provides the model-service platform and online execution infrastructure. PyGeoModel is a Python client package that exposes OpenGMS model-service discovery, metadata inspection, task invocation, and result management to Python and notebook workflows.

{pygeomodel-1.0.9 → pygeomodel-1.0.11}/README.md

@@ -1,6 +1,6 @@
 # PyGeoModel
 
-PyGeoModel is a Python package for integrating OpenGMS geographic model services into Python-based urban data science workflows. It provides programmatic access to model-service discovery, metadata inspection, service invocation, task records, and result management. For exploratory notebook-based analysis, PyGeoModel also provides an optional Jupyter interface built on the same core API.
+PyGeoModel is a Python package for integrating OpenGMS geographic model services into Python-based urban data science workflows. It provides programmatic access to model-service discovery, metadata inspection, service invocation, and result management. For exploratory notebook-based analysis, PyGeoModel also provides an optional Jupyter interface built on the same core API.
 
 ## Installation
 
@@ -36,23 +36,25 @@ result = modeler.invoke(
     "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
     params={
         "system_efficiency": 0.8,
-        "start_time": 201801,
-        "end_time": 201812,
+        "start_time": "2018-01",
+        "end_time": "2018-12",
         "roof_vector_path": "data/rooftops.zip",
     },
 )
 
-result.to_json("execution_record.json")
+saved_files = result.save(output_dir="data/result/live_run")
 ```
 
+The model configuration is recorded directly in the Python cell through the explicit `params` dictionary, while `TaskResult.save()` stores the downloadable model outputs for subsequent analysis.
+
 ## Notebook Interface
 
 ```python
 modeler.show_models()
-modeler.invoke_model("SWAT_Model")
+modeler.invoke_model("Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model")
 ```
 
-The notebook interface renders model search, metadata inspection, parameter entry, task execution, and output display. It uses the same `search_models()`, `get_model()`, and `invoke()` functions as the programmatic API so GUI operations can be converted into Python dictionaries and execution records.
+The notebook interface renders model search, metadata inspection, parameter entry, task execution, and output display. It uses the same `search_models()`, `get_model()`, and `invoke()` functions as the programmatic API so GUI operations can be converted into explicit Python parameters and saved model outputs when needed.
 
 ## Recommendation and Q&A Records
 
@@ -60,12 +62,14 @@ The notebook interface renders model search, metadata inspection, parameter entr
 recommendation = modeler.suggest_model(return_result=True)
 recommendation.to_json("recommendation_record.json")
 
-answer = modeler.ask_model("SWAT_Model", "What input data are required?")
-answer.to_json("qa_record.json")
+answer = modeler.ask_model(
+    "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
+    "What input data are required?",
+)
 ```
 
 The recommendation service automatically builds notebook/data context and calls the configured recommendation workflow. Q&A uses OpenGMS model metadata and an OpenAI-compatible web-enabled model. The main notebook workflow is designed to run out of the box for demonstration use.
 
 ## Relation to OpenGMS
 
-OpenGMS provides the model-service platform and online execution infrastructure. PyGeoModel is a Python client package that exposes OpenGMS model-service discovery, metadata inspection, task invocation, and result records to Python and notebook workflows.
+OpenGMS provides the model-service platform and online execution infrastructure. PyGeoModel is a Python client package that exposes OpenGMS model-service discovery, metadata inspection, task invocation, and result management to Python and notebook workflows.

{pygeomodel-1.0.9 → pygeomodel-1.0.11}/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.9"
+__version__ = "1.0.11"
 
 __all__ = [
     "GeoModeler",

{pygeomodel-1.0.9 → pygeomodel-1.0.11}/pygeomodel/models.py

@@ -201,9 +201,15 @@ class ModelService:
             return str(value)
         dtype = (item.data_type or "").upper()
         if dtype in {"REAL", "DOUBLE", "FLOAT"}:
-            return float(value)
+            try:
+                return float(value)
+            except (TypeError, ValueError):
+                return value
         if dtype in {"INT", "INTEGER"}:
-            return int(value)
+            try:
+                return int(value)
+            except (TypeError, ValueError):
+                return value
         if dtype in {"BOOL", "BOOLEAN"}:
             if isinstance(value, str):
                 return value.strip().lower() in {"true", "1", "yes", "y"}

{pygeomodel-1.0.9 → pygeomodel-1.0.11}/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.9"
+    pygeomodel_version: str = "1.0.10"
     execution_time: float | None = None
     record_path: str | None = None
     created_at: float = field(default_factory=time.time)
@@ -52,12 +52,12 @@ class TaskResult:
         self,
         output_dir: str | Path | None = None,
         record_path: str | Path | None = None,
-    ) -> "TaskResult":
+    ) -> list[str]:
         if output_dir is not None:
             self.download(output_dir)
         if record_path is not None:
             self.to_json(record_path)
-        return self
+        return self.downloaded_outputs
 
     def _repr_markdown_(self) -> str:
         return f"Model run: {self.model_name}\n\nStatus: {self.status}\n\nTask ID: {self.task_id or 'Not returned'}"
@@ -583,20 +583,6 @@ def _recommendation_to_html(result: RecommendationResult) -> str:
         line-height: 1.4;
         white-space: nowrap;
     }}
-    .pygeomodel-rec-badge {{
-        display: inline-block;
-        margin-top: 6px;
-        border-radius: 999px;
-        border: 1px solid #bfdbfe;
-        background: #dbeafe;
-        color: #1d4ed8;
-        padding: 2px 7px;
-        font-size: 11px;
-        font-weight: 700;
-        line-height: 1.4;
-        text-transform: none;
-        letter-spacing: 0;
-    }}
     .pygeomodel-rec-name {{
         color: #0f172a;
         font-size: 13px;
@@ -704,13 +690,12 @@ def _recommendation_candidate_row(candidate: dict[str, Any]) -> str:
     rank = html.escape(str(candidate.get("rank") or ""))
     is_primary = bool(candidate.get("is_primary"))
     primary_class = " primary" if is_primary else ""
-    badge = '<span class="pygeomodel-rec-badge">Recommended</span>' if is_primary else ""
+    rank_label = f"&#9733; Rank {rank}" if is_primary else f"Rank {rank}"
 
     return f"""
     <div class="pygeomodel-rec-row{primary_class}">
         <div class="pygeomodel-rec-rank">
-            Rank {rank}
-            {badge}
+            {rank_label}
         </div>
         <div>
             <div class="pygeomodel-rec-name">{name}</div>

{pygeomodel-1.0.9 → pygeomodel-1.0.11}/setup.py

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

{pygeomodel-1.0.9 → pygeomodel-1.0.11}/tests/test_core_api.py

@@ -356,7 +356,7 @@ class CoreApiTests(unittest.TestCase):
         finally:
             client_module.download_output_files = original_downloader
 
-        self.assertIs(returned, result)
+        self.assertEqual(returned, [str(tmpdir / "outputs" / "SolarCalculation-roofSloar.zip")])
         self.assertEqual(
             result.downloaded_outputs,
             [str(tmpdir / "outputs" / "SolarCalculation-roofSloar.zip")],
@@ -389,7 +389,7 @@ class CoreApiTests(unittest.TestCase):
         finally:
             client_module.download_output_files = original_downloader
 
-        self.assertIs(returned, result)
+        self.assertEqual(returned, [str(tmpdir / "outputs" / "SolarCalculation-roofSloar.zip")])
         self.assertEqual(
             result.downloaded_outputs,
             [str(tmpdir / "outputs" / "SolarCalculation-roofSloar.zip")],
@@ -540,7 +540,8 @@ class CoreApiTests(unittest.TestCase):
 
         html = result._repr_html_()
 
-        self.assertIn("Recommended", html)
+        self.assertIn("★ Rank 1", html)
+        self.assertNotIn("Recommended</span>", html)
         self.assertIn("Solar Potential Analysis Model", html)
         self.assertIn("Rooftop Suitability Model", html)
         self.assertIn("Relevant Data", html)