ccs-digitalmarketplace-frameworks 3.11.0 → 3.11.2

package/.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.10' ]
+        python-version: [ '3.11' ]
 
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.10' ]
+        python-version: [ '3.11' ]
         script:
           - scripts/generate-assessment-schema.py g-cloud-14
           - scripts/generate-search-config.py g-cloud-14 services --output-path=/tmp

package/.pre-commit-config.yaml

@@ -1,18 +1,16 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
+---
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: d6d3bd94604578adbd918c5a00d531d98350d86f # v2.3.0
-    hooks:
-    -   id: detect-private-key
--   repo: https://github.com/Yelp/detect-secrets
-    rev: a3e7998bfa4924b13df3f9cb49070abdbdff8802 # v0.13.1
-    hooks:
-    -   id: detect-secrets
-        args: ['--baseline', '.secrets.baseline']
-        exclude: .*/keys/.*|
-              (?x)(
-                     ^package-lock.json$/|
-                     ^Pipfile/|
-                     ^pyproject.toml
-              )
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+    - id: trailing-whitespace
+    - id: end-of-file-fixer
+    - id: check-yaml
+    - id: check-added-large-files
+    - id: detect-private-key
+
+- repo: https://github.com/PyCQA/flake8
+  rev: 7.0.0
+  hooks:
+    - id: flake8
+      pass_filenames: false

package/.python-version

@@ -1 +1 @@
-3.10
+3.11

package/frameworks/digital-outcomes-and-specialists-7/questions/services/chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicDayRate.yml

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicPriceMax
-    message: Enter the amount you will charge for a chief data officer
+    message: Enter the amount you will charge for a chief information security officer
   - name: not_money_format
     field: chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

package/frameworks/digital-outcomes-and-specialists-7/questions/services/chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicDayRateSpecialist.yml

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicPriceMax
-    message: Enter the amount you will charge for a chief data officer
+    message: Enter the amount you will charge for a chief information security officer
   - name: not_money_format
     field: chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

package/frameworks/digital-outcomes-and-specialists-7/questions/services/chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicLocations.yml

@@ -1,6 +1,6 @@
-name: Where will your chief data officer work?
+name: Where will your chief information security officer work?
 question: |
-  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your chief data officer work?</span></p>
+  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your chief information security officer work?</span></p>
   <p class="govuk-!-margin-bottom-0"><span class="govuk-fieldset__legend--s">Choose all the locations where the specialist can work at buyer’s sites, and whether they can work offsite.</span></p>
 hint: |
   ‘Offsite’ means the supplier will not be working at the buyer’s own sites.

package/frameworks/digital-outcomes-and-specialists-7/questions/services/chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicUkDayRate.yml

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicUkPriceMax
-    message: Enter the amount you will charge for a chief data officer
+    message: Enter the amount you will charge for a chief information security officer
   - name: not_money_format
     field: chiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicUkPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

package/frameworks/digital-outcomes-and-specialists-7/questions/services/chiefDigitalAndDataRolesChiefInformationSecurityOfficerRoles.yml

@@ -10,9 +10,9 @@ depends:
 type: checkboxes
 
 options:
-  - label: Chief data officer
+  - label: Chief information security officer
     value: basic
-    description: <a class="govuk-link" target="_blank" rel="noopener noreferrer" href="https://ddat-capability-framework.service.gov.uk/role/chief-information-security-officer#chief-data-officer">View role description <span class="govuk-visually-hidden">for Chief data officer </span>(opens in new tab)</a>
+    description: <a class="govuk-link" target="_blank" rel="noopener noreferrer" href="https://ddat-capability-framework.service.gov.uk/role/chief-information-security-officer#chief-information-security-officer">View role description <span class="govuk-visually-hidden">for Chief information security officer </span>(opens in new tab)</a>
 
 followup:
   multiqChiefDigitalAndDataRolesChiefInformationSecurityOfficerBasic:

package/frameworks/digital-outcomes-and-specialists-7/questions/services/multiqChiefDigitalAndDataRolesChiefInformationSecurityOfficerBasic.yml

@@ -1,5 +1,5 @@
-name: Chief data officer
-question: Chief data officer
+name: Chief information security officer
+question: Chief information security officer
 question_advice:
   Framework maximum rates are fixed for the duration of the agreement
 

package/frameworks/digital-outcomes-and-specialists-7/questions/services/multiqChiefDigitalAndDataRolesChiefInformationSecurityOfficerBasicDCDP.yml

@@ -1,8 +1,8 @@
-name: Chief data officer
-question: Chief data officer
+name: Chief information security officer
+question: Chief information security officer
 question_advice:
   <p>
-    <a class="govuk-link" target="_blank" rel="noopener noreferrer" href="https://ddat-capability-framework.service.gov.uk/role/chief-information-security-officer#chief-data-officer">View role description <span class="govuk-visually-hidden">for Chief data officer </span>(opens in new tab)</a>.
+    <a class="govuk-link" target="_blank" rel="noopener noreferrer" href="https://ddat-capability-framework.service.gov.uk/role/chief-information-security-officer#chief-information-security-officer">View role description <span class="govuk-visually-hidden">for Chief information security officer </span>(opens in new tab)</a>.
   </p>
   <p>
     Framework maximum rates are fixed for the duration of the agreement.

