Merge pull request #230 from OpenGeoscience/type-fixes

brianhelba · web-flow · commit 0cccb8ef3c0f · 2025-11-20T12:54:52.000-05:00
Fix miscellaneous type issues detected by MyPy
diff --git a/geoinsight/core/management/commands/makeclient.py b/geoinsight/core/management/commands/makeclient.py
@@ -16,7 +16,7 @@ def handle(self, **kwargs):
         if client_id is None:
             raise CommandError('Environment variable VUE_APP_OAUTH_CLIENT_ID is not set.')
 
-        site = Site.objects.get_current()  # type: ignore
+        site = Site.objects.get_current()
         site.domain = 'geoinsight.demo'
         site.name = 'GeoInsight'
         site.save()
diff --git a/geoinsight/core/migrations/0015_style_configs.py b/geoinsight/core/migrations/0015_style_configs.py
@@ -5,6 +5,7 @@
 import django.db.models.deletion
 
 import geoinsight
+import geoinsight.core.models.styles
 
 
 class Migration(migrations.Migration):
diff --git a/geoinsight/core/models/__init__.py b/geoinsight/core/models/__init__.py
@@ -18,26 +18,26 @@
 from .task_result import TaskResult
 
 __all__ = [
-    TaskResult,
-    Chart,
-    Colormap,
-    Project,
-    Dataset,
-    DatasetTag,
-    FileItem,
-    RasterData,
-    VectorData,
-    VectorFeature,
-    Layer,
-    LayerFrame,
-    LayerStyle,
-    ColorConfig,
-    ColormapConfig,
-    SizeConfig,
-    SizeRangeConfig,
-    FilterConfig,
-    Region,
-    Network,
-    NetworkEdge,
-    NetworkNode,
+    'TaskResult',
+    'Chart',
+    'Colormap',
+    'Project',
+    'Dataset',
+    'DatasetTag',
+    'FileItem',
+    'RasterData',
+    'VectorData',
+    'VectorFeature',
+    'Layer',
+    'LayerFrame',
+    'LayerStyle',
+    'ColorConfig',
+    'ColormapConfig',
+    'SizeConfig',
+    'SizeRangeConfig',
+    'FilterConfig',
+    'Region',
+    'Network',
+    'NetworkEdge',
+    'NetworkNode',
 ]
diff --git a/geoinsight/core/models/dataset.py b/geoinsight/core/models/dataset.py
@@ -29,7 +29,7 @@ class Meta:
     def __str__(self):
         return f'{self.name} ({self.id})'
 
-    def owner(self) -> User:
+    def owner(self) -> User | None:
         users = typing.cast(
             list[User], list(get_users_with_perms(self, only_with_perms_in=['owner']))
         )
@@ -59,7 +59,7 @@ def set_owner(self, user: User):
         assign_perm('owner', user, self)
 
     @transaction.atomic()
-    def set_tags(self, tags: [str]):
+    def set_tags(self, tags: list[str]):
         for tag in tags:
             DatasetTag.objects.get_or_create(tag=tag)
         self.tags.set(DatasetTag.objects.filter(tag__in=tags))
diff --git a/geoinsight/core/rest/__init__.py b/geoinsight/core/rest/__init__.py
@@ -11,18 +11,18 @@
 from .user import UserViewSet
 
 __all__ = [
-    AnalyticsViewSet,
-    ChartViewSet,
-    ColormapViewSet,
-    LayerViewSet,
-    LayerFrameViewSet,
-    LayerStyleViewSet,
-    RasterDataViewSet,
-    VectorDataViewSet,
-    DatasetViewSet,
-    FileItemViewSet,
-    NetworkViewSet,
-    ProjectViewSet,
-    RegionViewSet,
-    UserViewSet,
+    'AnalyticsViewSet',
+    'ChartViewSet',
+    'ColormapViewSet',
+    'LayerViewSet',
+    'LayerFrameViewSet',
+    'LayerStyleViewSet',
+    'RasterDataViewSet',
+    'VectorDataViewSet',
+    'DatasetViewSet',
+    'FileItemViewSet',
+    'NetworkViewSet',
+    'ProjectViewSet',
+    'RegionViewSet',
+    'UserViewSet',
 ]
diff --git a/geoinsight/core/rest/analytics.py b/geoinsight/core/rest/analytics.py
@@ -83,7 +83,7 @@ def run(self, request, project_id: int, task_type: str, **kwargs):
         )
         if analysis_type_class is None or not analysis_type_class.is_enabled():
             return Response(f'Analysis type "{task_type}" not found', status=404)
