diff --git a/laborious/workflows/drift.py b/laborious/workflows/drift.py index 85780f7..769c613 100644 --- a/laborious/workflows/drift.py +++ b/laborious/workflows/drift.py @@ -42,7 +42,7 @@ class Drift: FROM "{input_data['schema']}"."{input_data['source_table_name']}" WHERE model_id = '{input_data['model_id']}' AND - timestamp > NOW() - INTERVAL {input_data['interval']} minutes + timestamp > NOW() - INTERVAL '{input_data['interval']} minutes' ORDER BY timestamp ASC """ diff --git a/laborious/workflows/simple_metrics.py b/laborious/workflows/simple_metrics.py index 7ab7153..438b98d 100644 --- a/laborious/workflows/simple_metrics.py +++ b/laborious/workflows/simple_metrics.py @@ -42,7 +42,7 @@ class SimpleMetrics: p.prediction is not null and ld.variable = '{target_name}' and ld.value is not null and - p."timestamp" >= NOW() - INTERVAL {interval_minutes} minutes + p."timestamp" >= NOW() - INTERVAL '{interval_minutes} minutes' order by p."timestamp" desc; """ diff --git a/requirements.txt b/requirements.txt index d475d8a..abc1753 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ sqlalchemy asyncua redis git+ssh://git@github.com/Aignosi/sientia-dataops-library.git@1.6.1 -git+ssh://git@github.com/Aignosi/sientia-mlops-library.git@0.40.2 +git+ssh://git@github.com/Aignosi/sientia-mlops-library.git@0.40.5 prometheus-client botocore boto3 diff --git a/tests/laborious/workflows/test_drift.py b/tests/laborious/workflows/test_drift.py index 25870ae..8f013d3 100644 --- a/tests/laborious/workflows/test_drift.py +++ b/tests/laborious/workflows/test_drift.py @@ -60,7 +60,7 @@ async def test_run(workflow_mock: AsyncMock, drift: Drift): FROM "{input_data['schema']}"."{input_data['source_table_name']}" WHERE model_id = '{input_data['model_id']}' AND - timestamp > NOW() - INTERVAL {input_data['interval']} minutes + timestamp > NOW() - INTERVAL '{input_data['interval']} minutes' ORDER BY timestamp ASC """ diff --git a/tests/laborious/workflows/test_simple_metrics.py b/tests/laborious/workflows/test_simple_metrics.py index 12c2cac..0d96bc5 100644 --- a/tests/laborious/workflows/test_simple_metrics.py +++ b/tests/laborious/workflows/test_simple_metrics.py @@ -61,7 +61,7 @@ async def test_run(workflow_mock: AsyncMock, simple_metrics: SimpleMetrics): p.prediction is not null and ld.variable = '{input_data['model_config']['target']}' and ld.value is not null and - p."timestamp" >= NOW() - INTERVAL {input_data['interval_minutes']} minutes + p."timestamp" >= NOW() - INTERVAL '{input_data['interval_minutes']} minutes' order by p."timestamp" desc; """