Skip to content

Commit

Permalink
Remove troubleshoot print statements
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-eq committed Dec 19, 2024
1 parent 2fe1d74 commit f073d13
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 19 deletions.
10 changes: 0 additions & 10 deletions src/ert/gui/ertwidgets/ensembleselector.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ def __init__(
notifier.storage_changed.connect(self.populate)

if notifier.is_storage_available:
print("populating from notifier available storage")
self.populate()

@property
Expand All @@ -65,7 +64,6 @@ def selected_ensemble(self) -> Ensemble:
return itemData

Check failure on line 64 in src/ert/gui/ertwidgets/ensembleselector.py

View workflow job for this annotation

GitHub Actions / type-checking (3.12)

Incompatible return value type (got "LocalEnsemble | None", expected "LocalEnsemble")

def populate(self) -> None:
print("CALLED POPULATE")
block = self.blockSignals(True)

self.clear()
Expand All @@ -82,9 +80,6 @@ def populate(self) -> None:
self._show_only_with_valid_experiment
and not ensemble.experiment.is_valid()
):
print(
f"FOUND INVALID EXPERIMENT {ensemble.experiment_id} FOR ENSEMBLE {ensemble.name}"
)
index = self.count() - 1
model_item = model.item(index)

Check failure on line 84 in src/ert/gui/ertwidgets/ensembleselector.py

View workflow job for this annotation

GitHub Actions / type-checking (3.12)

Item "QAbstractItemModel" of "QAbstractItemModel | None" has no attribute "item"

Check failure on line 84 in src/ert/gui/ertwidgets/ensembleselector.py

View workflow job for this annotation

GitHub Actions / type-checking (3.12)

