mapreader 1.8.2.post0.dev9__tar.gz → 1.8.2.post0.dev24__tar.gz

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapreader
-Version: 1.8.2.post0.dev9
+Version: 1.8.2.post0.dev24
 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
@@ -28,8 +28,8 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib<4.0.0,>=3.5.0
-Requires-Dist: numpy<2.0.0,>=1.21.5
-Requires-Dist: pandas>=2.0.0
+Requires-Dist: numpy<3.0.0,>=1.21.5
+Requires-Dist: pandas<3.0.0,>=2.0.0
 Requires-Dist: pyproj<4.0.0,>=3.2.0
 Requires-Dist: azure-storage-blob<13.0.0,>=12.9.0
 Requires-Dist: aiohttp<4.0.0,>=3.8.1
@@ -37,39 +37,39 @@ 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.2.2,>=1.10.0
-Requires-Dist: torchvision<=0.17.2,>=0.11.1
+Requires-Dist: torch<=2.12.0,>=1.10.0
+Requires-Dist: torchvision<=0.27.0,>=0.11.1
 Requires-Dist: jupyter<2.0.0,>=1.0.0
-Requires-Dist: ipykernel<7.0.0,>=6.5.1
+Requires-Dist: ipykernel<8.0.0,>=6.5.1
 Requires-Dist: ipywidgets<9.0.0,>=8.0.0
 Requires-Dist: ipyannotate==0.1.0-beta.0
-Requires-Dist: Cython<0.30.0,>=0.29.24
+Requires-Dist: Cython<4.0.0,>=0.29.24
 Requires-Dist: PyYAML<7.0,>=6.0
 Requires-Dist: tensorboard<3.0.0,>=2.7.0
 Requires-Dist: parhugin<0.0.4,>=0.0.3
-Requires-Dist: geopy==2.1.0
+Requires-Dist: geopy<3.0.0,>=2.1.0
 Requires-Dist: rasterio<2.0.0,>=1.2.10
 Requires-Dist: simplekml<2.0.0,>=1.3.6
 Requires-Dist: versioneer>=0.28
 Requires-Dist: tqdm<5.0.0
 Requires-Dist: torchinfo<2.0.0
 Requires-Dist: openpyxl<4.0.0,>=3.1.2
-Requires-Dist: geopandas<1.0.0
+Requires-Dist: geopandas<2.0.0,>=1.0.0
 Requires-Dist: pyogrio>=0.7.2
 Requires-Dist: cartopy>=0.22.0
 Requires-Dist: joblib>=1.4.0
 Requires-Dist: opencv-python<5.0.0.0,>=4.8.1.78
 Requires-Dist: folium<1.0.0,>=0.12
 Requires-Dist: mapclassify<3.0.0,>=2.0.0
-Requires-Dist: xyzservices==2024.9.0
+Requires-Dist: xyzservices>=2024.9.0
 Requires-Dist: piffle>=0.7.0
 Requires-Dist: lxml
 Provides-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!=4.50.0,<4.51.3; extra == "dev"
