Added pybamm-cookiecutter CLI

.github/workflows/test_on_push.yml

@@ -47,6 +47,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Set up Git
+        run: |
+          git config --global user.name "pybamm user"
+          git config --global user.email "[email protected]"
+
       - name: Set up uv
         uses: yezz123/setup-uv@v4
         with:
@@ -58,9 +63,6 @@ jobs:
       - name: Test template generation
         run: nox -s template-tests
 
-      - name: Test project
-        run: nox -s project-tests
-
       - name: Run coverage tests
         if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.12'
         run: nox -s coverage
@@ -98,7 +100,6 @@ jobs:
       - name: Check if the documentation can be built
         run: nox -s docs
 
-
   generated_project_tests:
     needs: [template_test]
     runs-on: ${{ matrix.os }}
@@ -121,12 +122,39 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Set up uv
+        uses: yezz123/setup-uv@v4
+        with:
+          uv-venv: ".venv"
+
       - name: Install copier and jinja2_time
-        run: python -m pip install copier jinja2_time
+        run: uv pip install copier jinja2_time
 
       - name: Generate project
         run: |
-          copier copy . ../pybamm-${{ matrix.backend }}-${{ matrix.vcs }} --data project_name=pybamm-${{ matrix.backend }}-${{ matrix.vcs }} --data project_slug=pybamm_${{ matrix.backend }}_${{ matrix.vcs }} --data backend=${{ matrix.backend }} --data vcs=${{ matrix.vcs }} --trust --defaults
+          copier copy . ../ --data project_name=pybamm-${{ matrix.backend }}-${{ matrix.vcs }} --data project_slug=pybamm_${{ matrix.backend }}_${{ matrix.vcs }} --data backend=${{ matrix.backend }} --data vcs=${{ matrix.vcs }} --trust --defaults
+      - name: Install nox
+        uses: wntrblm/[email protected]
+
+      - name: Test the generated project
+        working-directory: ../pybamm-${{ matrix.backend }}-${{ matrix.vcs }}
+        run: nox -s generated-project-tests
+
+  run_generated_project_doctests:
+    needs: [template_test]
+    runs-on: ubuntu-latest
+    name: Generated Project Doctests (ubuntu-latest / Python 3.12)
+
+    steps:
+      - name: Check out pybamm-cookiecutter repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
 
       - name: Set up uv
         uses: yezz123/setup-uv@v4
@@ -136,6 +164,14 @@ jobs:
       - name: Install nox
         uses: wntrblm/[email protected]
 
-      - name: Test the generated project
-        working-directory: ../pybamm-${{ matrix.backend }}-${{ matrix.vcs }}
-        run: nox -s generated-project-tests
+      - name: Install copier and jinja2_time and generate a template with default values
+        run: |
+          uv pip install copier jinja2-time
+          copier copy . . --trust --defaults
+
+      - name: Check if the documentation can be built
+        working-directory: ./pybamm-example-project
+        run: |
+          git add .
+          git commit -am "initial commit"
+          nox -s docs

.gitignore

@@ -127,8 +127,5 @@ cython_debug/
 # Code editor files and folders
 .vscode/
 
-# hatch-vcs
-src/pybamm_cookiecutter/_version.py
-
 # ruff
 .ruff_cache/

LICENSES-bundled.txt

@@ -3,5 +3,8 @@ compatibly licensed.
 
 
 Name: PyBaMM
