Merge pull request #4643 from janezd/remove-str-settings

[FIX] Fixes for deprecations in 3.26, and for changed behaviour of file dialog

Orange/widgets/data/owcorrelations.py

@@ -248,9 +248,9 @@ class Outputs:
 
     correlation_type: int
 
-    settings_version = 2
+    settings_version = 3
     settingsHandler = DomainContextHandler()
-    selection = ContextSetting(())
+    selection = ContextSetting([])
     feature = ContextSetting(None)
     correlation_type = Setting(0)
 
@@ -307,7 +307,7 @@ def _feature_combo_changed(self):
         self.apply()
 
     def _vizrank_selection_changed(self, *args):
-        self.selection = [(var.name, vartype(var)) for var in args]
+        self.selection = list(args)
         self.commit()
 
     def _vizrank_stopped(self):
@@ -323,7 +323,7 @@ def _vizrank_select(self):
         # filtered by a feature and therefore selection could not be found
         selection_in_model = False
         if self.selection:
-            sel_names = sorted(name for name, _ in self.selection)
+            sel_names = sorted(var.name for var in self.selection)
             for i in range(model.rowCount()):
                 # pylint: disable=protected-access
                 names = sorted(x.name for x in model.data(
@@ -345,7 +345,7 @@ def set_data(self, data):
         self.clear_messages()
         self.data = data
         self.cont_data = None
-        self.selection = ()
+        self.selection = []
         if data is not None:
             if len(data) < 2:
                 self.Warning.not_enough_inst()
@@ -415,7 +415,7 @@ def commit(self):
 
         # data has been imputed; send original attributes
         self.Outputs.features.send(AttributeList(
-            [self.data.domain[name] for name, _ in self.selection]))
+            [self.data.domain[var.name] for var in self.selection]))
         self.Outputs.correlations.send(corr_table)
 
     def send_report(self):
@@ -426,8 +426,12 @@ def send_report(self):
     def migrate_context(cls, context, version):
         if version < 2:
             sel = context.values["selection"]
-            context.values["selection"] = ([(var.name, vartype(var))
-                                            for var in sel[0]], sel[1])
+            context.values["selection"] = [(var.name, vartype(var))
+                                           for var in sel[0]]
+        if version < 3:
+            sel = context.values["selection"]
+            context.values["selection"] = ([(name, vtype + 100)
+                                            for name, vtype in sel], -3)
 
 
 if __name__ == "__main__":  # pragma: no cover

Orange/widgets/data/owselectcolumns.py

@@ -9,15 +9,17 @@
 )
 
 from Orange.widgets import gui, widget
-from Orange.widgets.data.contexthandlers import \
-    SelectAttributesDomainContextHandler
-from Orange.widgets.settings import ContextSetting, Setting
-from Orange.widgets.utils.listfilter import VariablesListItemView, slices, variables_filter
+from Orange.widgets.settings import (
+    ContextSetting, Setting, DomainContextHandler
+)
+from Orange.widgets.utils import vartype
+from Orange.widgets.utils.listfilter import (
+    VariablesListItemView, slices, variables_filter
+)
 from Orange.widgets.utils.widgetpreview import WidgetPreview
 from Orange.widgets.utils.state_summary import format_summary_details
 from Orange.widgets.widget import Input, Output, AttributeList, Msg
 from Orange.data.table import Table
-from Orange.widgets.utils import vartype
 from Orange.widgets.utils.itemmodels import VariableListModel
 import Orange
 
@@ -99,6 +101,45 @@ def dropMimeData(self, mime, action, row, column, parent):
         return True
 
 
+class SelectAttributesDomainContextHandler(DomainContextHandler):
+    def encode_setting(self, context, setting, value):
+        if setting.name == 'domain_role_hints':
+            value = {(var.name, vartype(var)): role_i
+                     for var, role_i in value.items()}
+        return super().encode_setting(context, setting, value)
+
+    def decode_setting(self, setting, value, domain=None):
+        decoded = super().decode_setting(setting, value, domain)
+        if setting.name == 'domain_role_hints':
+            decoded = {domain[name]: role_i
+                       for (name, _), role_i in decoded.items()}
+        return decoded
+
+    def match(self, context, domain, attrs, metas):
+        if not "domain_role_hints" in context.values:
+            return self.NO_MATCH
+
+        all_vars = attrs.copy()
+        all_vars.update(metas)
+        value = context.values["domain_role_hints"][0]
+        assigned = [desc for desc, (role, _) in value.items()
+                    if role != "available"]
+        return assigned and \
+               sum(all_vars.get(attr) == vtype for attr, vtype in assigned) \
+               / len(assigned)
+
+    def filter_value(self, setting, data, domain, attrs, metas):
+        if setting.name != "domain_role_hints":
+            return super().filter_value(setting, data, domain, attrs, metas)
+
+        all_vars = attrs.copy()
+        all_vars.update(metas)
+        value = data["domain_role_hints"][0].items()
+        data["domain_role_hints"] = {desc: role_i
+                                     for desc, role_i in value
+                                     if all_vars.get(desc[0]) == desc[1]}
+
+
 class OWSelectAttributes(widget.OWWidget):
     # pylint: disable=too-many-instance-attributes
     name = "Select Columns"
