Model

FNNDSC · Oct 10, 2023 · 79bda1e · 79bda1e
1 parent d25d4ee
commit 79bda1e
Show file tree

Hide file tree

Showing 16 changed files with 514 additions and 460 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,8 +48,7 @@ jobs:
 
   build:
     name: Build
-    if: false  # delete this line and uncomment the line below to enable automatic builds
-    # if: github.event_name == 'push' || github.event_name == 'release'
+    if: github.event_name == 'push' || github.event_name == 'release'
     # needs: [ test ]  # uncomment to require passing tests
     runs-on: ubuntu-22.04
 

diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,5 @@ __pycache__/
 .vscode/
 
 venv/
+
+.~lock.*#
diff --git a/Dockerfile b/Dockerfile
@@ -3,11 +3,11 @@
 # FROM docker.io/fnndsc/conda:python3.10.2-cuda11.6.0
 FROM docker.io/python:3.11.3-slim-bullseye
 
-LABEL org.opencontainers.image.authors="FNNDSC <[email protected]>" \
-      org.opencontainers.image.title="ChRIS Plugin Title" \
-      org.opencontainers.image.description="A ChRIS plugin that..."
+LABEL org.opencontainers.image.authors="FNNDSC <[email protected]>" \
+      org.opencontainers.image.title="Inner Subplate Surface Fit" \
+      org.opencontainers.image.description="Outer to inner surface mesh deformation using a radial distance map for human fetal MRI"
 
-ARG SRCDIR=/usr/local/src/app
+ARG SRCDIR=/usr/local/src/pl-inner-subplate-surface-fit
 WORKDIR ${SRCDIR}
 
 COPY requirements.txt .
@@ -19,4 +19,4 @@ RUN pip install ".[${extras_require}]" \
     && cd / && rm -rf ${SRCDIR}
 WORKDIR /
 
-CMD ["commandname"]
+CMD ["innerspfit"]
diff --git a/README.md b/README.md
@@ -1,76 +1,10 @@
-# _ChRIS_ Plugin Template
+# Inner Subplate Surface Fit
 
