python-databases 0.1.0__tar.gz → 0.1.1__tar.gz

{python_databases-0.1.0/python_databases.egg-info → python_databases-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-databases
-Version: 0.1.0
+Version: 0.1.1
 Summary: A Python library for managing and interacting with multiple databases seamlessly.
 Home-page: https://github.com/aviz92/python-databases
 Author: Avi Zaguri

{python_databases-0.1.0/python_databases → python_databases-0.1.1/python_databases/elasticsearch_infrastructure}/__init__.py

@@ -1,6 +1,6 @@
 from dotenv import load_dotenv
 
-from python_databases.elastic_search_infrastructure.elastic_search import (
+from python_databases.elasticsearch_infrastructure.elasticsearch import (
     UrlProtocol,
     ElasticSearch,
     ElasticSearchOnPrem,

python_databases-0.1.0/python_databases/elastic_search_infrastructure/elastic_search.py → python_databases-0.1.1/python_databases/elasticsearch_infrastructure/elasticsearch.py

@@ -1,8 +1,8 @@
-import datetime
 import logging
 import time
 from abc import ABC, abstractmethod
 from copy import deepcopy
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Optional, Any
 import pandas as pd
@@ -181,20 +181,21 @@ class ElasticSearch(ABC):
     def fill_elk_index_as_bulk(
             self,
             data: list[dict],
-            doc_id: str,
             doc_index_name: str,
-            timestamp: datetime,
-            date_and_time: str,
-            username: str = None,
+            doc_id: Optional[str] = None,
+            timestamp: datetime = None,
+            date_and_time: Optional[str] = None,
+            username: Optional[str] = None,
             chunk_size=1000,
             time_sleep: int = 1
     ) -> None:  # use as the main function to send data to the elastic search
+        timestamp = timestamp or datetime.now(tz=timezone.utc)
         list_of_docs = self._prepare_documents_for_bulk(
             data=data,
-            doc_id=doc_id,
             doc_index_name=doc_index_name,
             timestamp=timestamp,
-            date_and_time=date_and_time,
+            doc_id=doc_id or timestamp.strftime('%Y_%m_%dT%H_%M_%S_%f'),
+            date_and_time=date_and_time or timestamp.isoformat(),
             username=username
         )
 

{python_databases-0.1.0 → python_databases-0.1.1/python_databases.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-databases
-Version: 0.1.0
+Version: 0.1.1
 Summary: A Python library for managing and interacting with multiple databases seamlessly.
 Home-page: https://github.com/aviz92/python-databases
 Author: Avi Zaguri

{python_databases-0.1.0 → python_databases-0.1.1}/python_databases.egg-info/SOURCES.txt

@@ -10,5 +10,5 @@ python_databases.egg-info/SOURCES.txt
 python_databases.egg-info/dependency_links.txt
 python_databases.egg-info/requires.txt
 python_databases.egg-info/top_level.txt
-python_databases/elastic_search_infrastructure/__init__.py
-python_databases/elastic_search_infrastructure/elastic_search.py
+python_databases/elasticsearch_infrastructure/__init__.py
+python_databases/elasticsearch_infrastructure/elasticsearch.py

{python_databases-0.1.0 → python_databases-0.1.1}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-package_version = '0.1.0'
+package_version = '0.1.1'
 
 package_name = 'python-databases'
 package_description = 'A Python library for managing and interacting with multiple databases seamlessly.'

python_databases-0.1.0/python_databases/elastic_search_infrastructure/__init__.py

@@ -1,12 +0,0 @@
-from dotenv import load_dotenv
-
-from python_databases.elastic_search_infrastructure.elastic_search import (
-    UrlProtocol,
-    ElasticSearch,
-    ElasticSearchOnPrem,
-    ElasticSearchCloud
-)
-
-load_dotenv()
-
-__all__ = ['UrlProtocol', 'ElasticSearch', 'ElasticSearchOnPrem', 'ElasticSearchCloud']