fix(layout): add id2label to LayoutConfig and guard missing label_task_mapping

glmocr/config.py

@@ -197,8 +197,8 @@ class LayoutConfig(_BaseConfig):
     layout_unclip_ratio: Optional[Any] = None
     layout_merge_bboxes_mode: Union[str, Dict[int, str]] = "large"
     label_task_mapping: Optional[Dict[str, Any]] = None
-    id2label: Optional[Dict[int, str]] = None
     use_polygon: bool = False
+    id2label: Optional[Dict[Union[int, str], str]] = None
 
     @field_validator("device")
     @classmethod

glmocr/layout/layout_detector.py

@@ -64,10 +64,12 @@ def _validate_runtime_config(self):
                 "detection. Set it to a local checkpoint directory or a Hugging "
                 "Face model id such as 'PaddlePaddle/PP-DocLayoutV3_safetensors'."
             )
-        if not isinstance(self.label_task_mapping, dict) or not self.label_task_mapping:
+        if self.label_task_mapping is not None and (
+            not isinstance(self.label_task_mapping, dict) or not self.label_task_mapping
+        ):
             raise ValueError(
                 "pipeline.layout.label_task_mapping must be a non-empty mapping "
-                "when layout detection is enabled."
+                "when provided."
             )
 
     def start(self):
@@ -92,7 +94,12 @@ def start(self):
             self._device = "cpu"
         self._model = self._model.to(self._device)
         if self.id2label is None:
-            self.id2label = self._model.config.id2label
+            self.id2label = getattr(self._model.config, "id2label", None)
+        if self.id2label is None:
+            raise RuntimeError(
+                "Missing id2label in both layout config and model config; "
+                "please set pipeline.layout.id2label."
+            )
 
         # Patch upstream _extract_polygon_points_by_masks to guard against
         # empty mask crops that crash cv2.resize with !ssize.empty().
@@ -141,6 +148,11 @@ def _safe_extract(boxes, masks, scale_ratio):
             return polygon_points
 
         self._image_processor._extract_polygon_points_by_masks = _safe_extract
+        if self.label_task_mapping is None:
+            logger.warning(
+                "layout.label_task_mapping is missing; defaulting all labels to text"
+            )
+            self.label_task_mapping = {"text": list(self.id2label.values())}
         logger.debug(f"PP-DocLayoutV3 loaded on device: {self._device}")
 
     def stop(self):

glmocr/tests/test_unit.py

@@ -261,6 +261,66 @@ def test_detector_start_uses_public_config_defaults(self):
 
         assert det.id2label == cfg.id2label
 
+    def test_detector_defaults_label_task_mapping_from_model_id2label(self):
+        """Missing label_task_mapping falls back to a text bucket from id2label."""
+        self._require_layout_runtime()
+        from glmocr.config import LayoutConfig
+        from glmocr.layout.layout_detector import PPDocLayoutDetector
+
+        cfg = LayoutConfig(model_dir="dummy", device="cpu")
+        det = PPDocLayoutDetector(cfg)
+
+        mock_model = MagicMock()
+        mock_model.to = MagicMock(return_value=mock_model)
+        mock_model.eval = MagicMock()
+        mock_model.config = MagicMock()
+        mock_model.config.id2label = {0: "text", 1: "title"}
+        mock_proc = MagicMock()
+
+        with (
+            patch(
+                "glmocr.layout.layout_detector.PPDocLayoutV3ForObjectDetection.from_pretrained",
+                return_value=mock_model,
+            ),
+            patch(
+                "glmocr.layout.layout_detector.PPDocLayoutV3ImageProcessor.from_pretrained",
+                return_value=mock_proc,
+            ),
+        ):
+            det.start()
+
+        assert det.id2label == {0: "text", 1: "title"}
+        assert det.label_task_mapping == {"text": ["text", "title"]}
+
+    def test_detector_raises_when_id2label_missing_everywhere(self):
+        """Missing id2label in both config and model config raises a clear error."""
+        self._require_layout_runtime()
+        from glmocr.config import LayoutConfig
+        from glmocr.layout.layout_detector import PPDocLayoutDetector
+
+        cfg = LayoutConfig(model_dir="dummy", device="cpu")
+        det = PPDocLayoutDetector(cfg)
+
+        mock_model = MagicMock()
+        mock_model.to = MagicMock(return_value=mock_model)
+        mock_model.eval = MagicMock()
+        mock_model.config = MagicMock()
+        mock_model.config.id2label = None
+        mock_proc = MagicMock()
+
+        with (
+            patch(
+                "glmocr.layout.layout_detector.PPDocLayoutV3ForObjectDetection.from_pretrained",
+                return_value=mock_model,
+            ),
+            patch(
+                "glmocr.layout.layout_detector.PPDocLayoutV3ImageProcessor.from_pretrained",
+                return_value=mock_proc,
+            ),
+            pytest.raises(RuntimeError, match="Missing id2label"),
+        ):
+            det.start()
+
 
 class TestPageLoader:
     """Tests for PageLoader."""