-        result = analysis_type_class().run_task(project, **request.data)
+        result = analysis_type_class().run_task(project=project, **request.data)
         return Response(
             geoinsight_serializers.TaskResultSerializer(result).data,
             status=200,
diff --git a/geoinsight/core/rest/chart.py b/geoinsight/core/rest/chart.py
@@ -17,7 +17,7 @@ class ChartViewSet(ModelViewSet):
 
     def get_queryset(self):
         qs = super().get_queryset()
-        project_id: str = self.request.query_params.get('project')
+        project_id: str | None = self.request.query_params.get('project')
         if project_id is None or not project_id.isdigit():
             return qs
 
diff --git a/geoinsight/core/rest/dataset.py b/geoinsight/core/rest/dataset.py
@@ -24,7 +24,7 @@ class DatasetViewSet(ModelViewSet):
 
     def get_queryset(self):
         qs = super().get_queryset()
-        project_id: str = self.request.query_params.get('project')
+        project_id: str | None = self.request.query_params.get('project')
         if project_id is None or not project_id.isdigit():
             return qs
 
diff --git a/geoinsight/core/rest/file_item.py b/geoinsight/core/rest/file_item.py
@@ -21,7 +21,7 @@ class FileItemViewSet(ModelViewSet):
 
     def get_queryset(self):
         qs = super().get_queryset()
-        project_id: str = self.request.query_params.get('project')
+        project_id: str | None = self.request.query_params.get('project')
         if project_id is None or not project_id.isdigit():
             return qs
 
diff --git a/geoinsight/core/rest/project.py b/geoinsight/core/rest/project.py
@@ -34,14 +34,13 @@ def permissions(self, request: Request, *args: Any, **kwargs: Any):
 
         # Only the owner can modify project permissions
         project: Project = self.get_object()
-        if not user.has_perm('owner', project):  # type: ignore
+        if not user.has_perm('owner', project):
             return Response(status=403)
 
         serializer = ProjectPermissionsSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
 
         data = serializer.validated_data
-        project: Project = self.get_object()
         project.set_permissions(
             owner=User.objects.get(id=data['owner_id']),
             collaborator=list(User.objects.filter(id__in=data['collaborator_ids'])),
diff --git a/geoinsight/core/tasks/analytics/__init__.py b/geoinsight/core/tasks/analytics/__init__.py
@@ -6,7 +6,7 @@
 from .network_recovery import NetworkRecovery
 from .tile2net_segmentation import Tile2NetSegmentation
 
-analysis_types: list[AnalysisType] = [
+analysis_types: list[type[AnalysisType]] = [
     FloodSimulation,
     FloodNetworkFailure,
     NetworkRecovery,
@@ -15,4 +15,4 @@
     CreateRoadNetwork,
 ]
 
-__all__ = list(analysis_types)
+__all__ = [analysis_type.__name__ for analysis_type in analysis_types]
diff --git a/geoinsight/core/tasks/analytics/analysis_type.py b/geoinsight/core/tasks/analytics/analysis_type.py
@@ -3,21 +3,22 @@
 
 class AnalysisType(ABC):
     def __init__(self, *args):
-        self.name = None
-        self.description = None
-        self.db_value = None  # cannot be longer than 25 characters
+        self.name = ''
+        self.description = ''
+        self.db_value = ''  # cannot be longer than 25 characters
         self.input_types = {}
         self.output_types = {}
         self.attribution = 'Kitware, Inc.'
 
+    @classmethod
     @abstractmethod
-    def is_enabled(self):
+    def is_enabled(cls):
         raise NotImplementedError
 
     @abstractmethod
     def get_input_options(self):
         raise NotImplementedError
 
     @abstractmethod
-    def run_task(self, **inputs):
+    def run_task(self, *, project, **inputs):
         raise NotImplementedError
diff --git a/geoinsight/core/tasks/analytics/create_road_network.py b/geoinsight/core/tasks/analytics/create_road_network.py
@@ -37,7 +37,7 @@ def is_enabled(cls):
     def get_input_options(self):
         return {'location': []}
 
-    def run_task(self, project, **inputs):
+    def run_task(self, *, project, **inputs):
         location = inputs.get('location')
         result = TaskResult.objects.create(
             name=f'Create Road Network for {location}',
@@ -81,7 +81,7 @@ def create_road_network(result_id):
             name=name,
             description='Network generated by OSMnx from OpenStreetMap data',
             category='transportation',
-            metadata={'creation_time': datetime.datetime.now(datetime.UTC).isoformat()},
+            metadata={'creation_time': datetime.datetime.now(datetime.timezone.utc).isoformat()},
         )
         dataset.set_tags(['analytics', 'osmnx', 'network'])
         vector_data = VectorData.objects.create(
diff --git a/geoinsight/core/tasks/analytics/flood_network_failure.py b/geoinsight/core/tasks/analytics/flood_network_failure.py
@@ -41,7 +41,7 @@ def get_input_options(self):
             'station_radius_meters': [10, 15, 20, 25, 30, 35, 40, 45, 50],
         }
 
-    def run_task(self, project, **inputs):
+    def run_task(self, *, project, **inputs):
         result = TaskResult.objects.create(
             name='Flood Network Failure',
             task_type=self.db_value,
diff --git a/geoinsight/core/tasks/analytics/flood_simulation.py b/geoinsight/core/tasks/analytics/flood_simulation.py
@@ -48,7 +48,7 @@ def get_input_options(self):
             'annual_probability': [dict(min=0, max=1, step=0.01)],
         }
 
-    def run_task(self, project, **inputs):
+    def run_task(self, *, project, **inputs):
         result = TaskResult.objects.create(
             name='Flood Simulation',
             task_type=self.db_value,
@@ -193,7 +193,7 @@ def flood_simulation(result_id):
                     gw_percentile=gw_percentile,
                     annual_probability=annual_probability,
                 ),
-                uploaded=datetime.datetime.now(datetime.UTC).isoformat(),
+                uploaded=datetime.datetime.now(datetime.timezone.utc).isoformat(),
             )
             name_match = Dataset.objects.filter(name__icontains=name)
             if name_match.count() > 0:
diff --git a/geoinsight/core/tasks/analytics/geoai_segmentation.py b/geoinsight/core/tasks/analytics/geoai_segmentation.py
@@ -46,7 +46,7 @@ def get_input_options(self):
             'smoothing_sigma': [dict(min=0, max=1, step=0.01)],
         }
 
-    def run_task(self, project, **inputs):
+    def run_task(self, *, project, **inputs):
         prompt = inputs.get('segmentation_prompt', '')
         result = TaskResult.objects.create(
             name=f'Segment {prompt}',
@@ -144,7 +144,7 @@ def geoai_segmentation(result_id):
                 description='Segmentation generated by GeoAI from aerial imagery',
                 category='segmentation',
                 metadata={
-                    'creation_time': datetime.datetime.now(datetime.UTC).isoformat(),
+                    'creation_time': datetime.datetime.now(datetime.timezone.utc).isoformat(),
                     'api': 'https://opengeoai.org/geoai/?h=clipseg#geoai.geoai.CLIPSegmentation',
                 },
             )
diff --git a/geoinsight/core/tasks/analytics/network_recovery.py b/geoinsight/core/tasks/analytics/network_recovery.py
@@ -59,7 +59,7 @@ def get_input_options(self):
             'recovery_mode': RECOVERY_MODES,
         }
 
