Skip to content

Commit 20bb941

Browse files
committed
Rename Python package to monai-deploy-app-sdk
1 parent b621942 commit 20bb941

File tree

8 files changed

+33
-33
lines changed

8 files changed

+33
-33
lines changed

Diff for: CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,4 +236,4 @@ For string definition, [f-string](https://www.python.org/dev/peps/pep-0498/) is
236236
### Release a new version
237237

238238
[github ci]: https://github.com/Project-MONAI/monai-deploy-app-sdk/actions
239-
[monai-app-sdk issue list]: https://github.com/Project-MONAI/monai-deploy-app-sdk/issues
239+
[monai-deploy-app-sdk issue list]: https://github.com/Project-MONAI/monai-deploy-app-sdk/issues

Diff for: README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ MONAI Deploy Application SDK offers a framework and associated tools to design,
2020

2121
## Installation
2222

23-
To install [the current release](https://pypi.org/project/monai-app-sdk/), you can simply run:
23+
To install [the current release](https://pypi.org/project/monai-deploy-app-sdk/), you can simply run:
2424

2525
```bash
26-
pip install monai-app-sdk # NOTE: monai-app-sdk package is not available in PyPI for now.
26+
pip install monai-deploy-app-sdk # NOTE: monai-deploy-app-sdk package is not available in PyPI for now.
2727
```
2828

2929
## Getting Started
3030

3131
```bash
32-
pip install monai-app-sdk # NOTE: monai-app-sdk package is not available in PyPI for now.
32+
pip install monai-deploy-app-sdk # NOTE: monai-deploy-app-sdk package is not available in PyPI for now.
3333

34-
# Clone monai-app-sdk repository for accessing examples.
34+
# Clone monai-deploy-app-sdk repository for accessing examples.
3535
git clone https://github.com/Project-MONAI/monai-deploy-app-sdk.git
3636
cd monai-deploy-app-sdk
3737

@@ -79,5 +79,5 @@ Join the conversation on Twitter [@ProjectMONAI](https://twitter.com/ProjectMONA
7979
- Issue tracker: <https://github.com/Project-MONAI/monai-deploy-app-sdk/issues>
8080
- Wiki: <https://github.com/Project-MONAI/monai-deploy-app-sdk/wiki>
8181
- Test status: <https://github.com/Project-MONAI/monai-deploy-app-sdk/actions>
82-
- PyPI package: <https://pypi.org/project/monai-app-sdk>
83-
<!-- - Docker Hub: <https://hub.docker.com/r/projectmonai/monai-app-sdk> -->
82+
- PyPI package: <https://pypi.org/project/monai-deploy-app-sdk>
83+
<!-- - Docker Hub: <https://hub.docker.com/r/projectmonai/monai-deploy-app-sdk> -->

Diff for: monai-app-sdk.code-workspace renamed to monai-deploy-app-sdk.code-workspace

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
"name": "Python: simple_imaging_app",
3232
"type": "python",
3333
"request": "launch",
34-
"program": "${workspaceFolder:monai-app-sdk}/examples/apps/simple_imaging_app/app.py",
35-
"args": ["-i", "${workspaceFolder:monai-app-sdk}/examples/apps/simple_imaging_app/brain_mr_input.jpg", "-o", "${workspaceFolder:monai-app-sdk}/output"],
36-
"cwd": "${workspaceFolder:monai-app-sdk}",
34+
"program": "${workspaceFolder:monai-deploy-app-sdk}/examples/apps/simple_imaging_app/app.py",
35+
"args": ["-i", "${workspaceFolder:monai-deploy-app-sdk}/examples/apps/simple_imaging_app/brain_mr_input.jpg", "-o", "${workspaceFolder:monai-deploy-app-sdk}/output"],
36+
"cwd": "${workspaceFolder:monai-deploy-app-sdk}",
3737
"console": "integratedTerminal",
3838
// Hanging on WSL2 if DISPLAY is set. Due to https://github.com/matplotlib/matplotlib/pull/17396
3939
"env" : {"DISPLAY": ""}

Diff for: monai/deploy/operators/dicom_seg_writer_operator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,8 @@ def segslice_from_mhd(dcm_output, seg_img, input_ds, num_labels):
626626

627627

628628
def test():
629-
data_path = "/home/mqin/src/monai-app-sdk/examples/apps/ai_spleen_seg_app/input"
630-
out_path = "/home/mqin/src/monai-app-sdk/examples/apps/ai_spleen_seg_app/output/dcm_seg_test.dcm"
629+
data_path = "/home/mqin/src/monai-deploy-app-sdk/examples/apps/ai_spleen_seg_app/input"
630+
out_path = "/home/mqin/src/monai-deploy-app-sdk/examples/apps/ai_spleen_seg_app/output/dcm_seg_test.dcm"
631631

632632
files = []
633633
loader = DICOMDataLoaderOperator()

Diff for: monai/deploy/packager/templates.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
4444
RUN pip install --no-cache-dir --upgrade -r {map_requirements_path}
4545
46-
# Override monai-app-sdk module
47-
COPY --chown=monai:monai ./monai-app-sdk /home/monai/.local/lib/python3.8/site-packages/monai/deploy/
46+
# Override monai-deploy-app-sdk module
47+
COPY --chown=monai:monai ./monai-deploy-app-sdk /home/monai/.local/lib/python3.8/site-packages/monai/deploy/
4848
4949
COPY --chown=monai:monai ./map/app.json /etc/monai/
5050
COPY --chown=monai:monai ./map/pkg.json /etc/monai/

Diff for: monai/deploy/packager/util.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ def build_image(args: dict, temp_dir: str):
9696
else:
9797
shutil.copytree(application_path, target_application_path)
9898

99-
# Copy monai-app-sdk module to temp directory (under 'monai-app-sdk' folder)
100-
monai_app_sdk_path = os.path.join(dist_module_path("monai-app-sdk"), "monai", "deploy")
101-
target_monai_app_sdk_path = os.path.join(temp_dir, "monai-app-sdk")
99+
# Copy monai-deploy-app-sdk module to temp directory (under 'monai-deploy-app-sdk' folder)
100+
monai_app_sdk_path = os.path.join(dist_module_path("monai-deploy-app-sdk"), "monai", "deploy")
101+
target_monai_app_sdk_path = os.path.join(temp_dir, "monai-deploy-app-sdk")
102102
shutil.copytree(monai_app_sdk_path, target_monai_app_sdk_path)
103103

104104
# Parse SDK provided values
@@ -108,7 +108,7 @@ def build_image(args: dict, temp_dir: str):
108108
pip_packages = args["application_info"]["pip-packages"]
109109

110110
# Append required packages for SDK to pip_packages
111-
monai_app_sdk_requires = dist_requires("monai-app-sdk")
111+
monai_app_sdk_requires = dist_requires("monai-deploy-app-sdk")
112112
pip_packages.extend(monai_app_sdk_requires)
113113

114114
pip_folder = os.path.join(temp_dir, "pip")

Diff for: run

+14-14
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,13 @@ install_python_dev_deps() {
325325

326326
install_edit_mode() {
327327
# Create a symlink to the virtual environment.
328-
# This solves an issue with separate package folders for 'monai' and 'monai-app-sdk' like below:
328+
# This solves an issue with separate package folders for 'monai' and 'monai-deploy-app-sdk' like below:
329329
# - 'monai': installed with 'pip install monai'
330-
# - 'monai-app-sdk': installed with 'pip install -e . # installed with development(edit) mode
330+
# - 'monai-deploy-app-sdk': installed with 'pip install -e . # installed with development(edit) mode
331331
local monai_package_path=$(${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py dist_module_path monai)
332-
local sdk_package_path=$(${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py dist_module_path monai-app-sdk)
332+
local sdk_package_path=$(${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py dist_module_path monai-deploy-app-sdk)
333333
local is_sdk_editable="false"
334-
if ${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py is_dist_editable monai-app-sdk; then
334+
if ${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py is_dist_editable monai-deploy-app-sdk; then
335335
is_sdk_editable="true"
336336
fi
337337

@@ -340,24 +340,24 @@ install_edit_mode() {
340340
c_echo b "is_sdk_editable : " Z "${is_sdk_editable}"
341341

342342
if [ "${is_sdk_editable}" == "false" ]; then
343-
c_echo W "Installing monai-app-sdk in edit mode..."
343+
c_echo W "Installing monai-deploy-app-sdk in edit mode..."
344344
if [ -n "${VIRTUAL_ENV}" ] || [ -n "${CONDA_PREFIX}" ]; then
345345
run_command ${MONAI_PY_EXE} -m pip install -e .
346346
else
347-
c_echo_err R "You must be in a virtual environment to install monai-app-sdk in edit mode."
347+
c_echo_err R "You must be in a virtual environment to install monai-deploy-app-sdk in edit mode."
348348
fi
349349

350-
if ${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py is_dist_editable monai-app-sdk; then
350+
if ${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py is_dist_editable monai-deploy-app-sdk; then
351351
is_sdk_editable="true"
352352
fi
353353

354-
sdk_package_path=$(${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py dist_module_path monai-app-sdk)
354+
sdk_package_path=$(${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py dist_module_path monai-deploy-app-sdk)
355355
c_echo b "sdk_package_path : " Z "${sdk_package_path}"
356356
c_echo b "is_sdk_editable : " Z "${is_sdk_editable}"
357357
fi
358358

359359
if [ "${is_sdk_editable}" = "false" ]; then
360-
c_echo W "Installing monai-app-sdk in edit mode..."
360+
c_echo W "Installing monai-deploy-app-sdk in edit mode..."
361361
fi
362362

363363
if [ "$is_sdk_editable" = "true" ] && [ -n "${monai_package_path}" ] && [ ! -L ${monai_package_path}/monai/deploy ]; then
@@ -376,7 +376,7 @@ setup() {
376376
install_python_dev_deps
377377
}
378378

379-
clean_desc() { c_echo 'Clean up temporary files and uninstall monai-app-sdk
379+
clean_desc() { c_echo 'Clean up temporary files and uninstall monai-deploy-app-sdk
380380
'
381381
}
382382
clean() {
@@ -742,9 +742,9 @@ It executes the following command:
742742
743743
' "${MONAI_PY_EXE}"' -m py.test --cache-clear -vv \
744744
--cov=monai \
745-
--junitxml="'"$TOP/junit-monai-app-sdk.xml"'" \
745+
--junitxml="'"$TOP/junit-monai-deploy-app-sdk.xml"'" \
746746
--cov-config="'"$TOP/.coveragerc"'" \
747-
--cov-report=xml:"'"$TOP/monai-app-sdk-coverage.xml"'" \
747+
--cov-report=xml:"'"$TOP/monai-deploy-app-sdk-coverage.xml"'" \
748748
--cov-report term \
749749
"$@"
750750
@@ -761,9 +761,9 @@ pytest() {
761761
pushd $TOP > /dev/null
762762
run_command ${MONAI_PY_EXE} -m py.test --cache-clear -vv \
763763
--cov=monai \
764-
--junitxml="$TOP/junit-monai-app-sdk.xml" \
764+
--junitxml="$TOP/junit-monai-deploy-app-sdk.xml" \
765765
--cov-config="$TOP/.coveragerc" \
766-
--cov-report=xml:"$TOP/monai-app-sdk-coverage.xml" \
766+
--cov-report=xml:"$TOP/monai-deploy-app-sdk-coverage.xml" \
767767
--cov-report term \
768768
"$@"
769769
result=$?

Diff for: setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[metadata]
2-
name = monai-app-sdk
2+
name = monai-deploy-app-sdk
33
author = MONAI Consortium
44
author_email = [email protected]
55
url = https://monai.io/

0 commit comments

Comments
 (0)