Fix cyclic imports (#101)

equinor · Sep 30, 2019 · 4914d92 · 4914d92
1 parent b7aca88
commit 4914d92
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/webviz_subsurface/containers/_reservoir_simulation_timeseries.py b/webviz_subsurface/containers/_reservoir_simulation_timeseries.py
@@ -14,6 +14,13 @@
 from webviz_config.containers import WebvizContainer
 from webviz_config.common_cache import cache
 
+from ..datainput import (
+    get_time_series_data,
+    get_time_series_statistics,
+    get_time_series_delta_ens,
+    get_time_series_delta_ens_stats,
+)
+
 # =============================================================================
 # Container
 # =============================================================================

diff --git a/webviz_subsurface/datainput/__init__.py b/webviz_subsurface/datainput/__init__.py
@@ -8,7 +8,13 @@
 from ._intersect import load_surface, get_wfence, get_hfence
 from ._inplace_volumes import extract_volumes
 from ._fmu_input import load_parameters, get_realizations, find_surfaces
-
+from ._reservoir_simulation_timeseries import (
+    get_time_series_data,
+    get_time_series_statistics,
+    get_time_series_delta_ens,
+    load_ensemble_set,
+    get_time_series_delta_ens_stats,
+)
 
 __all__ = [
     "scratch_ensemble",
@@ -17,6 +23,11 @@
     "get_wfence",
     "get_hfence",
     "extract_volumes",
+    "load_ensemble_set",
+    "get_time_series_data",
+    "get_time_series_statistics",
+    "get_time_series_delta_ens",
+    "get_time_series_delta_ens_stats",
     "load_parameters",
     "get_realizations",
     "find_surfaces",

diff --git a/webviz_subsurface/datainput/_reservoir_simulation_timeseries.py b/webviz_subsurface/datainput/_reservoir_simulation_timeseries.py
@@ -7,7 +7,7 @@
 except ImportError:  # fmu.ensemble is an optional dependency, e.g.
     pass  # for a portable webviz instance, it is never used.
 
-from ..datainput import scratch_ensemble
+from ._history_match import scratch_ensemble
 
 
 @cache.memoize(timeout=cache.TIMEOUT)