goad-py 0.7.0__cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl → 0.8.0__cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl

goad_py/convergence.py

@@ -92,6 +92,7 @@ class Convergence:
         min_batches: int = 10,
         mueller_1d: bool = True,
         mueller_2d: bool = False,
+        log_file: Optional[str] = None,
     ):
         """
         Initialize a convergence study.
@@ -104,6 +105,7 @@ class Convergence:
             min_batches: Minimum number of batches before allowing convergence
             mueller_1d: Whether to collect 1D Mueller matrices
             mueller_2d: Whether to collect 2D Mueller matrices
+            log_file: Optional path to log file for convergence progress
         """
         self.settings = settings
         # Enable quiet mode to suppress Rust progress bars
@@ -172,6 +174,7 @@ class Convergence:
             min_batches=self.min_batches,
             convergence_type=self._get_convergence_type(),
             console=self._console,
+            log_file=log_file,
         )
 
     def _update_statistics(self, results: goad.Results, batch_size: int):

goad_py/convergence_display.py

@@ -267,6 +267,7 @@ class ConvergenceDisplay:
         min_batches: int,
         convergence_type: str = "standard",
         console: Optional[Console] = None,
+        log_file: Optional[str] = None,
     ):
         """
         Initialize convergence display.
@@ -277,6 +278,7 @@ class ConvergenceDisplay:
             min_batches: Minimum batches before convergence check
             convergence_type: Display string for convergence mode
             console: Optional Rich console (creates one if None)
+            log_file: Optional path to log file for convergence progress
         """
         self.variables = variables
         self.batch_size = batch_size
@@ -284,6 +286,18 @@ class ConvergenceDisplay:
         self.convergence_type = convergence_type
         self._console = console or Console()
 
+        # File logging
+        self.log_file = log_file
+        self._file_console = None
+        self._file_handle = None
+        if self.log_file:
+            # Create a separate console for file output
+            self._file_handle = open(self.log_file, "w")
+            self._file_console = Console(file=self._file_handle, width=120)
+            # Write header
+            self._file_console.print(f"GOAD Convergence Log - {convergence_type}")
+            self._file_console.print("=" * 120)
+
         # Progress tracking
         self._progress: Optional[Progress] = None
         self._progress_tasks: Dict[str, int] = {}
@@ -463,8 +477,8 @@ class ConvergenceDisplay:
             )
             progress_lines.append(line)
 
-        # Return full display
-        return Group(
+        # Build full display
+        display = Group(
             separator,
             title,
             Text(""),  # Blank line
@@ -473,6 +487,12 @@ class ConvergenceDisplay:
             *progress_lines,
         )
 
+        # Log to file if enabled
+        if self._file_console is not None:
+            self._file_console.print(display)
+
+        return display
+
     def _get_power_ratio_color(self, power_ratio: float) -> str:
         """Get color for power ratio based on threshold."""
         if power_ratio >= 0.99:
@@ -497,3 +517,16 @@ class ConvergenceDisplay:
             refresh_per_second=refresh_per_second,
             transient=False,
         )
+
+    def close(self):
+        """Close the log file if open."""
+        if self._file_handle is not None:
+            self._file_console.print("\n" + "=" * 120)
+            self._file_console.print("End of convergence log")
+            self._file_handle.close()
+            self._file_handle = None
+            self._file_console = None
+
+    def __del__(self):
+        """Cleanup when object is destroyed."""
+        self.close()

goad_py/phips_convergence.py

@@ -71,6 +71,7 @@ class PHIPSConvergence:
         batch_size: int = 24,
         max_orientations: int = 100_000,
         min_batches: int = 10,
+        log_file: Optional[str] = None,
     ):
         """
         Initialize a PHIPS convergence study.
@@ -81,6 +82,7 @@ class PHIPSConvergence:
             batch_size: Number of orientations per iteration
             max_orientations: Maximum total orientations before stopping
             min_batches: Minimum number of batches before allowing convergence
+            log_file: Optional path to log file for convergence progress
         """
         self.settings = settings
         # Enable quiet mode to suppress Rust progress bars