@@ -305,68 +346,52 @@ def __used_attrs_changed(self):
     def set_data(self, data=None):
         self.update_domain_role_hints()
         self.closeContext()
+        self.domain_role_hints = {}
+
         self.data = data
-        if data is not None:
-            self.openContext(data)
-            all_vars = data.domain.variables + data.domain.metas
-
-            var_sig = lambda attr: (attr.name, vartype(attr))
-
-            domain_hints = {var_sig(attr): ("attribute", i)
-                            for i, attr in enumerate(data.domain.attributes)}
-
-            domain_hints.update({var_sig(attr): ("meta", i)
-                                 for i, attr in enumerate(data.domain.metas)})
-
-            if data.domain.class_vars:
-                domain_hints.update(
-                    {var_sig(attr): ("class", i)
-                     for i, attr in enumerate(data.domain.class_vars)})
-
-            # update the hints from context settings
-            domain_hints.update(self.domain_role_hints)
-
-            attrs_for_role = lambda role: [
-                (domain_hints[var_sig(attr)][1], attr)
-                for attr in all_vars if domain_hints[var_sig(attr)][0] == role]
-
-            attributes = [
-                attr for place, attr in sorted(attrs_for_role("attribute"),
-                                               key=lambda a: a[0])]
-            classes = [
-                attr for place, attr in sorted(attrs_for_role("class"),
-                                               key=lambda a: a[0])]
-            metas = [
-                attr for place, attr in sorted(attrs_for_role("meta"),
-                                               key=lambda a: a[0])]
-            available = [
-                attr for place, attr in sorted(attrs_for_role("available"),
-                                               key=lambda a: a[0])]
-
-            self.used_attrs[:] = attributes
-            self.class_attrs[:] = classes
-            self.meta_attrs[:] = metas
-            self.available_attrs[:] = available
-            self.info.set_input_summary(len(data), format_summary_details(data))
-        else:
+        if data is None:
             self.used_attrs[:] = []
             self.class_attrs[:] = []
             self.meta_attrs[:] = []
             self.available_attrs[:] = []
             self.info.set_input_summary(self.info.NoInput)
+            return
+
+        self.openContext(data)
+        all_vars = data.domain.variables + data.domain.metas
+
+        def attrs_for_role(role):
+            return [attr for _, attr in sorted(
+                (domain_hints[attr][1], attr)
+                for attr in all_vars if domain_hints[attr][0] == role)]
+
+        domain = data.domain
+        domain_hints = {}
+        domain_hints.update(self._hints_from_seq("attribute", domain.attributes))
+        domain_hints.update(self._hints_from_seq("meta", domain.metas))
+        domain_hints.update(self._hints_from_seq("class", domain.class_vars))
+        domain_hints.update(self.domain_role_hints)
+
+        self.used_attrs[:] = attrs_for_role("attribute")
+        self.class_attrs[:] = attrs_for_role("class")
+        self.meta_attrs[:] = attrs_for_role("meta")
+        self.available_attrs[:] = attrs_for_role("available")
+        self.info.set_input_summary(len(data), format_summary_details(data))
 
     def update_domain_role_hints(self):
         """ Update the domain hints to be stored in the widgets settings.
         """
-        hints_from_model = lambda role, model: [
-            ((attr.name, vartype(attr)), (role, i))
-            for i, attr in enumerate(model)]
-        hints = dict(hints_from_model("available", self.available_attrs))
-        hints.update(hints_from_model("attribute", self.used_attrs))
-        hints.update(hints_from_model("class", self.class_attrs))
-        hints.update(hints_from_model("meta", self.meta_attrs))
+        hints = {}
+        hints.update(self._hints_from_seq("available", self.available_attrs))
+        hints.update(self._hints_from_seq("attribute", self.used_attrs))
+        hints.update(self._hints_from_seq("class", self.class_attrs))
+        hints.update(self._hints_from_seq("meta", self.meta_attrs))
         self.domain_role_hints = hints
 
+    @staticmethod
+    def _hints_from_seq(role, model):
+        return [(attr, (role, i)) for i, attr in enumerate(model)]
+
     @Inputs.features
     def set_features(self, features):
         self.features = features

Orange/widgets/data/tests/test_owfile.py

