PyGeoModel 1.0.2__tar.gz → 1.0.3__tar.gz

{pygeomodel-1.0.2 → pygeomodel-1.0.3}/LICENSE

@@ -19,3 +19,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+

{pygeomodel-1.0.2 → pygeomodel-1.0.3}/MANIFEST.in

@@ -7,3 +7,5 @@ recursive-include ogmsServer2/data */*.tif
 exclude __pycache__
 exclude *.py[co]
 exclude .DS_Store
+
+

{pygeomodel-1.0.2 → pygeomodel-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.2
+Version: 1.0.3
 Summary: An intelligent Python toolkit for geographic modeling with smart model recommendations
 Home-page: https://github.com/yourusername/PyGeoModel
 Author: Your Name

{pygeomodel-1.0.2/pygeomodel → pygeomodel-1.0.3/PyGeoModel}/__init__.py

@@ -208,82 +208,27 @@ class GeoModeler:
 
     def _load_model_names(self):
         """轻量级加载 - 只加载模型名称，不加载完整数据"""
-        try:
-            json_content = self._load_json_data()
-            models_data = json.loads(json_content)
-            self.model_names = list(models_data.keys())
-        except Exception as e:
-            print(f"Failed to load model names: {str(e)}")
-            self.model_names = []
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        json_path = os.path.join(current_dir, "data", "computeModel.json")
 
-    def _load_json_data(self):
-        """加载 computeModel.json 数据，支持多种环境"""
         try:
-            # 方法1: 尝试使用 pkg_resources
-            try:
-                import pkg_resources
-                return pkg_resources.resource_string('pygeomodel', 'data/computeModel.json').decode('utf-8')
-            except:
-                pass
-
-            # 方法2: 尝试使用 importlib.resources (Python 3.9+)
-            try:
-                from importlib import resources
-                import sys
-                if 'pygeomodel' in sys.modules:
-                    json_path = resources.files(
-                        'pygeomodel') / 'data' / 'computeModel.json'
-                    return json_path.read_text(encoding='utf-8')
-            except:
-                pass
-
-            # 方法3: 回退到相对路径（开发环境）
-            current_dir = os.path.dirname(os.path.abspath(__file__))
-            json_path = os.path.join(current_dir, "data", "computeModel.json")
-            with open(json_path, encoding='utf-8') as f:
-                return f.read()
-
-        except Exception as e:
-            raise Exception(f"Cannot load computeModel.json: {str(e)}")
-
-    @staticmethod
-    def _load_json_data_static():
-        """静态方法加载 computeModel.json 数据，供其他类使用"""
-        try:
-            # 方法1: 尝试使用 pkg_resources
-            try:
-                import pkg_resources
-                return pkg_resources.resource_string('pygeomodel', 'data/computeModel.json').decode('utf-8')
-            except:
-                pass
-            
-            # 方法2: 尝试使用 importlib.resources (Python 3.9+)
-            try:
-                from importlib import resources
-                import sys
-                if 'pygeomodel' in sys.modules:
-                    json_path = resources.files('pygeomodel') / 'data' / 'computeModel.json'
-                    return json_path.read_text(encoding='utf-8')
-            except:
-                pass
-            
-            # 方法3: 回退到相对路径（开发环境）
-            import os
-            current_dir = os.path.dirname(os.path.abspath(__file__))
-            json_path = os.path.join(current_dir, "data", "computeModel.json")
             with open(json_path, encoding='utf-8') as f:
-                return f.read()
-                
+                models_data = json.load(f)
+                self.model_names = list(models_data.keys())
         except Exception as e:
-            raise Exception(f"Cannot load computeModel.json: {str(e)}")
+            print(f"Failed to load model names: {str(e)}")
+            self.model_names = []
 
     def _load_models(self):
         """加载所有模型的完整数据（保留原有方法作为兼容性接口）"""
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        json_path = os.path.join(current_dir, "data", "computeModel.json")
+
         try:
-            json_content = self._load_json_data()
-            models_data = json.loads(json_content)
-            for model_name, model_data in models_data.items():
-                self.models[model_name] = Model(model_name, model_data)
+            with open(json_path, encoding='utf-8') as f:
+                models_data = json.load(f)
+                for model_name, model_data in models_data.items():
+                    self.models[model_name] = Model(model_name, model_data)
         except Exception as e:
             print(f"Failed to load model configuration file: {str(e)}")
             self.models = {}
@@ -305,26 +250,29 @@ class GeoModeler:
             return None
 
         # 从文件加载特定模型数据
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        json_path = os.path.join(current_dir, "data", "computeModel.json")
+
         try:
-            json_content = self._load_json_data()
-            models_data = json.loads(json_content)
-            if model_name in models_data:
-                model_data = models_data[model_name]
+            with open(json_path, encoding='utf-8') as f:
+                models_data = json.load(f)
+                if model_name in models_data:
+                    model_data = models_data[model_name]
 
-                # 添加到缓存
-                if len(self._model_cache) >= self._max_cache_size:
-                    # 移除最旧的缓存项
-                    oldest_key = next(iter(self._model_cache))
-                    del self._model_cache[oldest_key]
+                    # 添加到缓存
+                    if len(self._model_cache) >= self._max_cache_size:
+                        # 移除最旧的缓存项
+                        oldest_key = next(iter(self._model_cache))
+                        del self._model_cache[oldest_key]
 
-                self._model_cache[model_name] = model_data
-                self.models[model_name] = Model(model_name, model_data)
+                    self._model_cache[model_name] = model_data
+                    self.models[model_name] = Model(model_name, model_data)
 
-                # 定期清理内存
-                if len(self.models) % 5 == 0:
-                    cleanup_memory()
+                    # 定期清理内存
+                    if len(self.models) % 5 == 0:
+                        cleanup_memory()
 
-                return self.models[model_name]
+                    return self.models[model_name]
         except Exception as e:
             print(f"Failed to load model '{model_name}': {str(e)}")
             return None
@@ -1344,34 +1292,60 @@ class GeoModeler:
         button_container = widgets.HBox(
             layout=widgets.Layout(
                 display='flex',
-                justify_content='flex-start',
+                justify_content='flex-end',
                 gap='10px'
             )
         )
 
-        # 创建Run按钮
+        # 创建Run按钮（运行期间禁用）
         run_button = widgets.Button(
             description='Run',
             style=widgets.ButtonStyle(
                 button_color='#4CAF50', text_color='white')
         )
-        run_button.on_click(self._on_run_button_clicked)
 
-        # 创建Close按钮
-        close_button = widgets.Button(
-            description='Close',
-            style=widgets.ButtonStyle(
-                button_color='#ef4444', text_color='white'),
-            layout=widgets.Layout(width='80px')
-        )
+        # 运行中动画（放在按钮右侧，默认隐藏）
+        spinner_widget = widgets.HTML(
+            value='', layout=widgets.Layout(margin='0 6px'))
+        self.widgets['running_spinner'] = spinner_widget
 
-        def close_model(b):
-            main_container.close()
+        def on_run_click(b):
+            # 禁用按钮，按钮文案与图标切换为运行中
+            run_button.disabled = True
+            original_desc = run_button.description
+            original_icon = getattr(run_button, 'icon', '')
+            run_button.description = 'Model calculating...'
+            # 在按钮内使用 fontawesome spinner 图标并注入旋转CSS
+            try:
+                run_button.icon = 'spinner'
+                display, HTML, _ = _lazy_import_ipython_display()
+                if not getattr(self, '_spinner_css_injected', False):
+                    display(HTML(
+                        '<style>@keyframes fa-spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}} .fa-spinner{animation:fa-spin 1s linear infinite!important;}</style>'))
+                    self._spinner_css_injected = True
+            except Exception:
+                pass
+            # 静默运行，屏蔽底层print日志
+            import contextlib
+            import io
+            _buf_out, _buf_err = io.StringIO(), io.StringIO()
+            try:
+                with contextlib.redirect_stdout(_buf_out), contextlib.redirect_stderr(_buf_err):
+                    self._on_run_button_clicked(b)
+            finally:
+                # 恢复按钮状态
+                run_button.disabled = False
+                run_button.description = original_desc
+                try:
+                    run_button.icon = original_icon
+                except Exception:
+                    pass
+                spinner_widget.value = ''
 
-        close_button.on_click(close_model)
+        run_button.on_click(on_run_click)
 
         # 将按钮添加到按钮容器
-        button_container.children = [run_button, close_button]
+        button_container.children = [run_button, spinner_widget]
 
         # 将按钮容器添加到widgets_list
         widgets_list.append(button_container)
@@ -1523,8 +1497,20 @@ class GeoModeler:
         # 导入requests模块
         requests = _lazy_import_requests()
 
-        with self.widgets['output_area']:
-            self.widgets['output_area'].clear_output()
+        # 检查是否为静默模式
+        silent_mode = getattr(self, '_silent_mode', False)
+
+        # 定义输出上下文
+        if not silent_mode:
+            output_context = self.widgets['output_area']
+        else:
+            # 静默模式下使用空的上下文管理器
+            import contextlib
+            output_context = contextlib.nullcontext()
+
+        with output_context:
+            if not silent_mode:
+                self.widgets['output_area'].clear_output()
 
             missing_required_fields = []
             input_files = {}
@@ -1600,7 +1586,9 @@ class GeoModeler:
                 return
 
             try:
-                print(input_files)
+                # 只在非静默模式下打印调试信息
+                if not silent_mode:
+                    print(input_files)
                 # 继续执行模型
                 # 导入openModel模块
                 openModel = _lazy_import_openmodel()
@@ -1617,49 +1605,50 @@ class GeoModeler:
                 # print(result)
 
                 # 在UI中展示结果的下载链接（不自动下载到本地）
-                display, HTML, _ = _lazy_import_ipython_display()
-                rows = []
-                for output in result:
-                    url = output.get('url')
-                    tag = output.get('tag', '')
-                    suffix = output.get('suffix', '')
-                    statename = output.get('statename', '')
-                    event = output.get('event', '')
-                    filename = f"{tag}.{suffix}" if tag and suffix else (
-                        tag or '')
-                    if url:
-                        rows.append(f"""
-                            <tr>
-                                <td style=\"padding:8px;border-bottom:1px solid #e5e7eb;text-align:left;\">{statename}</td>
-                                <td style=\"padding:8px;border-bottom:1px solid #e5e7eb;text-align:left;\">{event}</td>
-                                <td style=\"padding:8px;border-bottom:1px solid #e5e7eb;text-align:left;\">{filename}</td>
-                                <td style=\"padding:8px;border-bottom:1px solid #e5e7eb;text-align:left;\"><a href=\"{url}\" target=\"_blank\">Download</a></td>
-                            </tr>
-                        """)
-
-                # 预生成表格行HTML，避免在f-string表达式中包含反斜杠
-                rows_html = ''.join(
-                    rows) if rows else '<tr><td colspan="4" style="padding:8px;color:#64748b;">No outputs</td></tr>'
-
-                table_html = f"""
-                <div style=\"margin:10px 0;\">
-                  <div style=\"font-weight:600;margin-bottom:6px;\">Model outputs</div>
-                  <table style=\"width:100%;border-collapse:collapse;font-size:14px;\">
-                    <thead>
-                      <tr style=\"background:#f8fafc;\">
-                        <th style=\"text-align:left;padding:8px;border-bottom:1px solid #e5e7eb;\">State</th>
-                        <th style=\"text-align:left;padding:8px;border-bottom:1px solid #e5e7eb;\">Event</th>
-                        <th style=\"text-align:left;padding:8px;border-bottom:1px solid #e5e7eb;\">File</th>
-                        <th style=\"text-align:left;padding:8px;border-bottom:1px solid #e5e7eb;\">Link</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      {rows_html}
-                    </tbody>
-                  </table>
-                </div>
-                """
-                display(HTML(table_html))
+                if not silent_mode:
+                    display, HTML, _ = _lazy_import_ipython_display()
+                    rows = []
+                    for output in result:
+                        url = output.get('url')
+                        tag = output.get('tag', '')
+                        suffix = output.get('suffix', '')
+                        statename = output.get('statename', '')
+                        event = output.get('event', '')
+                        filename = f"{tag}.{suffix}" if tag and suffix else (
+                            tag or '')
+                        if url:
+                            rows.append(f"""
+                                <tr>
+                                    <td style=\"padding:8px;border-bottom:1px solid #e5e7eb;text-align:left;\">{statename}</td>
+                                    <td style=\"padding:8px;border-bottom:1px solid #e5e7eb;text-align:left;\">{event}</td>
+                                    <td style=\"padding:8px;border-bottom:1px solid #e5e7eb;text-align:left;\">{filename}</td>
+                                    <td style=\"padding:8px;border-bottom:1px solid #e5e7eb;text-align:left;\"><a href=\"{url}\" target=\"_blank\">Download</a></td>
+                                </tr>
+                            """)
+
+                    # 预生成表格行HTML，避免在f-string表达式中包含反斜杠
+                    rows_html = ''.join(
+                        rows) if rows else '<tr><td colspan="4" style="padding:8px;color:#64748b;">No outputs</td></tr>'
+
+                    table_html = f"""
+                    <div style=\"margin:10px 0;\">
+                      <div style=\"font-weight:600;margin-bottom:6px;\">Model outputs</div>
+                      <table style=\"width:100%;border-collapse:collapse;font-size:14px;\">
+                        <thead>
+                          <tr style=\"background:#f8fafc;\">
+                            <th style=\"text-align:left;padding:8px;border-bottom:1px solid #e5e7eb;\">State</th>
+                            <th style=\"text-align:left;padding:8px;border-bottom:1px solid #e5e7eb;\">Event</th>
+                            <th style=\"text-align:left;padding:8px;border-bottom:1px solid #e5e7eb;\">File</th>
+                            <th style=\"text-align:left;padding:8px;border-bottom:1px solid #e5e7eb;\">Link</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          {rows_html}
+                        </tbody>
+                      </table>
+                    </div>
+                    """
+                    display(HTML(table_html))
 
             except Exception as e:
                 print(f"❌ Error: Model run failed - {str(e)}")
@@ -1952,12 +1941,15 @@ Please output in English.
             import os
 
             # 加载本地模型数据
-            try:
-                json_content = GeoModeler._load_json_data_static()
-                all_models = json.loads(json_content)
-            except:
+            model_data_path = os.path.join(os.path.dirname(
+                __file__), 'data', 'computeModel.json')
+
+            if not os.path.exists(model_data_path):
                 return []
 
+            with open(model_data_path, 'r', encoding='utf-8') as f:
+                all_models = json.load(f)
+
             # 获取当前模型信息
             current_model_name = self.current_model.name
             if current_model_name not in all_models:
@@ -2357,9 +2349,14 @@ class NotebookContext:
     def _get_model_context(self):
         """获取模型仓库上下文信息"""
         try:
-            # 加载模型配置文件
-            json_content = GeoModeler._load_json_data_static()
-            models_data = json.loads(json_content)
+            # 获取当前文件所在目录
+            current_dir = os.path.dirname(os.path.abspath(__file__))
+            # 构建JSON文件路径
+            json_path = os.path.join(current_dir, "data", "computeModel.json")
+
+            # 取模型配置文件
+            with open(json_path, encoding='utf-8') as f:
+                models_data = json.load(f)
 
             # 如果没有模型数据，返回相应描述
             if not models_data:

{pygeomodel-1.0.2 → pygeomodel-1.0.3}/PyGeoModel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyGeoModel
-Version: 1.0.2
+Version: 1.0.3
 Summary: An intelligent Python toolkit for geographic modeling with smart model recommendations
 Home-page: https://github.com/yourusername/PyGeoModel
 Author: Your Name

{pygeomodel-1.0.2 → pygeomodel-1.0.3}/PyGeoModel.egg-info/SOURCES.txt

@@ -3,11 +3,14 @@ MANIFEST.in
 README.md
 scripts.py
 setup.py
+PyGeoModel/__init__.py
 PyGeoModel.egg-info/PKG-INFO
 PyGeoModel.egg-info/SOURCES.txt
 PyGeoModel.egg-info/dependency_links.txt
 PyGeoModel.egg-info/requires.txt
 PyGeoModel.egg-info/top_level.txt
+PyGeoModel/data/computeModel.json
+PyGeoModel/data/modelContext.txt
 data/computeModel.json
 data/modelContext.txt
 ogmsServer2/__init__.py
@@ -30,7 +33,4 @@ ogmsServer2/openUtils/exceptions.py
 ogmsServer2/openUtils/http_client.py
 ogmsServer2/openUtils/mdlUtils.py
 ogmsServer2/openUtils/parameterValidator.py
-ogmsServer2/openUtils/stateManager.py
-pygeomodel/__init__.py
-pygeomodel/data/computeModel.json
-pygeomodel/data/modelContext.txt
+ogmsServer2/openUtils/stateManager.py

{pygeomodel-1.0.2 → pygeomodel-1.0.3}/PyGeoModel.egg-info/top_level.txt

@@ -1,3 +1,3 @@
+PyGeoModel
 ogmsServer2
-pygeomodel
 scripts

{pygeomodel-1.0.2 → pygeomodel-1.0.3}/setup.py

@@ -11,7 +11,7 @@ def read_readme():
 
 setup(
     name="PyGeoModel",
-    version="1.0.2",
+    version="1.0.3",
     author="Your Name",  # 请替换为您的姓名
     author_email="your.email@example.com",  # 请替换为您的邮箱
     description="An intelligent Python toolkit for geographic modeling with smart model recommendations",
@@ -21,7 +21,7 @@ setup(
     py_modules=["scripts"],
     packages=find_packages(),
     package_data={
-        'pygeomodel': ['data/*.json', 'data/*.txt'],
+        'PyGeoModel': ['data/*.json', 'data/*.txt'],
         'ogmsServer2': ['data/*.tif', 'data/*/*.tif'],
     },
     include_package_data=True,
@@ -52,3 +52,5 @@ setup(
     ],
     keywords="geographic modeling, GIS, machine learning, model recommendation, geospatial analysis, jupyter",
 )
+
+