@@ -136,6 +138,7 @@ class PHIPSConvergence:
             min_batches=self.min_batches,
             convergence_type=self._get_convergence_type(),
             console=self._console,
+            log_file=log_file,
         )
 
     def _compute_phips_dscs_from_mueller2d(self, results: goad.Results) -> np.ndarray:
@@ -444,6 +447,7 @@ class PHIPSEnsembleConvergence(PHIPSConvergence):
         batch_size: int = 24,
         max_orientations: int = 100_000,
         min_batches: int = 10,
+        log_file: Optional[str] = None,
     ):
         """
         Initialize a PHIPS ensemble convergence study.
@@ -455,6 +459,7 @@ class PHIPSEnsembleConvergence(PHIPSConvergence):
             batch_size: Number of orientations per iteration
             max_orientations: Maximum total orientations before stopping
             min_batches: Minimum number of batches before allowing convergence
+            log_file: Optional path to log file for convergence progress
         """
         # Discover all .obj files in directory
         geom_path = Path(geom_dir)
@@ -480,6 +485,7 @@ class PHIPSEnsembleConvergence(PHIPSConvergence):
             batch_size=batch_size,
             max_orientations=max_orientations,
             min_batches=min_batches,
+            log_file=log_file,
         )
 
     def run(self) -> ConvergenceResults:

goad_py/unified_convergence.py

