Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions src/viam/module/resource_data_consumer.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import datetime
import os
from typing import Any, Dict, List
from typing import Any, Dict, List, Optional

from viam.app.viam_client import ViamClient

Expand All @@ -12,7 +12,7 @@ class ResourceDataConsumer:
"""

@classmethod
def construct_query(cls, part_id: str, resource_name: str, time_back: datetime.timedelta):
def construct_query(cls, part_id: str, resource_name: str, time_back: datetime.timedelta) -> List[Dict[str, Any]]:
return [
{
"$match": {
Expand All @@ -24,12 +24,18 @@ def construct_query(cls, part_id: str, resource_name: str, time_back: datetime.t
]

@classmethod
async def query_tabular_data(cls, resource_name: str, time_back: datetime.timedelta, **kwargs) -> List[Dict[str, Any]]:
async def query_tabular_data(
cls, resource_name: str, time_back: datetime.timedelta, additional_stages: Optional[List[Dict[str, Any]]] = None, **kwargs
) -> List[Dict[str, Any]]:
"""Return historical data for this module, queried with MQL."""
viam_client = await ViamClient.create_from_env_vars()

org_id = os.environ["VIAM_PRIMARY_ORG_ID"]
part_id = os.environ["VIAM_MACHINE_PART_ID"]

query = cls.construct_query(part_id=part_id, resource_name=resource_name, time_back=time_back)

if additional_stages is not None:
query += additional_stages

return await viam_client.data_client.tabular_data_by_mql(org_id, query)
Loading