Skip to content

Commit

Permalink
fix: ems export command
Browse files Browse the repository at this point in the history
did that ever work?
  • Loading branch information
zebehringer committed Dec 6, 2023
1 parent 924f5ba commit 79b4fb0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
8 changes: 4 additions & 4 deletions contxt/cli/commands/ems.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ def usage(


@ems.command()
@click.argument("facility_ids", nargs=-1)
@click.argument("facility_ids", nargs=-1, type=click.INT)
@click.option(
"--include",
default="all",
callback=csv_callback(options=["spend", "usage"]),
callback=csv_callback(options=["mains", "usage"]),
help="Data to export",
)
@click.option("--start", type=click.DateTime(), default=LAST_WEEK.isoformat(), help="Start time")
Expand All @@ -151,9 +151,9 @@ def export(
"""Export data for facilities"""
with click.progressbar(
facility_ids, label="Downloading data", item_show_func=lambda f: f"Facility {f}" if f else ""
) as facility_ids_:
):
for facility in clients.nionic.get_facilities():
if facility.id not in facility_ids_:
if facility.id not in facility_ids:
continue
fpath = output / facility.slug

Expand Down
7 changes: 5 additions & 2 deletions contxt/services/nionic.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from typing import Any, Iterable, List
from typing import Any, Iterable, List, Optional

from sgqlc.endpoint.requests import RequestsEndpoint

from contxt.generated.nionic_queries import Operations as nionic_operations
from contxt.generated.nionic_schema import Facility, MainService, MetricLabel
from contxt.models.ems import ResourceType
from contxt.models.iot import Window
from contxt.services.api import ApiEnvironment, BaseGraphService

Expand Down Expand Up @@ -60,7 +61,9 @@ def get_metric_data(self, label: str, facility_id: int, start: str) -> List[Any]
resp = self.query(query, {"facilityId": int(facility_id), "label": label, "from": start})
return resp["facility"]["metricData"]["nodes"]

def get_main_services(self, facility_id: int, resource_type) -> List[MainService]:
def get_main_services(
self, facility_id: int, resource_type: Optional[ResourceType] = None
) -> List[MainService]:
op = nionic_operations.query.main_services
filterValues = {"facilityId": int(facility_id)}
return [
Expand Down

0 comments on commit 79b4fb0

Please sign in to comment.