package/frameworks/digital-outcomes-and-specialists-7/questions/services/multiqCyberSecurityRolesCyberSecurity.yml

@@ -1,5 +1,7 @@
 name: Cyber security
 question: Cyber security
+hint:
+  The role is responsible for protecting an organisation's systems, networks, and data from unauthorised access, cyberattacks, and security breaches. Individuals in these roles perform a variety of tasks that involve identifying potential threats, responding and recovering from incidents, and ensuring that appropriate security measures are in place to safeguard critical information.
 
 depends:
   - "on": lot

package/frameworks/digital-outcomes-and-specialists-7/questions/services/multiqCyberSecurityRolesCyberSecurityDCDP.yml

@@ -1,5 +1,7 @@
 name: Cyber security
 question: Cyber security
+hint:
+  The role is responsible for protecting an organisation's systems, networks, and data from unauthorised access, cyberattacks, and security breaches. Individuals in these roles perform a variety of tasks that involve identifying potential threats, responding and recovering from incidents, and ensuring that appropriate security measures are in place to safeguard critical information.
 
 depends:
   - "on": lot

package/frameworks/digital-outcomes-and-specialists-7/questions/services/studioLocationPostcode.yml

@@ -1,5 +1,5 @@
-name: Potscode
-question: Potscode
+name: Postcode
+question: Postcode
 
 depends:
   - "on": lot

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "3.11.0",
+  "version": "3.11.2",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": "git@github.com:Crown-Commercial-Service/ccs-digitalmarketplace-frameworks",
   "author": "enquiries@digitalmarketplace.service.gov.uk"

package/requirements-dev.txt

@@ -1,13 +1,9 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements-dev.in
 #
-async-timeout==4.0.3
-    # via
-    #   -r requirements.txt
-    #   redis
 attrs==23.1.0
     # via
     #   hypothesis
@@ -30,13 +26,13 @@ cachelib==0.13.0
     # via
     #   -r requirements.txt
     #   flask-session
-ccs-digitalmarketplace-apiclient==27.3.0
+ccs-digitalmarketplace-apiclient==28.0.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-ccs-digitalmarketplace-content-loader==12.0.1
+ccs-digitalmarketplace-content-loader==13.0.0
     # via -r requirements.txt
-ccs-digitalmarketplace-utils==68.1.0
+ccs-digitalmarketplace-utils==69.0.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-content-loader
@@ -76,10 +72,6 @@ docopt==0.6.2
     # via
     #   -r requirements.txt
     #   notifications-python-client
-exceptiongroup==1.1.3
-    # via
-    #   hypothesis
-    #   pytest
 flake8==7.1.1
     # via -r requirements-dev.in
 flask==3.0.3
@@ -116,7 +108,7 @@ govuk-country-register==0.5.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-hypothesis==6.116.0
+hypothesis==6.119.3
     # via -r requirements-dev.in
 idna==3.7
     # via
@@ -238,8 +230,6 @@ six==1.16.0
     #   python-dateutil
 sortedcontainers==2.3.0
     # via hypothesis
-tomli==2.0.1
-    # via pytest
 unicodecsv==0.14.1
     # via
     #   -r requirements.txt

package/requirements.in

@@ -1,5 +1,5 @@
 docopt==0.6.2
 deepmerge==2.0
 python-json-logger==2.0.7
-ccs-digitalmarketplace-content-loader==12.0.1
-ccs-digitalmarketplace-utils==68.1.0
+ccs-digitalmarketplace-content-loader==13.0.0
+ccs-digitalmarketplace-utils==69.0.0

package/requirements.txt

@@ -1,11 +1,9 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements.in
 #
-async-timeout==4.0.3
-    # via redis
 blinker==1.8.2
     # via flask
 boto3==1.34.144
@@ -16,11 +14,11 @@ botocore==1.34.144
     #   s3transfer
 cachelib==0.13.0
     # via flask-session
-ccs-digitalmarketplace-apiclient==27.3.0
+ccs-digitalmarketplace-apiclient==28.0.0
     # via ccs-digitalmarketplace-utils
-ccs-digitalmarketplace-content-loader==12.0.1
+ccs-digitalmarketplace-content-loader==13.0.0
     # via -r requirements.in
-ccs-digitalmarketplace-utils==68.1.0
+ccs-digitalmarketplace-utils==69.0.0
     # via
     #   -r requirements.in
     #   ccs-digitalmarketplace-content-loader

package/schema_generator/validation.py

@@ -29,6 +29,10 @@ MANIFESTS = {
         'question_set': 'additional-lot-questions',
         'manifest': 'evaluations'
     },
+    'assign-evaluations': {
+        'question_set': 'additional-lot-questions',
+        'manifest': 'evaluations'
+    },
     'agreements': {
         'question_set': 'agreements',
         'manifest': 'agreement'
@@ -231,6 +235,17 @@ SCHEMAS = {
             "user-research-studios-and-participants",
         ],
     ),
