neoload 1.3.19.dev2__tar.gz → 1.4.1__tar.gz

{neoload-1.3.19.dev2 → neoload-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neoload
-Version: 1.3.19.dev2
+Version: 1.4.1
 Summary: A command-line native utility for launching and observing NeoLoad performance tests
 Home-page: https://github.com/Neotys-Labs/neoload-cli
 Author: Neotys
@@ -13,6 +13,7 @@ Requires-Dist: pyconfig
 Requires-Dist: appdirs
 Requires-Dist: requests>=2.25.1
 Requires-Dist: jsonschema
+Requires-Dist: regex
 Requires-Dist: PyYAML>=5
 Requires-Dist: junit_xml
 Requires-Dist: termcolor
@@ -215,24 +216,6 @@ Pressing `Ctrl+C` causes the CLI to attempt to stop the test gracefully.
 neoload stop             # Sends the stop signal to the test and waits until it ends.
 ```
 
-## CheckVU an as-code project
-This command runs a CheckVU on an as-code project: it executes a single virtual user to verify that the project runs. It is meant to support fast iteration on as-code projects (generate -> checkvu -> fix).
-
-It delegates to a standalone headless CheckVU JAR and streams the JAR's output and exit code directly.
-
-```
-Usage: neoload checkvu [OPTIONS] PROJECT_FILE
-Help: neoload checkvu --help
-neoload checkvu default.yaml
-neoload checkvu -u myUser default.yaml
-```
- - `PROJECT_FILE` is a path to an as-code yaml file. The CLI validates it against the as-code schema first (same as `neoload validate`), using `-s, --as-code-schema` to override the default schema.
- - `-e, --engine-jar <path-or-url>` resolves the CheckVU JAR: a local file path or a download URL. If omitted, a previously cached JAR is reused, otherwise a default URL is used to download the latest JAR.
- - `-j, --java` selects the java executable; by default `JAVA_HOME/bin/java` then `java` on the PATH. Java 21+ is required and verified before running.
- - `-w, --work-dir <path>` sets the directory used for engine files and logs. Defaults to a temporary directory deleted afterwards unless `--keep-temp-work-dir` is set; a directory you supply yourself is never deleted.
- - `--app-proxy`, `--app-proxy-username` and `--app-proxy-bypass` configure the proxy used for application traffic. The proxy password is set with `NEOLOAD_CHECK_VU_APP_PROXY_PASSWORD` environment variable instead so it never shows up in the process list or CI logs.
- - `--controller-properties` and `--load-generator-properties` are advanced options to merge a `.properties` file into the JAR's embedded `controller.properties` / `agent.properties`.
-
 ## Reporting
 
 The NeoLoad CLI provides basic support for viewing and exporting test results.
@@ -418,9 +401,14 @@ The configuration lets you customize the CLI's behavior. For now, it is only use
 
 ### As-Code Demo Project
 
-[`examples/as-code-demo`](examples/as-code-demo) contains a NeoLoad As-Code YAML project that works out-of-the-box:
-no NeoLoad Web project, no manual scenario setup - just point NeoLoad at
-[`default.yaml`](examples/as-code-demo/default.yaml) and run.
+Create a starter NeoLoad As-Code YAML project with:
+
+```
+neoload project create DemoWebShop
+```
+
+This scaffolds `DemoWebShop/default.yaml` from the bundled Demo Web Shop template —
+no NeoLoad Web project, no manual scenario setup.
 
 Target: [Tricentis Demo Web Shop](https://demowebshop.tricentis.com/) (nopCommerce demo).
 
@@ -435,16 +423,12 @@ The `BuyAsGuest` user path walks through a typical guest purchase:
 
 It uses two variables (`product_id`, `quantity`) and a single population (`GuestShoppers`)
 
-Run CheckVU against the project:
-```
-neoload checkvu examples/as-code-demo/default.yaml
-```
-
 Run the full test:
 ```
+neoload project create DemoWebShop
 neoload login $NLW_TOKEN \
      test-settings --zone defaultzone --lgs 1 createorpatch DemoWebShopTest \
-     project --path examples/as-code-demo/default.yaml upload DemoWebShopTest \
+     project --path DemoWebShop/default.yaml upload DemoWebShopTest \
      run --scenario DemoWebShop
 ```
 

{neoload-1.3.19.dev2 → neoload-1.4.1}/README.md

@@ -176,24 +176,6 @@ Pressing `Ctrl+C` causes the CLI to attempt to stop the test gracefully.
 neoload stop             # Sends the stop signal to the test and waits until it ends.
 ```
 
-## CheckVU an as-code project
-This command runs a CheckVU on an as-code project: it executes a single virtual user to verify that the project runs. It is meant to support fast iteration on as-code projects (generate -> checkvu -> fix).
-
-It delegates to a standalone headless CheckVU JAR and streams the JAR's output and exit code directly.
-
-```
-Usage: neoload checkvu [OPTIONS] PROJECT_FILE
-Help: neoload checkvu --help
-neoload checkvu default.yaml
-neoload checkvu -u myUser default.yaml
-```
- - `PROJECT_FILE` is a path to an as-code yaml file. The CLI validates it against the as-code schema first (same as `neoload validate`), using `-s, --as-code-schema` to override the default schema.
- - `-e, --engine-jar <path-or-url>` resolves the CheckVU JAR: a local file path or a download URL. If omitted, a previously cached JAR is reused, otherwise a default URL is used to download the latest JAR.
- - `-j, --java` selects the java executable; by default `JAVA_HOME/bin/java` then `java` on the PATH. Java 21+ is required and verified before running.
- - `-w, --work-dir <path>` sets the directory used for engine files and logs. Defaults to a temporary directory deleted afterwards unless `--keep-temp-work-dir` is set; a directory you supply yourself is never deleted.
- - `--app-proxy`, `--app-proxy-username` and `--app-proxy-bypass` configure the proxy used for application traffic. The proxy password is set with `NEOLOAD_CHECK_VU_APP_PROXY_PASSWORD` environment variable instead so it never shows up in the process list or CI logs.
- - `--controller-properties` and `--load-generator-properties` are advanced options to merge a `.properties` file into the JAR's embedded `controller.properties` / `agent.properties`.
-
 ## Reporting
 
 The NeoLoad CLI provides basic support for viewing and exporting test results.
@@ -379,9 +361,14 @@ The configuration lets you customize the CLI's behavior. For now, it is only use
 
 ### As-Code Demo Project
 
-[`examples/as-code-demo`](examples/as-code-demo) contains a NeoLoad As-Code YAML project that works out-of-the-box:
-no NeoLoad Web project, no manual scenario setup - just point NeoLoad at
-[`default.yaml`](examples/as-code-demo/default.yaml) and run.
+Create a starter NeoLoad As-Code YAML project with:
+
+```
+neoload project create DemoWebShop
+```
+
+This scaffolds `DemoWebShop/default.yaml` from the bundled Demo Web Shop template —
+no NeoLoad Web project, no manual scenario setup.
 
 Target: [Tricentis Demo Web Shop](https://demowebshop.tricentis.com/) (nopCommerce demo).
 
@@ -396,16 +383,12 @@ The `BuyAsGuest` user path walks through a typical guest purchase:
 
 It uses two variables (`product_id`, `quantity`) and a single population (`GuestShoppers`)
 
-Run CheckVU against the project:
-```
-neoload checkvu examples/as-code-demo/default.yaml
-```
-
 Run the full test:
 ```
+neoload project create DemoWebShop
 neoload login $NLW_TOKEN \
      test-settings --zone defaultzone --lgs 1 createorpatch DemoWebShopTest \
-     project --path examples/as-code-demo/default.yaml upload DemoWebShopTest \
+     project --path DemoWebShop/default.yaml upload DemoWebShopTest \
      run --scenario DemoWebShop
 ```
 

neoload-1.4.1/neoload/commands/__init__.py

@@ -0,0 +1,2 @@
+__all__ = ["config", "docker", "fastfail", "login", "logout", "logs_url", "project", "run", "status", "stop", "test_results", "test_settings",
+           "validate", "wait", "workspaces", "zones", "report"]

{neoload-1.3.19.dev2 → neoload-1.4.1}/neoload/commands/project.py

@@ -4,18 +4,30 @@ import click
 import urllib.parse as urlparse
 from commands import test_settings
 from pathlib import Path
-from neoload_cli_lib import user_data, tools, rest_crud, neoLoad_project
+from neoload_cli_lib import user_data, tools, rest_crud, neoLoad_project, cli_exception, resources
+
+__template_namespace = 'resources.templates'
+__template_filename = 'default.yaml'
+__project_yaml_name = 'default.yaml'
 
 
 @click.command()
-@click.argument("command", required=True, type=click.Choice(['up', 'upload', 'meta']))
+@click.argument("command", required=True, type=click.Choice(['create', 'up', 'upload', 'meta']))
 @click.option("--path", "-p", type=click.Path(exists=True), default=os.getcwd(),
               help="Path of project folder, zip or yml file. . is default value")
 @click.option("--save", "-s", type=click.Path(exists=False),
               help="Path to a (non-existent) file ending in .zip to preserve what was uploaded")
 @click.argument("name_or_id", type=str, required=False)
 def cli(command, name_or_id, path, save):
-    """Upload and list scenario from settings"""
+    """
+    create # Create a local as-code project folder from the demo yaml template.
+    upload # Upload a project to NeoLoad Web test settings (alias: up)        .
+    meta   # Display project metadata from the current test settings          .
+    """
+    if command == "create":
+        create_local_project(name_or_id)
+        return
+
     rest_crud.set_current_command()
     if not name_or_id or name_or_id == "cur":
         name_or_id = user_data.get_meta(test_settings.meta_key)
@@ -75,3 +87,32 @@ def meta_data(setting_id):
 
 def get_endpoint(settings_id: str):
     return rest_crud.base_endpoint_with_workspace() + '/tests/' + settings_id + "/project"
+
+
+def create_local_project(project_name):
+    if project_name is None:
+        raise cli_exception.CliException("Missing project name. Usage: neoload project create <project-name>")
+    project_name = project_name.strip()
+    if not project_name or project_name in ('.', '..'):
+        raise cli_exception.CliException(f"Invalid project name: '{project_name}'.")
+    if os.path.sep in project_name or (os.path.altsep and os.path.altsep in project_name):
+        raise cli_exception.CliException(
+            f"Invalid project name: '{project_name}'. Use a single folder name, not a path."
+        )
+
+    if os.path.exists(project_name):
+        raise cli_exception.CliException(
+            f"Cannot create project '{project_name}': path already exists."
+        )
+
+    yaml_path = os.path.join(project_name, __project_yaml_name)
+    try:
+        template = resources.get_resource_as_string(__template_namespace, __template_filename)
+        os.mkdir(project_name)
+        with open(yaml_path, 'w', encoding='utf-8') as yaml_file:
+            yaml_file.write(template)
+    except OSError as err:
+        raise cli_exception.CliException(f"Failed to create project '{project_name}': {err}") from err
+
+    print(f"Project '{project_name}' created successfully.")
+    print(f"  {yaml_path}")

{neoload-1.3.19.dev2 → neoload-1.4.1}/neoload/commands/report.py

@@ -8,7 +8,7 @@ import statistics
 import math
 import time
 
-from neoload_cli_lib import tools, rest_crud, user_data, displayer, cli_exception
+from neoload_cli_lib import tools, rest_crud, user_data, displayer, cli_exception, resources
 from dateutil.relativedelta import relativedelta
 
 import logging
@@ -165,19 +165,6 @@ def parse_filter_spec(filter_spec):
     return ret
 
 
-def get_resource_as_string(namespace, file):
-    try:
-        import importlib.resources as pkg_resources
-    except ImportError:
-        # Try backported to PY<37 `importlib_resources`.
-        import importlib_resources as pkg_resources
-
-    logging.debug({'namespace': namespace, 'file': file})
-    if hasattr(pkg_resources, 'files'):  # files is present from Python 3.9
-        return pkg_resources.files(namespace).joinpath(file).read_text()
-    return pkg_resources.read_text(namespace, file)
-
-
 def split_path(path):
     sep = os.path.sep
     if sep not in path: sep = '/'  # try internal posix style
@@ -1131,11 +1118,11 @@ def unique(seq, idfun=None):
 
 
 def get_builtin_template_transaction_csv():
-    return get_resource_as_string('resources.jinja', 'builtin_transactions_csv.j2').strip()
+    return resources.get_resource_as_string('resources.jinja', 'builtin_transactions_csv.j2').strip()
 
 
 def get_builtin_template_console_summary():
-    return get_resource_as_string('resources.jinja', 'builtin_console_summary.j2').strip()
+    return resources.get_resource_as_string('resources.jinja', 'builtin_console_summary.j2').strip()
 
 
 def print_extended_help():

neoload-1.4.1/neoload/commands/validate.py

@@ -0,0 +1,30 @@
+import click
+from neoload_cli_lib import cli_exception
+import neoload_cli_lib.schema_validation as schema_validation
+import os
+
+@click.command()
+@click.option('--schema-url', help="The URL (or local path) to the as-code schema. "
+              "When omitted, download schemas/v<schemaVersion>/as-code.schema.json from neoload-models (v3). "
+              "If schemaVersion is absent, use schemas/v3.0/as-code.schema.json.",
+              metavar="URL", default=None)
+@click.option('--refresh', is_flag=True, help="THIS OPTION IS NOW USELESS", hidden=True)
+@click.option('--ssl-cert', default="", help="Path to SSL certificate or write False to disable certificate checking")
+@click.argument('file')
+def cli(file, refresh, schema_url, ssl_cert):
+    """Verify that the yaml FILE matches the neoload as-code file format"""
+
+    force_schema = os.environ.get('NLCLI_FORCE_SCHEMA')
+    if force_schema is not None and len(force_schema) > 0:
+        schema_url = force_schema
+
+    path = os.path.abspath(file)
+    try:
+        if os.path.isdir(path):
+            schema_validation.validate_yaml_dir(path, schema_url, ssl_cert)
+            print('All yaml files underneath the path provided are valid.')
+        else:
+            schema_validation.validate_yaml(file, schema_url, ssl_cert)
+            print('Yaml file is valid.')
+    except Exception as err:
+        raise cli_exception.CliException(str(err))

neoload-1.4.1/neoload/neoload_cli_lib/resources.py

@@ -0,0 +1,14 @@
+import logging
+
+
+def get_resource_as_string(namespace, file):
+    try:
+        import importlib.resources as pkg_resources
+    except ImportError:
+        # Try backported to PY<37 `importlib_resources`.
+        import importlib_resources as pkg_resources
+
+    logging.debug({'namespace': namespace, 'file': file})
+    if hasattr(pkg_resources, 'files'):  # files is present from Python 3.9
+        return pkg_resources.files(namespace).joinpath(file).read_text(encoding='utf-8')
+    return pkg_resources.read_text(namespace, file, encoding='utf-8')

{neoload-1.3.19.dev2 → neoload-1.4.1}/neoload/neoload_cli_lib/schema_validation.py

@@ -2,6 +2,7 @@ import json
 from json import JSONDecodeError
 
 import jsonschema
+import regex as _regex
 import requests
 import yaml
 from yaml.scanner import ScannerError
@@ -16,15 +17,17 @@ import  gitignorefile
 from neoload_cli_lib.neoLoad_project import is_not_to_be_included
 
 YAML_NOT_CONFIRM_MESSAGE = "YAML does not confirm to NeoLoad DSL schema."
-__default_schema_url = "https://raw.githubusercontent.com/Neotys-Labs/neoload-models/v3/neoload-project/src/main/resources/as-code.latest.schema.json"
+__models_raw_root = "https://raw.githubusercontent.com/Neotys-Labs/neoload-models/v3"
+__compatibility_url = __models_raw_root + "/schemas/compatibility.json"
+__default_schema_version = "3.0"
 
 _MERGED_ARRAY_FIELDS = ['sla_profiles', 'variables', 'servers', 'user_paths', 'populations', 'scenarios', 'frameworks']
-_MERGED_SPECIAL_FIELDS = set(_MERGED_ARRAY_FIELDS) | {'project_settings', 'name', 'includes'}
+_MERGED_SPECIAL_FIELDS = set(_MERGED_ARRAY_FIELDS) | {'project_settings', 'name', 'includes', 'schemaVersion'}
 
 
 def parse_yaml_file(file_path):
     try:
-        yaml_content = open(file_path)
+        yaml_content = open(file_path, encoding='utf-8')
     except Exception as err:
         raise cli_exception.CliException('Unable to open file %s:\n%s' % (file_path, str(err)))
 
@@ -55,6 +58,10 @@ def merge_projects(projects):
         if project.get('name'):
             merged['name'] = project['name']
 
+    for project in projects:
+        if 'schemaVersion' in project and project.get('schemaVersion') is not None:
+            merged['schemaVersion'] = project['schemaVersion']
+
     # Carry over any other/unrecognized top-level key too, so genuinely
     # invalid content isn't silently dropped by the merge instead of being
     # caught by the schema (e.g. root "additionalProperties: false").
@@ -112,8 +119,58 @@ def resolve_and_merge_project(entry_file_path):
     return merge_projects(resolved)
 
 
+def normalize_schema_version(value):
+    """Return the schemaVersion contract as a string. Absent values default to 3.0."""
+    if value is None or value == '':
+        return __default_schema_version
+    if isinstance(value, bool):
+        raise cli_exception.CliException('Invalid schemaVersion: %s' % value)
+    if isinstance(value, int):
+        return '%s.0' % value
+    if isinstance(value, float):
+        if value == int(value):
+            return '%s.0' % int(value)
+        return str(value)
+    return str(value).strip()
+
+
+def schema_url_for_version(version):
+    return '%s/schemas/v%s/as-code.schema.json' % (__models_raw_root, version)
+
+
+def load_supported_schema_versions(ssl_cert=''):
+    """Supported versions are the keys of neoload-models schemas/compatibility.json (v3)."""
+    compatibility_json, _etag, _not_modified = get_network_schema_by_spec(__compatibility_url, ssl_cert)
+    if compatibility_json is None:
+        raise cli_exception.CliException(
+            'Could not load schema compatibility matrix from %s' % __compatibility_url)
+    try:
+        compatibility = json.loads(compatibility_json)
+    except JSONDecodeError as err:
+        raise cli_exception.CliException(
+            'Invalid schema compatibility matrix at %s:\n%s' % (__compatibility_url, err))
+    if not isinstance(compatibility, dict) or not compatibility:
+        raise cli_exception.CliException(
+            'Schema compatibility matrix at %s does not list any versions.' % __compatibility_url)
+    return compatibility
+
+
+def resolve_schema_spec(project_object, schema_spec=None, ssl_cert=''):
+    """Pick the GitHub schema URL from schemaVersion, unless the caller overrode it."""
+    if schema_spec is not None:
+        return schema_spec, None
+    version = normalize_schema_version((project_object or {}).get('schemaVersion'))
+    compatibility = load_supported_schema_versions(ssl_cert)
+    if version not in compatibility:
+        supported = ', '.join(sorted(compatibility.keys()))
+        raise cli_exception.CliException(
+            'Unsupported schemaVersion "%s". Supported versions: %s' % (version, supported))
+    return schema_url_for_version(version), version
+
+
 def validate_project_object(project_object, schema_spec, ssl_cert='', check_schema=True, label=None):
-    json_schema = init_yaml_schema_with_checks(schema_spec,ssl_cert,check_schema)
+    schema_spec, schema_key = resolve_schema_spec(project_object, schema_spec, ssl_cert)
+    json_schema = init_yaml_schema_with_checks(schema_spec, ssl_cert, check_schema, schema_key=schema_key)
     try:
         schema_as_object = json.loads(json_schema)
     except JSONDecodeError as err:
@@ -122,6 +179,14 @@ def validate_project_object(project_object, schema_spec, ssl_cert='', check_sche
 
     validator_cls = jsonschema.validators.validator_for(schema_as_object, jsonschema.validators.Draft7Validator)
     logging.debug("Using JSON-Schema validator: %s" % validator_cls.__name__)
+
+    def _unicode_pattern(validator, pattern, instance, schema):
+        if not isinstance(instance, str):
+            return
+        if not _regex.search(pattern, instance):
+            yield jsonschema.ValidationError(f"{instance!r} does not match {pattern!r}")
+
+    validator_cls = jsonschema.validators.extend(validator_cls, validators={"pattern": _unicode_pattern})
     v = validator_cls(schema_as_object)
     try:
         v.validate(project_object)
@@ -207,10 +272,10 @@ def validate_yaml_dir(path, schema_spec, ssl_cert='',continue_on_error=True):
         raise ValueError('One or more errors in files underneath this directory.')
 
 
-def init_yaml_schema_with_checks(schema_spec, ssl_cert='', check_schema=True):
-    json_schema = get_yaml_schema(False)
+def init_yaml_schema_with_checks(schema_spec, ssl_cert='', check_schema=True, schema_key=None):
+    json_schema = get_yaml_schema(False, schema_key=schema_key)
     if json_schema is not None:
-        cached_etag = get_yaml_schema_etag()
+        cached_etag = get_yaml_schema_etag(schema_key=schema_key)
         if cached_etag:
             logging.info('Loaded schema and ETag from disk cache.')
         else:
@@ -222,13 +287,11 @@ def init_yaml_schema_with_checks(schema_spec, ssl_cert='', check_schema=True):
     if not check_schema:
         return json_schema
 
-    schema_spec_remote = __default_schema_url
-    if schema_spec is None: schema_spec = schema_spec_remote
     logging.debug("Checking schema source for changes %s" %schema_spec)
 
     try:
         if is_network_spec(schema_spec):
-            cached_etag = get_yaml_schema_etag() if json_schema is not None else None
+            cached_etag = get_yaml_schema_etag(schema_key=schema_key) if json_schema is not None else None
             json_schema_spec, response_etag, not_modified = get_network_schema_by_spec(schema_spec, ssl_cert, cached_etag)
             if not_modified:
                 logging.info('Remote schema unchanged since last download (ETag match) - using cached schema.')
@@ -239,7 +302,7 @@ def init_yaml_schema_with_checks(schema_spec, ssl_cert='', check_schema=True):
                 else:
                     logging.info('Cached schema updated from remote source (no ETag).')
                 json_schema = json_schema_spec
-                update_schema(json_schema_spec, response_etag)
+                update_schema(json_schema_spec, response_etag, schema_key=schema_key)
             else:
                 json_schema = None
         else:
@@ -253,7 +316,7 @@ def init_yaml_schema_with_checks(schema_spec, ssl_cert='', check_schema=True):
             if hash_disk != hash_spec:
                 logging.info('Cached schema differs from source!')
                 json_schema = json_schema_spec
-                update_schema(json_schema_spec)
+                update_schema(json_schema_spec, schema_key=schema_key)
             else:
                 logging.info('No differences between cached and remote schema.')
     except Exception as err:
@@ -308,20 +371,3 @@ def get_json_schema_by_spec(schema_spec, ssl_cert):
 
     return json_schema_spec
 
-
-def validate_path(file, schema_url, ssl_cert=''):
-    """Validates an as-code yaml file against the schema from NLCLI_FORCE_SCHEMA
-    or downloaded from given URL or from the defautl URL."""
-    force_schema = os.environ.get('NLCLI_FORCE_SCHEMA')
-    if force_schema is not None and len(force_schema) > 0:
-        schema_url = force_schema
-
-    path = os.path.abspath(file)
-    try:
-        if os.path.isdir(path):
-            validate_yaml_dir(path, schema_url, ssl_cert)
-            return 'All yaml files underneath the path provided are valid.'
-        validate_yaml(file, schema_url, ssl_cert)
-        return 'Yaml file is valid.'
-    except Exception as err:
-        raise cli_exception.CliException(str(err))

{neoload-1.3.19.dev2 → neoload-1.4.1}/neoload/neoload_cli_lib/user_data.py

@@ -18,6 +18,16 @@ CONFIG_FILE = __local_file if os.path.exists(__local_file) else os.path.join(__c
 __yaml_schema_file = os.path.join(__config_dir, "yaml_schema.json")
 __yaml_schema_etag_file = os.path.join(__config_dir, "yaml_schema.etag")
 
+
+def __schema_cache_paths(schema_key=None):
+    if not schema_key:
+        return __yaml_schema_file, __yaml_schema_etag_file
+    safe_key = re.sub(r'[^0-9A-Za-z._-]', '_', str(schema_key))
+    return (
+        os.path.join(__config_dir, "yaml_schema-%s.json" % safe_key),
+        os.path.join(__config_dir, "yaml_schema-%s.etag" % safe_key),
+    )
+
 __no_write = False
 
 
@@ -239,44 +249,64 @@ def get_meta_required(key):
     return get_user_data().metadata.get(key)
 
 
-def __load_yaml_schema():
-    if os.path.exists(__yaml_schema_file):
-        with open(__yaml_schema_file, "r") as stream:
+def __load_yaml_schema(schema_key=None):
+    schema_file, _etag_file = __schema_cache_paths(schema_key)
+    if os.path.exists(schema_file):
+        with open(schema_file, "r") as stream:
             return stream.read()
     return None
 
 
-def __load_yaml_schema_etag():
-    if os.path.exists(__yaml_schema_etag_file):
-        with open(__yaml_schema_etag_file, "r") as stream:
+def __load_yaml_schema_etag(schema_key=None):
+    _schema_file, etag_file = __schema_cache_paths(schema_key)
+    if os.path.exists(etag_file):
+        with open(etag_file, "r") as stream:
             return stream.read() or None
     return None
 
 
 __yaml_schema_singleton = __load_yaml_schema()
 __yaml_schema_etag_singleton = __load_yaml_schema_etag()
-
-
-def get_yaml_schema(throw=True):
+__yaml_schema_by_key = {}
+__yaml_schema_etag_by_key = {}
+
+
+def get_yaml_schema(throw=True, schema_key=None):
+    if schema_key:
+        if schema_key not in __yaml_schema_by_key:
+            __yaml_schema_by_key[schema_key] = __load_yaml_schema(schema_key)
+        schema = __yaml_schema_by_key[schema_key]
+        if schema is None and throw:
+            raise cli_exception.CliException("No yaml schema found. Please add --refresh option to download it first")
+        return schema
     if __yaml_schema_singleton is None and throw:
         raise cli_exception.CliException("No yaml schema found. Please add --refresh option to download it first")
     return __yaml_schema_singleton
 
 
-def get_yaml_schema_etag():
+def get_yaml_schema_etag(schema_key=None):
+    if schema_key:
+        if schema_key not in __yaml_schema_etag_by_key:
+            __yaml_schema_etag_by_key[schema_key] = __load_yaml_schema_etag(schema_key)
+        return __yaml_schema_etag_by_key[schema_key]
     return __yaml_schema_etag_singleton
 
 
-def update_schema(yaml_schema_as_json: str, etag: str = None):
+def update_schema(yaml_schema_as_json: str, etag: str = None, schema_key=None):
     global __yaml_schema_singleton, __yaml_schema_etag_singleton
-    __yaml_schema_singleton = yaml_schema_as_json
-    __yaml_schema_etag_singleton = etag
+    schema_file, etag_file = __schema_cache_paths(schema_key)
     os.makedirs(__config_dir, exist_ok=True)
-    with open(__yaml_schema_file, "w") as stream:
-        stream.write(__yaml_schema_singleton)
+    with open(schema_file, "w") as stream:
+        stream.write(yaml_schema_as_json)
     if etag:
-        with open(__yaml_schema_etag_file, "w") as stream:
+        with open(etag_file, "w") as stream:
             stream.write(etag)
-    elif os.path.exists(__yaml_schema_etag_file):
+    elif os.path.exists(etag_file):
         # no etag for this schema source (e.g. a local file) - don't leave a stale one around
-        os.remove(__yaml_schema_etag_file)
+        os.remove(etag_file)
+    if schema_key:
+        __yaml_schema_by_key[schema_key] = yaml_schema_as_json
+        __yaml_schema_etag_by_key[schema_key] = etag
+        return
+    __yaml_schema_singleton = yaml_schema_as_json
+    __yaml_schema_etag_singleton = etag

{neoload-1.3.19.dev2/examples/as-code-demo → neoload-1.4.1/neoload/resources/templates}/default.yaml

@@ -4,13 +4,11 @@
 # Target : https://demowebshop.tricentis.com/  (nopCommerce demo)
 # Scenario:  add a product to the cart  ->  checkout as guest  ->  view details
 #
-# Out-of-the-box usage (from the repo root, via neoload-cli):
-#   Run CheckVU against the project:
-#     neoload checkvu examples/as-code-demo/default.yaml
+# Out-of-the-box usage (via neoload-cli), from this project directory:
 #   Run the full test:
 #     neoload login $NLW_TOKEN \
 #          test-settings --zone defaultzone --lgs 1 createorpatch DemoWebShopTest \
-#          project --path examples/as-code-demo/default.yaml upload DemoWebShopTest \
+#          project --path default.yaml upload DemoWebShopTest \
 #          run --scenario DemoWebShop
 #
 # =============================================================================

neoload-1.4.1/neoload/version.py

@@ -0,0 +1 @@
+__version__ = "1.4.1"