change test

Author: ElJocho

mapswipe_workers/.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 
 repos:
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 22.3.0
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8

mapswipe_workers/mapswipe_workers/generate_stats/project_stats.py

@@ -335,7 +335,9 @@ def get_agg_results_by_task_id(
     # add task geometry using left join
     tasks_df.drop(columns=["project_id", "group_id"], inplace=True)
     agg_results_df = results_by_task_id_df.merge(
-        tasks_df, left_on="task_id", right_on="task_id",
+        tasks_df,
+        left_on="task_id",
+        right_on="task_id",
     )
     logger.info("added geometry to aggregated results")
 

mapswipe_workers/mapswipe_workers/mapswipe_workers.py

@@ -331,7 +331,10 @@ def run_create_tutorials() -> None:
 
 @cli.command("archive")
 @click.option(
-    "--project-id", "-i", help=("Archive project with giving project id"), type=str,
+    "--project-id",
+    "-i",
+    help=("Archive project with giving project id"),
+    type=str,
 )
 @click.option(
     "--project-ids",
@@ -359,7 +362,10 @@ def run_archive_project(project_id, project_ids):
 
 @cli.command("delete")
 @click.option(
-    "--project-id", "-i", help=("Delete project with giving project id"), type=str,
+    "--project-id",
+    "-i",
+    help=("Delete project with giving project id"),
+    type=str,
 )
 @click.option(
     "--project-ids",

mapswipe_workers/mapswipe_workers/project_types/arbitrary_geometry/group.py

@@ -8,7 +8,11 @@ class Group(BaseGroup):
     def __init__(self, project: object, groupId: int) -> None:
         super().__init__(project, groupId)
 
-    def create_tasks(self, feature_ids: List, features: List,) -> None:
+    def create_tasks(
+        self,
+        feature_ids: List,
+        features: List,
+    ) -> None:
         """Create tasks for a group
 
         feature_geometries is a list of geometries or feature in geojson format.

mapswipe_workers/mapswipe_workers/project_types/arbitrary_geometry/task.py

@@ -7,7 +7,10 @@
 
 class Task(BaseTask):
     def __init__(
-        self, group: object, featureId: Union[int, str], feature: Dict,
+        self,
+        group: object,
+        featureId: Union[int, str],
+        feature: Dict,
     ):
         """
         Parameters

mapswipe_workers/mapswipe_workers/project_types/base/project.py

@@ -136,7 +136,9 @@ def save_project(self):
         # Make sure projects get saved in Postgres and Firebase successful
         try:
             self.save_to_postgres(
-                project, groups, groupsOfTasks,
+                project,
+                groups,
+                groupsOfTasks,
             )
             logger.info(
                 f"{self.projectId}" f" - the project has been saved" f" to postgres"
@@ -168,7 +170,9 @@ def save_project(self):
 
         try:
             self.save_to_firebase(
-                project, groups, groupsOfTasks,
+                project,
+                groups,
+                groupsOfTasks,
             )
             logger.info(
                 f"{self.projectId}" f" - the project has been saved" f" to firebase"
@@ -493,7 +497,10 @@ def create_groups_txt_file(self, groups):
             "project_type_specifics",
         )
         w = csv.DictWriter(
-            groups_txt_file, fieldnames=fieldnames, delimiter="\t", quotechar="'",
+            groups_txt_file,
+            fieldnames=fieldnames,
+            delimiter="\t",
+            quotechar="'",
         )
 
         for groupId, group in groups.items():
@@ -575,7 +582,10 @@ def create_tasks_txt_file(self, groupsOfTasks):
             "project_type_specifics",
         )
         w = csv.DictWriter(
-            tasks_txt_file, fieldnames=fieldnames, delimiter="\t", quotechar="'",
+            tasks_txt_file,
+            fieldnames=fieldnames,
+            delimiter="\t",
+            quotechar="'",
         )
 
         for groupId, tasks in groupsOfTasks.items():

mapswipe_workers/mapswipe_workers/utils/geojson_functions.py

@@ -206,7 +206,11 @@ def create_geojson_file_from_dict(final_groups_dict, outfile):
 
     dataSource = driver.CreateDataSource(outfile_temp)
     # create layer
-    layer = dataSource.CreateLayer(outfile_temp, srs, geom_type=ogr.wkbPolygon,)
+    layer = dataSource.CreateLayer(
+        outfile_temp,
+        srs,
+        geom_type=ogr.wkbPolygon,
+    )
 
     # create fields
     field_id = ogr.FieldDefn("group_id", ogr.OFTInteger)
@@ -295,7 +299,11 @@ def create_geojson_file(geometries, outfile):
 
     dataSource = driver.CreateDataSource(outfile_temp)
     # create layer
-    layer = dataSource.CreateLayer(outfile_temp, srs, geom_type=ogr.wkbPolygon,)
+    layer = dataSource.CreateLayer(
+        outfile_temp,
+        srs,
+        geom_type=ogr.wkbPolygon,
+    )
 
     # create fields
     field_id = ogr.FieldDefn("id", ogr.OFTInteger)

mapswipe_workers/mapswipe_workers/utils/tile_functions.py

@@ -96,7 +96,10 @@ def tile_coords_zoom_and_tileserver_to_url(
         # https://www.maptiler.com/google-maps-coordinates-tile-bounds-projection/
         tile_y = int(math.pow(2, tile_z) - tile_y) - 1
         url = tile_server["url"].format(
-            key=tile_server["apiKey"], x=tile_x, y=tile_y, z=tile_z,
+            key=tile_server["apiKey"],
+            x=tile_x,
+            y=tile_y,
+            z=tile_z,
         )
     elif "{-y}" in tile_server["url"]:
         # this uses not the standard TMS tile y coordinate,
@@ -105,10 +108,18 @@ def tile_coords_zoom_and_tileserver_to_url(
         # https://www.maptiler.com/google-maps-coordinates-tile-bounds-projection/
         tile_y = int(math.pow(2, tile_z) - tile_y) - 1
         url = tile_server["url"].replace("{-y}", "{y}")
-        url = url.format(key=tile_server["apiKey"], x=tile_x, y=tile_y, z=tile_z,)
+        url = url.format(
+            key=tile_server["apiKey"],
+            x=tile_x,
+            y=tile_y,
+            z=tile_z,
+        )
     else:
         url = tile_server["url"].format(
-            key=tile_server["apiKey"], x=tile_x, y=tile_y, z=tile_z,
+            key=tile_server["apiKey"],
+            x=tile_x,
+            y=tile_y,
+            z=tile_z,
         )
 
     return url

mapswipe_workers/python_scripts/update_project_status.py

@@ -58,7 +58,9 @@ def run_update_project_status(filter_string: str) -> None:
     logger.info("### Start update project status workflow ###")
     active_projects = get_projects(status="active")
     finished_projects = filter_projects_by_name_and_progress(
-        active_projects, filter_string, progress_threshold=100,
+        active_projects,
+        filter_string,
+        progress_threshold=100,
     )
 
     inactive_projects = get_projects(status="inactive")
@@ -69,7 +71,9 @@ def run_update_project_status(filter_string: str) -> None:
     )
 
     new_active_projects = filter_projects_by_name_and_progress(
-        inactive_projects, filter_string, progress_threshold=0,
+        inactive_projects,
+        filter_string,
+        progress_threshold=0,
     )[0 : len(finished_projects)]
 
     # Here we check that there is at least one inactive project
@@ -89,11 +93,11 @@ def run_update_project_status(filter_string: str) -> None:
 if __name__ == "__main__":
     """Use this command to run in docker container.
     docker-compose run -d mapswipe_workers_creation python3 python_scripts/update_project_status.py "test" 30  # noqa
-    
+
     You need to use two arguments for the script
     - filter string, e.g. "test"
     - time interval in minutes, e.g. 30
-    
+
     Make sure that you don't run this script too frequently as it pulls data from firebase and
     this will have implications on costs. Running this script once every 15-30 minutes should be totally fine.
     This means that there can be a "delay" in setting a project to finished about roughly the same time.

mapswipe_workers/requirements.txt

@@ -5,7 +5,7 @@ firebase-admin==4.4.0
 flake8==3.8.3
 mapswipe-workers==3.0
 pandas==1.1.3
-pre-commit==1.21.0
+pre-commit==2.9.2
 psycopg2-binary==2.8.6
 python-dateutil==2.8.1
 schedule==0.6.0