well-log-toolkit 0.1.149__py3-none-any.whl → 0.1.150__py3-none-any.whl

well_log_toolkit/manager.py

@@ -1445,12 +1445,23 @@ class _ManagerPropertyProxy:
                             prop = prop.filter(filter_name, source=source_name)
 
                     # Compute sums_avg
-                    source_results[source_name] = prop.sums_avg(
+                    result = prop.sums_avg(
                         weighted=weighted,
                         arithmetic=arithmetic,
                         precision=precision
                     )
 
+                    # Add well-level thickness for this source if using filter_intervals
+                    if self._custom_intervals and result:
+                        well_thickness = 0.0
+                        for key, value in result.items():
+                            if isinstance(value, dict) and 'thickness' in value:
+                                well_thickness += value['thickness']
+                        if well_thickness > 0:
+                            result['thickness'] = round(well_thickness, precision)
+
+                    source_results[source_name] = result
+
                 except (PropertyNotFoundError, PropertyTypeError, AttributeError, KeyError, ValueError):
                     # Property or filter doesn't exist in this source, or filter isn't discrete - skip it
                     pass
@@ -1476,12 +1487,23 @@ class _ManagerPropertyProxy:
                     prop = prop.filter(filter_name)
 
             # Compute sums_avg
-            return prop.sums_avg(
+            result = prop.sums_avg(
                 weighted=weighted,
                 arithmetic=arithmetic,
                 precision=precision
             )
 
+            # Add well-level thickness (sum of all zone thicknesses) if using filter_intervals
+            if self._custom_intervals and result:
+                well_thickness = 0.0
+                for key, value in result.items():
+                    if isinstance(value, dict) and 'thickness' in value:
+                        well_thickness += value['thickness']
+                if well_thickness > 0:
+                    result['thickness'] = round(well_thickness, precision)
+
+            return result
+
         except PropertyNotFoundError as e:
             # Check if it's ambiguous (exists in multiple sources)
             if "ambiguous" in str(e).lower():
@@ -1512,6 +1534,16 @@ class _ManagerPropertyProxy:
                             arithmetic=arithmetic,
                             precision=precision
                         )
+
+                        # Add well-level thickness for this source if using filter_intervals
+                        if self._custom_intervals and result:
+                            well_thickness = 0.0
+                            for key, value in result.items():
+                                if isinstance(value, dict) and 'thickness' in value:
+                                    well_thickness += value['thickness']
+                            if well_thickness > 0:
+                                result['thickness'] = round(well_thickness, precision)
+
                         source_results[source_name] = result
 
                     except (PropertyNotFoundError, PropertyTypeError, AttributeError, KeyError, ValueError):
@@ -1632,7 +1664,7 @@ class _ManagerMultiPropertyProxy:
     PROPERTY_STATS = {'mean', 'median', 'mode', 'sum', 'std_dev', 'percentile', 'range'}
 
     # Stats that are common across properties (stay at group level)
-    COMMON_STATS = {'depth_range', 'samples', 'thickness', 'gross_thickness', 'thickness_fraction', 'calculation'}
+    COMMON_STATS = {'depth_range', 'samples', 'thickness', 'thickness_fraction', 'calculation'}
 
     def __init__(
         self,
@@ -1849,7 +1881,17 @@ class _ManagerMultiPropertyProxy:
             return self._merge_flat_results(property_results)
 
         # Merge results: nest property-specific stats, keep common stats at group level
-        return self._merge_property_results(property_results)
+        merged = self._merge_property_results(property_results)
+
+        # Add well-level thickness (sum of all zone thicknesses)
+        if self._custom_intervals and merged:
+            well_thickness = 0.0
+            for key, value in merged.items():
+                if isinstance(value, dict) and 'thickness' in value:
+                    well_thickness += value['thickness']
+            merged['thickness'] = round(well_thickness, 6)
+
+        return merged
 
     def _apply_filter_intervals(self, prop, well):
         """
@@ -3108,7 +3150,70 @@ class WellDataManager:
         ['well_12_3_2_B', 'well_12_3_2_A']
         """
         return list(self._wells.keys())
-    
+
+    @property
+    def saved_intervals(self) -> dict[str, list[str]]:
+        """
+        List saved interval names for all wells.
+
+        Returns
+        -------
+        dict[str, list[str]]
+            Dictionary mapping well names to their saved interval names
+
+        Examples
+        --------
+        >>> manager.saved_intervals
+        {'well_A': ['Reservoir_Zones', 'Slump_Zones'], 'well_B': ['Reservoir_Zones']}
+        """
+        result = {}
+        for well_name, well in self._wells.items():
+            if well.saved_intervals:
+                result[well_name] = well.saved_intervals
+        return result
+
+    def get_intervals(self, name: str) -> dict[str, list[dict]]:
+        """
+        Get saved filter intervals by name from all wells that have them.
+
+        Parameters
+        ----------
+        name : str
+            Name of the saved filter intervals
+
+        Returns
+        -------
+        dict[str, list[dict]]
+            Dictionary mapping well names to their interval definitions
+
+        Raises
+        ------
+        KeyError
+            If no wells have intervals with the given name
+
+        Examples
+        --------
+        >>> manager.get_intervals("Slump_Zones")
+        {'well_A': [{'name': 'Zone_A', 'top': 2500, 'base': 2650}],
+         'well_B': [{'name': 'Zone_A', 'top': 2600, 'base': 2750}]}
+        """
+        result = {}
+        for well_name, well in self._wells.items():
+            if name in well.saved_intervals:
+                result[well_name] = well.get_intervals(name)
+
+        if not result:
+            # Collect all available interval names for error message
+            all_names = set()
+            for well in self._wells.values():
+                all_names.update(well.saved_intervals)
+            raise KeyError(
+                f"No wells have saved intervals named '{name}'. "
+                f"Available: {sorted(all_names) if all_names else 'none'}"
+            )
+
+        return result
+
     def get_well(self, name: str) -> Well:
         """
         Get well by original or sanitized name.

well_log_toolkit/property.py

@@ -1779,24 +1779,31 @@ class Property(PropertyOperationsMixin):
             # contributes to this zone (even boundary samples with partial intervals)
             interval_mask = zone_intervals > 0
 
+            # Calculate zone thickness (sum of valid intervals within zone)
+            valid_mask = interval_mask & ~np.isnan(self.values)
+            zone_thickness = float(np.sum(zone_intervals[valid_mask]))
+
             # If there are secondary properties, group within this interval
             if self.secondary_properties:
-                result[interval_name] = self._recursive_group(
+                interval_result = self._recursive_group(
                     0,
                     interval_mask,
                     weighted=weighted,
                     arithmetic=arithmetic,
-                    gross_thickness=gross_thickness,
+                    gross_thickness=zone_thickness,  # Pass zone thickness as gross for children
                     precision=precision,
                     zone_intervals=zone_intervals
                 )
+                # Add zone-level thickness
+                interval_result['thickness'] = round(zone_thickness, precision)
+                result[interval_name] = interval_result
             else:
                 # No secondary properties, compute stats directly for interval
                 result[interval_name] = self._compute_stats(
                     interval_mask,
                     weighted=weighted,
                     arithmetic=arithmetic,
-                    gross_thickness=gross_thickness,
+                    gross_thickness=zone_thickness,  # Use zone thickness for fraction calc
                     precision=precision,
                     zone_intervals=zone_intervals
                 )
@@ -2416,7 +2423,6 @@ class Property(PropertyOperationsMixin):
             'depth_range': _round_value(depth_range_dict),
             'samples': int(len(valid)),
             'thickness': round(thickness, precision),
-            'gross_thickness': round(gross_thickness, precision),
             'thickness_fraction': round(fraction, precision),
             'calculation': calc_method,
         }

{well_log_toolkit-0.1.149.dist-info → well_log_toolkit-0.1.150.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: well-log-toolkit
-Version: 0.1.149
+Version: 0.1.150
 Summary: Fast LAS file processing with lazy loading and filtering for well log analysis
 Author-email: Kristian dF Kollsgård <kkollsg@gmail.com>
 License: MIT

{well_log_toolkit-0.1.149.dist-info → well_log_toolkit-0.1.150.dist-info}/RECORD

@@ -1,15 +1,15 @@
 well_log_toolkit/__init__.py,sha256=ilJAIIhh68pYfD9I3V53juTEJpoMN8oHpcpEFNpuXAQ,3793
 well_log_toolkit/exceptions.py,sha256=X_fzC7d4yaBFO9Vx74dEIB6xmI9Agi6_bTU3MPxn6ko,985
 well_log_toolkit/las_file.py,sha256=Tj0mRfX1aX2s6uug7BBlY1m_mu3G50EGxHGzD0eEedE,53876
-well_log_toolkit/manager.py,sha256=Jx0w1KpxRB2Oex6bC0FQFZOlJkoTKNexW3HMXxndL68,136713
+well_log_toolkit/manager.py,sha256=F6C8SXSD53FtG16-u3z298ViAj-5cMeNLSAoU77MyXY,140694
 well_log_toolkit/operations.py,sha256=z8j8fGBOwoJGUQFy-Vawjq9nm3OD_dUt0oaNh8yuG7o,18515
-well_log_toolkit/property.py,sha256=TkBuqgunIGIGdsLtWtQkwwXPdh0yqY37PgO_150FilA,103782
+well_log_toolkit/property.py,sha256=XY3BAN76CY6KY8na4iyoz6P-inhDyb821o3gN7ZC3q4,104184
 well_log_toolkit/regression.py,sha256=JDcRxaODJnFikAdPJyTq8eUV7iY0vCDmvnGufqlojxs,31625
 well_log_toolkit/statistics.py,sha256=cpUbaRGlqyqpGWKtETk9XpXWrMJIIjVacdqEqIBkvqQ,19118
 well_log_toolkit/utils.py,sha256=O2KPq4htIoUlL74V2zKftdqqTjRfezU9M-568zPLme0,6866
 well_log_toolkit/visualization.py,sha256=nnpmFmbj44TbP0fsnLMR1GaKRkqKCEpI6Fd8Cp0oqBc,204716
 well_log_toolkit/well.py,sha256=n6XfaGSjGtyXCIaAr0ytslIK0DMUY_fSPQ_VCqj8jaU,106173
-well_log_toolkit-0.1.149.dist-info/METADATA,sha256=g__8aYidDAd_oKi-MQ7PLGX0Ss63NHRbxjudCfdGtF8,63473
-well_log_toolkit-0.1.149.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-well_log_toolkit-0.1.149.dist-info/top_level.txt,sha256=BMOo7OKLcZEnjo0wOLMclwzwTbYKYh31I8RGDOGSBdE,17
-well_log_toolkit-0.1.149.dist-info/RECORD,,
+well_log_toolkit-0.1.150.dist-info/METADATA,sha256=I5J-CdMD7XIL0uhVhHnergVpoFxblRISMCT5KumaiU8,63473
+well_log_toolkit-0.1.150.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+well_log_toolkit-0.1.150.dist-info/top_level.txt,sha256=BMOo7OKLcZEnjo0wOLMclwzwTbYKYh31I8RGDOGSBdE,17
+well_log_toolkit-0.1.150.dist-info/RECORD,,