-    def run_task(self, project, **inputs):
+    def run_task(self, *, project, **inputs):
         result = TaskResult.objects.create(
             name='Network Recovery',
             task_type=self.db_value,
diff --git a/geoinsight/core/tasks/analytics/tile2net_segmentation.py b/geoinsight/core/tasks/analytics/tile2net_segmentation.py
@@ -34,7 +34,7 @@ def is_enabled(cls):
     def get_input_options(self):
         return {'aerial_imagery': RasterData.objects.filter(dataset__category='imagery')}
 
-    def run_task(self, project, **inputs):
+    def run_task(self, *, project, **inputs):
         result = TaskResult.objects.create(
             name='Tile2Net Segmentation',
             task_type=self.db_value,
@@ -127,7 +127,9 @@ def tile2net_segmentation(result_id):
                             description='Segmentation generated by tile2net from orthoimagery',
                             category='segmentation',
                             metadata={
-                                'creation_time': datetime.datetime.now(datetime.UTC).isoformat()
+                                'creation_time': datetime.datetime.now(
+                                    datetime.timezone.utc
+                                ).isoformat()
                             },
                         )
                         dataset.set_tags(['analytics', 'segmentation', 'imagery'])
diff --git a/geoinsight/core/tasks/conversion.py b/geoinsight/core/tasks/conversion.py
@@ -67,7 +67,7 @@ def get_cog_path(file):
 
 
 def convert_files(*files, file_item=None, combine=False):
-    source_projection = 4326
+    source_projection = 'epsg:4326'
     geodata_set = []
     cog_set = []
     metadata = dict(source_filenames=[])
diff --git a/geoinsight/core/tests/test_network.py b/geoinsight/core/tests/test_network.py
@@ -27,9 +27,7 @@ def test_rest_dataset_networks(authenticated_api_client, project: Project, netwo
 
     data: list[dict] = resp.json()
     assert len(data) == 1
-
-    data: dict = data[0]
-    assert len(data['nodes']) == 2
+    assert len(data[0]['nodes']) == 2
 
 
 @pytest.mark.django_db

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ def run(self, request, project_id: int, task_type: str, **kwargs):`
`83`	`83`	`)`
`84`	`84`	`if analysis_type_class is None or not analysis_type_class.is_enabled():`
`85`	`85`	`return Response(f'Analysis type "{task_type}" not found', status=404)`
`86`		`- result = analysis_type_class().run_task(project, **request.data)`
	`86`	`+ result = analysis_type_class().run_task(project=project, **request.data)`
`87`	`87`	`return Response(`
`88`	`88`	`geoinsight_serializers.TaskResultSerializer(result).data,`
`89`	`89`	`status=200,`