Item "None" of "QAbstractItemModel | None" has no attribute "item"
model_item.setFlags(
Expand All @@ -103,12 +98,10 @@ def populate(self) -> None:
self.setCurrentIndex(max(current_index, 0))

self.blockSignals(block)
print("EMITTING ENSEMBLE POPULATED")
self.ensemble_populated.emit()

def _ensemble_list(self) -> Iterable[Ensemble]:
if self._show_only_undefined:
print("JONAK1")
ensembles = (
ensemble
for ensemble in self.notifier.storage.ensembles
Expand All @@ -121,7 +114,6 @@ def _ensemble_list(self) -> Iterable[Ensemble]:
ensembles = self.notifier.storage.ensembles
ensemble_list = list(ensembles)
if self._show_only_with_valid_experiment:
print("FILTERED")
ensemble_list = [ens for ens in ensemble_list if ens.experiment.is_valid()]
if self._show_only_no_children:
parents = [
Expand All @@ -131,9 +123,7 @@ def _ensemble_list(self) -> Iterable[Ensemble]:
return sorted(ensemble_list, key=lambda x: x.started_at, reverse=True)

def _on_current_index_changed(self, index: int) -> None:
print("ON CURRENT INDEX CHANGED")
self.notifier.set_current_ensemble(self.itemData(index))

def _on_global_current_ensemble_changed(self, data: Ensemble | None) -> None:
print("ON GLOBAL CURRENT ENSEMBLE CHANGED")
self.setCurrentIndex(max(self.findData(data, Qt.ItemDataRole.UserRole), 0))
6 changes: 3 additions & 3 deletions src/ert/gui/simulation/evaluate_ensemble_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ def __init__(self, ensemble_size: int, run_path: str, notifier: ErtNotifier):
lab.setWordWrap(True)
lab.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
layout.addRow(lab)
self._ensemble_selector = EnsembleSelector(notifier, show_only_no_children=True)
self._ensemble_selector = EnsembleSelector(
notifier, show_only_no_children=True, show_only_with_valid_experiment=True
)
layout.addRow("Ensemble:", self._ensemble_selector)
runpath_label = CopyableLabel(text=run_path)
layout.addRow("Runpath:", runpath_label)
Expand Down Expand Up @@ -73,15 +75,13 @@ def isConfigurationValid(self) -> bool:
)

def get_experiment_arguments(self) -> Arguments:
print("GET_EXPERIMENT_ARGUMENTS")
return Arguments(
mode=EVALUATE_ENSEMBLE_MODE,
ensemble_id=str(self._ensemble_selector.selected_ensemble.id),
realizations=self._active_realizations_field.text(),
)

def _realizations_from_fs(self) -> None:
print("REALIZATIONS_FROM_FS")
ensemble = self._ensemble_selector.selected_ensemble
self._active_realizations_field.setEnabled(ensemble is not None)
if ensemble:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ def _add_initialize_from_scratch_tab(self) -> None:

ensemble_layout = QHBoxLayout()
ensemble_label = QLabel("Target ensemble:")
ensemble_selector = EnsembleSelector(self.notifier, show_only_undefined=True)
ensemble_selector = EnsembleSelector(
self.notifier,
show_only_undefined=True,
show_only_with_valid_experiment=True,
)
ensemble_selector.setMinimumWidth(300)
ensemble_layout.addWidget(ensemble_label)
ensemble_layout.addWidget(ensemble_selector)
Expand Down
21 changes: 16 additions & 5 deletions src/ert/gui/tools/manage_experiments/storage_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def __init__(self, ensemble: Ensemble, parent: Any):
self._id = ensemble.id
self._start_time = ensemble.started_at
self._children: list[RealizationModel] = []
self._error = ensemble.experiment.error_message

def add_realization(self, realization: RealizationModel) -> None:
self._children.append(realization)
Expand All @@ -75,25 +76,28 @@ def row(self) -> int:
def data(self, index: QModelIndex, role: Qt.ItemDataRole) -> Any:
if not index.isValid():
return None

print(f"{self=}")
col = index.column()
if role == Qt.ItemDataRole.DisplayRole:
if col == _Column.NAME:
return self._name
if col == _Column.TIME:
return humanize.naturaltime(self._start_time)
elif role == Qt.ItemDataRole.ToolTipRole:
if self._error:
print("FOUND ERROR TOOLTIP")
return self._error
if col == _Column.TIME:
return str(self._start_time)

return None


class ExperimentModel:
def __init__(self, experiment: Experiment, parent: Any):
class ExperimentModel(QAbstractItemModel):
def __init__(self, experiment: Experiment, parent: "StorageModel"):
self._parent = parent
self._id = experiment.id
self._name = experiment.name
self._is_valid = experiment.is_valid()
self._experiment_type = experiment.metadata.get("ensemble_type")
self._children: list[EnsembleModel] = []

Expand All @@ -105,6 +109,14 @@ def row(self) -> int:
return self._parent._children.index(self)
return 0

def flags(self, index: QModelIndex) -> Qt.ItemFlag:

Check failure on line 112 in src/ert/gui/tools/manage_experiments/storage_model.py

View workflow job for this annotation

GitHub Actions / type-checking (3.12)

Return type "ItemFlag" of "flags" incompatible with return type "ItemFlags" in supertype "QAbstractItemModel"
print(f"2.{self=}")
return (
Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable

Check failure on line 115 in src/ert/gui/tools/manage_experiments/storage_model.py

View workflow job for this annotation

GitHub Actions / type-checking (3.12)

Incompatible return value type (got "int | None", expected "ItemFlag")
if self._is_valid
else None
)

def data(
self, index: QModelIndex, role: Qt.ItemDataRole = Qt.ItemDataRole.DisplayRole

Check failure on line 121 in src/ert/gui/tools/manage_experiments/storage_model.py

View workflow job for this annotation

GitHub Actions / type-checking (3.12)

Argument 2 of "data" is incompatible with supertype "QAbstractItemModel"; supertype defines the argument type as "int"
) -> Any:
Expand All @@ -128,7 +140,6 @@ def data(
qapp = QApplication.instance()
assert isinstance(qapp, QApplication)
return qapp.palette().mid()

return None


Expand Down

0 comments on commit f073d13

Please sign in to comment.