brynq-sdk-elastic 1.0.0__tar.gz → 2.0.1__tar.gz

{brynq_sdk_elastic-1.0.0 → brynq_sdk_elastic-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_elastic
-Version: 1.0.0
+Version: 2.0.1
 Summary: elastic wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_elastic-1.0.0 → brynq_sdk_elastic-2.0.1}/brynq_sdk/elastic/elastic.py

@@ -1,3 +1,4 @@
+import warnings
 import requests
 import json
 import datetime
@@ -15,17 +16,34 @@ class Elastic:
         """
         try:
             self.verify = False
-            if os.getenv('BRYNQ_ENVIRONMENT') == 'prod':
-                self.elasticsearch_host = f'https://{os.getenv("ELASTIC_HOST_LIVE", "localhost")}:{os.getenv("ELASTIC_PORT_LIVE", "9200")}'
-                self.kibana_host = f'http://{os.getenv("ELASTIC_HOST_LIVE", "localhost")}:{os.getenv("KIBANA_PORT_LIVE", "5601")}'
-                self.elastic_token = os.getenv('ELASTIC_API_KEY_LIVE', api_key)
-            else:
-                self.elasticsearch_host = f'https://{os.getenv("ELASTIC_HOST_STAGING", "localhost")}:{os.getenv("ELASTIC_PORT_STAGING", "9200")}'
-                self.kibana_host = f'http://{os.getenv("ELASTIC_HOST_STAGING", "localhost")}:{os.getenv("KIBANA_PORT_STAGING", "5601")}'
-                self.elastic_token = os.getenv('ELASTIC_API_KEY_STAGING', api_key)
-
-            self.client_user = os.getenv('BRYNQ_CUSTOMER_NAME', 'default').lower().replace(' ', '_') if customer_name is None else customer_name.lower().replace(' ', '_')
+            elasticsearch_host = os.getenv("ELASTIC_HOST", "localhost")
+            elasticsearch_port = os.getenv("ELASTIC_PORT", "9200")
+            kibana_port = os.getenv("KIBANA_PORT", "5601")
+            elastic_token = os.getenv('ELASTIC_API_KEY', None)
+
+            # Build the host URLs
+            self.elasticsearch_host = f'https://{elasticsearch_host}:{elasticsearch_port}'
+            self.kibana_host = f'http://{elasticsearch_host}:{kibana_port}'
+            self.elastic_token = elastic_token if elastic_token is not None else api_key
             self.space_name = os.getenv('ELASTIC_SPACE', 'default') if space_name is None else space_name
+            self.client_user = os.getenv('BRYNQ_SUBDOMAIN', 'default').lower().replace(' ', '_') if customer_name is None else customer_name.lower().replace(' ', '_')
+
+            # Check for missing environment variables and show warnings
+            if os.getenv("ELASTIC_HOST") is None:
+                warnings.warn("Environment variable ELASTIC_HOST is not set. Using default: localhost")
+            if os.getenv("KIBANA_PORT") is None:
+                warnings.warn("Environment variable ELASTIC_PORT is not set. Using default: 9200")
+            if os.getenv("KIBANA_PORT") is None:
+                warnings.warn("Environment variable KIBANA_PORT is not set. Using default: 5601")
+            if elastic_token is None:
+                raise KeyError("Environment variable ELASTIC_API_KEY is not set and no api_key is provided. Please specify either one and try again")
+            if os.getenv("ELASTIC_SPACE") is None:
+                warnings.warn("Environment variable ELASTIC_SPACE is not set. Using 'default'")
+            if self.client_user == 'default':
+                warnings.warn("Environment variable BRYNQ_SUBDOMAIN is not set and customer_name is not specified. Using 'default'")
+
+            print(f"Elasticsearch running on: {elasticsearch_host}")
+
             self.timestamp = int(datetime.datetime.now().timestamp())
             self.elastic_headers = {
                 'Content-Type': 'application/json',
@@ -47,11 +65,14 @@ class Elastic:
         :return: if the connection is established or not
         """
         # Get the health of the database connection
-        health = requests.get(url=f'{self.elasticsearch_host}/_cat/health?', headers=self.elastic_headers, verify=self.verify).status_code
-        if health != 200:
-            raise ConnectionError('Elasticsearch cluster health check failed with status code: {}'.format(health))
-        else:
-            return 'Healthy connection established with elasticsearch!'
+        try:
+            health = requests.get(url=f'{self.elasticsearch_host}/_cat/health?', headers=self.elastic_headers, verify=self.verify).status_code
+            if health != 200:
+                raise ConnectionError(f"Elasticsearch cluster health check failed with status code: {health}")
+            else:
+                return 'Healthy connection established with elasticsearch!'
+        except Exception as e:
+            raise ConnectionError(f'Elasticsearch was not reachable, error is: {e}')
 
     def initialize_customer(self):
         # Creates the index for the user if it does not exist yet

{brynq_sdk_elastic-1.0.0 → brynq_sdk_elastic-2.0.1}/brynq_sdk_elastic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-elastic
-Version: 1.0.0
+Version: 2.0.1
 Summary: elastic wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_elastic-1.0.0 → brynq_sdk_elastic-2.0.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='brynq_sdk_elastic',
-    version='1.0.0',
+    version='2.0.1',
     description='elastic wrapper from BrynQ',
     long_description='elastic wrapper from BrynQ',
     author='BrynQ',