get_events & list_validations uses /api/v1

fedn/fedn/network/api/client.py

@@ -434,20 +434,87 @@ def get_controller_status(self):
         response = requests.get(self._get_url('get_controller_status'), verify=self.verify, headers=self.headers)
         return response.json()
 
-    def get_events(self, **kwargs):
+    # --- Events --- #
+
+    def get_events(self, session_id: str = None, event_type: str = None, sender_name: str = None, sender_role: str = None, n_max: int = None):
         """ Get the events from the statestore. Pass kwargs to filter events.
 
         :return: The events in dict
         :rtype: dict
         """
-        response = requests.get(self._get_url('get_events'), params=kwargs, verify=self.verify, headers=self.headers)
-        return response.json()
+        _params = {}
+
+        if session_id:
+            _params["session_id"] = session_id
+
+        if event_type:
+            _params["type"] = event_type
+
+        if sender_name:
+            _params["sender.name"] = sender_name
+
+        if sender_role:
+            _params["sender.role"] = sender_role
+
+        _headers = self.headers.copy()
 
-    def list_validations(self, **kwargs):
+        if n_max:
+            _headers['X-Limit'] = str(n_max)        
+
+        response = requests.get(self._get_url_api_v1('statuses'), params=_params, verify=self.verify, headers=_headers)
+
+        _json = response.json()
+
+        return _json
+
+    # --- Validations --- #
+
+    def list_validations(
+        self, 
+        session_id: str = None,
+        model_id: str = None,
+        correlation_id: str = None,
+        sender_name: str = None,
+        sender_role: str = None,
+        receiver_name: str = None,
+        receiver_role: str = None,
+        n_max: int = None
+    ):
         """ Get all validations from the statestore. Pass kwargs to filter validations.
 
         :return: All validations in dict.
         :rtype: dict
         """
-        response = requests.get(self._get_url('list_validations'), params=kwargs, verify=self.verify, headers=self.headers)
-        return response.json()
+        _params = {}
+
+        if session_id:
+            _params["session_id"] = session_id
+
+        if model_id:
+            _params["model_id"] = model_id
+
+        if correlation_id:
+            _params["correlation_id"] = correlation_id
+
+        if sender_name:
+            _params["sender.name"] = sender_name
+
+        if sender_role:
+            _params["sender.role"] = sender_role
+
+        if receiver_name:
+            _params["receiver.name"] = receiver_name
+
+        if receiver_role:
+            _params["receiver.role"] = receiver_role
+
+        _headers = self.headers.copy()
+
+        if n_max:
+            _headers['X-Limit'] = str(n_max)
+
+        response = requests.get(self._get_url_api_v1('validations'), params=_params, verify=self.verify, headers=_headers)
+
+        _json = response.json()
+
+        return _json