webviz-subsurface 0.2.43__py3-none-any.whl → 0.2.44__py3-none-any.whl

webviz_subsurface/_datainput/well_completions.py

@@ -69,7 +69,7 @@ def read_zone_layer_mapping(
         )
         df_real["K1"] = df_real.index
         df_real["REAL"] = real
-        zonelist = remove_invalid_colors(zonelist)
+        zonelist = remove_invalid_colors(zonelist) if zonelist else []
         zone_color_mapping = {
             zonedict["name"]: zonedict["color"]
             for zonedict in zonelist

webviz_subsurface/_models/gruptree_model.py

@@ -191,16 +191,13 @@ GruptreeDataModel({self._ens_name!r}, {self._ens_path!r}, {self._gruptree_file!r
                     raise ValueError(
                         f"Keyword {self._tree_type.value} not found in {row['FULLPATH']}"
                     )
+
+                # Only filter if both tree types are present
                 if (
-                    self._tree_type == TreeType.GRUPTREE
+                    TreeType.GRUPTREE.value in unique_keywords
                     and TreeType.BRANPROP.value in unique_keywords
                 ):
-                    # Filter out BRANPROP entries
-                    df_real = df_real[df_real["KEYWORD"] != TreeType.BRANPROP.value]
-
-                if self._tree_type == TreeType.BRANPROP:
-                    # Filter out GRUPTREE entries
-                    df_real = df_real[df_real["KEYWORD"] != TreeType.GRUPTREE.value]
+                    df_real = self._filter_by_tree_type(df_real, self._tree_type)
 
             if (
                 i > 0
@@ -222,3 +219,30 @@ GruptreeDataModel({self._ens_name!r}, {self._ens_path!r}, {self._gruptree_file!r
         df["DATE"] = pd.to_datetime(df["DATE"])
 
         return df.where(pd.notnull(df), None)
+
+    @staticmethod
+    def _filter_by_tree_type(df: pd.DataFrame, tree_type: TreeType) -> pd.DataFrame:
+        """
+        Filter dataframe to include only dates where the selected tree type is defined,
+        and only include WELSPECS nodes that belong to the selected tree type.
+
+        A WELSPECS node belongs to a tree if its parent node exists in that tree's definition.
+        """
+        # Find dates where the selected tree type is defined
+        dates_with_tree_type = df[df["KEYWORD"] == tree_type.value]["DATE"].unique()
+
+        # Filter to only include rows from those dates
+        df = df[df["DATE"].isin(dates_with_tree_type)].copy()
+
+        # Get all nodes that are defined in the selected tree type (across all dates)
+        tree_nodes = set(df[df["KEYWORD"] == tree_type.value]["CHILD"].unique())
+
+        # Keep rows that are:
+        # 1. The selected tree type itself (GRUPTREE or BRANPROP)
+        # 2. WELSPECS whose parent exists in the selected tree type
+        is_selected_tree = df["KEYWORD"] == tree_type.value
+        is_welspecs_with_valid_parent = (df["KEYWORD"] == "WELSPECS") & df[
+            "PARENT"
+        ].isin(tree_nodes)
+
+        return df[is_selected_tree | is_welspecs_with_valid_parent].copy()

webviz_subsurface/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.43'
-__version_tuple__ = version_tuple = (0, 2, 43)
+__version__ = version = '0.2.44'
+__version_tuple__ = version_tuple = (0, 2, 44)
 
 __commit_id__ = commit_id = None

webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_property_serialization/ensemble_subplot_builder.py

@@ -357,5 +357,7 @@ class EnsembleSubplotBuilder(GraphFigureBuilderBase):
         missing = vectors - set(self._selected_vectors)
         if missing:
             raise ValueError(
-                f"Unexpected vectors found: {missing}. Does not exist among selected vectors: {self._selected_vectors}"
+                f"Unexpected vectors found: {missing}."
+                f" Does not exist among selected vectors: "
+                f"{self._selected_vectors}"
             )

webviz_subsurface/plugins/_vfp_analysis/_utils/_vfp_data_model.py

@@ -241,7 +241,7 @@ def _read_vfp_arrow(filename: str) -> io.BytesIO:
     source = pa.memory_map(filename, "r")
     reader = pa.ipc.RecordBatchFileReader(source)
     pa_table = reader.read_all()
-    vfp_dict = pyarrow2basic_data(pa_table)
+    vfp_dict = pyarrow2basic_data(pa_table) or {}
 
     for key, _ in vfp_dict.items():
         # Convert types to strings

{webviz_subsurface-0.2.43.dist-info → webviz_subsurface-0.2.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webviz-subsurface
-Version: 0.2.43
+Version: 0.2.44
 Summary: Webviz config plugins for subsurface data
 Author: R&T Equinor
 License:                     GNU GENERAL PUBLIC LICENSE

{webviz_subsurface-0.2.43.dist-info → webviz_subsurface-0.2.44.dist-info}/RECORD

@@ -1,5 +1,5 @@
 webviz_subsurface/__init__.py,sha256=XUL8THCPZObkUsxDodKtE_wx-pYmQ4sATXgx5sdYa-A,3824
-webviz_subsurface/_version.py,sha256=gGfD04M45bLDbLxKefFz8XrPC5GvdOYOo_ZY_ExXwEg,706
+webviz_subsurface/_version.py,sha256=UE3tuzn9Nb3J7PpIZg2XMsX6cuf1-nUKcp_XLyKP04s,706
 webviz_subsurface/smry2arrow_batch.py,sha256=zTekRSgkUei6_DGT1ZWibd22PrFkkTQ_pnjZYvzMOL4,4129
 webviz_subsurface/_abbreviations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webviz_subsurface/_abbreviations/number_formatting.py,sha256=zElrkv3j3H6i7nbeeyKG1oE6VfNtzfrSJQYrC08Bev0,3479
@@ -36,7 +36,7 @@ webviz_subsurface/_datainput/seismic.py,sha256=7alyU9dezKgrSqiGI1R405hh5ymPDf5Cb
 webviz_subsurface/_datainput/surface.py,sha256=fxrV65AJBw1dbIyJtnfknk7DriqpotF2oi7ZDNQBheE,348
 webviz_subsurface/_datainput/units.py,sha256=xBtouLCXa4ZzNSCTjmTRfsHS3GluwTHIBh9SpzxAksA,15902
 webviz_subsurface/_datainput/well.py,sha256=9_Hi66TMqy4tkwYXugYV_lSyZFQ9SY5rQZvkpPxxnp8,6916
-webviz_subsurface/_datainput/well_completions.py,sha256=ckZug0bwoJmIBZC-h8ADnw2Ss68oKj4-DezCbDuPCr0,6269
+webviz_subsurface/_datainput/well_completions.py,sha256=f_VPGoaarXBuJ7Pwjf8RTY-mJHxL21fJgbzvYVQT3VA,6289
 webviz_subsurface/_datainput/xsection.py,sha256=X3B88ufAANzKOeHelVGIulj3cwRgMMrl6lbAq90QD4U,19126
 webviz_subsurface/_datainput/eclipse_init_io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webviz_subsurface/_datainput/eclipse_init_io/pvt_common.py,sha256=iH94cMbifEJjGC7Pj4HA8kYMPH4uXLoIlXtWy2oKo7E,30857
@@ -52,7 +52,7 @@ webviz_subsurface/_models/__init__.py,sha256=N2vfEx6bChJu9w_Vax_FslPBhNxbdWBqL6V
 webviz_subsurface/_models/caching_ensemble_set_model_factory.py,sha256=Jt7lCEpPPBhLB36V-QRyc2cvp2hF85zmiXODqKTza_I,1201
 webviz_subsurface/_models/ensemble_model.py,sha256=qic5LtPHeWRG3yzITvAihkiIxDZOuKYUFLbzc9peQcM,6288
 webviz_subsurface/_models/ensemble_set_model.py,sha256=elS5eLpktTJeeSU_44hL9SBHufDQB3SyBllUJZzdSKM,4231
-webviz_subsurface/_models/gruptree_model.py,sha256=TkPBTre3Srs7n2SJSVGbj6oWAUEaJJ811XTxCIcHjPQ,8369
+webviz_subsurface/_models/gruptree_model.py,sha256=yrYW-6FwCSJ4ClwJjqP3UeWV7ka6LcPza-Qyfp-O3Qw,9439
 webviz_subsurface/_models/inplace_volumes_model.py,sha256=AxVJzEeYgDgKfbP6ePpxqwX9I1ybVpho9PSzpzfWzEY,15877
 webviz_subsurface/_models/observation_model.py,sha256=Z9wO6KfO6FcJ99x8kq1Y2m_2bCsAiWexYjhVoJkqxAY,1629
 webviz_subsurface/_models/parameter_model.py,sha256=IZOQvEM0zjzFQUsW0MzYfbo8kRVqZNJxzbe_uDW-GJE,7284
@@ -377,7 +377,7 @@ webviz_subsurface/plugins/_simulation_time_series/_views/__init__.py,sha256=47DE
 webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/__init__.py,sha256=Yt6Piyp2IkXxdlj-alqIKd6TFZjpmOWqSwjnuQxZSmI,31
 webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_view.py,sha256=HeWZyFM77MSdHCDUhWwXORidxjlqhkD_9u9CVniRdX0,42176
 webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_property_serialization/__init__.py,sha256=E6_uX-47qAv2qVvtue08xhv4uDhZLLImH4s3WsE-ssw,180
-webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_property_serialization/ensemble_subplot_builder.py,sha256=kPInKLVH7i9LoWw0dTB0xaK_etlZA4Jp57JjL_oNcTM,14232
+webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_property_serialization/ensemble_subplot_builder.py,sha256=yrd96RMk2kJlM5CdzQkiazEzXEgDoTglR8_LfOTDMpY,14272
 webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_property_serialization/graph_figure_builder_base.py,sha256=Ys9_XDUR0fQ-rR_LGEGW8jgp-DGwukec21Mj6VJHchw,5732
 webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_property_serialization/vector_subplot_builder.py,sha256=d7phNUn2ILx6_3TwfBsL2_1ossTi4-Lfcj_5IXjKXA8,14980
 webviz_subsurface/plugins/_simulation_time_series/_views/_subplot_view/_settings/__init__.py,sha256=hDqljNMPXr18Dir-7aBnXAiCPlyHB9jLtytq8kAWXT4,298
@@ -471,7 +471,7 @@ webviz_subsurface/plugins/_vfp_analysis/__init__.py,sha256=CF23TDvv2GOK1yhW-gBvU
 webviz_subsurface/plugins/_vfp_analysis/_plugin.py,sha256=Ni2GxLCFQFpD7VcqWQzy1Oa7sOm45VuLbnM81bYUrBY,1690
 webviz_subsurface/plugins/_vfp_analysis/_types.py,sha256=t2yKFHT7Y0UL6HJ3Zv0tHdHPtZRRuXo3mUM_YLoqrJU,210
 webviz_subsurface/plugins/_vfp_analysis/_utils/__init__.py,sha256=2CzWadhrnNQGdrpGSUrvqoTCMYvp3YnXvLPWB-egk8k,52
-webviz_subsurface/plugins/_vfp_analysis/_utils/_vfp_data_model.py,sha256=l1F9jlH9ESmXM877fqgrst7A4BPXBpbP1E5e72llXPI,9658
+webviz_subsurface/plugins/_vfp_analysis/_utils/_vfp_data_model.py,sha256=b9w_E4QsEaNyxQgkhq0UZx0i8YpVH7dM3dyEwfbCZVI,9664
 webviz_subsurface/plugins/_vfp_analysis/_views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webviz_subsurface/plugins/_vfp_analysis/_views/_vfp_view/__init__.py,sha256=S6q3vFDQe98gEuO0Ku1PPjSj_He1GVz6hbuTaPalcZQ,27
 webviz_subsurface/plugins/_vfp_analysis/_views/_vfp_view/_view.py,sha256=qHkiQMfZDwkUKchM2G1sJVUgKqERCUIujCj-ly-aY1c,10035
@@ -550,10 +550,10 @@ webviz_subsurface/plugins/_well_log_viewer/controllers/_well_controller.py,sha25
 webviz_subsurface/plugins/_well_log_viewer/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 webviz_subsurface/plugins/_well_log_viewer/utils/default_color_tables.py,sha256=0UgrvygPGEAuC15vn73NCXJUQLt9Dpn5QZqqq1IJkfw,4872
 webviz_subsurface/plugins/_well_log_viewer/utils/xtgeo_well_log_to_json.py,sha256=T44-vFwvvjyo376yoL1QWDc98exG8N1cLTEzrGp-I7A,1608
-webviz_subsurface-0.2.43.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-webviz_subsurface-0.2.43.dist-info/licenses/LICENSE.chromedriver,sha256=H5UWVvf6Y7Ul6i35mriz7071dWR01cR9G-5ypnZHnpM,326542
-webviz_subsurface-0.2.43.dist-info/METADATA,sha256=qnrO7JsE6b0T_R4AVoeQJry37uayjpE61igtRKkEFoQ,46825
-webviz_subsurface-0.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-webviz_subsurface-0.2.43.dist-info/entry_points.txt,sha256=Xdu_x9E_hJBueKfSYBFAAVFzKeUrenikc8lydm9C-6A,4135
-webviz_subsurface-0.2.43.dist-info/top_level.txt,sha256=ivY5svyqFD5YI8wdJHATxBrkxfcdU2Q6fDh5E_tDrl4,18
-webviz_subsurface-0.2.43.dist-info/RECORD,,
+webviz_subsurface-0.2.44.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+webviz_subsurface-0.2.44.dist-info/licenses/LICENSE.chromedriver,sha256=H5UWVvf6Y7Ul6i35mriz7071dWR01cR9G-5ypnZHnpM,326542
+webviz_subsurface-0.2.44.dist-info/METADATA,sha256=J393mypYv94qKzP6E7dUrWuusDylgi5wBjVu7cFdO5w,46825
+webviz_subsurface-0.2.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+webviz_subsurface-0.2.44.dist-info/entry_points.txt,sha256=Xdu_x9E_hJBueKfSYBFAAVFzKeUrenikc8lydm9C-6A,4135
+webviz_subsurface-0.2.44.dist-info/top_level.txt,sha256=ivY5svyqFD5YI8wdJHATxBrkxfcdU2Q6fDh5E_tDrl4,18
+webviz_subsurface-0.2.44.dist-info/RECORD,,