Merge pull request #316 from OpenGeoscience/ruff

Author: brianhelba

jupyter/geodatalytics_explorer.py

@@ -212,7 +212,7 @@ def get_datasets(self, *args):
             for dataset in datasets:
                 node = Node(dataset.get("name"), icon="database")
                 node.observe(self.get_dataset_layers, "selected")
-                self.tree_nodes[node._id] = dataset
+                self.tree_nodes[node._id] = dataset  # noqa: SLF001
                 self.tree.add_node(node)
 
             children = [self.tree, self.output]
@@ -223,7 +223,7 @@ def get_dataset_layers(self, event):
             node = event.get("owner")
             for child in node.nodes:
                 node.remove_node(child)
-            node_id = node._id
+            node_id = node._id  # noqa: SLF001
             dataset = self.tree_nodes[node_id]
             dataset_id = dataset.get("id")
 
@@ -234,13 +234,13 @@ def get_dataset_layers(self, event):
             for layer in layers:
                 child_node = Node(layer.get("name"), icon="file")
                 child_node.observe(self.select_layer, "selected")
-                self.tree_nodes[child_node._id] = layer
+                self.tree_nodes[child_node._id] = layer  # noqa: SLF001
                 node.add_node(child_node)
 
     def select_layer(self, event):
         with self.output:
             node = event.get("owner")
-            node_id = node._id
+            node_id = node._id  # noqa: SLF001
             layer = self.tree_nodes[node_id]
 
             self.map = LayerRepresentation(

pyproject.toml

@@ -171,8 +171,6 @@ ignore = [
   # Project-specific
   "BLE001", # blind-except
   "PLC0415", # import-outside-top-level
-  "PLW2901", # redefined-loop-name
-  "SLF001", # private-member-access
   "TRY301", # raise-within-try
 ]
 

uvdat/core/rest/analytics.py

@@ -33,10 +33,12 @@ def list_types(self, request, project_id: int, **kwargs):
             for k, v in instance.get_input_options().items():
                 if isinstance(v, QuerySet):
                     filtered_queryset = v.filter_by_projects(Project.objects.filter(id=project_id))
-                    v = [{"id": o.id, "name": o.name} for o in filtered_queryset]
+                    options = [{"id": o.id, "name": o.name} for o in filtered_queryset]
                 elif any(not isinstance(o, dict) for o in v):
-                    v = [{"id": o, "name": o} for o in v]
-                filtered_input_options[k] = v
+                    options = [{"id": o, "name": o} for o in v]
+                else:
+                    options = v
+                filtered_input_options[k] = options
             serializer = uvdat_serializers.AnalysisTypeSerializer(
                 data={
                     "name": instance.name,