mapreader 1.6.1.post0.dev20__tar.gz → 1.6.2__tar.gz

{mapreader-1.6.1.post0.dev20 → mapreader-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.6.1.post0.dev20
+Version: 1.6.2
 Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
 Home-page: https://github.com/Living-with-machines/MapReader
 Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip

{mapreader-1.6.1.post0.dev20 → mapreader-1.6.2}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-12-19T11:45:25+0000",
+ "date": "2024-12-19T16:32:25+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "6b70e301b5bd1a2a98b2e4175f79cceef26b78d1",
- "version": "1.6.1.post0.dev20"
+ "full-revisionid": "914ab59309c4d45b12626ffc1c18e617d58b34ac",
+ "version": "1.6.2"
 }
 '''  # END VERSION_JSON
 

mapreader-1.6.2/mapreader/spot_text/dataclasses.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from shapely.geometry import Polygon
+
+
+@dataclass(frozen=True)
+class PatchPrediction:
+    pixel_geometry: Polygon
+    score: float
+    text: str = None
+
+
+@dataclass(frozen=True)
+class ParentPrediction:
+    pixel_geometry: Polygon
+    score: float
+    patch_id: str
+    text: str = None
+
+
+@dataclass(frozen=True)
+class GeoPrediction:
+    pixel_geometry: Polygon
+    score: float
+    patch_id: str
+    geometry: Polygon
+    crs: str
+    text: str = None

{mapreader-1.6.1.post0.dev20 → mapreader-1.6.2}/mapreader/spot_text/deepsolo_runner.py

@@ -20,10 +20,10 @@ import pandas as pd
 import torch
 from deepsolo.config import get_cfg
 
-from .rec_runner_base import RecRunner
+from .runner_base import DetRecRunner
 
 
-class DeepSoloRunner(RecRunner):
+class DeepSoloRunner(DetRecRunner):
     def __init__(
         self,
         patch_df: pd.DataFrame | gpd.GeoDataFrame | str | pathlib.Path,

{mapreader-1.6.1.post0.dev20 → mapreader-1.6.2}/mapreader/spot_text/dptext_detr_runner.py

@@ -21,10 +21,11 @@ import torch
 from dptext_detr.config import get_cfg
 from shapely import MultiPolygon, Polygon
 
-from .runner_base import Runner
+from .dataclasses import PatchPrediction
+from .runner_base import DetRunner
 
 
-class DPTextDETRRunner(Runner):
+class DPTextDETRRunner(DetRunner):
     def __init__(
         self,
         patch_df: pd.DataFrame | gpd.GeoDataFrame | str | pathlib.Path,
@@ -71,7 +72,7 @@ class DPTextDETRRunner(Runner):
         # setup the predictor
         self.predictor = DefaultPredictor(cfg)
 
-    def get_patch_predictions(
+    def _get_patch_predictions(
         self,
         outputs: dict,
         return_dataframe: bool = False,
@@ -107,7 +108,7 @@ class DPTextDETRRunner(Runner):
         self._deduplicate(image_id, min_ioa=min_ioa)
 
         if return_dataframe:
-            return self._dict_to_dataframe(self.patch_predictions, geo=False)
+            return self._dict_to_dataframe(self.patch_predictions)
         return self.patch_predictions
 
     def _post_process(self, image_id, scores, pred_classes, bd_pnts):
@@ -122,59 +123,6 @@ class DPTextDETRRunner(Runner):
 
             score = f"{score:.2f}"
 
-            self.patch_predictions[image_id].append([polygon, score])
-
-    @staticmethod
-    def _dict_to_dataframe(
-        preds: dict,
-        geo: bool = False,
-        parent: bool = False,
-    ) -> pd.DataFrame:
-        """Convert the predictions dictionary to a pandas DataFrame.
-
-        Parameters
-        ----------
-        preds : dict
-            A dictionary of predictions.
-        geo : bool, optional
-            Whether the dictionary is georeferenced coords (or pixel bounds), by default True
-        parent : bool, optional
-            Whether the dictionary is at the parent level, by default False
-
-        Returns
-        -------
-        pd.DataFrame
-            A pandas DataFrame containing the predictions.
-        """
-        if geo:
-            columns = ["geometry", "crs", "score"]
-        else:
-            columns = ["geometry", "score"]
-
-        if parent:
-            columns.append("patch_id")
-
-        preds_df = pd.concat(
-            pd.DataFrame(
-                preds[k],
-                index=np.full(len(preds[k]), k),
-                columns=columns,
+            self.patch_predictions[image_id].append(
+                PatchPrediction(pixel_geometry=polygon, score=score)
             )
-            for k in preds.keys()
-        )
-
-        if geo:
-            # get the crs (should be the same for all)
-            if not preds_df["crs"].nunique() == 1:
-                raise ValueError("[ERROR] Multiple crs found in the predictions.")
-            crs = preds_df["crs"].unique()[0]
-
-            preds_df = gpd.GeoDataFrame(
-                preds_df,
-                geometry="geometry",
-                crs=crs,
-            )
-
-        preds_df.index.name = "image_id"
-        preds_df.reset_index(inplace=True)
-        return preds_df

{mapreader-1.6.1.post0.dev20 → mapreader-1.6.2}/mapreader/spot_text/maptext_runner.py

@@ -20,10 +20,10 @@ import pandas as pd
 import torch
 from maptextpipeline.config import get_cfg
 
-from .rec_runner_base import RecRunner
+from .runner_base import DetRecRunner
 
 
-class MapTextRunner(RecRunner):
+class MapTextRunner(DetRecRunner):
     def __init__(
         self,
         patch_df: pd.DataFrame | gpd.GeoDataFrame | str | pathlib.Path,