PyGeoModel 1.0.10__tar.gz → 1.0.11__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/PKG-INFO +14 -10
  2. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/PyGeoModel.egg-info/PKG-INFO +14 -10
  3. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/README.md +13 -9
  4. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/__init__.py +1 -1
  5. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/setup.py +1 -1
  6. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/LICENSE +0 -0
  7. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/MANIFEST.in +0 -0
  8. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/PyGeoModel.egg-info/SOURCES.txt +0 -0
  9. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/PyGeoModel.egg-info/dependency_links.txt +0 -0
  10. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/PyGeoModel.egg-info/requires.txt +0 -0
  11. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/PyGeoModel.egg-info/top_level.txt +0 -0
  12. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/__init__.py +0 -0
  13. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/base.py +0 -0
  14. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/constants.py +0 -0
  15. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/openModel.py +0 -0
  16. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/openUtils/__init__.py +0 -0
  17. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/openUtils/exceptions.py +0 -0
  18. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/openUtils/http_client.py +0 -0
  19. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/openUtils/mdlUtils.py +0 -0
  20. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/openUtils/parameterValidator.py +0 -0
  21. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/ogmsServer2/openUtils/stateManager.py +0 -0
  22. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/client.py +0 -0
  23. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/config.py +0 -0
  24. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/consensus.py +0 -0
  25. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/context.py +0 -0
  26. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/data/__init__.py +0 -0
  27. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/data/computeModel.json +0 -0
  28. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/data/modelContext.txt +0 -0
  29. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/modeler.py +0 -0
  30. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/models.py +0 -0
  31. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/notebook.py +0 -0
  32. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/qa.py +0 -0
  33. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/recommendation.py +0 -0
  34. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/pygeomodel/results.py +0 -0
  35. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/scripts.py +0 -0
  36. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/setup.cfg +0 -0
  37. {pygeomodel-1.0.10 → pygeomodel-1.0.11}/tests/test_core_api.py +0 -0
{pygeomodel-1.0.10 → pygeomodel-1.0.11}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: PyGeoModel
3
- Version: 1.0.10
3
+ Version: 1.0.11
4
4
  Summary: A Python package for integrating OpenGMS geographic model services.
5
5
  Home-page: https://github.com/MpLebron/PyGeoModel
6
6
  Author: Peilong Ma
@@ -45,7 +45,7 @@ Dynamic: summary
45
45
 
46
46
  # PyGeoModel
47
47
 
48
- 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.
48
+ 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.
49
49
 
50
50
  ## Installation
51
51
 
@@ -81,23 +81,25 @@ result = modeler.invoke(
81
81
  "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
82
82
  params={
83
83
  "system_efficiency": 0.8,
84
- "start_time": 201801,
85
- "end_time": 201812,
84
+ "start_time": "2018-01",
85
+ "end_time": "2018-12",
86
86
  "roof_vector_path": "data/rooftops.zip",
87
87
  },
88
88
  )
89
89
 
90
- result.to_json("execution_record.json")
90
+ saved_files = result.save(output_dir="data/result/live_run")
91
91
  ```
92
92
 
93
+ 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.
94
+
93
95
  ## Notebook Interface
94
96
 
95
97
  ```python
96
98
  modeler.show_models()
97
- modeler.invoke_model("SWAT_Model")
99
+ modeler.invoke_model("Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model")
98
100
  ```
99
101
 
100
- 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.
102
+ 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.
101
103
 
102
104
  ## Recommendation and Q&A Records
103
105
 
@@ -105,12 +107,14 @@ The notebook interface renders model search, metadata inspection, parameter entr
105
107
  recommendation = modeler.suggest_model(return_result=True)
106
108
  recommendation.to_json("recommendation_record.json")
107
109
 
108
- answer = modeler.ask_model("SWAT_Model", "What input data are required?")
109
- answer.to_json("qa_record.json")
110
+ answer = modeler.ask_model(
111
+ "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
112
+ "What input data are required?",
113
+ )
110
114
  ```
111
115
 
112
116
  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.
113
117
 
114
118
  ## Relation to OpenGMS
115
119
 
116
- 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.
120
+ 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.10 → pygeomodel-1.0.11}/PyGeoModel.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: PyGeoModel
3
- Version: 1.0.10
3
+ Version: 1.0.11
4
4
  Summary: A Python package for integrating OpenGMS geographic model services.
5
5
  Home-page: https://github.com/MpLebron/PyGeoModel
6
6
  Author: Peilong Ma
@@ -45,7 +45,7 @@ Dynamic: summary
45
45
 
46
46
  # PyGeoModel
47
47
 
48
- 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.
48
+ 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.
49
49
 
50
50
  ## Installation
51
51
 
