ansys-saf-cli 4.1.dev0__tar.gz → 4.3.0__tar.gz

{ansys_saf_cli-4.1.dev0 → ansys_saf_cli-4.3.0}/PKG-INFO

@@ -1,28 +1,26 @@
 Metadata-Version: 2.4
 Name: ansys-saf-cli
-Version: 4.1.dev0
+Version: 4.3.0
 Summary: Command line interface for developing SAF solutions from scaffolding to packaging.
 License: Apache-2.0
-License-File: AUTHORS
 License-File: LICENSE
 Keywords: solution application framework,python,saf,solution
 Author: ANSYS, Inc.
-Author-email: pyansys.core@ansys.com
+Author-email: pyansys-core@synopsys.com
 Maintainer: ANSYS, Inc.
-Maintainer-email: pyansys.core@ansys.com
-Requires-Python: >=3.10,<4
+Maintainer-email: pyansys-core@synopsys.com
+Requires-Python: >=3.11,<4
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Other Audience
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering
-Requires-Dist: ansys-saf-templates (>=0.2.dev2,<1.0.0)
+Requires-Dist: ansys-saf-templates (>=0.2.0,<1.0.0)
 Requires-Dist: chardet (>=5.2.0,<7)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: cookiecutter (>=2.6.0,<3.0.0)

{ansys_saf_cli-4.1.dev0 → ansys_saf_cli-4.3.0}/pyproject.toml

@@ -4,11 +4,11 @@ requires = [ "poetry-core>=2.0.0", "setuptools>=67.0" ]
 
 [tool.poetry]
 name = "ansys-saf-cli"
-version = "4.1.dev0"
+version = "4.3.0"
 description = "Command line interface for developing SAF solutions from scaffolding to packaging."
 license = "Apache-2.0"
