feat(assessment): add risk assessment treatments

Author: somehowchris

.dockerignore

@@ -27,3 +27,6 @@ production.ini
 pyvenv.cfg
 test
 tmp/
+
+*.ini
+*.xslx

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-slim
+FROM python:3.11-slim
 
 # Set the working directory
 WORKDIR /app
@@ -10,7 +10,7 @@ RUN apt-get update && \
     gcc \
     python3-dev \
     build-essential \
-    linux-headers-amd64 && \
+    linux-headers-amd64 libcairo2 libpango1.0-dev libffi-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

README.md

@@ -21,11 +21,15 @@ Getting Started
 
     source venv/bin/activate
 
-- Upgrade packaging tools, if necessary.
+- Install uv for faster package management (recommended).
 
-    python -m pip install -U pip setuptools
+    pip install uv
 
-- Install the project in editable mode with its testing requirements.
+- Install the project dependencies using uv.
+
+    uv pip sync combined_requirements.lock
+
+  Alternatively, you can use pip:
 
     pip install -r requirements.txt -r test_requirements.txt
 

i18n.sh

@@ -33,17 +33,17 @@ if [ $# -eq 0 ]; then
 
     echo "Update translations"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/$DOMAIN.po; do
-        msgmerge --no-fuzzy-matching -o "$po" "$po" "$LOCALES_PATH"/$DOMAIN.pot
+        msgmerge --previous -o "$po" "$po" "$LOCALES_PATH"/$DOMAIN.pot
     done
 
     echo "Compile message catalogs"
     for po in "$LOCALES_PATH"/*/LC_MESSAGES/*.po; do
-        msgfmt --statistics -o "${po%.*}.mo" "$po"
+        msgfmt --check --use-fuzzy --statistics -o "${po%.*}.mo" "$po"
     done
 
 # first argument represents language identifier, create catalog
 else
     cd "$LOCALES_PATH"
     mkdir -p $1/LC_MESSAGES
-    msginit -i $DOMAIN.pot -o $1/LC_MESSAGES/$DOMAIN.po -l $1
+    msginit --no-wrap -i $DOMAIN.pot -o $1/LC_MESSAGES/$DOMAIN.po -l $1 --no-translator
 fi

requirements.txt

@@ -49,9 +49,8 @@ zope.interface==6.1
 zope.schema==7.0.1
 zope.sqlalchemy==3.1
 numpy==1.26.3
-openai==1.12.0
 plotly==5.18.0
-anthropic
+
 redis[hiredis]==5.0.3
 uwsgi==2.0.25.1
 psycopg2-binary==2.9.9
@@ -62,5 +61,8 @@ langchain
 langfuse
 langchain-openai
 langchain-anthropic
+anthropic
+openai
 
--e .
+# PDF Generation
+WeasyPrint==52.5

src/riskmatrix/layouts/steps.pt

@@ -1,5 +1,63 @@
-<div class="list-group">
+<div class="list-group steps">
     <tal:b tal:repeat="step steps">
-    <a href="${step.url}" class="list-group-item list-group-item-action${' active' if active else ''}${' disabled' if step.disabled else ''}" tal:attributes="aria-current 'true' if active else None; aria-disabled 'true' if step.disabled else None" tal:define="active layout.request.path_url == step.url">${repeat.step.number}. ${step.title}</a>
+        <a href="${step.url}" class="step${' active' if active else ''}${' disabled' if step.disabled else ''}" tal:attributes="aria-current 'true' if active else None; aria-disabled 'true' if step.disabled else None" tal:define="active layout.request.path_url == step.url">
+            ${repeat.step.number}. ${step.title}
+        </a>
     </tal:b>
 </div>
+
+<style>
+    .steps {
+        display: flex;
+        flex-direction: column;
+        gap: 0.5rem;
+        width: 280px;
+        padding: 0.5rem;
+    }
+
+    .step {
+        display: flex;
+        align-items: center;
+        padding: 0.75rem 1rem;
+        border-radius: 2px;
+        color: hsl(240 10% 30%);
+        text-decoration: none;
+        font-size: 0.95rem;
+        transition: all 0.15s;
+        position: relative;
+        overflow: hidden;
+        /* Override bootstrap styles that add a border and box shadow */
+        border: none;
+        box-shadow: none;
+    }
+
+    .step::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        width: 3px;
+        background: transparent;
+        transition: all 0.15s;
+    }
+
+    .step:hover:not(.disabled) {
+        background: hsl(220 40% 97%);
+    }
+
+    .step.active {
+        background: hsl(220 40% 97%);
+        color: hsl(220 90% 56%);
+    }
+
+    .step.active::before {
+        background: hsl(220 90% 56%);
+    }
+
+    .step.disabled {
+        opacity: 0.5;
+        cursor: not-allowed;
+        pointer-events: none;
+    }
+</style>

src/riskmatrix/layouts/steps.py

@@ -37,9 +37,8 @@ def steps(context: 'Organization', request: 'IRequest') -> 'RenderData':
                 request.route_url('generate_risk_matrix')
             ),
             Step(
-                Markup('<s>Plan Actions</s>'),
-                '#',
-                disabled=True
+                _('Plan Treatment'),
+                request.route_url('treatment')
             ),
             Step(
                 _("Finish Assessment"),
@@ -61,6 +60,7 @@ def show_steps(request: 'IRequest') -> bool:
             'assess_impact',
             'assess_likelihood',
             'generate_risk_matrix',
+            'treatment',
             'finish_assessment'
         )
     return False