hyper-py-photometry 0.1.2__tar.gz → 0.1.3__tar.gz

{hyper_py_photometry-0.1.2 → hyper_py_photometry-0.1.3}/.vscode/launch.json

@@ -6,10 +6,10 @@
             "name": "Python Debugger: Current File",
             "type": "debugpy",
             "request": "launch",
-            // "program": "${workspaceFolder}/src/hyper_py/run_hyper.py",
-            "program": "${workspaceFolder}/test/test_hyper.py", 
+            "program": "${workspaceFolder}/src/hyper_py/run_hyper.py",
+            //"program": "${workspaceFolder}/test/test_hyper.py", 
             "console": "integratedTerminal",
-            "args": ["${workspaceFolder}/src/hyper_py/config.yaml"],
+            //"args": ["${workspaceFolder}/src/hyper_py/config.yaml"],
             "env": {
                 "MPLBACKEND": "TkAgg"
             }

{hyper_py_photometry-0.1.2 → hyper_py_photometry-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyper-py-photometry
-Version: 0.1.2
+Version: 0.1.3
 Summary: HYPER: Hybrid Photometry Photometry and Extraction Routine
 Author-email: Alessio Traficante <alessio.traficante@inaf.it>
 Project-URL: Homepage, https://github.com/alessio-traficante/hyper-py
@@ -15,6 +15,7 @@ Requires-Dist: scipy
 Requires-Dist: lmfit
 Requires-Dist: matplotlib
 Requires-Dist: scikit-learn<1.6,>=1.4
+Requires-Dist: ruamel.yaml>=0.18
 Dynamic: license-file
 
 # 💫 `Hyper-py`: Hybrid Photometry Photometry and Extraction Routine in Python

{hyper_py_photometry-0.1.2 → hyper_py_photometry-0.1.3}/pyproject.toml

@@ -18,7 +18,8 @@ dependencies = [
     "scipy",
     "lmfit",
     "matplotlib",
-    "scikit-learn>=1.4,<1.6"
+    "scikit-learn>=1.4,<1.6",
+    "ruamel.yaml>=0.18"
 ]
 
 [project.urls]
@@ -32,6 +33,9 @@ hyper_py = "hyper_py.run_hyper:main"
 [tool.setuptools]
 package-dir = {"" = "src"}
 
+[tool.setuptools.package-data]
+hyper_py = ["assets/default_config.yaml"]
+
 [tool.setuptools.packages.find]
 where = ["src"]
 

hyper_py_photometry-0.1.3/src/hyper_py/__init__.py

@@ -0,0 +1,21 @@
+"""
+Hyper-Py package initializer.
+
+This file defines the public API and version metadata.
+It does not run the application automatically; use
+either `python -m hyper_py` or the console script entry point.
+"""
+
+from importlib.metadata import version, PackageNotFoundError
+
+from .hyper import start_hyper
+
+try:
+    __version__ = version("hyper-py")
+except PackageNotFoundError:
+    __version__ = "0.0.0-dev"
+
+__all__ = [
+    "start_hyper",
+    "__version__",
+]

hyper_py_photometry-0.1.3/src/hyper_py/__main__.py

@@ -0,0 +1,7 @@
+# Allows: python -m hyper_py [optional /path/to/config.yaml]
+# This delegates to the same CLI logic used by the console_script entry point.
+
+from .run_hyper import main
+
+if __name__ == "__main__":
+    main()

{hyper_py_photometry-0.1.2 → hyper_py_photometry-0.1.3}/src/hyper_py/hyper.py

@@ -22,7 +22,7 @@ def start_hyper(cfg_path):
     # === Load config ===
     os.chdir(os.path.dirname(__file__))
 
-    config_path = cfg_path if not None else "config.yaml"
+    config_path = cfg_path if not None else "hyper_config.yaml"
     
     if not os.path.exists(config_path):
         raise FileNotFoundError(f"Config file not found: {config_path}")

hyper_py_photometry-0.1.3/src/hyper_py/run_hyper.py

@@ -0,0 +1,154 @@
+import sys
+import os
+import warnings
+import shutil
+import platform
+from pathlib import Path
+
+# Silence some known irrelevant warnings
+warnings.filterwarnings("ignore", message="Using UFloat objects with std_dev==0 may give unexpected results.")
+warnings.filterwarnings("ignore", message=".*Set OBSGEO-L to.*")
+warnings.filterwarnings("ignore", message=".*Wrapping comment lines > 78 characters.*")
+warnings.filterwarnings("ignore", message=".*more axes \\(4\\) than the image it is associated with \\(2\\).*")
+warnings.filterwarnings("ignore", message=".*Set MJD-OBS to.*")
+
+# Import the main entry point of the package
+from hyper_py.hyper import start_hyper
+
+# importlib.resources for packaged data (fallback to importlib_resources on older Python)
+try:
+    from importlib.resources import files as ir_files
+except Exception:  # Python <3.9
+    from importlib_resources import files as ir_files  # type: ignore
+
+# Try ruamel.yaml for comment-preserving roundtrips
+try:
+    from ruamel.yaml import YAML  # type: ignore
+    _HAS_RUAMEL = True
+except Exception:
+    _HAS_RUAMEL = False
+
+_PKG = "hyper_py"  # top-level package name
+_CONFIG_FILENAME = "hyper_config.yaml"  # custom config filename
+
+
+def _user_config_path() -> Path:
+    """Return the user-level config path depending on the operating system."""
+    if platform.system() == "Windows":
+        base = Path(os.environ.get("APPDATA", Path.home() / "AppData" / "Roaming"))
+        return base / "HyperPy" / _CONFIG_FILENAME
+    base = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config"))
+    return base / "hyper-py" / _CONFIG_FILENAME
+
+
+def _load_default_template_path() -> Path:
+    """
+    Locate the packaged default config template.
+    Fallback to local files when running directly from src (dev mode).
+    """
+    try:
+        res = ir_files(_PKG).joinpath("assets/default_config.yaml")
+        if res and os.path.isfile(str(res)):
+            return Path(str(res))
+    except Exception:
+        pass
+
+    # Fallbacks for development mode
+    here = Path(__file__).parent
+    for cand in (
+        here / "assets" / "default_config.yaml",
+        here / "config.yaml",
+        here.parent / "config.yaml",
+    ):
+        if cand.is_file():
+            return cand
+
+    print("Error: default config template not found in package or src.")
+    sys.exit(1)
+
+
+def _ensure_parent(p: Path) -> None:
+    """Ensure the parent directory exists."""
+    p.parent.mkdir(parents=True, exist_ok=True)
+
+
+def _copy_template_to(dest: Path) -> None:
+    """Copy the default template into the destination config file."""
+    src = _load_default_template_path()
+    _ensure_parent(dest)
+    with src.open("rb") as s, dest.open("wb") as d:
+        shutil.copyfileobj(s, d)
+
+
+def _resolve_config_path(argv: list[str]) -> Path:
+    """Resolve the path of the configuration file from CLI args or default locations."""
+    # 1) CLI argument
+    if len(argv) > 1:
+        return Path(argv[1]).expanduser().resolve()
+    # 2) config file in the current working directory
+    cwd_cfg = Path.cwd() / _CONFIG_FILENAME
+    if cwd_cfg.is_file():
+        return cwd_cfg
+    # 3) user config path
+    ucfg = _user_config_path()
+    if ucfg.is_file():
+        return ucfg
+    # 4) if nothing found, suggest CWD/hyper_config.yaml as creation target
+    return cwd_cfg
+
+
+def _update_dir_root_preserving_comments(config_path: Path, new_dir_root: Path) -> None:
+    """
+    Update paths.output.dir_root preserving comments and formatting using ruamel.yaml.
+    If ruamel.yaml is not available, do nothing (keep template intact and let the user edit).
+    """
+    if not _HAS_RUAMEL:
+        print("Note: ruamel.yaml not installed; left config comments intact. "
+              "Please edit 'paths.output.dir_root' manually in hyper_config.yaml.")
+        return
+
+    yaml = YAML()
+    yaml.preserve_quotes = True
+    yaml.indent(mapping=2, sequence=4, offset=2)
+
+    with config_path.open("r", encoding="utf-8") as f:
+        data = yaml.load(f) or {}
+
+    # Ensure nested mapping exists without destroying comments
+    paths = data.get("paths")
+    if paths is None:
+        from ruamel.yaml.comments import CommentedMap  # type: ignore
+        paths = CommentedMap()
+        data["paths"] = paths
+
+    output = paths.get("output")
+    if output is None:
+        from ruamel.yaml.comments import CommentedMap  # type: ignore
+        output = CommentedMap()
+        paths["output"] = output
+
+    output["dir_root"] = str(new_dir_root / "output")
+
+    with config_path.open("w", encoding="utf-8") as f:
+        yaml.dump(data, f)
+
+
+def main() -> None:
+    """Main entry point for CLI execution."""
+    cfg_path = _resolve_config_path(sys.argv)
+
+    if not cfg_path.exists():
+        # Create new hyper_config.yaml from packaged template
+        _copy_template_to(cfg_path)
+        # Update dir_root while preserving comments (if ruamel.yaml is available)
+        _update_dir_root_preserving_comments(cfg_path, Path.cwd())
+        print(f"⚠️  New {_CONFIG_FILENAME} created at: {cfg_path}")
+        print("⚠️  Please edit it and run the command again.")
+        sys.exit(0)
+
+    # Run the real application
+    start_hyper(str(cfg_path))
+
+
+if __name__ == "__main__":
+    main()

{hyper_py_photometry-0.1.2 → hyper_py_photometry-0.1.3}/src/hyper_py_photometry.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyper-py-photometry
-Version: 0.1.2
+Version: 0.1.3
 Summary: HYPER: Hybrid Photometry Photometry and Extraction Routine
 Author-email: Alessio Traficante <alessio.traficante@inaf.it>
 Project-URL: Homepage, https://github.com/alessio-traficante/hyper-py
@@ -15,6 +15,7 @@ Requires-Dist: scipy
 Requires-Dist: lmfit
 Requires-Dist: matplotlib
 Requires-Dist: scikit-learn<1.6,>=1.4
+Requires-Dist: ruamel.yaml>=0.18
 Dynamic: license-file
 
 # 💫 `Hyper-py`: Hybrid Photometry Photometry and Extraction Routine in Python

{hyper_py_photometry-0.1.2 → hyper_py_photometry-0.1.3}/src/hyper_py_photometry.egg-info/SOURCES.txt

@@ -42,10 +42,10 @@ paper/paper.md
 paper/Figures/Flux_Diff_Histogram_Int.png
 paper/Figures/Flux_Diff_Histogram_Peak.png
 src/hyper_py/__init__.py
+src/hyper_py/__main__.py
 src/hyper_py/bkg_multigauss.py
 src/hyper_py/bkg_single.py
 src/hyper_py/config.py
-src/hyper_py/config.yaml
 src/hyper_py/create_background_slices.py
 src/hyper_py/data_output.py
 src/hyper_py/detection.py
@@ -62,6 +62,7 @@ src/hyper_py/run_hyper.py
 src/hyper_py/single_map.py
 src/hyper_py/survey.py
 src/hyper_py/visualization.py
+src/hyper_py/assets/default_config.yaml
 src/hyper_py_photometry.egg-info/PKG-INFO
 src/hyper_py_photometry.egg-info/SOURCES.txt
 src/hyper_py_photometry.egg-info/dependency_links.txt

{hyper_py_photometry-0.1.2 → hyper_py_photometry-0.1.3}/src/hyper_py_photometry.egg-info/requires.txt

@@ -6,3 +6,4 @@ scipy
 lmfit
 matplotlib
 scikit-learn<1.6,>=1.4
+ruamel.yaml>=0.18

{hyper_py_photometry-0.1.2 → hyper_py_photometry-0.1.3}/test/test_hyper.py

@@ -16,6 +16,10 @@ def find_package_config(pkg_dir: Path) -> Path:
         p = pkg_dir / name
         if p.exists():
             return p
+    for name in ("config.yaml","config.yml","default_config.yaml","config_default.yaml","config_base.yaml"):
+        p = pkg_dir / "assets" / name 
+        if p.exists():
+            return p
     alts: List[Path] = list(pkg_dir.glob("*.yaml")) + list(pkg_dir.glob("*.yml"))
     if alts:
         return alts[0]

hyper_py_photometry-0.1.2/src/hyper_py/__init__.py

@@ -1 +0,0 @@
-from hyper_py.hyper import start_hyper

hyper_py_photometry-0.1.2/src/hyper_py/run_hyper.py

@@ -1,45 +0,0 @@
-import sys
-import os
-import shutil
-import warnings
-import yaml
-from pathlib import Path
-
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
-# Block warnings
-warnings.filterwarnings("ignore", message="Using UFloat objects with std_dev==0 may give unexpected results.")
-warnings.filterwarnings("ignore", message=".*Set OBSGEO-L to.*")
-warnings.filterwarnings("ignore", message=".*Wrapping comment lines > 78 characters.*")
-warnings.filterwarnings("ignore", message=".*more axes \(4\) than the image it is associated with \(2\).*")
-warnings.filterwarnings("ignore", message=".*Set MJD-OBS to.*")
-
-from hyper_py.hyper import start_hyper
-
-def update_dir_root(default_config, config_path, new_dir_root):
-    """Create a new config.yaml in the specified directory with updated dir_root."""
-    default_config = Path(default_config)
-    config_path = Path(config_path)      
-    cfg = yaml.safe_load(default_config.read_text(encoding="utf-8")) or {}
-    cfg['paths']['output']['dir_root'] = str(Path(new_dir_root, "output"))
-    config_path.write_text(yaml.safe_dump(cfg, sort_keys=False), encoding="utf-8")
-
-def main():
-    config_path = sys.argv[1] if len(sys.argv) > 1 else "config.yaml"
-    if not os.path.exists(config_path):
-        default_config = os.path.join(os.path.dirname(__file__), "config.yaml")
-        if not os.path.exists(default_config):
-            print("Error: default config.yaml not found.")
-            sys.exit(1)
-
-        config_path = os.path.join(os.getcwd(), "config.yaml")
-
-        update_dir_root(default_config, config_path, os.getcwd())
-        print(f"⚠️  New config.yaml created in {config_path}")
-        print("⚠️  Please edit the configuration file and set the correct parameters and paths before running again.")
-        sys.exit(0)
-
-    start_hyper(config_path)
-
-if __name__ == "__main__":
-    main()