Data viz taking in variables

Author: mgoldmansight

smsdk/client.py

@@ -240,9 +240,36 @@ def get_kpis_for_asset(self, **kwargs):
         )
         return kpis(self.session, base_url).get_kpis_for_asset(**kwargs)
 
-    def get_kpi_data_viz(self, **kwargs):
-        kpis = smsdkentities.get('kpi')
+    def get_kpi_data_viz(self, machine_source=None, kpis=None, i_vars=None, time_selection=None, **kwargs):
+        kpi_entity = smsdkentities.get('kpi')
+        if machine_source:
+            machine_type = self.get_type_from_machine(machine_source, **kwargs)
+            kwargs["asset_selection"]= {
+                "machine_source": [machine_source],
+                "machine_type": [machine_type]
+            }
+        
+        if kpis:
+            d_vars = []
+            for kpi in kpis:
+                d_vars.append({"name": kpi, "aggregate": ["avg"]})
+            kwargs['d_vars'] = d_vars
+        
+        if i_vars:
+            kwargs['i_vars'] = i_vars
+        
+        if time_selection:
+            kwargs["time_selection"] = time_selection
+        
         base_url = get_url(
             self.config["protocol"], self.tenant, self.config["site.domain"]
         )
-        return kpis(self.session, base_url).get_kpi_data_viz(**kwargs)
+        return kpi_entity(self.session, base_url).get_kpi_data_viz(**kwargs)
+        
+    def get_type_from_machine(self, machine_source=None, **kwargs):
+        machine = smsdkentities.get('machine')
+        base_url = get_url(
+            self.config["protocol"], self.tenant, self.config["site.domain"]
+        )
+        return machine(self.session, base_url).get_type_from_machine_name(machine_source, **kwargs)
+

smsdk/config/api_endpoints.json

@@ -32,7 +32,9 @@
     "task": "/v1/datavis/task/async"
   },
   "KPI": {
-    "availible_kpis": "/v1/selector/assets",
     "availible_kpis_for_asset": "/v1/selector/datavis/kpi/y_axis"
+  },
+  "Assets": { 
+    "url":"/v1/selector/assets"
   }
 }

smsdk/ma_session.py

@@ -1,4 +1,5 @@
 from json.decoder import JSONDecodeError
+from time import sleep
 from typing import List
 import json
 import requests
@@ -229,6 +230,7 @@ def _complete_async_task(
                     response = self.session.get(
                             endpoint+'/'+task_id, json=url_params
                         )
+                    sleep(1)
                     if response.status_code not in [200, 201]:
                         raise ValueError("Error - {}".format(response.text))
                     data = response.json()

smsdk/smsdk_entities/kpi/kpi.py

@@ -45,7 +45,7 @@ def get_kpis(self, *args, **kwargs):
         """
         Returns a list of all KPIs
         """
-        url = "{}{}".format(self.base_url, ENDPOINTS["KPI"]["availible_kpis"])
+        url = "{}{}".format(self.base_url, ENDPOINTS["Assets"]["url"])
         records = self._get_records_v1(url, method="get", **kwargs)[0]["kpi"]
 
         if not isinstance(records, List):

smsdk/smsdk_entities/machine/machine.py

@@ -46,3 +46,15 @@ def get_machines(self, *args, **kwargs):
         if not isinstance(records, List):
             raise ValueError("Error - {}".format(records))
         return records
+    
+    def get_type_from_machine_name(self, machine_source, *args, **kwargs):
+        """
+        Function that gives the name of a machine from it's type
+        """
+        url = "{}{}".format(self.base_url, ENDPOINTS["Assets"]["url"])
+        records = self._get_records_v1(url, method="get", **kwargs)[0]["machine"]
+        machine_type = ''
+        for record in records:
+            if record['name'] == machine_source:
+                machine_type = record['type']
+        return machine_type