-authors = [ "ANSYS, Inc. <pyansys.core@ansys.com>" ]
-maintainers = [ "ANSYS, Inc. <pyansys.core@ansys.com>" ]
+authors = [ "ANSYS, Inc. <pyansys-core@synopsys.com>" ]
+maintainers = [ "ANSYS, Inc. <pyansys-core@synopsys.com>" ]
 readme = "README.rst"
 keywords = [
   "solution application framework",
@@ -22,7 +22,6 @@ classifiers = [
   "License :: OSI Approved :: Apache Software License",
   "Natural Language :: English",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
@@ -42,15 +41,15 @@ name = "PyPI"
 priority = "primary"
 
 [tool.poetry.dependencies]
-python = ">=3.10,<4"
+python = ">=3.11,<4"
 python-dotenv = "^1.0.0"
 click = "^8.1.7"
 pydantic = "^2.7"
-chardet = ">=5.2.0,<7"                                                             # chardet 7.0 breaks binaryornot used by cookiecutter
+chardet = ">=5.2.0,<7"                                                          # chardet 7.0 breaks binaryornot used by cookiecutter
 cookiecutter = "^2.6.0"
 packaging = "^24.2"
 tomlkit = ">=0.14.0,<1.0.0"
-ansys-saf-templates = { version = ">=0.2.dev2, <1.0.0", allow-prereleases = true }
+ansys-saf-templates = { version = ">=0.2.0, <1.0.0", allow-prereleases = true }
 
 [tool.poetry.group.doc]
 optional = true
@@ -61,7 +60,6 @@ numpydoc = "^1.6.0"
 sphinx = "^8.0"
 sphinx-code-tabs = "^0.5.5"
 sphinx-design = "^0.6.1"
-sphinx_mdinclude = "^0.5.3"
 sphinx-autobuild = "^2021.3.14"
 sphinx-autodoc-typehints = "^2.5.0"
 sphinxcontrib-websupport = "^1.2.4"
@@ -75,9 +73,9 @@ sphinx-tabs = ">=1.2.1,<3.5.0"
 optional = true
 [tool.poetry.group.tests.dependencies]
 coverage = "^7.0.0"
-httpx = "^0.27.0"
+httpx2 = "^2.5.0"
 mock = "^4.0.3"
-psutil = "^6.0"
+psutil = "^7.0"
 pytest = "^9.0.0"
 pytest-cov = "^7.0.0"
 pytest-html = "^4.1.0"
@@ -88,24 +86,18 @@ pytest-rerunfailures = "^15.0.0"
 pytest-timeout = "^2.3.1"
 pytest-xdist = "^3.6.1"
 tenacity = "^8.2.3"
-ansys-saf-testing = { version = ">=0.11.dev0, <1.0.0", allow-prereleases = true, extras = [
+ansys-saf-testing = { version = ">=0.13.0, <1.0.0", allow-prereleases = true, extras = [
   "selenium",
-  "solution",
   "hps",
 ] }
-pywinpty = { version = "^3.0.5", platform = "win32" }
-
-[tool.poetry.group.style]
-optional = true
-[tool.poetry.group.style.dependencies]
 # The following packages are included for the linting of the solutions in tests/
-ansys-saf-glow-engine = { version = "^1.41.dev2", allow-prereleases = true, extras = [
+ansys-saf-glow-engine = { version = "^2.1", allow-prereleases = true, extras = [
   "dash",
 ] }
-ansys-solutions-dash-super-components = { version = ">=0.2.dev7, <1.0.0", allow-prereleases = true }
+ansys-solutions-dash-super-components = "^1.0.0"
 dash_bootstrap_components = "^1.2"
 dash-mantine-components = "^2.6.0"
-dash-uploader = "^0.6"
+pywinpty = { version = "^3.0.5", platform = "win32" }
 
 [tool.poetry.group.dev]
 optional = true
@@ -120,7 +112,7 @@ line-length = 120
 extend-exclude = "({{.*?}})" # Ignore files containing cookiecutter syntax
 
 [tool.ruff]
-target-version = "py310"
+target-version = "py311"
 line-length = 120
 extend-exclude = [
   "**/_solutions/templates/**", # Ignore files containing cookiecutter syntax
@@ -151,7 +143,7 @@ lint.select = [
   "UP",     # pyupgrade
   "W",      # pycodestyle - warning
 ]
-lint.ignore = [ "PTH207" ]
+lint.ignore = [ "COM812", "PTH207" ]
 lint.flake8-pytest-style.mark-parentheses = false
 lint.isort.force-sort-within-sections = true
 lint.isort.known-first-party = [ "src", "doc", "tests", "scripts" ]
@@ -179,7 +171,6 @@ source = [ "ansys.saf.cli" ]
 [tool.coverage.report]
 show_missing = true
 omit = [
-  "setup_environment.py",
   "*/pytest-of-*/pytest-*/popen-*/*",
   "/tmp/*",
   "*/_solutions/templates/*",
@@ -193,18 +184,21 @@ exclude = [
   ".venv",
   ".poetry",
   ".git",
-  "setup_environment.py",
   "**/_solutions/templates/",                         # Ignore files containing cookiecutter syntax
   "tests/mocks/plugin/",                              # Ignore files containing cookiecutter syntax
   "tests/mocks/pages/first_page_with_minerva.py",
   "tests/mocks/pages/first_page_with_hps.py",
-  "tests/mocks/steps/first_step_with_hps.py",
   "tests/mocks/pages/first_page_with_file_output.py",
+  "tests/mocks/steps/first_step_with_hps.py",
   "tests/mocks/steps/first_step_with_file_output.py",
+  "tests/mocks/steps/first_step_with_minerva.py",
+  "tests/unit/mocks/solutions/",
+  "doc/source/_static/examples/",
 ]
 strict = [ "src/ansys/saf/cli", "tests", "scripts" ]
 venvPath = "."
 venv = ".venv"
+pythonVersion = "3.11"
 
 [tool.bandit]
 exclude_dirs = [ "tests", "setup_environment.py" ]

{ansys_saf_cli-4.1.dev0 → ansys_saf_cli-4.3.0}/src/ansys/saf/cli/_solutions/templates/solution/cookiecutter.json

@@ -13,6 +13,6 @@
   "__pkg_namespace": "saf.solutions.my_solution",
   "__repository_url": "",
   "__appdata_directory": "",
-  "__python_version": "3.10",
+  "__python_version": "3.11",
   "__saf_cli_version": ""
 }

{ansys_saf_cli-4.1.dev0 → ansys_saf_cli-4.3.0}/src/ansys/saf/cli/_solutions/templates/solution/{{cookiecutter.__solution_name}}/.devcontainer/devcontainer.json

@@ -1,8 +1,8 @@
 {
-    "image": "mcr.microsoft.com/devcontainers/python:3.10",
+    "image": "mcr.microsoft.com/devcontainers/python:3.11",
     "features": {
     },
-    "onCreateCommand": "pip install packaging toml && python setup_environment.py -d all -f",
+    "onCreateCommand": "pip install ansys-saf-cli && saf install -d all -f",
     "postCreateCommand": "chmod +x /workspaces/{{ cookiecutter.__solution_name }}/.venv/bin/activate && sed -i '$a source /workspaces/{{ cookiecutter.__solution_name }}/.venv/bin/activate' ~/.bashrc && sed -i '$a source /workspaces/{{ cookiecutter.__solution_name }}/.venv/bin/activate' ~/.zshrc",
     "postAttachCommand": "tox -e style",
     "customizations": {

{ansys_saf_cli-4.1.dev0 → ansys_saf_cli-4.3.0}/src/ansys/saf/cli/_solutions/templates/solution/{{cookiecutter.__solution_name}}/.github/workflows/build-release.yml

@@ -67,7 +67,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
     env:
       # Workaround for Python toolset mismatch on windows-2025:
@@ -118,21 +118,9 @@ jobs:
           activate-venv: "source {{ "${{ steps.python-setup.outputs.venv-exe-location }}" }}/activate"
           use-uv: false
 
-  check-doc-style:
-    name: Check documentation style
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - name: Check documentation style
-        uses: ansys/actions/doc-style@v10
-        with:
-          token: {{ "${{ github.token }}" }}
-          files: "doc"
-
   build-doc:
     name: Build documentation
     runs-on: ubuntu-latest
-    needs: check-doc-style
     timeout-minutes: 10
     steps:
       - name: Build documentation

ansys_saf_cli-4.3.0/src/ansys/saf/cli/_solutions/templates/solution/{{cookiecutter.__solution_name}}/.github/workflows/label.yml

@@ -0,0 +1,89 @@
+name: Labeler
+on:
+  pull_request:
+    # opened, reopened, and synchronize are default for pull_request
+    # edited - when PR title or body is changed
+    # labeled - when labels are added to PR
+    types: [opened, reopened, synchronize, edited, labeled]
+  push:
+    branches: [main]
+    paths:
+      - '.github/labels.yml'
+
+concurrency:
+  group: {{ "${{ github.workflow }}-${{ github.ref }}-label" }}
+  cancel-in-progress: true
+
+jobs:
+
+  label-syncer:
+    name: Syncer
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: micnncim/action-label-syncer@v1
+        env:
+          GITHUB_TOKEN: {{ "${{ secrets.GITHUB_TOKEN }}" }}
+
+  labeler:
+    name: Set labels
+    needs: [label-syncer]
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+
+      # Label based on modified files
+      - name: Label based on changed files
+        uses: actions/labeler@v5
+        with:
+          repo-token: {{ "${{ secrets.GITHUB_TOKEN }}" }}
+          sync-labels: true
+
+      # Label based on branch name
+      - uses: actions-ecosystem/action-add-labels@v1
+        if: |
+          startsWith(github.event.pull_request.head.ref, 'doc') ||
+          startsWith(github.event.pull_request.head.ref, 'docs')
+        with:
+          labels: documentation
+
+      - uses: actions-ecosystem/action-add-labels@v1
+        if: |
+          startsWith(github.event.pull_request.head.ref, 'maint') ||
+          startsWith(github.event.pull_request.head.ref, 'no-ci') ||
+          startsWith(github.event.pull_request.head.ref, 'ci')
+        with:
+          labels: maintenance
+
+      - uses: actions-ecosystem/action-add-labels@v1
+        if: startsWith(github.event.pull_request.head.ref, 'feat')
+        with:
+          labels: |
+            enhancement
+
+      - uses: actions-ecosystem/action-add-labels@v1
+        if: |
+          startsWith(github.event.pull_request.head.ref, 'fix') ||
+          startsWith(github.event.pull_request.head.ref, 'patch')
+        with:
+          labels: bug
+
+  commenter:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Suggest to add labels
+        uses: peter-evans/create-or-update-comment@v2
+        # Execute only when no labels have been applied to the pull request
+        if: toJSON(github.event.pull_request.labels.*.name) == '{}'
+        with:
+          issue-number: {{ "${{ github.event.pull_request.number }}" }}
+          body: |
+            Please add one of the following labels to add this contribution to the Release Notes :point_down:
+            - [bug]({{ cookiecutter.__repository_url }}/pulls?q=label%3Abug+)
+            - [documentation]({{ cookiecutter.__repository_url }}/pulls?q=label%3Adocumentation+)
+            - [enhancement]({{ cookiecutter.__repository_url }}/pulls?q=label%3Aenhancement+)
+            - [good first issue]({{ cookiecutter.__repository_url }}/pulls?q=label%3Agood+first+issue)
+            - [maintenance]({{ cookiecutter.__repository_url }}/pulls?q=label%3Amaintenance+)
+            - [release]({{ cookiecutter.__repository_url }}/pulls?q=label%3Arelease+)

{ansys_saf_cli-4.1.dev0 → ansys_saf_cli-4.3.0}/src/ansys/saf/cli/_solutions/templates/solution/{{cookiecutter.__solution_name}}/.pre-commit-config.yaml

@@ -3,38 +3,31 @@ repos:
   - repo: https://github.com/psf/black
     rev: 24.4.2
     hooks:
-    - id: black
+      - id: black
 
   - repo: https://github.com/pycqa/isort
     rev: 5.13.2
     hooks:
-    - id: isort
+      - id: isort
 
   - repo: https://github.com/PyCQA/flake8
     rev: 7.0.0
     hooks:
-    - id: flake8
+      - id: flake8
 
   - repo: https://github.com/codespell-project/codespell
     rev: v2.3.0
     hooks:
-    - id: codespell
-      args: [--skip, "doc/styles/*,doc/_build/*,*.js,*.tmp", --ignore-words, ".codespell.ignore", --exclude, "pyproject.toml,poetry.lock"]
+      - id: codespell
+        args: [--skip, "doc/styles/*,doc/_build/*,*.js,*.tmp", --ignore-words, ".codespell.ignore",
+          --exclude, "pyproject.toml,poetry.lock"]
 
   - repo: https://github.com/pycqa/pydocstyle
     rev: 6.3.0
     hooks:
-    - id: pydocstyle
-      additional_dependencies: [toml]
-      exclude: "tests/"
-
-  - repo: https://github.com/ansys/pre-commit-hooks
-    rev: fd1d6b0b4baeb08e32d4de0909999576695c0433 # v0.5.2
-    hooks:
-      - id: add-license-headers
-        args:
-          - --start_year=2023
-          - --custom_template=copyright.jinja2
+      - id: pydocstyle
+        additional_dependencies: [toml]
+        exclude: "tests/"
 
   - repo: https://github.com/dotenv-linter/dotenv-linter
     rev: f9076b02daed89f54ed0bd23951a4cfa5ccceac4 # v4.0.0

ansys_saf_cli-4.3.0/src/ansys/saf/cli/_solutions/templates/solution/{{cookiecutter.__solution_name}}/AGENTS.md

@@ -0,0 +1,165 @@
+# AGENTS guidelines for this repository
+
+## Project overview
+
+This repository contains **{{ cookiecutter.__solution_display_name }}**, a Solution Application Framework (SAF) *solution*.
+
+A SAF solution is a simulation-driven application built on top of the Solution Application Framework. It couples a
+Python backend (built with the **GLOW** engine) that defines the solution's data model, transaction methods, and
+step orchestration, with an optional frontend that renders the solution's graphical user interface.
+{%- if cookiecutter.__ui_framework == "dash" %}
+The user interface of this solution is implemented with **Dash** and served by the Solution UI server, letting the UI
+be authored in Python.
+{%- else %}
+This solution was generated without a bundled UI framework (`--ui-framework none`). Only the backend
+(the GLOW API server and its transaction methods) is provided; any UI is expected to be integrated separately or the
+solution is intended to be consumed exclusively through its REST API.
+{%- endif %}
+
+A solution is composed of:
+
+- A **solution definition** (the top-level `{{ cookiecutter.__solution_definition_class_name }}` class, a subclass of
+  `ansys.saf.glow.solution.Solution`) that declares the projects, steps, and shared data model.
+- One or more **steps**, each with its own data model and transaction methods.
+{%- if cookiecutter.__ui_framework == "dash" %}
+- **UI code** that consumes the GLOW REST API exposed by the solution.
+{%- endif %}
+
+This solution is managed with **SAF CLI** (`saf`). SAF CLI automatically activates the solution's virtual environment
+and sets the solution root as the working directory when it runs commands. You typically don't need to activate the
+virtual environment manually or invoke Python/Poetry directly — prefer running tasks via `saf`.
+
+## Folder structure
+
+- `src/{{ cookiecutter.__solution_namespace_path }}/{{ cookiecutter.__solution_module_name }}/`: Solution source code
+  (solution definition, steps, and, when applicable, UI code).
+- `tests/`: pytest tests.
+- `doc/`: Sphinx documentation sources.
+- `examples/`: Example scripts and usage snippets.
+- `deployments/`: Deployment recipes (Docker Compose files for standalone, HPS, Minerva, and distributed setups).
+- `pyproject.toml`, `poetry.lock`: Dependency and build configuration (Poetry). Never edit `poetry.lock` by hand;
+  regenerate it via `saf execute {{ cookiecutter.__solution_name }} "poetry lock"`.
+- `.pre-commit-config.yaml`, `tox.ini`, `.flake8`: Code quality configuration.
+
+## Key technologies and tools
+
+- **Python {{ cookiecutter.__python_version }}**, **Poetry** for dependencies.
+- **GLOW** (`ansys-saf-glow-engine`): backend engine that powers the solution.
+{%- if cookiecutter.__ui_framework == "dash" %}
+- **Dash**: Python UI framework used by this solution.
+{%- endif %}
+- **pytest** for tests, **Sphinx** for docs.
+- **tox**, **pre-commit**, **black**, **isort**, **flake8**, **pydocstyle**, **codespell** for style and quality.
+
+## Working with SAF CLI
+
+Target this solution by its name (`{{ cookiecutter.__solution_name }}`), or omit the name when the current working
+directory is the solution root. For any command, `saf <command> --help` lists the supported options.
+
+### Install / reinstall the solution environment
+
+```bash
+saf install {{ cookiecutter.__solution_name }} -d all       # install with all dependency groups
+saf install {{ cookiecutter.__solution_name }} -d <group>   # single group: doc, build, tests, style
+saf install {{ cookiecutter.__solution_name }} -d all -f    # force a clean reinstall
+```
+
+### Run commands in the solution environment
+
+Any command that must run inside the solution's virtual environment (poetry, pytest, sphinx-build, tox, ...) **must**
+be wrapped with `saf execute`:
+
+```bash
+saf execute {{ cookiecutter.__solution_name }} "<command>"
+```
+
+Common tasks:
+
+```bash
+saf execute {{ cookiecutter.__solution_name }} "pytest tests"
+saf execute {{ cookiecutter.__solution_name }} "sphinx-build doc/source doc/build/html --color -vW -bhtml"
+saf execute {{ cookiecutter.__solution_name }} "tox -e style"
+saf execute {{ cookiecutter.__solution_name }} "poetry add <package>"
+saf execute {{ cookiecutter.__solution_name }} "poetry add <package> --group <group>"
+saf execute {{ cookiecutter.__solution_name }} "poetry add <package> --source <source>"
+saf execute {{ cookiecutter.__solution_name }} "poetry lock"
+```
+
+### Run the solution
+
+```bash
+saf run {{ cookiecutter.__solution_name }}           # default run
+saf run {{ cookiecutter.__solution_name }} --debug   # debug mode
+saf run {{ cookiecutter.__solution_name }} --no-ui   # backend only (useful for API-level checks)
+```
+
+Additional flags (`--portal`, `--browser`, `--project`, `--env-file`) exist for interactive use; see
+`saf run --help`.
+
+### Adding a step
+
+Steps are scaffolded from templates managed by the SAF Templates package (built-in templates plus any installed
+plugins). List every template available in the current environment with:
+
+```bash
+saf templates
+```
+
+{%- if cookiecutter.__ui_framework == "dash" %}
+The step's `--ui-framework` must match this solution's (`dash`), or be `none`. Pass `--template <template-name>` to
+pick a specific template (from `saf templates`); omit it to be prompted interactively:
+
+```bash
+saf add-step {{ cookiecutter.__solution_name }} --step-name <step-name> --ui-framework dash --template <template-name>
+saf add-step {{ cookiecutter.__solution_name }} --step-name <step-name> --ui-framework none --template <template-name>
+```
+{%- else %}
+This solution was created with `--ui-framework none`, so all steps must use the same value. Pass
+`--template <template-name>` to pick a specific template (from `saf templates`); omit it to be prompted interactively:
+
+```bash
+saf add-step {{ cookiecutter.__solution_name }} --step-name <step-name> --ui-framework none --template <template-name>
+```
+{%- endif %}
+
+### Build / archive
+
+Producing installers (`saf build`, with `--offline-package`, `--python-version`, `--encrypt`) and archives
+(`saf archive`) is typically part of a release workflow. See `saf build --help` and `saf archive --help`.
+
+## Coding standards
+
+- Follow **PEP 8**. Line length is **120** characters; use the full width when it improves readability.
+- Use **type hints** on all public functions, methods, and class attributes.
+- Write docstrings in **numpydoc** format for all public APIs.
+- Add or update **pytest tests** together with any code change that affects behavior. If tests are not added,
+  proactively list the use cases (inputs, expected outcomes, edge cases) that should be covered — not the test
+  implementation — so the user can decide what to test next.
+- Never bypass pre-commit hooks (do not use `--no-verify`). Fix the underlying issue instead.
+
+## Adding dependencies
+
+When introducing a new dependency:
+
+- **Never edit `pyproject.toml` directly** to add, remove, or change a dependency, its version, or its group. Do not
+  edit `poetry.lock` by hand either.
+- Always add, remove, or update dependencies through `saf execute {{ cookiecutter.__solution_name }} "poetry <cmd> ..."`
+  (for example `poetry add`, `poetry remove`, `poetry lock`) so `pyproject.toml` and `poetry.lock` stay consistent.
+
+When there are several candidates that solve the same problem, flag maintenance status (recent releases, active issue
+tracker) and known security advisories (PyPI / OSV) to the user so they can pick informed. Do not silently reject a
+package on these grounds.
+
+## Git and contribution workflow
+
+- Branch naming: `feature/`, `bugfix/`, `hotfix/`, `refactor/`.
+- Commit messages: conventional commits (`feat:`, `fix:`, `docs:`, `chore:`, `refactor:`, `test:`).
+- Pull requests: focused, reasonably sized, with descriptive titles and links to related issues.
+- All code must pass pre-commit hooks and CI before merging.
+
+## Troubleshooting
+
+- Inspect any command's options with `saf <command> --help`.
+- If the environment appears broken, force a clean reinstall:
+  `saf install {{ cookiecutter.__solution_name }} -d all -f`.
+- For private PyPI access issues, verify Poetry's credentials configuration for the relevant private source.

{ansys_saf_cli-4.1.dev0 → ansys_saf_cli-4.3.0}/src/ansys/saf/cli/_solutions/templates/solution/{{cookiecutter.__solution_name}}/README.md

@@ -24,7 +24,7 @@
 |--------------|-------------|
 | Operating system | Windows 10 or Ubuntu |
 | Python distribution | Python {{ cookiecutter.__python_version }} |
-| Supported Python distributions | Python 3.10, 3.11, 3.12, 3.13 and 3.14 |
+| Supported Python distributions | Python 3.11, 3.12, 3.13 and 3.14 |
 | IDE | [Visual Studio Code](https://code.visualstudio.com/download#) |
 | SAF CLI | Install [latest SAF CLI](https://dev-docs.external.solutions.ansys.com/version/stable/getting_started/prerequisites/saf_cli.html) |
 

{ansys_saf_cli-4.1.dev0 → ansys_saf_cli-4.3.0}/src/ansys/saf/cli/_solutions/templates/solution/{{cookiecutter.__solution_name}}/deployments/Dockerfile

@@ -15,8 +15,6 @@ RUN touch /app/src/{{ cookiecutter.__solution_namespace_path }}/{{ cookiecutter.
 
 RUN poetry install
 
-COPY ../../minerva /usr/local/share/minerva
-
 RUN rm -rf /root/.cache/pip/* /dist /var/lib/apt/lists/*
 
 # === API Stage ===================================================================================

{ansys_saf_cli-4.1.dev0 → ansys_saf_cli-4.3.0}/src/ansys/saf/cli/_solutions/templates/solution/{{cookiecutter.__solution_name}}/deployments/distributed-deployment-template/.env

@@ -1,27 +1,41 @@
-ACCESS_URL=solutions.${DOMAIN_NAME}
-APP_IMAGE_VERSION=main
-DATABASE_LOCATION={{ cookiecutter.__appdata_directory }}/Ansys/portal/{{ cookiecutter.__solution_name }}
-DOMAIN_NAME=
+# dotenv-linter:off UnorderedKey
+DOMAIN_NAME=${DOMAIN_NAME}
+TRAEFIK_PORT=${TRAEFIK_PORT}
 EXT_NETWORK_NAME=platform_default
-GLOW_API_CONTAINER_PORT=8000
+APP_IMAGE_VERSION=main
+GLOW_DEPLOYMENT=DockerCompose
+GLOW_SOLUTION_DEFINITION={{ cookiecutter.__solution_namespace }}.{{ cookiecutter.__solution_module_name }}.solution.definition
+GLOW_UI_MODULE={{ cookiecutter.__solution_namespace }}.{{ cookiecutter.__solution_module_name }}.ui.app
+
+# Solution Docker name
+APP_NAME={{ cookiecutter.__docker_name }}
+
+# Routing config
+ACCESS_URL=solutions.${DOMAIN_NAME}
 GLOW_API_PATH_PREFIX=/
+GLOW_UI_PATH_PREFIX=/{{ cookiecutter.__docker_name }}/
+
+# API service config
+GLOW_API_CONTAINER_PORT=8000
+GLOW_API_NUMBER_OF_WORKERS=8
 # dotenv-linter:off QuoteCharacter
 GLOW_CORS_ORIGINS=["*"]
 # dotenv-linter:on QuoteCharacter
-GLOW_API_NUMBER_OF_WORKERS=8
-GLOW_DEPLOYMENT=DockerCompose
+
+# UI service config
+GLOW_UI_CONTAINER_PORT=8001
+
+# HPS service config
+GLOW_PRODUCT_INSTANCE_SYSTEM=HPS
 GLOW_HPS_HOST=hps.${DOMAIN_NAME}
-GLOW_HPS_PASSWORD=repadmin
 GLOW_HPS_PORT=${TRAEFIK_PORT}
-GLOW_HPS_USERNAME=repadmin
-GLOW_PRODUCT_INSTANCE_SYSTEM=HPS
+GLOW_HPS_USERNAME=${PG_USER}
+GLOW_HPS_PASSWORD=${PG_PASSWORD}
+
+# Storage config
+DATABASE_LOCATION=${APPDATA}/Ansys/portal/{{ cookiecutter.__solution_name }}
 GLOW_PROJECTS_DIR_SOLUTION=./data/projects
-GLOW_SOLUTION_DEFINITION={{ cookiecutter.__solution_namespace }}.{{ cookiecutter.__solution_module_name }}.solution.definition
 GLOW_TRANSACTIONS_DIR_SOLUTION=./data/transactions
-GLOW_UI_CONTAINER_PORT=8001
-GLOW_UI_MODULE={{ cookiecutter.__solution_namespace }}.{{ cookiecutter.__solution_module_name }}.ui.app
-GLOW_UI_PATH_PREFIX=/
+
+# Observability
 OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318
-PORTAL_DATABASE_TYPE=postgres
-PORTAL_PROJECT_DATABASE_LOCATION=${DATABASE_LOCATION}/projects.db
-TRAEFIK_PORT=8443