-Files: src/pybamm_cookiecutter/parameters/*
+Files: - src/{{ project_slug }}/parameters/input/Chen2020.py
+       - src/{{ project_slug }}/models/input/BasicReservoir.py
+       - src/{{ project_slug }}/models/input/SPM.py
+       - src/{{ project_slug }}/entry_point.py
 License: BSD-3-Clause

README.md

@@ -31,19 +31,36 @@ This repository contains a `copier` template for battery modeling projects using
 
 ## 📄 Using `pybamm-cookiecutter`
 
-### Generating projects with `pybamm-cookiecutter` manually using copier
+### Generating projects with `pybamm-cookiecutter`
 
-This template is not on PyPI yet, so it cannot be installed through `pip` until the first release. Meanwhile, it can be used by cloning this repository and using `copier` to generate a project with this template.
+#### Manually using copier
 
 Install `copier` and `jinja2_time` extension using `pip`.
 ```bash
 pip install copier jinja2-time
 ```
 Generate a project from the `pybamm-cookiecutter` template.
-**Note:** This requires an internet connection. You could manually clone the git repository and run the copy command, or just execute the copy command with the URL to the git repository.
 
 ```bash
-copier copy https://github.com/pybamm-team/pybamm-cookiecutter.git name_of_your_project/ --trust
+copier copy https://github.com/pybamm-team/pybamm-cookiecutter.git . --trust
+# this will generate the project in the current working directory
+copier copy https://github.com/pybamm-team/pybamm-cookiecutter.git path_to_copy_to/ --trust
+# this will generate the project in the specified path
+```
+#### Using pipx (recommended)
+
+You can generate a project by executing the `pipx run` command which doesn't need any package installations.
+```bash
+pipx run pybamm-cookiecutter --path /path_to_copy_to
+```
+
+Or if you wish to install the `pybamm-cookiecutter` package and then generate a project, you could do so with the help of following commands.
+```bash
+pipx install pybamm-cookiecutter  # or pip install pybamm-cookiecutter
+```
+Navigate into the directory you want your project directory to reside in, or use `--path` argument to explicitly mention the path where you want your project to be generated.
+```bash
+pybamm-cookiecutter --path /path_to_copy_to
 ```
 
 Copier will prompt you with various configurations and you may choose the ones that suit your use case.

copier.yml

@@ -87,7 +87,13 @@ _jinja_extensions:
 
 _subdirectory: template
 
+_exclude:
+  - copier.yml
+
 _tasks:
-  - git init -b {{branch}}
-  - git config user.name "{{full_name}}"
-  - git config user.email "{{email}}"
+  - command: git init -b {{branch}}
+    working_directory: "{{project_name}}"
+  - command: git config user.name {{full_name}}
+    working_directory: "{{project_name}}"
+  - command: git config user.email {{email}}
+    working_directory: "{{project_name}}"

noxfile.py

@@ -39,18 +39,14 @@ def install_and_run_tests(session, test_dir):
     """Install dependencies and run tests in the specified directory."""
     session.install("setuptools", silent=False)
     session.install("-e", ".[dev]", silent=False)
+    session.run("pipx", "install", ".", "--force", silent=False)
     session.run("pytest", test_dir)
 
 @nox.session(name="template-tests")
 def run_template_generation(session):
     """Run tests for the template generation."""
     install_and_run_tests(session, "tests/template_tests")
 
-@nox.session(name="project-tests")
-def run_project_tests(session):
-    """Run the tests for testing project units"""
-    install_and_run_tests(session, "tests/project_tests")
-
 @nox.session(name="coverage")
 def run_coverage(session):
     """Run the coverage tests and generate an XML report."""

pyproject.toml

@@ -6,6 +6,7 @@ build-backend = "hatchling.build"
 name = "pybamm-cookiecutter"
 authors = [
   { name = "Agriya Khetarpal", email = "[email protected]" },
+  { name = "Santhosh Sundaram", email = "[email protected]" },
 ]
 maintainers = [
   { name = "PyBaMM Team", email = "[email protected]" },
@@ -30,7 +31,7 @@ classifiers = [
   "Typing :: Typed",
 ]
 dynamic = ["version"]
-dependencies = ["pybamm", "copier", "jinja2-time"]
+dependencies = ["copier", "jinja2-time", "colorama"]
 
 [project.optional-dependencies]
 dev = [
@@ -55,26 +56,29 @@ docs = [
   "sphinx-gallery",
 ]
 
+[project.scripts]
+pybamm-cookiecutter = "pybamm_cookiecutter.cli:pybamm_cookiecutter_cli"
+
+[project.entry-points."pipx.run"]
+pybamm-cookiecutter = "pybamm_cookiecutter.cli:pybamm_cookiecutter_cli"
+
 [project.urls]
 Homepage = "https://github.com/pybamm-team/pybamm-cookiecutter"
 "Bug Tracker" = "https://github.com/pybamm-team/pybamm-cookiecutter/issues"
 Discussions = "https://github.com/pybamm-team/pybamm-cookiecutter/discussions"
 Changelog = "https://github.com/pybamm-team/pybamm-cookiecutter/releases"
 
-[project.entry-points."parameter_sets"]
-Chen2020 = "pybamm_cookiecutter.parameters.input.Chen2020:get_parameter_values"
-
-[project.entry-points."models"]
-SPM = "pybamm_cookiecutter.models.input.SPM:SPM"
-BasicReservoir = "pybamm_cookiecutter.models.input.BasicReservoir:BasicReservoir"
-
 [tool.hatch]
 version.source = "vcs"
 build.hooks.vcs.version-file = "src/pybamm_cookiecutter/_version.py"
 envs.default.dependencies = [
   "pybamm",
 ]
 
+[tool.hatch.build.targets.wheel]
+only-include = ["src/pybamm_cookiecutter", "/template", "copier.yml"]
+sources = ["src"]
+
 [tool.mypy]
 packages = [
   "src/pybamm_cookiecutter",

src/pybamm_cookiecutter/__init__.py

@@ -5,15 +5,10 @@
 """
 from __future__ import annotations
 
-import pybamm
-
-from ._version import version as __version__
-from .entry_point import Model, parameter_sets, models
+from pybamm_cookiecutter.cli import pybamm_cookiecutter_cli
+from pybamm_cookiecutter._version import __version__
 
 __all__ : list[str] = [
     "__version__",
-    "pybamm",
-    "parameter_sets",
-    "Model",
-    "models",
+    "pybamm_cookiecutter_cli",
 ]

src/pybamm_cookiecutter/__main__.py

@@ -0,0 +1,4 @@
+if __name__ == "__main__":
+    from pybamm_cookiecutter.cli import pybamm_cookiecutter_cli
+
+    pybamm_cookiecutter_cli()

src/pybamm_cookiecutter/_version.py

@@ -0,0 +1,16 @@
+# file generated by setuptools_scm
+# don't change, don't track in version control
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple, Union
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '0.1.dev142+g0fc714a.d20240813'
+__version_tuple__ = version_tuple = (0, 1, 'dev142', 'g0fc714a.d20240813')

src/pybamm_cookiecutter/cli.py

@@ -0,0 +1,60 @@
+import copier
+import argparse
+from pathlib import Path
+from colorama import Fore
+import os
+
+project_root = Path(__file__).resolve().parent.parent
+TEMPLATE = str(project_root)
+
+def pybamm_cookiecutter_cli():
+    """
+    Command Line Interface (CLI) for generating PyBaMM based projects using copier.
+
+    Parameters
+    ----------
+    --path: pathlib.Path
+
+    Examples
+    -------
+    $ pybamm-cookiecutter
+    Generates a project in the current working directory of the terminal.
+    $ pybamm-cookiecutter --path /myproject
+    Generates a project in the `myproject` directory.
+    """
+    try:
+        parser = argparse.ArgumentParser(description = "A copier template generator for PyBaMM based projects")
+        parser.add_argument(
+            "--path", type = str,
+            required = False,
+            default = os.getcwd(),
+            help = "The destination path for project generation. The default is the current working directory"
+        )
+
+        from pybamm_cookiecutter import __version__ as version
+        parser.add_argument(
+            '--version',
+            action='version',
+            version=f'PyBaMM Cookiecutter CLI Version - {version}'
+        )
+
+        parser.add_argument(
+            "--defaults",
+            action="store_true",
+            help="Whether to use default options for generating the template"
+        )
+        args = parser.parse_args()
+        destination_path = Path(args.path)
+
+        with copier.Worker(src_path = TEMPLATE, dst_path = destination_path, unsafe = True, defaults = args.defaults) as worker:
+            worker.run_copy()
+
+    except KeyboardInterrupt:
+        print(Fore.RED + "Execution stopped by the user" + Fore.RESET)
+    except Exception as error:
+        print(Fore.RED + "Error caused by an exception: " + Fore.RESET, error)
+        print(Fore.CYAN + "If you are unsure what the error is, feel free to open an issue at" + Fore.YELLOW +" - https://github.com/pybamm-team/pybamm-cookiecutter/issues" + Fore.RESET)
+
+if __name__ == '__main__':
+
+    pybamm_cookiecutter_cli()