dcmspec 0.2.3__tar.gz → 0.3.1__tar.gz

dcmspec-0.3.1/CHANGELOG.md

@@ -0,0 +1,91 @@
+# Release Notes
+
+These release notes summarize key changes, improvements, and breaking updates for each version of **dcmspec**.
+
+## [0.3.1] - 2026-08-27
+
+### Added
+
+- Reorganized `tests/` into `tests/unit`, `tests/integration`, and `tests/e2e` tiers, and added an opt-in `tests/e2e`
+  canary suite that downloads and parses real, current DICOM standard tables (Part 3 IOD+modules, Part 6 data
+  dictionary, Part 4 UPS DIMSE attributes, and a Part 3/Part 6 merge) to catch upstream markup changes between
+  standard releases. Excluded from the default test run; also runs on a monthly schedule via
+  `.github/workflows/e2e.yml`.
+
+### Fixed
+
+- `PDFDocHandler.select_tables` now raises `ValueError` when a header cell contains a DICOM tag pattern (e.g. `(300A,0230)`), indicating that a data row was absorbed into the header — typically a `table_header_rowspan` over-count. This fails loudly instead of silently dropping an attribute row. Opt out with `strict_header_check=False` to restore the prior warn-and-continue behavior.
+- `PDFDocHandler.concat_tables` now reconstructs page-straddling description cells. When an attribute's description wraps across a PDF page boundary, pdfplumber emits the continuation as an untagged row (empty name and tag, description only) atop the next page's table; this is now merged into the preceding tagged row's description instead of becoming a floating node. Recovers enum values and conditional requirements that were silently lost at page breaks (e.g. HDSS Contour Geometric Type `(3006,0042)` losing its `POINT` / `CLOSED_PLANAR` / `CLOSEDPLANAR_XOR` enumeration, where `CLOSEDPLANAR_XOR` reflects the original DICOM spelling).
+- `PDFDocHandler.load_document` / `extract_tables_pdfplumber` now accept a `snap_tolerance_overrides` dict (keyed by 1-indexed page number) to lower pdfplumber's `snap_tolerance` for individual pages. The default (8) snaps two near-coincident header rules together on a few pages, fusing a repeated continuation sub-header (e.g. `Presence | Specific Rules`) into the first data row of the next page; that row then trips the tag-in-header guard (rowspan over-count) and the page cannot be extracted. Lowering the tolerance for just that page (e.g. `{34: 6}`) keeps the two rules distinct so the sub-header is recognized as a header row, recovering the first attribute of the continuation table (e.g. TPPC-Brachy HDR/PDR Source `(0008,1040)`) without disturbing extraction of any other page. This also un-fuses line-snapped "frankenrows" at the source on the affected page; the `concat_tables` split below remains as a downstream safety net for pages that still fuse at the default tolerance.
+- `PDFDocHandler.concat_tables` now splits fused "frankenrow" rows back into their constituent attribute rows. pdfplumber's line-snapping can merge two adjacent table rows whose separating rule falls within `snap_tolerance` into one row, newline-joining every column (e.g. tag `(300A,0214)\n(300A,0216)`, type `1\n3`). A legitimate attribute row carries exactly one DICOM tag, so a tag cell holding N≥2 DICOM-tag patterns is unambiguously a fusion; the row is split into N rows **only** when every structured column yields exactly N aligned newline-parts (the description must be blank or also N parts), otherwise it is left intact and logged. Mirrors the continuation-merge discriminator and recovers attributes (e.g. TPPC-Brachy `(300A,0214)` Source Type / `(300A,0216)` Source Manufacturer) that were fused by line-snapping into a single malformed node.
+- `IODSpecBuilder.build_from_url` no longer raises a spurious `DeprecationWarning` when callers use only `progress_observer`. An internal call was incorrectly re-passing it as the legacy `progress_callback` argument as well.
+
+## [0.3.0] - 2025-11-27
+
+### Added
+
+- CSV output mode in `SpecPrinter` via `print_csv` method
+- Excel OOXML output mode in `SpecPrinter` via `print_xlsx` method
+- Optional `output` parameter in `SpecPrinter` for writing to files
+- Optional `column_width` parameter in `print_table` and `print_xlsx`
+- `--print-mode` option in `modattributes` CLI for CSV and OOXML output
+- `--output` option in `modattributes` CLI for directing output to files
+
+### Changed
+
+- Switch PyPI version badge in `README` from `badge.fury.io` to `shields.io` for faster updates
+- Update modattributes CLI example for CSV and XLSX output
+- Improved nesting level color schemes for consistency and better contrast and readability.
+
+### Fixed
+
+- Correct handling of `include_table` names in `DOMTableSpecParser`
+- Correct handling of empty node attributes in `SpecPrinter`
+
+## [0.2.3] - 2025-09-29
+
+### Fixed
+
+- Hotfix: Force UTF-8 decoding for DICOM standard XHTML downloads to prevent mojibake when server omits charset ([#85](https://github.com/dwikler/dcmspec/issues/85)).
+- Hotfix: Add missing `progress_observer` argument to `CSVTableSpecParser.parse` for interface compatibility and to prevent `TypeError` when used with `SpecFactory` ([#86](https://github.com/dwikler/dcmspec/issues/86)).
+
+## [0.2.2] - 2025-09-25
+
+### Fixed
+
+- Fix CONTRIBUTING.md link in README for PyPI compatibility
+- Remove focus border and misleading text cursor in iod-explorer details panel
+
+### Changed
+
+- Update README: add PyPI and Python version badges
+- Replace Unicode ▶ with ASCII > in status bar for compatibility
+- Improve DICOM Modules usage condition parsing using regex for robustness to missing spaces
+- Add PR template to remind contributors to check the target branch and check tests and docs were updated
+- Move detailed table parsing logs to DEBUG level for less verbose INFO output
+
+## [0.2.1] - 2025-09-19
+
+### Fixed
+
+- Sanitize node and attribute names to remove "/" in DOMTableSpecParser ([#56](https://github.com/dwikler/dcmspec/issues/56))
+
+### Changed
+
+- Major project restructure: move CLI and UI apps to new `apps/cli` and `apps/ui` folders
+- Improve installation instructions and documentation
+- Prepare and publish the package to [PyPI](https://pypi.org/project/dcmspec/)
+
+## [0.2.0] - 2025-09-13
+
+### Changed
+
+- **Breaking change:** `IODSpecBuilder.build_from_url` now returns a tuple `(iod_model, module_models)` instead of just the IOD model. All callers must be updated to unpack the tuple
+- Update CLI and UI applications to support new return value
+- Add registry mode to `IODSpecBuilder` for efficient module model sharing
+
+## [0.1.0] - 2025-05-25
+
+### Added
+
+- Initial release

{dcmspec-0.2.3 → dcmspec-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dcmspec
-Version: 0.2.3
+Version: 0.3.1
 Summary: Toolkit for extracting, parsing, and processing DICOM specifications.
 License: Apache-2.0
 License-File: LICENSE
@@ -25,8 +25,10 @@ Provides-Extra: pdf
 Requires-Dist: anytree (>=2.13.0,<3.0.0)
 Requires-Dist: bs4 (>=0.0.2,<0.0.3)
 Requires-Dist: camelot-py (>=1.0.0,<2.0.0) ; extra == "pdf"
+Requires-Dist: html2text (>=2025.4.15,<2026.0.0)
 Requires-Dist: lxml (>=5.4.0,<6.0.0)
 Requires-Dist: opencv-python-headless (>=4.12.0.88,<5.0.0) ; extra == "pdf"
+Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0) ; extra == "pdf"
 Requires-Dist: pandas (>=2.3.1,<3.0.0) ; extra == "pdf"
 Requires-Dist: pdfplumber (>=0.11.7,<0.12.0) ; extra == "pdf"
@@ -43,9 +45,10 @@ Project-URL: Source, https://github.com/dwikler/dcmspec
 Description-Content-Type: text/markdown
 
 [![tests](https://github.com/dwikler/dcmspec/actions/workflows/test.yml/badge.svg)](https://github.com/dwikler/dcmspec/actions/workflows/test.yml)
-[![PyPI version](https://badge.fury.io/py/dcmspec.svg)](https://badge.fury.io/py/dcmspec)
+[![dicom](https://img.shields.io/github/actions/workflow/status/dwikler/dcmspec/e2e.yml?label=dicom&labelColor=24292e&color=28a745)](https://github.com/dwikler/dcmspec/actions/workflows/e2e.yml)
+[![PyPI version](https://img.shields.io/pypi/v/dcmspec.svg)](https://pypi.org/project/dcmspec/)
 [![Python versions](https://img.shields.io/pypi/pyversions/dcmspec.svg)](https://pypi.org/project/dcmspec/)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.17233195.svg)](https://doi.org/10.5281/zenodo.17233195)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.22131618.svg)](https://doi.org/10.5281/zenodo.22131618)
 
 # dcmspec
 

{dcmspec-0.2.3 → dcmspec-0.3.1}/README.md

@@ -1,7 +1,8 @@
 [![tests](https://github.com/dwikler/dcmspec/actions/workflows/test.yml/badge.svg)](https://github.com/dwikler/dcmspec/actions/workflows/test.yml)
-[![PyPI version](https://badge.fury.io/py/dcmspec.svg)](https://badge.fury.io/py/dcmspec)
+[![dicom](https://img.shields.io/github/actions/workflow/status/dwikler/dcmspec/e2e.yml?label=dicom&labelColor=24292e&color=28a745)](https://github.com/dwikler/dcmspec/actions/workflows/e2e.yml)
+[![PyPI version](https://img.shields.io/pypi/v/dcmspec.svg)](https://pypi.org/project/dcmspec/)
 [![Python versions](https://img.shields.io/pypi/pyversions/dcmspec.svg)](https://pypi.org/project/dcmspec/)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.17233195.svg)](https://doi.org/10.5281/zenodo.17233195)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.22131618.svg)](https://doi.org/10.5281/zenodo.22131618)
 
 # dcmspec
 

{dcmspec-0.2.3 → dcmspec-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dcmspec"
-version = "0.2.3"
+version = "0.3.1"
 description = "Toolkit for extracting, parsing, and processing DICOM specifications."
 authors = [{ name = "David Wikler", email = "david.wikler@ulb.be" }]
 license = { text = "Apache-2.0" }
@@ -29,6 +29,8 @@ dependencies = [
     "requests (>=2.32.3,<3.0.0)",
     "lxml (>=5.4.0,<6.0.0)",
     "rich (>=14.0.0,<15.0.0)",
+    "html2text (>=2025.4.15,<2026.0.0)",
+    "openpyxl (>=3.1.5,<4.0.0)",
 ]
 
 [project.urls]
@@ -56,6 +58,7 @@ exclude = ["src/dcmspec/tests/*", "src/dcmspec/.DS_Store"]
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.5"
 pytest-cov = "^6.1.1"
+ruff = "^0.16.4"
 mkdocs = "^1.6.1"
 mkdocstrings = { extras = ["python"], version = "^0.29.1" }
 mkdocs-material = "^9.6.14"
@@ -77,8 +80,11 @@ iod-explorer = "dcmspec.apps.ui.iod_explorer.iod_explorer:main"
 
 [tool.ruff]
 line-length = 120
+
+[tool.ruff.lint]
 select = [
     "E",
     "F",
     "D",
 ] # E includes line-too-long (E501), D includes docstrings checks
+ignore = ["D203", "D213"] # conflict with D211/D212, which we keep instead

dcmspec-0.3.1/src/dcmspec/__init__.py

@@ -0,0 +1 @@
+"""Toolkit for extracting, parsing, and processing DICOM specifications."""

dcmspec-0.3.1/src/dcmspec/apps/cli/__init__.py

@@ -0,0 +1 @@
+"""CLI applications for dcmspec."""

{dcmspec-0.2.3 → dcmspec-0.3.1}/src/dcmspec/apps/cli/iodattributes.py

@@ -58,12 +58,25 @@ def main():
     parser.add_argument("--config", help="Path to the configuration file")
     parser.add_argument(
         "--print-mode", 
-        choices=["table", "tree", "none"],
+        choices=["table", "tree", "csv", "xlsx", "none"],
         default="table",
-        help="Print as 'table' (default), 'tree', or 'none' to skip printing"
+        help="Print as 'table' (default), 'tree', 'csv', 'xlsx' (requires --output), or 'none' to skip printing"
+    )
+    parser.add_argument(
+        "--no-color",
+        action="store_true",
+        help="Disable colorized output (default: color enabled for terminal, disabled for file output)"
+    )
+    parser.add_argument(
+        "--output",
+        type=str,
+        help="Path to output file. If not specified (and not xlsx), prints to stdout."
     )
     args = parser.parse_args()
 
+    if args.print_mode == "xlsx" and not args.output:
+        parser.error("--output is required when --print-mode xlsx")
+
     cache_file_name = "Part3.xhtml"
     model_file_name = f"Part3_{args.table}_expanded.json"
     table_id = args.table 
@@ -114,11 +127,21 @@ def main():
     )
 
     # Print the model
-    printer = IODSpecPrinter(model)
+    printer = IODSpecPrinter(model, output=getattr(args, "output", None))
+
+    # Only disable color if --no-color is set; SpecPrinter disables color for file outputs automatically
+    use_color = not args.no_color
+
     if args.print_mode == "tree":
-        printer.print_tree(colorize=True)
+        printer.print_tree(
+            attr_names=["elem_tag", "elem_type", "elem_name"], attr_widths=[11, 2, 100], colorize=use_color
+            )
     elif args.print_mode == "table":
-        printer.print_table(colorize=True)
+        printer.print_table(colorize=use_color, column_widths=[30, 11, 4, 60])
+    elif args.print_mode == "csv":
+        printer.print_csv(colorize=use_color)
+    elif args.print_mode == "xlsx":
+        printer.print_xlsx(column_widths=[60, 16, 10, 100], colorize=use_color)
     # else: do not print anything if print_mode == "none"
 
 if __name__ == "__main__":

{dcmspec-0.2.3 → dcmspec-0.3.1}/src/dcmspec/apps/cli/modattributes.py

@@ -4,7 +4,7 @@ Features:
 - Download and parse DICOM Module Attributes tables from Part 3 of the DICOM standard.
 - Optionally merge additional information (VR, VM, Keyword, Status) from Part 6.
 - Cache the resulting model as a JSON file for future runs and as a structured representation of the standard.
-- Print the resulting model as a table or tree.
+- Print the resulting model as a table, tree, csv, or xlsx.
 - Supports caching, configuration files, and command-line options for flexible workflows.
 
 Usage:
@@ -113,12 +113,12 @@ def main():
 
     The tool parses the specified Module Attributes table to extract all attributes, tags, types,
     and descriptions for the module. Optionally, it can merge in VR, VM, Keyword, or Status information
-    from Part 6. The output can be printed as a table or tree.
+    from Part 6. The output can be printed as a table, tree, csv, or xlsx (xlsx requires --output).
 
     The resulting model is cached as a JSON file. The primary purpose of this cache file is to provide
-    a structured, machine-readable representation of the module's attributes, which can be used for further processing
-    or integration in other tools. As a secondary benefit, the cache file is also used to speed up subsequent runs
-    of the CLI scripts.
+    a structured, machine-readable representation of the module's attributes, which can be used for
+    further processing or integration in other tools. As a secondary benefit, the cache file is also used
+    to speed up subsequent runs of the CLI scripts.
 
     Usage:
         poetry run python -m src.dcmspec.apps.cli.modattributes <table_id> [options]
@@ -129,14 +129,17 @@ def main():
         --include-depth (int): Depth to which included tables should be parsed (default: unlimited).
         --force-parse: Force reparsing of the DOM and regeneration of the JSON model.
         --force-download: Force download of the input file and regeneration of the model.
-        --print-mode (str): Print as 'table' (default), 'tree', or 'none' to skip printing.
+        --print-mode (str): Print as 'table' (default), 'tree', 'csv', 'xlsx', or 'none' to skip printing.
+                            'xlsx' requires --output.
+        --output (str): Path to output file. If not specified (and not xlsx), prints to stdout.
         --add-part6 (list): Specification(s) to merge from Part 6 (e.g., --add-part6 VR VM).
         --force-update: Force update of the specifications merged from part 6, even if cached.
         -d, --debug: Enable debug logging to the console.
         -v, --verbose: Enable verbose (info-level) logging to the console.
 
-    Example:
+    Examples:
         poetry run python -m src.dcmspec.apps.cli.modattributes table_C.7-1 --add-part6 VR VM
+        poetry run python -m src.dcmspec.apps.cli.modattributes table_C.7-1 --print-mode xlsx --output module.xlsx
 
     """
     # Parse command-line arguments
@@ -164,9 +167,19 @@ def main():
     )
     parser.add_argument(
         "--print-mode", 
-        choices=["table", "tree", "none"],
+        choices=["table", "tree", "csv", "xlsx", "none"],
         default="table",
-        help="Print as 'table' (default), 'tree', or 'none' to skip printing"
+        help="Print as 'table' (default), 'tree', 'csv', 'xlsx' (requires --output), or 'none' to skip printing"
+    )
+    parser.add_argument(
+        "--no-color",
+        action="store_true",
+        help="Disable colorized output (default: color enabled for terminal, disabled for file output)"
+    )
+    parser.add_argument(
+        "--output",
+        type=str,
+        help="Path to output file. If not specified (and not xlsx), prints to stdout."
     )
     parser.add_argument(
         "--add-part6",
@@ -189,9 +202,12 @@ def main():
         action="store_true",
         help="Enable verbose (info-level) logging to the console"
     )
-    
+
     args = parser.parse_args()
 
+    if args.print_mode == "xlsx" and not args.output:
+        parser.error("--output is required when --print-mode xlsx")
+
     # Set up logger
     logger = logging.getLogger("modattributes")
     handler = logging.StreamHandler()
@@ -254,11 +270,20 @@ def main():
         model = module_model
 
     logger.debug("Model ready for printing/output")
-    printer = SpecPrinter(model)
+    printer = SpecPrinter(model, output=args.output)
+
+    # Only disable color if --no-color is set; SpecPrinter disables color for file outputs automatically
+    use_color = not args.no_color
     if args.print_mode == "tree":
-        printer.print_tree(colorize=True)
+        printer.print_tree(
+            attr_names=["elem_tag", "elem_type", "elem_name"], attr_widths=[11, 2, 100], colorize=use_color
+            )
     elif args.print_mode == "table":
-        printer.print_table(colorize=True)
+        printer.print_table(colorize=use_color, column_widths=[30, 11, 4, 60])
+    elif args.print_mode == "csv":
+        printer.print_csv(colorize=use_color)
+    elif args.print_mode == "xlsx":
+        printer.print_xlsx(column_widths=[60, 16, 10, 100], colorize=use_color)
     # else: do not print anything if print_mode == "none"
 
 if __name__ == "__main__":

{dcmspec-0.2.3 → dcmspec-0.3.1}/src/dcmspec/dom_table_spec_parser.py

@@ -3,15 +3,18 @@
 Provides the DOMSpecParser class for parsing DICOM specification tables from XHTML documents,
 converting them into structured in-memory representations using anytree.
 """
+
 from contextlib import contextmanager
 import re
 import unicodedata
+from typing import Any, Dict, Optional, Union
+
 from unidecode import unidecode
 from anytree import Node
 from bs4 import BeautifulSoup, Tag
-from typing import Any, Dict, Optional, Union
-from dcmspec.spec_parser import SpecParser
+import html2text
 
+from dcmspec.spec_parser import SpecParser
 from dcmspec.dom_utils import DOMUtils
 from dcmspec.progress import Progress, ProgressObserver, ProgressStatus, calculate_percent
 
@@ -506,6 +509,7 @@ class DOMTableSpecParser(SpecParser):
 
         return logical_cells, logical_col_idx, physical_col_idx
 
+
     def _extract_cell_value(
         self,
         cell: Tag,
@@ -518,11 +522,27 @@ class DOMTableSpecParser(SpecParser):
             if unformatted_list and logical_col_idx < len(unformatted_list)
             else True
         )
-        if use_unformatted:
-            return self._clean_extracted_text(cell.get_text(separator="\n", strip=True))
-        else:
+
+        # Guard clause: if formatted HTML is required, return content as-is
+        if not use_unformatted:
+            # Keep original HTML content
             return self._clean_extracted_text(cell.decode_contents())
 
+        # Use html2text for better readability of unformatted text extraction
+        converter = self._create_html2text_converter()
+        raw_text = converter.handle(str(cell))
+        return self._clean_extracted_text(raw_text)
+
+
+    def _create_html2text_converter(self) -> html2text.HTML2Text:
+        """Create and configure an html2text converter for consistent text extraction."""
+        converter = html2text.HTML2Text()
+        converter.ignore_links = True       # Remove URLs
+        converter.ignore_images = True      # Remove image references
+        converter.ignore_emphasis = True    # Remove Markdown emphasis
+        converter.body_width = 0            # Disable word wrapping
+        return converter
+
     def _update_rowspan_trackers(
         self,
         physical_col_idx: int,
@@ -781,15 +801,7 @@ class DOMTableSpecParser(SpecParser):
         return header
 
     def _clean_extracted_text(self, text: str) -> str:
-        """Clean extracted text using Unicode normalization and regex.
-
-        Args:
-            text (str): The text to be cleaned.
-
-        Returns:
-            str: The cleaned text.
-
-        """
+        """Clean extracted text using Unicode normalization and regex."""
         # Normalize unicode characters to compatibility form
         cleaned = unicodedata.normalize('NFKC', text)
 
@@ -805,27 +817,48 @@ class DOMTableSpecParser(SpecParser):
         # Remove stray  character
         cleaned = cleaned.replace('\u00c2', '')
 
+        # Collapse multiple newlines (including those separated by spaces/tabs) into a single newline
+        cleaned = re.sub(r'(\n\s*){2,}', '\n', cleaned)
+
         return cleaned.strip()
 
-    def _sanitize_string(self, input_string: str) -> str:
-        """Sanitize string to use it as a node attribute name.
+    @staticmethod
+    def _sanitize_string(input_string: str) -> str:
+        r"""Sanitize a string to make it safe for use as a node attribute name.
 
-        - Convert non-ASCII characters to closest ASCII equivalents
-        - Replace space characters and slashes with underscores
-        - Replace parentheses characters with dashes
+        Transformations applied:
+        - Convert to lowercase.
+        - Transliterate non-ASCII characters to ASCII.
+        - Replace spaces, slashes, newlines, and dots with underscores ("_").
+        - Replace parentheses with dashes ("-").
+        - Remove all characters except letters, digits, underscores, and dashes.
+        - Collapse multiple consecutive underscores into a single underscore.
+        - Remove leading and trailing underscores for cleanliness.
+        - Return a default name if the result is empty after sanitization.
 
         Args:
-            input_string (str): The string to be sanitized.
+            input_string (str): The original string to sanitize.
 
         Returns:
-            str: The sanitized string.
+            str: A sanitized version of the input string, suitable for use as an identifier.
+                    or "unnamed_node" if sanitization results in an empty string.
+
+        Example:
+            >>> DOMTableSpecParser._sanitize_string(
+            '>>Include\\nTable C.36.2.2.19-1 "RT Beam Limiting Device Definition Macro Attributes"\\n.'
+            )
+            'include_table_c_36_2_2_19-1_rt_beam_limiting_device_definition_macro_attributes'
+            >>> DOMTableSpecParser._sanitize_string('...')
+            'unnamed_node'
 
         """
-        # Normalize the string to NFC form and transliterate to ASCII
         normalized_str = unidecode(input_string.lower())
-        # Replace spaces and slashes with underscores, parentheses with dashes, and single quotes with underscores
-        return re.sub(
-            r"[ /\-()']",
-            lambda match: "-" if match.group(0) in "()" else "_",
-            normalized_str,
-        )
+        sanitized = re.sub(r"[ /\n\\.]", "_", normalized_str)  # spaces, slashes, newlines, dots → _
+        sanitized = re.sub(r"[()]", "-", sanitized)            # parentheses → -
+        sanitized = re.sub(r"[^a-z0-9_-]", "", sanitized)      # remove other chars
+        sanitized = re.sub(r"_+", "_", sanitized)              # collapse multiple underscores
+        sanitized = sanitized.strip("_")                       # remove leading/trailing underscores
+
+        # Fallback to default name if sanitization resulted in empty string
+        return sanitized or "unnamed_node"
+

{dcmspec-0.2.3 → dcmspec-0.3.1}/src/dcmspec/iod_spec_builder.py

@@ -176,9 +176,9 @@ class IODSpecBuilder:
             cache_file_name=cache_file_name,
             force_download=force_download,
             progress_observer=step1_progress_observer,
-            # BEGIN LEGACY SUPPORT: Remove for int progress callback deprecation
-            progress_callback=progress_observer,
-            # END LEGACY SUPPORT
+            # NOTE: do not pass `progress_observer` as `progress_callback`.
+            # Legacy `progress_callback` is deprecated and should only be used
+            # when an integer callback is explicitly provided by callers.
         )
 
         # --- Step 2: Build the IOD model from the DOM ---