-[![test status](https://github.com/FNNDSC/python-chrisapp-template/actions/workflows/src.yml/badge.svg)](https://github.com/FNNDSC/python-chrisapp-template/actions/workflows/src.yml)
-[![MIT License](https://img.shields.io/github/license/FNNDSC/python-chrisapp-template)](LICENSE)
+[![Version](https://img.shields.io/docker/v/fnndsc/pl-inner-subplate-surface-fit?sort=semver)](https://hub.docker.com/r/fnndsc/pl-inner-subplate-surface-fit)
+[![MIT License](https://img.shields.io/github/license/fnndsc/pl-inner-subplate-surface-fit)](https://github.com/FNNDSC/pl-inner-subplate-surface-fit/blob/main/LICENSE)
+[![ci](https://github.com/FNNDSC/pl-inner-subplate-surface-fit/actions/workflows/ci.yml/badge.svg)](https://github.com/FNNDSC/pl-inner-subplate-surface-fit/actions/workflows/ci.yml)
 
-This is a minimal template repository for _ChRIS_ plugin applications in Python.
-
-## About _ChRIS_ Plugins
-
-A _ChRIS_ plugin is a scientific data-processing software which can run anywhere all-the-same:
-in the cloud via a [web app](https://github.com/FNNDSC/ChRIS_ui/), or on your own laptop
-from the terminal. They are easy to build and easy to understand: most simply, a
-_ChRIS_ plugin is a command-line program which processes data from an input directory
-and creates data to an output directory with the usage
-`commandname [options...] inputdir/ outputdir/`.
-
-For more information, visit our website https://chrisproject.org
-
-## How to Use This Template
-
-Go to https://github.com/FNNDSC/python-chrisapp-template and click "Use this template".
-The newly created repository is ready to use right away.
-
-A script `bootstrap.sh` is provided to help fill in and rename values for your new project.
-It is optional to use.
-
-1. Edit the variables in `bootstrap.sh`
-2. Run `./bootstrap.sh`
-3. Follow the instructions it will print out
-
-## Example Plugins
-
-Here are some good, complete examples of _ChRIS_ plugins created from this template.
-
-- https://github.com/FNNDSC/pl-dcm2niix (basic command wrapper example)
-- <https://github.com/FNNDSC/pl-adapt_object_mesh> (parallelizes a command)
-- https://github.com/FNNDSC/pl-mri-preview (uses [NiBabel](https://nipy.org/nibabel/))
-- https://github.com/FNNDSC/pl-pyvista-volume (example using Python package project structure and pytest)
-- https://github.com/FNNDSC/pl-fetal-cp-surface-extract (has a good README.md)
-
-## What's Inside
-
-| Path                       | Purpose                                                                                                                                                                                                  |
-|----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `app.py`                   | Main script: start editing here!                                                                                                                                                                         |
-| `tests/`                   | Unit tests                                                                                                                                                                                               |
-| `setup.py`                 | [Python project metadata and installation script](https://packaging.python.org/en/latest/guides/distributing-packages-using-setuptools/#setup-py)                                                        |
-| `requirements.txt`         | List of Python dependencies                                                                                                                                                                              |
-| `Dockerfile`               | [Container image build recipe](https://docs.docker.com/engine/reference/builder/)                                                                                                                        |
-| `.github/workflows/ci.yml` | "continuous integration" using [Github Actions](https://docs.github.com/en/actions/learn-github-actions/understanding-github-actions): automatic testing, building, and uploads to https://chrisstore.co |
-
-## Contributing
-
-The source code for the `main` branch of this repository is on the
-[src](https://github.com/fnndsc/python-chrisapp-template/tree/src)
-branch, which has an additional file
-[`.github/workflows/src.yml`](https://github.com/FNNDSC/python-chrisapp-template/blob/src/.github/workflows/src.yml)
-When tests pass, changes are automatically merged into `main`.
-Developers should commit to or make pull requests targeting `src`.
-Do not push directly to `main`.
-
-This is a workaround in order to do automatic testing of this template
-without including the `.github/workflows/src.yml` file in the template itself.
-
-<!-- BEGIN README TEMPLATE
-
-# ChRIS Plugin Title
-
-[![Version](https://img.shields.io/docker/v/fnndsc/pl-appname?sort=semver)](https://hub.docker.com/r/fnndsc/pl-appname)
-[![MIT License](https://img.shields.io/github/license/fnndsc/pl-appname)](https://github.com/FNNDSC/pl-appname/blob/main/LICENSE)
-[![ci](https://github.com/FNNDSC/pl-appname/actions/workflows/ci.yml/badge.svg)](https://github.com/FNNDSC/pl-appname/actions/workflows/ci.yml)
-
-`pl-appname` is a [_ChRIS_](https://chrisproject.org/)
+`pl-inner-subplate-surface-fit` is a [_ChRIS_](https://chrisproject.org/)
 _ds_ plugin which takes in ...  as input files and
 creates ... as output files.
 
@@ -80,36 +14,36 @@ creates ... as output files.
 
 ## Installation
 
-`pl-appname` is a _[ChRIS](https://chrisproject.org/) plugin_, meaning it can
+`pl-inner-subplate-surface-fit` is a _[ChRIS](https://chrisproject.org/) plugin_, meaning it can
 run from either within _ChRIS_ or the command-line.
 
-[![Get it from chrisstore.co](https://raw.githubusercontent.com/FNNDSC/ChRIS_store_ui/963938c241636e4c3dc4753ee1327f56cb82d8b5/src/assets/public/badges/light.svg)](https://chrisstore.co/plugin/pl-appname)
+[![Get it from chrisstore.co](https://raw.githubusercontent.com/FNNDSC/ChRIS_store_ui/963938c241636e4c3dc4753ee1327f56cb82d8b5/src/assets/public/badges/light.svg)](https://chrisstore.co/plugin/pl-inner-subplate-surface-fit)
 
 ## Local Usage
 
 To get started with local command-line usage, use [Apptainer](https://apptainer.org/)
-(a.k.a. Singularity) to run `pl-appname` as a container:
+(a.k.a. Singularity) to run `pl-inner-subplate-surface-fit` as a container:
 
 ```shell
-apptainer exec docker://fnndsc/pl-appname commandname [--args values...] input/ output/
+apptainer exec docker://fnndsc/pl-inner-subplate-surface-fit innerspfit [--args values...] input/ output/
 ```
 
 To print its available options, run:
 
 ```shell
-apptainer exec docker://fnndsc/pl-appname commandname --help
+apptainer exec docker://fnndsc/pl-inner-subplate-surface-fit innerspfit --help
 ```
 
 ## Examples
 
-`commandname` requires two positional arguments: a directory containing
+`innerspfit` requires two positional arguments: a directory containing
 input data, and a directory where to create output data.
 First, create the input directory and move input data into it.
 
 ```shell
 mkdir incoming/ outgoing/
 mv some.dat other.dat incoming/
-apptainer exec docker://fnndsc/pl-appname:latest commandname [--args] incoming/ outgoing/
+apptainer exec docker://fnndsc/pl-inner-subplate-surface-fit:latest innerspfit [--args] incoming/ outgoing/
 ```
 
 ## Development
@@ -121,18 +55,18 @@ Instructions for developers.
 Build a local container image:
 
 ```shell
-docker build -t localhost/fnndsc/pl-appname .
+docker build -t localhost/fnndsc/pl-inner-subplate-surface-fit .
 ```
 
 ### Running
 
-Mount the source code `app.py` into a container to try out changes without rebuild.
+Mount the source code `innerspfit.py` into a container to try out changes without rebuild.
 
 ```shell
 docker run --rm -it --userns=host -u $(id -u):$(id -g) \
-    -v $PWD/app.py:/usr/local/lib/python3.11/site-packages/app.py:ro \
+    -v $PWD/__main__.py:/usr/local/lib/python3.11/site-packages/__main__.py:ro \
     -v $PWD/in:/incoming:ro -v $PWD/out:/outgoing:rw -w /outgoing \
-    localhost/fnndsc/pl-appname commandname /incoming /outgoing
+    localhost/fnndsc/pl-inner-subplate-surface-fit innerspfit /incoming /outgoing
 ```
 
 ### Testing
@@ -142,8 +76,8 @@ It's recommended to rebuild the image to ensure that sources are up-to-date.
 Use the option `--build-arg extras_require=dev` to install extra dependencies for testing.
 
 ```shell
-docker build -t localhost/fnndsc/pl-appname:dev --build-arg extras_require=dev .
-docker run --rm -it localhost/fnndsc/pl-appname:dev pytest
+docker build -t localhost/fnndsc/pl-inner-subplate-surface-fit:dev --build-arg extras_require=dev .
+docker run --rm -it localhost/fnndsc/pl-inner-subplate-surface-fit:dev pytest
 ```
 
 ## Release
@@ -160,8 +94,8 @@ Increase the version number in `setup.py` and commit this file.
 Build and push an image tagged by the version. For example, for version `1.2.3`:
 
 ```
-docker build -t docker.io/fnndsc/pl-appname:1.2.3 .
-docker push docker.io/fnndsc/pl-appname:1.2.3
+docker build -t docker.io/fnndsc/pl-inner-subplate-surface-fit:1.2.3 .
+docker push docker.io/fnndsc/pl-inner-subplate-surface-fit:1.2.3
 ```
 
 ### Get JSON Representation
@@ -170,7 +104,6 @@ Run [`chris_plugin_info`](https://github.com/FNNDSC/chris_plugin#usage)
 to produce a JSON description of this plugin, which can be uploaded to a _ChRIS Store_.
 
 ```shell
-docker run --rm localhost/fnndsc/pl-appname:dev chris_plugin_info > chris_plugin_info.json
+docker run --rm localhost/fnndsc/pl-inner-subplate-surface-fit:dev chris_plugin_info > chris_plugin_info.json
 ```
 
-END README TEMPLATE -->
diff --git a/app.py b/app.py