well-log-toolkit 0.1.125__py3-none-any.whl → 0.1.127__py3-none-any.whl

well_log_toolkit/manager.py

@@ -1510,7 +1510,8 @@ class WellDataManager:
         path: Optional[Union[str, Path]] = None,
         sampled: bool = False,
         combine: Optional[str] = None,
-        source_name: Optional[str] = None
+        source_name: Optional[str] = None,
+        silent: bool = False
     ) -> 'WellDataManager':
         """
         Load LAS file(s), auto-create well if needed.
@@ -1538,6 +1539,9 @@ class WellDataManager:
             Name for combined source when combine is specified. If not specified,
             uses 'combined_match', 'combined_resample', or 'combined_concat'.
             When files span multiple wells, the well name is prepended automatically.
+        silent : bool, default False
+            If True, suppress debug output showing which sources were loaded.
+            Useful when loading many files programmatically.
 
         Returns
         -------
@@ -1633,9 +1637,10 @@ class WellDataManager:
                     )
 
                 # Print debug output
-                print("Loaded sources:")
-                for well_name, src_name, file_count in loaded_sources:
-                    print(f"  - Well {well_name}: {src_name} ({file_count} file{'s' if file_count > 1 else ''} combined)")
+                if not silent:
+                    print("Loaded sources:")
+                    for well_name, src_name, file_count in loaded_sources:
+                        print(f"  - Well {well_name}: {src_name} ({file_count} file{'s' if file_count > 1 else ''} combined)")
 
                 return self
 
@@ -1668,7 +1673,7 @@ class WellDataManager:
                         loaded_sources.append((well_name, src_name))
 
             # Print debug output
-            if loaded_sources:
+            if not silent and loaded_sources:
                 print("Loaded sources:")
                 for well_name, src_name in loaded_sources:
                     print(f"  - Well {well_name}: {src_name}")
@@ -1715,7 +1720,7 @@ class WellDataManager:
         new_sources = set(self._wells[well_key].sources) - existing_sources
 
         # Print debug output
-        if new_sources:
+        if not silent and new_sources:
             print("Loaded sources:")
             for src_name in new_sources:
                 print(f"  - Well {well_name}: {src_name}")
@@ -2342,7 +2347,7 @@ class WellDataManager:
             las_files = list(base_path.glob("*.las"))
             if las_files:
                 for las_file in las_files:
-                    self.load_las(las_file)
+                    self.load_las(las_file, silent=True)
             return self
 
         # Load from well folders
@@ -2350,7 +2355,7 @@ class WellDataManager:
             # Find all LAS files in this folder
             las_files = sorted(well_folder.glob("*.las"))
             for las_file in las_files:
-                self.load_las(las_file)
+                self.load_las(las_file, silent=True)
 
         return self
 

well_log_toolkit/visualization.py

@@ -24,6 +24,7 @@ from .regression import (
     LinearRegression, LogarithmicRegression, ExponentialRegression,
     PolynomialRegression, PowerRegression
 )
+from .exceptions import PropertyNotFoundError
 
 # Default color palettes
 DEFAULT_COLORS = [
@@ -3033,7 +3034,7 @@ class Crossplot:
                         if needs_alignment(color_prop.depth, depths):
                             color_values = np.interp(depths, color_prop.depth, color_prop.values, left=np.nan, right=np.nan)
                         df['color_val'] = color_values
-                    except (AttributeError, KeyError):
+                    except (AttributeError, KeyError, PropertyNotFoundError):
                         warnings.warn(f"Color property '{self.color}' not found in well '{well.name}', using depth")
                         df['color_val'] = depths
                 elif self.color == "depth":
@@ -3048,7 +3049,7 @@ class Crossplot:
                         if needs_alignment(size_prop.depth, depths):
                             size_values = np.interp(depths, size_prop.depth, size_prop.values, left=np.nan, right=np.nan)
                         df['size_val'] = size_values
-                    except (AttributeError, KeyError):
+                    except (AttributeError, KeyError, PropertyNotFoundError):
                         warnings.warn(f"Size property '{self.size}' not found in well '{well.name}'")
 
                 # Add shape property if specified and not "well"
@@ -3060,12 +3061,12 @@ class Crossplot:
                         if needs_alignment(shape_prop.depth, depths):
                             shape_values = np.interp(depths, shape_prop.depth, shape_prop.values, left=np.nan, right=np.nan)
                         df['shape_val'] = shape_values
-                    except (AttributeError, KeyError):
+                    except (AttributeError, KeyError, PropertyNotFoundError):
                         warnings.warn(f"Shape property '{self.shape}' not found in well '{well.name}'")
 
                 all_data.append(df)
 
-            except (AttributeError, KeyError) as e:
+            except (AttributeError, KeyError, PropertyNotFoundError) as e:
                 warnings.warn(f"Could not get properties for well '{well.name}': {e}")
                 continue
 

well_log_toolkit/well.py

@@ -457,27 +457,49 @@ class Well:
                 las_files = las
 
             # Load all files as separate sources
+            # Track sources before and after to identify what was loaded
             loaded_sources = []
+
             for las_file in las_files:
+                # Track sources before this file
+                sources_before = set(self.sources)
+
                 # Recursively call load_las for each file (without merge or combine, path already prepended)
                 self.load_las(las_file, path=None, sampled=sampled, resample_method=resample_method, merge=False, combine=None)
-                # Get the source name that was just created
-                loaded_sources.append(self.sources[-1])
+
+                # Find which source was added or modified
+                sources_after = set(self.sources)
+                new_or_modified = sources_after - sources_before
+
+                if new_or_modified:
+                    # New source was added
+                    loaded_sources.append(list(new_or_modified)[0])
+                else:
+                    # Source was overwritten - find it by checking which source is newest
+                    # Since we don't know which one, we'll use the last one in the list
+                    # This handles the overwrite case
+                    if self.sources:
+                        loaded_sources.append(self.sources[-1])
 
             # Combine if requested
             if combine in {'match', 'resample', 'concat'}:
                 # Determine combined source name
                 combined_source_name = source_name or f'combined_{combine}'
 
-                # Merge all loaded sources
-                self.merge(
-                    method=combine,
-                    sources=loaded_sources,
-                    source_name=combined_source_name
-                )
+                # Merge all loaded sources (only ones that exist)
+                sources_to_merge = [s for s in loaded_sources if s in self._sources]
+
+                if sources_to_merge:
+                    self.merge(
+                        method=combine,
+                        sources=sources_to_merge,
+                        source_name=combined_source_name
+                    )
 
-                # Remove original sources
-                self.remove_source(loaded_sources)
+                    # Remove original sources (only ones that exist)
+                    sources_to_remove = [s for s in sources_to_merge if s in self._sources]
+                    if sources_to_remove:
+                        self.remove_source(sources_to_remove)
 
             return self
 

{well_log_toolkit-0.1.125.dist-info → well_log_toolkit-0.1.127.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: well-log-toolkit
-Version: 0.1.125
+Version: 0.1.127
 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.125.dist-info → well_log_toolkit-0.1.127.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=7v2zzdkUc_WFCdjZwn4DFHW5pkowtC85LS3o4lvZ9bI,109002
+well_log_toolkit/manager.py,sha256=STXkr5qxvxDJ9nqgAKTnZjIZ8RYgFUYdGKiCrYi5mlY,109307
 well_log_toolkit/operations.py,sha256=z8j8fGBOwoJGUQFy-Vawjq9nm3OD_dUt0oaNh8yuG7o,18515
 well_log_toolkit/property.py,sha256=WOzoNQcmHCQ8moIKsnSyLgVC8s4LBu2x5IBXtFzmMe8,76236
 well_log_toolkit/regression.py,sha256=7D3oI-1XVlFb-mOoHTxTTtUHERFyvQSBAzJzAGVoZnk,25192
 well_log_toolkit/statistics.py,sha256=_huPMbv2H3o9ezunjEM94mJknX5wPK8V4nDv2lIZZRw,16814
 well_log_toolkit/utils.py,sha256=O2KPq4htIoUlL74V2zKftdqqTjRfezU9M-568zPLme0,6866
-well_log_toolkit/visualization.py,sha256=xb870FG5FghU2gEkqdn1b2NbWNu07oDmFDN1Cx1HIi0,157280
-well_log_toolkit/well.py,sha256=kIN3Zr0sI3Zt3DeHbxDXADbQfWnVxXCQrHZ4UEMyeqI,103343
-well_log_toolkit-0.1.125.dist-info/METADATA,sha256=I3JrySR3JycP7qOsp4gCCOKme-hcasI-VkhbaArGsRg,59810
-well_log_toolkit-0.1.125.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-well_log_toolkit-0.1.125.dist-info/top_level.txt,sha256=BMOo7OKLcZEnjo0wOLMclwzwTbYKYh31I8RGDOGSBdE,17
-well_log_toolkit-0.1.125.dist-info/RECORD,,
+well_log_toolkit/visualization.py,sha256=tNaS1BPr1kLmr73BKqCBOSMptDdsxVofDic6vJ1iyr4,157418
+well_log_toolkit/well.py,sha256=7RzbC7zud5M53zZ8FmuQP0GPhUP5Y6RiFjTuf4_oMWE,104419
+well_log_toolkit-0.1.127.dist-info/METADATA,sha256=6WtUXbcWy0jWgfCF2Fv06MoBHIvEJREjksDth_Q-PL8,59810
+well_log_toolkit-0.1.127.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+well_log_toolkit-0.1.127.dist-info/top_level.txt,sha256=BMOo7OKLcZEnjo0wOLMclwzwTbYKYh31I8RGDOGSBdE,17
+well_log_toolkit-0.1.127.dist-info/RECORD,,