diff --git a/package.json b/package.json index 395261051..0a75afcdb 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ "build:bindgen:typescript:compress-stringify": "./src/itk-wasm-cli.js -s packages/compress-stringify -b emscripten-build bindgen --package-version 0.4.5 --package-name @itk-wasm/compress-stringify --package-description \"Zstandard compression and decompression and base64 encoding and decoding in WebAssembly.\" --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'", "build:bindgen:python:compress-stringify": "./src/itk-wasm-cli.js -s packages/compress-stringify -b wasi-build bindgen --language python --package-name itkwasm-compress-stringify --package-description \"Zstandard compression and decompression and base64 encoding and decoding in WebAssembly.\" --package-version 0.4.5 --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'", "build:emscripten:dicom": "node ./src/itk-wasm-cli.js -s packages/dicom -b emscripten-build build ", - "build:bindgen:typescript:dicom": "./src/itk-wasm-cli.js -s packages/dicom -b emscripten-build bindgen --package-version 2.0.2 --package-name @itk-wasm/dicom --package-description \"Read files and images related to DICOM file format.\" --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'", - "build:bindgen:python:dicom": "./src/itk-wasm-cli.js -s packages/dicom -b wasi-build bindgen --package-version 2.0.2 --language python --package-name itkwasm-dicom --package-description \"Read files and images related to DICOM file format.\" --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'", + "build:bindgen:typescript:dicom": "./src/itk-wasm-cli.js -s packages/dicom -b emscripten-build bindgen --package-version 2.0.3 --package-name @itk-wasm/dicom --package-description \"Read files and images related to DICOM file format.\" --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'", + "build:bindgen:python:dicom": "./src/itk-wasm-cli.js -s packages/dicom -b wasi-build bindgen --package-version 2.0.3 --language python --package-name itkwasm-dicom --package-description \"Read files and images related to DICOM file format.\" --repository 'https://github.com/InsightSoftwareConsortium/itk-wasm'", "build:emscripten:packages": "npm run build:emscripten:compress-stringify && npm run build:bindgen:typescript:compress-stringify && npm run build:emscripten:dicom && npm run build:bindgen:typescript:dicom", "build:wasi": "node ./src/build-wasi.js && npm run build:wasi:packages", "build:wasi:compress-stringify": "node ./src/itk-wasm-cli.js -i itkwasm/wasi:latest -s packages/compress-stringify -b wasi-build build", diff --git a/packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/_version.py b/packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/_version.py index 0309ae290..5fa9130a6 100644 --- a/packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/_version.py +++ b/packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/_version.py @@ -1 +1 @@ -__version__ = "2.0.2" +__version__ = "2.0.3" diff --git a/packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/structured_report_to_html_async.py b/packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/structured_report_to_html_async.py index a674746fd..1e61dcf87 100644 --- a/packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/structured_report_to_html_async.py +++ b/packages/dicom/python/itkwasm-dicom-emscripten/itkwasm_dicom_emscripten/structured_report_to_html_async.py @@ -93,15 +93,13 @@ async def structured_report_to_html_async( :param unknown_relationship: accept unknown/missing relationship type :type unknown_relationship: bool - :param invalid_item_value: accept invalid content item value -(e.g. violation of VR or VM definition) + :param invalid_item_value: accept invalid content item value (e.g. violation of VR or VM definition) :type invalid_item_value: bool :param ignore_constraints: ignore relationship content constraints :type ignore_constraints: bool - :param ignore_item_errors: do not abort on content item errors, just warn -(e.g. missing value type specific attributes) + :param ignore_item_errors: do not abort on content item errors, just warn (e.g. missing value type specific attributes) :type ignore_item_errors: bool :param skip_invalid_items: skip invalid content items (incl. sub-tree) @@ -116,12 +114,10 @@ async def structured_report_to_html_async( :param charset_assume: [c]harset: string, assume charset c if no extended charset declared :type charset_assume: str - :param charset_check_all: check all data elements with string values -(default: only PN, LO, LT, SH, ST, UC and UT) + :param charset_check_all: check all data elements with string values (default: only PN, LO, LT, SH, ST, UC and UT) :type charset_check_all: bool - :param convert_to_utf8: convert all element values that are affected -by Specific Character Set (0008,0005) to UTF-8 + :param convert_to_utf8: convert all element values that are affected by Specific Character Set (0008,0005) to UTF-8 :type convert_to_utf8: bool :param url_prefix: URL: string. Append specificed URL prefix to hyperlinks of referenced composite objects in the document. diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/_version.py b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/_version.py index 0309ae290..5fa9130a6 100644 --- a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/_version.py +++ b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/_version.py @@ -1 +1 @@ -__version__ = "2.0.2" +__version__ = "2.0.3" diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/apply_presentation_state_to_image.py b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/apply_presentation_state_to_image.py index 0d6d5b396..18e1e96c1 100644 --- a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/apply_presentation_state_to_image.py +++ b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/apply_presentation_state_to_image.py @@ -2,7 +2,7 @@ from pathlib import Path, PurePosixPath import os -from typing import Dict, Tuple, Optional +from typing import Dict, Tuple, Optional, List from importlib_resources import files as file_resources diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/read_dicom_encapsulated_pdf.py b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/read_dicom_encapsulated_pdf.py index 01db64b06..a106aaa3b 100644 --- a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/read_dicom_encapsulated_pdf.py +++ b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/read_dicom_encapsulated_pdf.py @@ -2,7 +2,7 @@ from pathlib import Path, PurePosixPath import os -from typing import Dict, Tuple, Optional +from typing import Dict, Tuple, Optional, List from importlib_resources import files as file_resources diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/structured_report_to_html.py b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/structured_report_to_html.py index b47298138..4a594c8ac 100644 --- a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/structured_report_to_html.py +++ b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/structured_report_to_html.py @@ -2,7 +2,7 @@ from pathlib import Path, PurePosixPath import os -from typing import Dict, Tuple, Optional +from typing import Dict, Tuple, Optional, List from importlib_resources import files as file_resources @@ -91,15 +91,13 @@ def structured_report_to_html( :param unknown_relationship: accept unknown/missing relationship type :type unknown_relationship: bool - :param invalid_item_value: accept invalid content item value -(e.g. violation of VR or VM definition) + :param invalid_item_value: accept invalid content item value (e.g. violation of VR or VM definition) :type invalid_item_value: bool :param ignore_constraints: ignore relationship content constraints :type ignore_constraints: bool - :param ignore_item_errors: do not abort on content item errors, just warn -(e.g. missing value type specific attributes) + :param ignore_item_errors: do not abort on content item errors, just warn (e.g. missing value type specific attributes) :type ignore_item_errors: bool :param skip_invalid_items: skip invalid content items (incl. sub-tree) @@ -114,12 +112,10 @@ def structured_report_to_html( :param charset_assume: [c]harset: string, assume charset c if no extended charset declared :type charset_assume: str - :param charset_check_all: check all data elements with string values -(default: only PN, LO, LT, SH, ST, UC and UT) + :param charset_check_all: check all data elements with string values (default: only PN, LO, LT, SH, ST, UC and UT) :type charset_check_all: bool - :param convert_to_utf8: convert all element values that are affected -by Specific Character Set (0008,0005) to UTF-8 + :param convert_to_utf8: convert all element values that are affected by Specific Character Set (0008,0005) to UTF-8 :type convert_to_utf8: bool :param url_prefix: URL: string. Append specificed URL prefix to hyperlinks of referenced composite objects in the document. diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/structured_report_to_text.py b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/structured_report_to_text.py index 06064d09d..23b688d8a 100644 --- a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/structured_report_to_text.py +++ b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/structured_report_to_text.py @@ -2,7 +2,7 @@ from pathlib import Path, PurePosixPath import os -from typing import Dict, Tuple, Optional +from typing import Dict, Tuple, Optional, List from importlib_resources import files as file_resources diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/apply-presentation-state-to-image.wasi.wasm b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/apply-presentation-state-to-image.wasi.wasm index 8b8d135c5..6e19a6c55 100755 Binary files a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/apply-presentation-state-to-image.wasi.wasm and b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/apply-presentation-state-to-image.wasi.wasm differ diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/read-dicom-encapsulated-pdf.wasi.wasm b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/read-dicom-encapsulated-pdf.wasi.wasm index 88d76eaef..7114f0167 100755 Binary files a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/read-dicom-encapsulated-pdf.wasi.wasm and b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/read-dicom-encapsulated-pdf.wasi.wasm differ diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/structured-report-to-html.wasi.wasm b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/structured-report-to-html.wasi.wasm index 3085bea55..78475b19a 100755 Binary files a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/structured-report-to-html.wasi.wasm and b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/structured-report-to-html.wasi.wasm differ diff --git a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/structured-report-to-text.wasi.wasm b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/structured-report-to-text.wasi.wasm index 5729a2aed..a75cf09d1 100755 Binary files a/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/structured-report-to-text.wasi.wasm and b/packages/dicom/python/itkwasm-dicom-wasi/itkwasm_dicom_wasi/wasm_modules/structured-report-to-text.wasi.wasm differ diff --git a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/_version.py b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/_version.py index 0309ae290..5fa9130a6 100644 --- a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/_version.py +++ b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/_version.py @@ -1 +1 @@ -__version__ = "2.0.2" +__version__ = "2.0.3" diff --git a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/apply_presentation_state_to_image.py b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/apply_presentation_state_to_image.py index 4cb422ade..5c5cf577a 100644 --- a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/apply_presentation_state_to_image.py +++ b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/apply_presentation_state_to_image.py @@ -1,6 +1,7 @@ # Generated file. Do not edit. -from typing import Optional +import os +from typing import Dict, Tuple, Optional from itkwasm import ( environment_dispatch, diff --git a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/apply_presentation_state_to_image_async.py b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/apply_presentation_state_to_image_async.py index 076f4de4b..bb31a760f 100644 --- a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/apply_presentation_state_to_image_async.py +++ b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/apply_presentation_state_to_image_async.py @@ -1,6 +1,7 @@ # Generated file. Do not edit. -from typing import Optional +import os +from typing import Dict, Tuple, Optional from itkwasm import ( environment_dispatch, diff --git a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/read_dicom_encapsulated_pdf.py b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/read_dicom_encapsulated_pdf.py index 0d86d60a2..d37d135c8 100644 --- a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/read_dicom_encapsulated_pdf.py +++ b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/read_dicom_encapsulated_pdf.py @@ -1,6 +1,7 @@ # Generated file. Do not edit. -from typing import Optional +import os +from typing import Dict, Tuple, Optional from itkwasm import ( environment_dispatch, diff --git a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/read_dicom_encapsulated_pdf_async.py b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/read_dicom_encapsulated_pdf_async.py index 021327be8..ef3de66d9 100644 --- a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/read_dicom_encapsulated_pdf_async.py +++ b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/read_dicom_encapsulated_pdf_async.py @@ -1,6 +1,7 @@ # Generated file. Do not edit. -from typing import Optional +import os +from typing import Dict, Tuple, Optional from itkwasm import ( environment_dispatch, diff --git a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_html.py b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_html.py index 9e8b938f1..a340fbcb5 100644 --- a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_html.py +++ b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_html.py @@ -1,6 +1,7 @@ # Generated file. Do not edit. -from typing import Optional +import os +from typing import Dict, Tuple, Optional from itkwasm import ( environment_dispatch, diff --git a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_html_async.py b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_html_async.py index 33f172dd1..97981c983 100644 --- a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_html_async.py +++ b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_html_async.py @@ -1,6 +1,7 @@ # Generated file. Do not edit. -from typing import Optional +import os +from typing import Dict, Tuple, Optional from itkwasm import ( environment_dispatch, diff --git a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_text.py b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_text.py index b3f00a9a4..05020a7a5 100644 --- a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_text.py +++ b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_text.py @@ -1,6 +1,7 @@ # Generated file. Do not edit. -from typing import Optional +import os +from typing import Dict, Tuple, Optional from itkwasm import ( environment_dispatch, diff --git a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_text_async.py b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_text_async.py index de32f83e9..9e83aca45 100644 --- a/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_text_async.py +++ b/packages/dicom/python/itkwasm-dicom/itkwasm_dicom/structured_report_to_text_async.py @@ -1,6 +1,7 @@ # Generated file. Do not edit. -from typing import Optional +import os +from typing import Dict, Tuple, Optional from itkwasm import ( environment_dispatch, diff --git a/packages/dicom/typescript/package.json b/packages/dicom/typescript/package.json index 5e2dc7192..2f8ada5c9 100644 --- a/packages/dicom/typescript/package.json +++ b/packages/dicom/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@itk-wasm/dicom", - "version": "2.0.2", + "version": "2.0.3", "description": "Read files and images related to DICOM file format.", "type": "module", "module": "./dist/bundles/dicom.js", diff --git a/src/bindgen/python.js b/src/bindgen/python.js index 9a262d2d5..0ec2eebaf 100644 --- a/src/bindgen/python.js +++ b/src/bindgen/python.js @@ -610,7 +610,8 @@ function dispatchFunctionModule(interfaceJson, pypackage, modulePath) { const functionName = snakeCase(interfaceJson.name) let moduleContent = `# Generated file. Do not edit. -from typing import Optional +import os +from typing import Dict, Tuple, Optional from itkwasm import ( environment_dispatch,`