@@ -15,28 +15,28 @@ Features:
 - Reproducible results via random seed control
 """
 
-from dataclasses import dataclass, field, asdict
-from typing import List, Dict, Optional, Union, Any, Tuple
+import json
+from abc import ABC, abstractmethod
+from dataclasses import asdict, dataclass, field
 from pathlib import Path
+from typing import Any, Dict, List, Optional, Tuple, Union
+
 import numpy as np
-import json
 import toml
-from abc import ABC, abstractmethod
 
 from . import _goad_py as goad
 from .convergence import (
-    Convergence,
     Convergable,
+    Convergence,
     ConvergenceResults,
     EnsembleConvergence,
 )
 from .phips_convergence import (
-    PHIPSConvergence,
     PHIPSConvergable,
+    PHIPSConvergence,
     PHIPSEnsembleConvergence,
 )
 
-
 # ============================================================================
 # Convergence Modes
 # ============================================================================
@@ -373,6 +373,7 @@ class ConvergenceConfig:
 
     # Output options
     output_dir: Optional[str] = None
+    log_file: Optional[str] = None
 
     def __post_init__(self):
         """Validate configuration after initialization."""
@@ -872,6 +873,7 @@ class UnifiedConvergence:
                 min_batches=self.config.min_batches,
                 mueller_1d=self.config.mueller_1d,
                 mueller_2d=False,
+                log_file=self.config.log_file,
             )
         else:
             self._convergence = Convergence(
@@ -882,6 +884,7 @@ class UnifiedConvergence:
                 min_batches=self.config.min_batches,
                 mueller_1d=self.config.mueller_1d,
                 mueller_2d=False,
+                log_file=self.config.log_file,
             )
 
     def _setup_phips(self, settings):
@@ -903,6 +906,7 @@ class UnifiedConvergence:
                 batch_size=self.config.batch_size,
                 max_orientations=self.config.max_orientations,
                 min_batches=self.config.min_batches,
+                log_file=self.config.log_file,
             )
         else:
             self._convergence = PHIPSConvergence(
@@ -911,6 +915,7 @@ class UnifiedConvergence:
                 batch_size=self.config.batch_size,
                 max_orientations=self.config.max_orientations,
                 min_batches=self.config.min_batches,
+                log_file=self.config.log_file,
             )
 
     def run(self) -> UnifiedResults:
@@ -1092,6 +1097,9 @@ def run_convergence(
             # Reproducibility
             - seed: Random seed for orientations (optional)
 
+            # Output options
+            - log_file: Path to log file for convergence progress (optional)
+
     Returns:
         UnifiedResults object
 
@@ -1157,8 +1165,9 @@ def run_convergence(
         fov_factor=kwargs.pop("fov_factor", None),
     )
 
-    # Extract seed
+    # Extract seed and log_file
     seed = kwargs.pop("seed", None)
+    log_file = kwargs.pop("log_file", None)
 
     # Normalize targets to list of dicts
     target_dicts = _normalize_targets(targets, tolerance, tolerance_type)
@@ -1190,6 +1199,7 @@ def run_convergence(
         geometry_transform=geometry_transform,
         advanced_config=advanced_config,
         seed=seed,
+        log_file=log_file,
         **kwargs,  # Remaining kwargs (wavelength, particle_refr_index_re, etc.)
     )
 

{goad_py-0.7.0.dist-info → goad_py-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: goad-py
-Version: 0.7.0
+Version: 0.8.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics

goad_py-0.8.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+goad_py-0.8.0.dist-info/METADATA,sha256=A3QnubU86DsTw06KrjvyGV6duTvqJMveIg8MkXcX_S4,3266
+goad_py-0.8.0.dist-info/WHEEL,sha256=cqfH6P_NujaeOc1olR46J5a7YgoxWJnrr5iZ1_DMqps,129
+goad_py/__init__.py,sha256=iGJg-Oj9btk4I4GITkE7olNRm38uFRjENMJqXaDJmpM,1083
+goad_py/_goad_py.abi3.so,sha256=LauIBxD05jiyclyP1bjhVdmD8AUMLZIUWm9xWzFis_E,2116304
+goad_py/convergence.py,sha256=2VBhavlI5Oh99GxiZLq4qHHLeU-WttuAMTzXvPzLE9E,32826
+goad_py/convergence_display.py,sha256=j3l9lpy1JZgySfAOA0Gqufq_DryJx9cczm-ZPVOKDUc,17861
+goad_py/goad_py.pyi,sha256=7Y79-TV-NjEN8DWPEqSRGQ7alCrkylL6y1ZK8d6FYSg,14502
+goad_py/phips_convergence.py,sha256=Ypgs0LpxC2-rh-AEDeEkiFn0dV41cL8PCJiU2pW447w,23053
+goad_py/unified_convergence.py,sha256=5rcqk1XX1AuRcMEaxxIx-rVyg_P3_6FjpfQI9Uc_HNg,49626
+goad_py-0.8.0.dist-info/RECORD,,

goad_py-0.7.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-goad_py-0.7.0.dist-info/METADATA,sha256=0_d3FTncDZ9MrOT3XWx-LpLlVW_kRzyVm8D3Bd2PH1Q,3266
-goad_py-0.7.0.dist-info/WHEEL,sha256=cqfH6P_NujaeOc1olR46J5a7YgoxWJnrr5iZ1_DMqps,129
-goad_py/__init__.py,sha256=iGJg-Oj9btk4I4GITkE7olNRm38uFRjENMJqXaDJmpM,1083
-goad_py/_goad_py.abi3.so,sha256=LauIBxD05jiyclyP1bjhVdmD8AUMLZIUWm9xWzFis_E,2116304
-goad_py/convergence.py,sha256=gbf8-uQTpCltCO3MrhVckobSP-uM2lxOiYocB6YSBTs,32682
-goad_py/convergence_display.py,sha256=2V_kyARZ504-pJNjiWO-Zqd5S1z8leTJ-A86c4r382w,16672
-goad_py/goad_py.pyi,sha256=7Y79-TV-NjEN8DWPEqSRGQ7alCrkylL6y1ZK8d6FYSg,14502
-goad_py/phips_convergence.py,sha256=U_2r40lDza6FO0VDo-FD6KxaKjo9gDdVfm01StqYKMU,22765
-goad_py/unified_convergence.py,sha256=3R4D_bVD-u-XbkaZ4R_BcVGZpwKoq8S0OZ-My-Nlxm0,49212
-goad_py-0.7.0.dist-info/RECORD,,