python-databases 2.0.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

python_databases/elasticsearch_infrastructure/elasticsearch.py

@@ -6,7 +6,6 @@ from datetime import UTC, datetime
 from enum import Enum
 from typing import Any
 
-import pandas as pd
 from custom_python_logger import get_logger
 from elasticsearch import Elasticsearch, helpers
 from retrying import retry
@@ -38,10 +37,10 @@ class ElasticSearch(ABC):
         self.password = password
 
         self.elasticsearch_port = elasticsearch_port
-        if not self.elasticsearch_port:
-            self.elasticsearch_url = f"{self.protocol.value}://{self.elk_hostname}"
-        else:
+        if self.elasticsearch_port:
             self.elasticsearch_url = f"{self.protocol.value}://{self.elk_hostname}:{self.elasticsearch_port}"
+        else:
+            self.elasticsearch_url = f"{self.protocol.value}://{self.elk_hostname}"
         self.kibana_port = kibana_port
 
         self.elk_client = None
@@ -67,7 +66,7 @@ class ElasticSearch(ABC):
         ):
             for item in failed_response:
                 if item[1]["index"]["status"] != 201 or item[1]["index"]["_shards"]["failed"] > 0:
-                    self.logger.debug(f"Failed document: \n{item}")
+                    self.logger.error(f"Failed document: \n{item}")
                     failed_response_list.append(item)
         if raise_on_error and failed_response_list:
             raise Exception(f"Failed to report {len(failed_response_list)} documents to Elasticsearch")
@@ -89,7 +88,9 @@ class ElasticSearch(ABC):
 
         if quick:
             self._set_list_of_docs_quick(
-                list_of_docs=list_of_docs, request_timeout=request_timeout, raise_on_error=raise_on_error
+                list_of_docs=list_of_docs,
+                request_timeout=request_timeout,
+                raise_on_error=raise_on_error,
             )
         else:
             self._set_list_of_docs_safe(list_of_docs=list_of_docs)
@@ -97,23 +98,15 @@ class ElasticSearch(ABC):
 
     @staticmethod
     def _get_doc_with_basic_info() -> dict:
-        doc = {}
-
         timestamp = datetime.now(tz=UTC)
         date_and_time_str = timestamp.isoformat()
-        date = date_and_time_str.split("T")[0]
-        time_part = date_and_time_str.split("T")[1].split("+")[0]
-
-        doc.update(
-            {
-                "doc_id": timestamp.strftime("%Y%m%dT%H%M%S%f"),
-                "upload_timestamp": timestamp,
-                "date_and_time_str": date_and_time_str,
-                "date_str": date,
-                "time_str": time_part,
-            }
-        )
-        return doc
+        return {
+            "doc_id": timestamp.strftime("%Y%m%dT%H%M%S%f"),
+            "upload_timestamp": timestamp,
+            "date_and_time_str": date_and_time_str,
+            "date_str": date_and_time_str.split("T")[0],
+            "time_str": date_and_time_str.split("T")[1].split("+")[0],
+        }
 
     @staticmethod
     def _add_list_values_as_str(doc: dict, column: str, value: Any) -> None:
@@ -218,19 +211,6 @@ class ElasticSearch(ABC):
         except Exception as e:
             raise Exception(f"Failed to get documents from index '{index}': {str(e)}") from e
 
-    def convert_dataframes_to_list_of_docs(
-        self,
-        dataframe: pd.DataFrame,
-        log_progress: bool = False,
-    ) -> list:
-        data = []
-        dataframe_values = dataframe.values.tolist()
-        for index, value in enumerate(dataframe_values):
-            if log_progress:
-                self.logger.debug(f"index: {index}/{len(dataframe_values)}")
-            data.append(value)
-        return data
-
 
 class ElasticSearchOnPrem(ElasticSearch):
     def __init__(

{python_databases-2.0.0.dist-info → python_databases-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-databases
-Version: 2.0.0
+Version: 2.2.0
 Summary: A Python library for managing and interacting with multiple databases seamlessly.
 Author: Avi Zaguri
 License: MIT
@@ -16,11 +16,10 @@ Classifier: Topic :: System :: Logging
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: custom-python-logger>=4.0.2
-Requires-Dist: elasticsearch<9
-Requires-Dist: pandas>=2.3.3
-Requires-Dist: psycopg2-binary>=2.9.11
-Requires-Dist: python-dotenv>=1.2.1
+Requires-Dist: custom-python-logger>=4.2.0
+Requires-Dist: elasticsearch<9,>=8.19.3
+Requires-Dist: psycopg2-binary>=2.9.13
+Requires-Dist: python-dotenv>=1.2.4
 Requires-Dist: retrying>=1.4.2
 Dynamic: license-file
 

{python_databases-2.0.0.dist-info → python_databases-2.2.0.dist-info}/RECORD

@@ -2,12 +2,12 @@ python_databases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 python_databases/consts.py,sha256=ADn3PmhTXKBobtiVgDR4Tqq2Ncn_FTK0WjgREOLdBPs,33
 python_databases/elasticsearch_infrastructure/__init__.py,sha256=U1orkPi0Pg-1rtY1CPSF4-eVRfrMr36qpT9VNKjBUw4,297
 python_databases/elasticsearch_infrastructure/consts.py,sha256=MBZL90yjYUmipayzj65-XEBS-4qTRhClGatnEwy7OfA,98
-python_databases/elasticsearch_infrastructure/elasticsearch.py,sha256=GtWDvOpwoUCq6zvml6KFi9Xxlu34bKZTRZjZYlZmggw,11071
+python_databases/elasticsearch_infrastructure/elasticsearch.py,sha256=qApNFrB5U2NlEcHHE-ePiAWBckiG0cD2IA9bMYcvx-s,10513
 python_databases/postgresql_infrastructure/__init__.py,sha256=yBjq7SLnNgnxW0DCQHEwCi_FrCNtjsJGJXIq7XtkUZg,150
 python_databases/postgresql_infrastructure/consts.py,sha256=1GPwiyRMyQJOgdz2np0H12cr9GrP9p3aR6APCli2Hs8,102
 python_databases/postgresql_infrastructure/postgresql.py,sha256=tFdQr5IOPYbuqKE3r9oqSoNoGMbED5NSEy1anrUNEyY,3105
-python_databases-2.0.0.dist-info/licenses/LICENSE,sha256=cSikHY6SZFsPZSBizCDAJ0-Bjjzxt-JtX6TVbKxwimo,1067
-python_databases-2.0.0.dist-info/METADATA,sha256=-lJYYQ9x82y0A5k1ISRlVTrMP8V8PKn3ml8niTaDfaY,2338
-python_databases-2.0.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_databases-2.0.0.dist-info/top_level.txt,sha256=fXcMUntaYJfKeFS7FjQ6DY4WVXYBsgdrDmhOudYs-vg,17
-python_databases-2.0.0.dist-info/RECORD,,
+python_databases-2.2.0.dist-info/licenses/LICENSE,sha256=cSikHY6SZFsPZSBizCDAJ0-Bjjzxt-JtX6TVbKxwimo,1067
+python_databases-2.2.0.dist-info/METADATA,sha256=ZuO-_JRrq1qMpW6VT8G0ll2AFm026IVkDUEu8Wf6L94,2318
+python_databases-2.2.0.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+python_databases-2.2.0.dist-info/top_level.txt,sha256=fXcMUntaYJfKeFS7FjQ6DY4WVXYBsgdrDmhOudYs-vg,17
+python_databases-2.2.0.dist-info/RECORD,,

{python_databases-2.0.0.dist-info → python_databases-2.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (84.0.0)
+Generator: setuptools (84.2.1)
 Root-Is-Purelib: true
 Tag: py3-none-any