-Requires-Dist: black<25.0.0,>=23.7.0; extra == "dev"
+Requires-Dist: pytest<10.0.0; extra == "dev"
+Requires-Dist: pytest-cov<8.0.0,>=4.1.0; extra == "dev"
+Requires-Dist: timm<2.0.0; extra == "dev"
+Requires-Dist: transformers!=4.50.0,<5.0.0,>=4.26.0; extra == "dev"
+Requires-Dist: black<27.0.0,>=23.7.0; extra == "dev"
 Requires-Dist: flake8<8.0.0,>=6.0.0; extra == "dev"
 Dynamic: author
 Dynamic: classifier

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2026-02-26T15:15:54+0000",
+ "date": "2026-09-13T07:48:00+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "87578a471ab1dcadf80a2552aa31a3f50cac862a",
- "version": "1.8.2.post0.dev9"
+ "full-revisionid": "398631a557be291e53f5f4efaa4895883da2cdb4",
+ "version": "1.8.2.post0.dev24"
 }
 '''  # END VERSION_JSON
 

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/mapreader/annotate/annotator.py

@@ -477,7 +477,7 @@ class Annotator:
         """
 
         def check_eligibility(row):
-            if row.label not in [np.NaN, None]:
+            if row.label not in [np.nan, None]:
                 return False
 
             if self._filter_for is None:
@@ -546,7 +546,7 @@ class Annotator:
 
             # Dim the image
             if dim in ["True", True]:
-                im_array = np.array(im)
+                im_array = np.array(im, dtype=np.float32)
                 im_array = 256 - (256 - im_array) * 0.4  # lighten image
                 im = Image.fromarray(im_array.astype(np.uint8))
 

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/mapreader/classify/classifier.py

@@ -108,6 +108,7 @@ class ClassifierContainer:
         is_inception: bool = False,
         load_path: str | None = None,
         force_device: bool = False,
+        huggingface: bool = False,
         **kwargs,
     ):
         # set up device
@@ -149,7 +150,31 @@ class ClassifierContainer:
                 self.input_size = input_size
                 self.is_inception = is_inception
             elif isinstance(model, str):
-                self._initialize_model(model, **kwargs)
+                if huggingface:
+                    try:
+                        from transformers import AutoModelForImageClassification, AutoImageProcessor
+                    except ImportError:
+                        raise ImportError(
+                            "Hugging Face models require the 'transformers' library: 'pip install transformers'."
+                        )
+                    print(f"[INFO] Initializing Hugging Face model: {model}")
+                    num_labels = len(self.labels_map)
+                    self.model = AutoModelForImageClassification.from_pretrained(
+                        model,
+                        num_labels=num_labels,
+                        ignore_mismatched_sizes=True
+                    ).to(self.device)
+                    hf_processor = AutoImageProcessor.from_pretrained(model)
+                    size = getattr(hf_processor, "size", {})
+                    if "height" in size and "width" in size:
+                        size = (size["height"], size["width"])
+                    elif "shortest_edge" in size:
+                        size = (size["shortest_edge"], size["shortest_edge"])
+                    else:
+                        size = input_size
+                    self.is_inception = False
+                else:
+                    self._initialize_model(model, **kwargs)
 
             self.optimizer = None
             self.scheduler = None
@@ -1745,7 +1770,7 @@ Use ``torch.optim.lr_scheduler`` directly and then the ``add_scheduler`` method
         par_name = os.path.dirname(load_path)
         base_name = os.path.basename(load_path)
         path2model = os.path.join(par_name, f"model_{base_name}")
-        self.model = torch.load(path2model, map_location=mydevice)
+        self.model = torch.load(path2model, map_location=mydevice, weights_only=False)
 
         try:
             self.device = mydevice

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/mapreader/classify/load_annotations.py

@@ -869,7 +869,7 @@ Please check your image paths and update them if necessary.'
             value_counts = (
                 datasets["train"].patch_df[self.label_col].value_counts().to_list()
             )
-            weights = np.reciprocal(Tensor(value_counts))
+            weights = Tensor(value_counts).reciprocal()
             weights = weights.double()
             sampler = WeightedRandomSampler(
                 weights[datasets["train"].patch_df["label_index"].tolist()],

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/mapreader/download/sheet_downloader.py

@@ -170,7 +170,7 @@ class SheetDownloader:
         """
         Creates a multipolygon representing all maps in metadata.
         """
-        self.merged_polygon = self.metadata["geometry"].unary_union
+        self.merged_polygon = self.metadata["geometry"].union_all()
 
     def get_minmax_latlon(self) -> None:
         """

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/mapreader/load/images.py

@@ -897,7 +897,7 @@ See https://pillow.readthedocs.io/en/stable/handbook/concepts.html#modes for mor
                 self._add_patch_coords_id(patch_id, verbose)
 
         if isinstance(patch_df, gpd.GeoDataFrame):
-            parent_polygon = patch_df.unary_union
+            parent_polygon = patch_df.union_all()
             parent_coords = parent_polygon.bounds
 
             self.parents[image_id]["coordinates"] = parent_coords

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/mapreader/process/occlusion_analysis.py

@@ -110,7 +110,7 @@ class OcclusionAnalyzer:
         return len(self.patch_df)
 
     def _load_model(self, model_path: str) -> nn.Module:
-        model = torch.load(model_path, map_location=self.device)
+        model = torch.load(model_path, map_location=self.device, weights_only=False)
         return model
 
     def add_loss_fn(
@@ -284,7 +284,7 @@ class OcclusionAnalyzer:
                 # preprocess the occluded image and get the prediction
                 image_tensor = self._preprocess_image(occluded_image)
                 prediction = self.model(image_tensor)
-                loss = round(float(self.loss_fn(prediction, gt_prediction)), 4)
+                loss = round(float(self.loss_fn(prediction, gt_prediction).detach()), 4)
 
                 # store the loss in the heatmap
                 heatmap[row, column] = loss

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/mapreader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapreader
-Version: 1.8.2.post0.dev9
+Version: 1.8.2.post0.dev24
 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
@@ -28,8 +28,8 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib<4.0.0,>=3.5.0
-Requires-Dist: numpy<2.0.0,>=1.21.5
-Requires-Dist: pandas>=2.0.0
+Requires-Dist: numpy<3.0.0,>=1.21.5
+Requires-Dist: pandas<3.0.0,>=2.0.0
 Requires-Dist: pyproj<4.0.0,>=3.2.0
 Requires-Dist: azure-storage-blob<13.0.0,>=12.9.0
 Requires-Dist: aiohttp<4.0.0,>=3.8.1
@@ -37,39 +37,39 @@ 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.2.2,>=1.10.0
-Requires-Dist: torchvision<=0.17.2,>=0.11.1
+Requires-Dist: torch<=2.12.0,>=1.10.0
+Requires-Dist: torchvision<=0.27.0,>=0.11.1
 Requires-Dist: jupyter<2.0.0,>=1.0.0
-Requires-Dist: ipykernel<7.0.0,>=6.5.1
+Requires-Dist: ipykernel<8.0.0,>=6.5.1
 Requires-Dist: ipywidgets<9.0.0,>=8.0.0
 Requires-Dist: ipyannotate==0.1.0-beta.0
-Requires-Dist: Cython<0.30.0,>=0.29.24
+Requires-Dist: Cython<4.0.0,>=0.29.24
 Requires-Dist: PyYAML<7.0,>=6.0
 Requires-Dist: tensorboard<3.0.0,>=2.7.0
 Requires-Dist: parhugin<0.0.4,>=0.0.3
-Requires-Dist: geopy==2.1.0
+Requires-Dist: geopy<3.0.0,>=2.1.0
 Requires-Dist: rasterio<2.0.0,>=1.2.10
 Requires-Dist: simplekml<2.0.0,>=1.3.6
 Requires-Dist: versioneer>=0.28
 Requires-Dist: tqdm<5.0.0
 Requires-Dist: torchinfo<2.0.0
 Requires-Dist: openpyxl<4.0.0,>=3.1.2
-Requires-Dist: geopandas<1.0.0
+Requires-Dist: geopandas<2.0.0,>=1.0.0
 Requires-Dist: pyogrio>=0.7.2
 Requires-Dist: cartopy>=0.22.0
 Requires-Dist: joblib>=1.4.0
 Requires-Dist: opencv-python<5.0.0.0,>=4.8.1.78
 Requires-Dist: folium<1.0.0,>=0.12
 Requires-Dist: mapclassify<3.0.0,>=2.0.0
-Requires-Dist: xyzservices==2024.9.0
+Requires-Dist: xyzservices>=2024.9.0
 Requires-Dist: piffle>=0.7.0
 Requires-Dist: lxml
 Provides-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!=4.50.0,<4.51.3; extra == "dev"
-Requires-Dist: black<25.0.0,>=23.7.0; extra == "dev"
+Requires-Dist: pytest<10.0.0; extra == "dev"
+Requires-Dist: pytest-cov<8.0.0,>=4.1.0; extra == "dev"
+Requires-Dist: timm<2.0.0; extra == "dev"
+Requires-Dist: transformers!=4.50.0,<5.0.0,>=4.26.0; extra == "dev"
+Requires-Dist: black<27.0.0,>=23.7.0; extra == "dev"
 Requires-Dist: flake8<8.0.0,>=6.0.0; extra == "dev"
 Dynamic: author
 Dynamic: classifier

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/mapreader.egg-info/requires.txt

@@ -1,6 +1,6 @@
 matplotlib<4.0.0,>=3.5.0
-numpy<2.0.0,>=1.21.5
-pandas>=2.0.0
+numpy<3.0.0,>=1.21.5
+pandas<3.0.0,>=2.0.0
 pyproj<4.0.0,>=3.2.0
 azure-storage-blob<13.0.0,>=12.9.0
 aiohttp<4.0.0,>=3.8.1
@@ -8,38 +8,38 @@ Shapely<3.0.0,>=2.0.0
 nest-asyncio<2.0.0,>=1.5.1
 scikit-image>=0.18.3
 scikit-learn<2.0.0,>=1.0.1
-torch<=2.2.2,>=1.10.0
-torchvision<=0.17.2,>=0.11.1
+torch<=2.12.0,>=1.10.0
+torchvision<=0.27.0,>=0.11.1
 jupyter<2.0.0,>=1.0.0
-ipykernel<7.0.0,>=6.5.1
+ipykernel<8.0.0,>=6.5.1
 ipywidgets<9.0.0,>=8.0.0
 ipyannotate==0.1.0-beta.0
-Cython<0.30.0,>=0.29.24
+Cython<4.0.0,>=0.29.24
 PyYAML<7.0,>=6.0
 tensorboard<3.0.0,>=2.7.0
 parhugin<0.0.4,>=0.0.3
-geopy==2.1.0
+geopy<3.0.0,>=2.1.0
 rasterio<2.0.0,>=1.2.10
 simplekml<2.0.0,>=1.3.6
 versioneer>=0.28
 tqdm<5.0.0
 torchinfo<2.0.0
 openpyxl<4.0.0,>=3.1.2
-geopandas<1.0.0
+geopandas<2.0.0,>=1.0.0
 pyogrio>=0.7.2
 cartopy>=0.22.0
 joblib>=1.4.0
 opencv-python<5.0.0.0,>=4.8.1.78
 folium<1.0.0,>=0.12
 mapclassify<3.0.0,>=2.0.0
-xyzservices==2024.9.0
+xyzservices>=2024.9.0
 piffle>=0.7.0
 lxml
 
 [dev]
-pytest<9.0.0
-pytest-cov<6.0.0,>=4.1.0
-timm<1.0.0
-transformers!=4.50.0,<4.51.3
-black<25.0.0,>=23.7.0
+pytest<10.0.0
+pytest-cov<8.0.0,>=4.1.0
+timm<2.0.0
+transformers!=4.50.0,<5.0.0,>=4.26.0
+black<27.0.0,>=23.7.0
 flake8<8.0.0,>=6.0.0

{mapreader-1.8.2.post0.dev9 → mapreader-1.8.2.post0.dev24}/setup.py

@@ -29,8 +29,8 @@ setuptools.setup(
     python_requires=">=3.9",
     install_requires=[
         "matplotlib>=3.5.0,<4.0.0",
-        "numpy>=1.21.5,<2.0.0",
-        "pandas>=2.0.0",
+        "numpy>=1.21.5,<3.0.0",
+        "pandas>=2.0.0,<3.0.0",
         "pyproj>=3.2.0,<4.0.0",
         "azure-storage-blob>=12.9.0,<13.0.0",
         "aiohttp>=3.8.1,<4.0.0",
@@ -38,41 +38,41 @@ setuptools.setup(
         "nest-asyncio>=1.5.1,<2.0.0",
         "scikit-image>=0.18.3",
         "scikit-learn>=1.0.1,<2.0.0",
-        "torch>=1.10.0,<=2.2.2",
-        "torchvision>=0.11.1,<=0.17.2",
+        "torch>=1.10.0,<=2.12.0",
+        "torchvision>=0.11.1,<=0.27.0",
         "jupyter>=1.0.0,<2.0.0",
-        "ipykernel>=6.5.1,<7.0.0",
+        "ipykernel>=6.5.1,<8.0.0",
         "ipywidgets>=8.0.0,<9.0.0",
         "ipyannotate==0.1.0-beta.0",
-        "Cython>=0.29.24,<0.30.0",
+        "Cython>=0.29.24,<4.0.0",
         "PyYAML>=6.0,<7.0",
         "tensorboard>=2.7.0,<3.0.0",
         "parhugin>=0.0.3,<0.0.4",
-        "geopy==2.1.0",
+        "geopy>=2.1.0,<3.0.0",
         "rasterio>=1.2.10,<2.0.0",
         "simplekml>=1.3.6,<2.0.0",
         "versioneer>=0.28",
         "tqdm<5.0.0",
         "torchinfo<2.0.0",
         "openpyxl>=3.1.2,<4.0.0",
-        "geopandas<1.0.0",
+        "geopandas>=1.0.0,<2.0.0",
         "pyogrio>=0.7.2",
         "cartopy>=0.22.0",
         "joblib>=1.4.0",
         "opencv-python>=4.8.1.78,<5.0.0.0",
         "folium>=0.12,<1.0.0",
         "mapclassify>=2.0.0,<3.0.0",
-        "xyzservices==2024.9.0",
+        "xyzservices>=2024.9.0",
         "piffle>=0.7.0",
         "lxml",
     ],
     extras_require={
         "dev": [
-            "pytest<9.0.0",
-            "pytest-cov>=4.1.0,<6.0.0",
-            "timm<1.0.0",
-            "transformers<4.51.3, !=4.50.0",
-            "black>=23.7.0,<25.0.0",
+            "pytest<10.0.0",
+            "pytest-cov>=4.1.0,<8.0.0",
+            "timm<2.0.0",
+            "transformers>=4.26.0,<5.0.0,!=4.50.0",
+            "black>=23.7.0,<27.0.0",
             "flake8>=6.0.0,<8.0.0",
         ],
     },