@@ -81,23 +81,25 @@ result = modeler.invoke(
81
81
  "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
82
82
  params={
83
83
  "system_efficiency": 0.8,
84
- "start_time": 201801,
85
- "end_time": 201812,
84
+ "start_time": "2018-01",
85
+ "end_time": "2018-12",
86
86
  "roof_vector_path": "data/rooftops.zip",
87
87
  },
88
88
  )
89
89
 
90
- result.to_json("execution_record.json")
90
+ saved_files = result.save(output_dir="data/result/live_run")
91
91
  ```
92
92
 
93
+ 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.
94
+
93
95
  ## Notebook Interface
94
96
 
95
97
  ```python
96
98
  modeler.show_models()
97
- modeler.invoke_model("SWAT_Model")
99
+ modeler.invoke_model("Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model")
98
100
  ```
99
101
 
100
- 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.
102
+ 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.
101
103
 
102
104
  ## Recommendation and Q&A Records
103
105
 
@@ -105,12 +107,14 @@ The notebook interface renders model search, metadata inspection, parameter entr
105
107
  recommendation = modeler.suggest_model(return_result=True)
106
108
  recommendation.to_json("recommendation_record.json")
107
109
 
108
- answer = modeler.ask_model("SWAT_Model", "What input data are required?")
109
- answer.to_json("qa_record.json")
110
+ answer = modeler.ask_model(
111
+ "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
112
+ "What input data are required?",
113
+ )
110
114
  ```
111
115
 
112
116
  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.
113
117
 
114
118
  ## Relation to OpenGMS
115
119
 
116
- 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.
120
+ 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.10 → pygeomodel-1.0.11}/README.md RENAMED
@@ -1,6 +1,6 @@
1
1
  # PyGeoModel
2
2
 
3
- 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.
3
+ 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.
4
4
 
5
5
  ## Installation
6
6
 
@@ -36,23 +36,25 @@ result = modeler.invoke(
36
36
  "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
37
37
  params={
38
38
  "system_efficiency": 0.8,
39
- "start_time": 201801,
40
- "end_time": 201812,
39
+ "start_time": "2018-01",
40
+ "end_time": "2018-12",
41
41
  "roof_vector_path": "data/rooftops.zip",
42
42
  },
43
43
  )
44
44
 
45
- result.to_json("execution_record.json")
45
+ saved_files = result.save(output_dir="data/result/live_run")
46
46
  ```
47
47
 
48
+ 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.
49
+
48
50
  ## Notebook Interface
49
51
 
50
52
  ```python
51
53
  modeler.show_models()
52
- modeler.invoke_model("SWAT_Model")
54
+ modeler.invoke_model("Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model")
53
55
  ```
54
56
 
55
- 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.
57
+ 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.
56
58
 
57
59
  ## Recommendation and Q&A Records
58
60
 
@@ -60,12 +62,14 @@ The notebook interface renders model search, metadata inspection, parameter entr
60
62
  recommendation = modeler.suggest_model(return_result=True)
61
63
  recommendation.to_json("recommendation_record.json")
62
64
 
63
- answer = modeler.ask_model("SWAT_Model", "What input data are required?")
64
- answer.to_json("qa_record.json")
65
+ answer = modeler.ask_model(
66
+ "Roof Photovoltaic Carbon Emission Reduction Potential Assessment Model",
67
+ "What input data are required?",
68
+ )
65
69
  ```
66
70
 
67
71
  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.
68
72
 
69
73
  ## Relation to OpenGMS
70
74
 
71
- 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.
75
+ 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.10 → pygeomodel-1.0.11}/pygeomodel/__init__.py RENAMED
@@ -5,7 +5,7 @@ from .modeler import GeoModeler
5
5
  from .models import ModelInput, ModelOutput, ModelService, ModelSummary
6
6
  from .results import QAResult, RecommendationResult, TaskResult
7
7
 
8
- __version__ = "1.0.10"
8
+ __version__ = "1.0.11"
9
9
 
10
10
  __all__ = [
11
11
  "GeoModeler",
{pygeomodel-1.0.10 → pygeomodel-1.0.11}/setup.py RENAMED
@@ -11,7 +11,7 @@ def read_readme():
11
11
 
12
12
  setup(
13
13
  name="PyGeoModel",
14
- version="1.0.10",
14
+ version="1.0.11",
15
15
  author="Peilong Ma",
16
16
  author_email="mpl_gis@nnu.edu.cn",
17
17
  description="A Python package for integrating OpenGMS geographic model services.",
{pygeomodel-1.0.10 → pygeomodel-1.0.11}/LICENSE RENAMED
File without changes
{pygeomodel-1.0.10 → pygeomodel-1.0.11}/MANIFEST.in RENAMED
File without changes
{pygeomodel-1.0.10 → pygeomodel-1.0.11}/scripts.py RENAMED
File without changes
{pygeomodel-1.0.10 → pygeomodel-1.0.11}/setup.cfg RENAMED
File without changes