+    'assign-evaluations': _get_schema_title_and_slugs(
+        "Assign evaluation framework lot questions",
+        "digital-outcomes-and-specialists",
+        exclude_lots=[
+            "digital-outcomes",
+            "digital-specialists",
+            "user-research-studios",
+            "user-research-participants",
+            "user-research-studios-and-participants",
+        ],
+    ),
     'additional-lot-questions': _get_schema_title_and_slugs(
         "Additional lot questions",
         "digital-outcomes-and-specialists",
@@ -262,7 +277,7 @@ SCHEMAS = {
 }
 
 
-def load_questions(schema_type, framework_slug, lot_slug_or_agreement_version):
+def _load_manifest(schema_type, framework_slug, lot_slug_or_agreement_version):
     loader = ContentLoader('./')
     print(
         f'{framework_slug}/{lot_slug_or_agreement_version} '
@@ -281,15 +296,25 @@ def load_questions(schema_type, framework_slug, lot_slug_or_agreement_version):
     else:
         filter_key = 'lot'
 
-    manifest = loader.get_manifest(framework_slug, MANIFESTS[schema_type]['manifest']).filter(
+    return loader.get_manifest(framework_slug, MANIFESTS[schema_type]['manifest']).filter(
         {filter_key: lot_slug_or_agreement_version},
         dynamic=False,
         ignore_depends_on_follow_up=True
     )
 
+
+def load_questions(schema_type, framework_slug, lot_slug_or_agreement_version):
+    manifest = _load_manifest(schema_type, framework_slug, lot_slug_or_agreement_version)
+
     return {q['id']: q for q in sum((s.questions for s in manifest.sections), [])}
 
 
+def load_sections(schema_type, framework_slug, lot_slug_or_agreement_version):
+    manifest = _load_manifest(schema_type, framework_slug, lot_slug_or_agreement_version)
+
+    return {s['slug']: s for s in manifest.sections}
+
+
 def merge_schemas(a, b):
     if not (isinstance(a, dict) and isinstance(b, dict)):
         raise TypeError("Error merging unsupported types '{}' and '{}'".format(
@@ -986,7 +1011,7 @@ def _multiquestion_dependencies(questions):
     return {'dependencies': dependencies} if dependencies else {}
 
 
-def generate_schema(schema_type, schema_name, framework_slug, lot_slug):
+def _generate_question_schema(schema_type, schema_name, framework_slug, lot_slug):
     questions = load_questions(schema_type, framework_slug, lot_slug)
     drop_non_schema_questions(questions)
     schema = empty_schema(schema_name)
@@ -998,6 +1023,43 @@ def generate_schema(schema_type, schema_name, framework_slug, lot_slug):
     return schema
 
 
+def _generate_assign_evaluations_schema(schema_type, schema_name, framework_slug, lot_slug):
+    sections = load_sections(schema_type, framework_slug, lot_slug)
+    schema = empty_schema(schema_name)
+
+    schema['properties'].update({
+        "evaluatorFrameworkLots": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "frameworkSlug": {
+            "type": "string",
+        },
+        "lotSlug": {
+            "type": "string",
+        },
+        "sectionSlug": {
+            "enum": list(sections)
+        }
+    })
+
+    schema['required'].extend(schema['properties'].keys())
+    schema['required'].sort()
+
+    return schema
+
+
+def generate_schema(schema_type, schema_name, framework_slug, lot_slug):
+    if schema_type == 'assign-evaluations':
+        generate_schema_method = _generate_assign_evaluations_schema
+    else:
+        generate_schema_method = _generate_question_schema
+
+    return generate_schema_method(schema_type, schema_name, framework_slug, lot_slug)
+
+
 def generate_schema_todir(dir_path, schema_type, schema_name, framework_slug, lot_slug):
     start_t = time.perf_counter()
     schema = generate_schema(schema_type, schema_name, framework_slug, lot_slug)

package/scripts/generate-validation-schemas.py

@@ -3,6 +3,7 @@
 
 Usage:
     generate-validation-schemas.py --output-path=<output_path> [--framework=<framework_slug>] [--lot=<lot_slug>]
+        [--manifest=<manifest>]
 
 """
 import os
@@ -22,6 +23,7 @@ if __name__ == '__main__':
     OUTPUT_DIR = arguments['--output-path']
     FRAMEWORK_SLUG = arguments.get('--framework')
     LOT_SLUG = arguments.get('--lot')
+    MANIFEST = arguments.get('--manifest')
     if not os.path.exists(OUTPUT_DIR):
         print("Creating {} directory".format(OUTPUT_DIR))
         os.makedirs(OUTPUT_DIR)
@@ -34,6 +36,9 @@ if __name__ == '__main__':
     if LOT_SLUG:
         schemas = [schema for schema in schemas if schema[3] == LOT_SLUG]
 
+    if MANIFEST:
+        schemas = [schema for schema in schemas if schema[0] == MANIFEST]
+
     with Pool(processes=5) as pool:
         results = pool.starmap(
             partial(