@@ -374,11 +374,22 @@ def test_read_format(self):
         def open_iris_with_no_spec_format(_a, _b, _c, filters, _e):
             return iris.__file__, filters.split(";;")[0]
 
+        """
+        orangewidgets.utils.filedialogs.open_filename_dialog changed behaviour
+        in https://github.com/biolab/orange-widget-base/pull/53. Until it is
+        released, one of the following tests fails, so this test is disabled.
+        If you read this and orange-widget-base has already been released,
+        uncomment this code and remove the first test
+
         with patch("AnyQt.QtWidgets.QFileDialog.getOpenFileName",
                    open_iris_with_no_spec_format):
             self.widget.browse_file()
 
+        # Worked before
         self.assertIsNone(self.widget.recent_paths[0].file_format)
+        # Works after
+        self.assertEqual(self.widget.recent_paths[0].file_format, "Orange.data.io.TabReader")
+        """
 
         def open_iris_with_tab(*_):
             return iris.__file__, format_filter(TabReader)

Orange/widgets/data/tests/test_owselectcolumns.py

@@ -6,14 +6,13 @@
 from AnyQt.QtGui import QDragEnterEvent
 
 from Orange.data import Table, ContinuousVariable, DiscreteVariable, Domain
-from Orange.widgets.data.contexthandlers import \
-    SelectAttributesDomainContextHandler
 from Orange.widgets.settings import ContextSetting
 from Orange.widgets.utils import vartype
 from Orange.widgets.utils.state_summary import format_summary_details
 from Orange.widgets.tests.base import WidgetTest
 from Orange.widgets.data.owselectcolumns \
-    import OWSelectAttributes, VariablesListItemModel
+    import OWSelectAttributes, VariablesListItemModel, \
+    SelectAttributesDomainContextHandler
 from Orange.widgets.data.owrank import OWRank
 from Orange.widgets.widget import AttributeList
 
@@ -56,20 +55,21 @@ def test_open_context(self):
 
         widget = SimpleWidget()
         self.handler.initialize(widget)
-        self.handler.open_context(widget, self.args[0])
+        domain = self.args[0]
+        self.handler.open_context(widget, domain)
         self.assertEqual(widget.domain_role_hints,
-                         {('d1', Discrete): ('available', 0),
-                          ('d2', Discrete): ('meta', 0),
-                          ('c1', Continuous): ('attribute', 0),
-                          ('d3', Discrete): ('attribute', 1),
-                          ('d4', Discrete): ('attribute', 2),
-                          ('c2', Continuous): ('class', 0)})
+                         {domain['d1']: ('available', 0),
+                          domain['d2']: ('meta', 0),
+                          domain['c1']: ('attribute', 0),
+                          domain['d3']: ('attribute', 1),
+                          domain['d4']: ('attribute', 2),
+                          domain['c2']: ('class', 0)})
 
     def test_open_context_with_imperfect_match(self):
         self.handler.bind(SimpleWidget)
         context1 = Mock(values=dict(
             domain_role_hints=({('d1', Discrete): ('attribute', 0),
-                                ('m2', Discrete): ('meta', 0)})
+                                ('m2', Discrete): ('meta', 0)}, -2)
         ))
         context = Mock(values=dict(
             domain_role_hints=({('d1', Discrete): ('available', 0),
@@ -84,30 +84,14 @@ def test_open_context_with_imperfect_match(self):
 
         widget = SimpleWidget()
         self.handler.initialize(widget)
-        self.handler.open_context(widget, self.args[0])
+        domain = self.args[0]
+        self.handler.open_context(widget, domain)
 
         self.assertEqual(widget.domain_role_hints,
-                         {('d1', Discrete): ('available', 0),
-                          ('d2', Discrete): ('meta', 0),
-                          ('c1', Continuous): ('attribute', 0),
-                          ('c2', Continuous): ('class', 0)})
-
-    def test_open_context_with_no_match(self):
-        self.handler.bind(SimpleWidget)
-        context = Mock(values=dict(
-            domain_role_hints=({('d1', Discrete): ('available', 0),
-                                ('d2', Discrete): ('meta', 0),
-                                ('c1', Continuous): ('attribute', 0),
-                                ('d3', Discrete): ('attribute', 1),
-                                ('d4', Discrete): ('attribute', 2),
-                                ('c2', Continuous): ('class', 0)}, -2),
-            required=('g1', Continuous),
-        ))
-        self.handler.global_contexts = [context]
-        widget = SimpleWidget()
-        self.handler.initialize(widget)
-        self.handler.open_context(widget, self.args[0])
-        self.assertEqual(widget.domain_role_hints, {})
+                         {domain['d1']: ('available', 0),
+                          domain['d2']: ('meta', 0),
+                          domain['c1']: ('attribute', 0),
+                          domain['c2']: ('class', 0)})
 
 
 class TestModel(TestCase):