mapreader 1.1.5__tar.gz → 1.3.0__tar.gz

{mapreader-1.1.5 → mapreader-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.1.5
+Version: 1.3.0
 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
@@ -24,7 +24,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Requires-Python: >=3.8, <3.11
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib<4.0.0,>=3.5.0
@@ -37,8 +37,8 @@ Requires-Dist: Shapely<3.0.0,>=2.0.0
 Requires-Dist: nest-asyncio<2.0.0,>=1.5.1
 Requires-Dist: scikit-image>=0.18.3
 Requires-Dist: scikit-learn<2.0.0,>=1.0.1
-Requires-Dist: torch<2.0.0,>=1.10.0
-Requires-Dist: torchvision<0.12.1,>=0.11.1
+Requires-Dist: torch>=1.10.0
+Requires-Dist: torchvision<0.17.3,>=0.11.1
 Requires-Dist: jupyter<2.0.0,>=1.0.0
 Requires-Dist: ipykernel<7.0.0,>=6.5.1
 Requires-Dist: ipywidgets<9.0.0,>=8.0.0
@@ -56,15 +56,14 @@ Requires-Dist: torchinfo<2.0.0
 Requires-Dist: openpyxl<4.0.0
 Requires-Dist: geopandas<1.0.0
 Requires-Dist: pyogrio>=0.7.2
+Requires-Dist: cartopy>=0.22.0
 Provides-Extra: dev
-Requires-Dist: pytest<8.0.0; extra == "dev"
-Requires-Dist: pytest-cov<5.0.0,>=4.1.0; extra == "dev"
+Requires-Dist: pytest<9.0.0; extra == "dev"
+Requires-Dist: pytest-cov<6.0.0,>=4.1.0; extra == "dev"
 Requires-Dist: timm<1.0.0; extra == "dev"
 Requires-Dist: transformers<5.0.0; extra == "dev"
-Requires-Dist: black<24.0.0,>=23.7.0; extra == "dev"
-Requires-Dist: flake8<7.0.0,>=6.0.0; extra == "dev"
-Provides-Extra: geo
-Requires-Dist: cartopy>=0.20.0; extra == "geo"
+Requires-Dist: black<25.0.0,>=23.7.0; extra == "dev"
+Requires-Dist: flake8<8.0.0,>=6.0.0; extra == "dev"
 
 <div align="center">
     <br>

{mapreader-1.1.5 → mapreader-1.3.0}/mapreader/__init__.py

@@ -12,6 +12,16 @@ from mapreader.classify.datasets import PatchContextDataset
 from mapreader.classify.classifier import ClassifierContainer
 from mapreader.classify import custom_models
 
+try:
+    from mapreader.spot_text.deepsolo_runner import DeepSoloRunner
+except ImportError:
+    pass
+
+try:
+    from mapreader.spot_text.dptext_detr_runner import DPTextDETRRunner
+except ImportError:
+    pass
+
 from mapreader.process import process
 
 from mapreader.annotate.annotator import Annotator

{mapreader-1.1.5 → mapreader-1.3.0}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-04-03T09:19:01+0100",
+ "date": "2024-04-29T15:52:44+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "75e2824c89f4f2d54893ffaf3fd5e2f96d04d282",
- "version": "1.1.5"
+ "full-revisionid": "f256ae9b73ae9dd14d8bd72b61a86088f8f1905a",
+ "version": "1.3.0"
 }
 '''  # END VERSION_JSON
 

{mapreader-1.1.5 → mapreader-1.3.0}/mapreader/annotate/utils.py

@@ -95,7 +95,7 @@ def prepare_data(
             ).values
             if random_state in ["random"]:
                 df = df.groupby("pixel_groups").sample(
-                    n=10, random_state=random.randint(0, 1e6)
+                    n=10, random_state=random.randint(0, int(1e6))
                 )
             else:
                 df = df.groupby("pixel_groups").sample(n=10, random_state=random_state)

{mapreader-1.1.5 → mapreader-1.3.0}/mapreader/classify/classifier.py

@@ -7,8 +7,9 @@ import random
 import socket
 import sys
 import time
+from collections.abc import Hashable, Iterable
 from datetime import datetime
-from typing import Any, Hashable, Iterable
+from typing import Any
 
 import joblib
 import matplotlib.pyplot as plt
@@ -167,7 +168,7 @@ class ClassifierContainer:
             if not os.path.exists("./tmp_checkpoints"):
                 os.makedirs("./tmp_checkpoints")
             self.tmp_save_filename = (
-                f"./tmp_checkpoints/tmp_{random.randint(0, 1e10)}_checkpoint.pkl"
+                f"./tmp_checkpoints/tmp_{random.randint(0, int(1e10))}_checkpoint.pkl"
             )
 
             # add colors for printing/logging

{mapreader-1.1.5 → mapreader-1.3.0}/mapreader/load/images.py

@@ -1753,7 +1753,7 @@ See https://pillow.readthedocs.io/en/stable/handbook/concepts.html#modes for mor
                         counter=-1,
                     )
 
-                ax.set_title(image_id)
+                ax.set_title(parent_id)
                 figures.append(fig)
 
                 if column_to_plot and plot_histogram: