update

cedadev · Oct 31, 2024 · d689aa2 · d689aa2
1 parent fcf1c26
commit d689aa2
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 322 deletions.
diff --git a/docs/autoapi/jasmin_metrics_client/index.rst b/docs/autoapi/jasmin_metrics_client/index.rst
@@ -11,21 +11,13 @@ jasmin_metrics_client
 
 
 
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 1
-
-   /autoapi/jasmin_metrics_client/tests/index
-
-
 Submodules
 ----------
 
 .. toctree::
    :maxdepth: 1
 
    /autoapi/jasmin_metrics_client/main/index
+   /autoapi/jasmin_metrics_client/tests/index
 
 
diff --git a/docs/autoapi/jasmin_metrics_client/main/index.rst b/docs/autoapi/jasmin_metrics_client/main/index.rst
@@ -17,12 +17,6 @@ Module Contents
 
 .. py:class:: MetricsClient(token: Optional[str] = None)
 
-   .. py:attribute:: hosts
-
-
-   .. py:attribute:: kwargs
-
-
    .. py:method:: get_all_metrics() -> Optional[List[str]]
 
       Retrieve all unique metric names from the Elasticsearch index.

diff --git a/docs/autoapi/jasmin_metrics_client/tests/index.rst b/docs/autoapi/jasmin_metrics_client/tests/index.rst
@@ -4,8 +4,8 @@ jasmin_metrics_client.tests
 .. py:module:: jasmin_metrics_client.tests
 
 
-Subpackages
------------
+Submodules
+----------
 
 .. toctree::
    :maxdepth: 1

diff --git a/jasmin_metrics_client/main.py b/jasmin_metrics_client/main.py
@@ -3,7 +3,7 @@
 from typing import Any, Dict, List, Optional, Union
 
 import pandas as pd
-from elasticsearch import Elasticsearch, ElasticsearchException
+from elasticsearch import Elasticsearch, ElasticsearchWarning
 
 
 class MetricsClient:
@@ -15,20 +15,22 @@ def __init__(self, token: Optional[str] = None) -> None:
             token (Optional[str]): The authentication token. Defaults to None.
         """
         hosts = [f"es{i}.ceda.ac.uk:9200" for i in range(1, 9)]
-        kwargs = {"hosts": hosts, "use_ssl": True, "ca_certs": "path/to/CA_ROOT"}
-        if token:
-            kwargs["headers"] = {"Authorization": f"Bearer {token}"}
-        else:
+
+        # Define headers if token is provided
+        headers = {"Authorization": f"Bearer {token}"} if token else {}
+
+        if not token:
             logging.error("No authentication token provided.")
+
         try:
+            # Initialize the Elasticsearch client without the `use_ssl` parameter
             self.es = Elasticsearch(
-                hosts=kwargs.get("hosts"),
-                use_ssl=kwargs.get("use_ssl"),
-                ca_certs=kwargs.get("ca_certs"),
-                headers=kwargs.get("headers", {}),
+                hosts=hosts,
+                headers=headers,
+                # ca_certs="path/to/CA_ROOT"
             )
             logging.info("Elasticsearch client initialized successfully.")
-        except ElasticsearchException as e:
+        except ElasticsearchWarning as e:
             logging.error(f"Error initializing Elasticsearch client: {str(e)}")
             raise e
         except Exception as e:
@@ -58,7 +60,7 @@ def get_all_metrics(self) -> Optional[List[str]]:
         response = None
         try:
             response = self.es.search(index="jasmin-metrics-production", query=query)
-        except ElasticsearchException as e:
+        except ElasticsearchWarning as e:
             logging.error(f"Error fetching all metrics: {str(e)}")
             return None
         except Exception as e:
@@ -95,7 +97,7 @@ def get_metric_labels(self, metric_name: str) -> Optional[List[str]]:
         try:
             response = self.es.search(index="jasmin-metrics-production", query=query)
 
-        except ElasticsearchException as e:
+        except ElasticsearchWarning as e:
             logging.error(f"Error fetching metric labels for {metric_name}: {str(e)}")
             return None
 
@@ -131,7 +133,7 @@ def get_metric(
         response = None
         try:
             response = self.es.search(index="jasmin-metrics-production", query=query)
-        except ElasticsearchException as e:
+        except ElasticsearchWarning as e:
             logging.error(f"Error fetching metric {metric_name}: {str(e)}")
             return None
         except Exception as e: