python-databases 1.2.2__tar.gz → 2.1.0__tar.gz

{python_databases-1.2.2/python_databases.egg-info → python_databases-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-databases
-Version: 1.2.2
+Version: 2.1.0
 Summary: A Python library for managing and interacting with multiple databases seamlessly.
 Author: Avi Zaguri
 License: MIT
@@ -16,11 +16,11 @@ Classifier: Topic :: System :: Logging
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: custom-python-logger>=4.0.0
-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: pandas>=3.1.1
+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-1.2.2 → python_databases-2.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-databases"
-version = "1.2.2"
+version = "2.1.0"
 description = "A Python library for managing and interacting with multiple databases seamlessly."
 readme = "README.md"
 requires-python = ">=3.12"
@@ -21,20 +21,18 @@ classifiers = [
 ]
 
 dependencies = [
-    "custom-python-logger>=4.0.0",
-    "elasticsearch<9",
-    "pandas>=2.3.3",
-    "psycopg2-binary>=2.9.11",
-    "python-dotenv>=1.2.1",
+    "custom-python-logger>=4.2.0",
+    "elasticsearch>=8.19.3,<9",
+    "pandas>=3.1.1",
+    "psycopg2-binary>=2.9.13",
+    "python-dotenv>=1.2.4",
     "retrying>=1.4.2",
 ]
 
 [dependency-groups]
 dev = [
-    "pre-commit>=4.6.2",
-    "pytest>=9.1.1",
-    "setuptools>=84.0.0",
-    "wheel>=0.48.0",
+    "pre-commit>=4.7.0",
+    "pytest>=9.2.0",
 ]
 
 [project.urls]

{python_databases-1.2.2 → python_databases-2.1.0}/python_databases/elasticsearch_infrastructure/elasticsearch.py

@@ -38,10 +38,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 +67,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 +89,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 +99,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"),
-                "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:

{python_databases-1.2.2 → python_databases-2.1.0/python_databases.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-databases
-Version: 1.2.2
+Version: 2.1.0
 Summary: A Python library for managing and interacting with multiple databases seamlessly.
 Author: Avi Zaguri
 License: MIT
@@ -16,11 +16,11 @@ Classifier: Topic :: System :: Logging
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: custom-python-logger>=4.0.0
-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: pandas>=3.1.1
+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.1.0/python_databases.egg-info/requires.txt

@@ -0,0 +1,6 @@
+custom-python-logger>=4.2.0
+elasticsearch<9,>=8.19.3
+pandas>=3.1.1
+psycopg2-binary>=2.9.13
+python-dotenv>=1.2.4
+retrying>=1.4.2

{python_databases-1.2.2 → python_databases-2.1.0}/tests/test_elasticsearch.py

@@ -138,7 +138,7 @@ def test_doc_id_is_derived_from_the_timestamp(
     es.fill_elk_index_as_bulk(data=[{"n": 1}], doc_index_name="idx", chunk_size=100)
 
     src = _sent_docs(mock_helpers)[0]["_source"]
-    ts = src["timestamp"]
+    ts = src["upload_timestamp"]
     assert isinstance(ts, datetime), f"timestamp must be a datetime, got {type(ts)}"
     assert src["doc_id"] == ts.strftime("%Y%m%dT%H%M%S%f"), "doc_id/timestamp derivation broken"
     assert src["date_and_time_str"].startswith(src["date_str"]), "date_str is not the date half"

python_databases-1.2.2/python_databases.egg-info/requires.txt

@@ -1,6 +0,0 @@
-custom-python-logger>=4.0.0
-elasticsearch<9
-pandas>=2.3.3
-psycopg2-binary>=2.9.11
-python-dotenv>=1.2.1
-retrying>=1.4.2