Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: All node metrics were returned by default #547

Merged
merged 3 commits into from
Jan 24, 2024
Merged

Fix: All node metrics were returned by default #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
963850f
Fix: All node metrics were returned by default
hoh Jan 24, 2024
3ca0f52
Try fix tests with mock time.time
hoh Jan 24, 2024
30ea9df
fixup! Try fix tests with mock time.time
hoh Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/aleph/db/accessors/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import time
from typing import Optional

from sqlalchemy import select, text
Expand Down Expand Up @@ -66,6 +67,12 @@ def query_metric_ccn(
end_date: Optional[float] = None,
sort_order: Optional[str] = None,
):
# Default to the last 2 weeks from now, or 2 weeks before the `end_date`.
if not start_date and not end_date:
start_date = time.time() - 60 * 60 * 24 * 14
elif end_date and not start_date:
start_date = end_date - 60 * 60 * 24 * 14

select_stmt = select(
[
text("item_hash"),
Expand Down Expand Up @@ -100,6 +107,12 @@ def query_metric_crn(
end_date: Optional[float] = None,
sort_order: Optional[str] = None,
):
# Default to the last 2 weeks from now, or 2 weeks before the `end_date`.
if not start_date and not end_date:
start_date = time.time() - 60 * 60 * 24 * 14
elif end_date and not start_date:
start_date = end_date - 60 * 60 * 24 * 14

select_stmt = select(
[
text("item_hash"),
Expand Down
24 changes: 17 additions & 7 deletions tests/api/test_new_metric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import Any, Dict, Sequence
from unittest import mock

import pytest
import pytest_asyncio
Expand All @@ -24,7 +25,9 @@ async def test_node_core_metrics(fixture_metrics_messages, ccn_api_client):
uri = _generate_uri(
"core", "b8b9104da69c54e58531212234fa31f49ef4c668a39a0bf6793322407857b821"
)
response = await ccn_api_client.get(uri)
with mock.patch("aleph.db.accessors.metrics.time.time", return_value=1701261227):
response = await ccn_api_client.get(uri)

test_data = await response.json()

assert response.status == 200
Expand All @@ -43,7 +46,8 @@ async def test_node_core_metrics_sort(fixture_metrics_messages, ccn_api_client):
uri = _generate_uri(
"core", "2e7cd67ff8f556b0b3fb8a2ef8ab0e8e1466cfa279dd7b9bfbc8aba92e0c5672"
)
response = await ccn_api_client.get(uri, params={"sort": "DESC"})
with mock.patch("aleph.db.accessors.metrics.time.time", return_value=1701261227):
response = await ccn_api_client.get(uri, params={"sort": "DESC"})
test_data = await response.json()

assert response.status == 200
Expand All @@ -62,7 +66,8 @@ async def test_node_core_metrics_end_date(fixture_metrics_messages, ccn_api_clie
uri = _generate_uri(
"core", "b8b9104da69c54e58531212234fa31f49ef4c668a39a0bf6793322407857b821"
)
response = await ccn_api_client.get(uri, params={"end_date": 1701261023})
with mock.patch("aleph.db.accessors.metrics.time.time", return_value=1701261227):
response = await ccn_api_client.get(uri, params={"end_date": 1701261023})
test_data = await response.json()

assert response.status == 200
Expand All @@ -77,7 +82,8 @@ async def test_node_core_metrics_start_date(fixture_metrics_messages, ccn_api_cl
uri = _generate_uri(
"core", "b8b9104da69c54e58531212234fa31f49ef4c668a39a0bf6793322407857b821"
)
response = await ccn_api_client.get(uri, params={"start_date": 1701261023})
with mock.patch("aleph.db.accessors.metrics.time.time", return_value=1701261227):
response = await ccn_api_client.get(uri, params={"start_date": 1701261023})
test_data = await response.json()

assert response.status == 200
Expand All @@ -90,7 +96,8 @@ async def test_node_core_metrics_start_date(fixture_metrics_messages, ccn_api_cl
@pytest.mark.asyncio
async def test_node_core_not_exist(fixture_metrics_messages, ccn_api_client):
uri = _generate_uri("core", "This_is_a_node_id")
response = await ccn_api_client.get(uri)
with mock.patch("aleph.db.accessors.metrics.time.time", return_value=1701261227):
response = await ccn_api_client.get(uri)

assert response.status == 404

Expand All @@ -100,7 +107,8 @@ async def test_node_compute_metric(fixture_metrics_messages, ccn_api_client):
uri = _generate_uri(
"compute", "d491f38ec66fe23a9c9ad398a04fd4dcb44a115b948ef612db844caea85cd59a"
)
response = await ccn_api_client.get(uri)
with mock.patch("aleph.db.accessors.metrics.time.time", return_value=1701261227):
response = await ccn_api_client.get(uri)
test_data = await response.json()

assert response.status == 200
Expand All @@ -109,11 +117,13 @@ async def test_node_compute_metric(fixture_metrics_messages, ccn_api_client):
== "56c82c6d3b28b76456594b4b57154b6826a6d5fb97d355d0428e5ca7d08193b9"
)


@pytest.mark.asyncio
async def test_node_compute_metric_not_exist(fixture_metrics_messages, ccn_api_client):
uri = _generate_uri(
"compute", "This_is_a_node_id"
)
response = await ccn_api_client.get(uri)
with mock.patch("aleph.db.accessors.metrics.time.time", return_value=1701261227):
response = await ccn_api_client.get(uri)

assert response.status == 404
Loading