python-databases 0.1.2__tar.gz → 0.1.4__tar.gz

{python_databases-0.1.2/python_databases.egg-info → python_databases-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-databases
-Version: 0.1.2
+Version: 0.1.4
 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.2 → python_databases-0.1.4}/python_databases/elasticsearch_infrastructure/elasticsearch.py

@@ -6,6 +6,7 @@ from datetime import datetime, timezone
 from enum import Enum
 from typing import Optional, Any
 import pandas as pd
+from custom_python_logger import get_logger
 from elasticsearch import Elasticsearch, helpers
 from retrying import retry
 
@@ -25,7 +26,7 @@ class ElasticSearch(ABC):
             username: Optional[str],
             password: Optional[str]
     ):
-        self.logger = logging.getLogger(self.__class__.__name__)
+        self.logger = get_logger(self.__class__.__name__)
         self._change_elasticsearch_logger()
 
         self.protocol = protocol
@@ -43,7 +44,7 @@ class ElasticSearch(ABC):
         self.elk_client = None
 
     def _change_elasticsearch_logger(self):
-        tracer = logging.getLogger('elasticsearch')
+        tracer = get_logger('elasticsearch')
         tracer.setLevel(logging.CRITICAL)  # or desired level
         # tracer.addHandler(logging.FileHandler('indexer.log'))
 
@@ -260,7 +261,7 @@ class ElasticSearchOnPrem(ElasticSearch):
             password=password
         )
 
-        self.logger = logging.getLogger(self.__class__.__name__)
+        self.logger = get_logger(self.__class__.__name__)
 
         self.connect_to_elasticsearch()
 
@@ -303,7 +304,7 @@ class ElasticSearchCloud(ElasticSearch):
             password=password
         )
 
-        self.logger = logging.getLogger(self.__class__.__name__)
+        self.logger = get_logger(self.__class__.__name__)
 
         self.connect_to_elasticsearch()
 

python_databases-0.1.4/python_databases/postgresql_infrastructure/__init__.py

@@ -0,0 +1,7 @@
+from dotenv import load_dotenv
+
+from python_databases.postgresql_infrastructure.postgresql import PostgreSQL
+
+load_dotenv()
+
+__all__ = ['PostgreSQL']

{python_databases-0.1.2 → python_databases-0.1.4}/python_databases/postgresql_infrastructure/postgresql.py

@@ -2,6 +2,7 @@ import logging
 import os
 from typing import Optional, Union, Any
 import psycopg2
+from custom_python_logger import get_logger
 from psycopg2 import extras
 from retrying import retry
 
@@ -15,7 +16,7 @@ class PostgreSQL:
         username: Optional[str] = None,
         password: Optional[str] = None
     ):
-        self.logger = logging.getLogger(self.__class__.__name__)
+        self.logger = get_logger(self.__class__.__name__)
 
         self.name = name or os.getenv("POSTGRESQL_NAME")
         self.host = host or os.getenv("POSTGRESQL_HOST")
@@ -42,7 +43,7 @@ class PostgreSQL:
             self.create_connection()
         return self._cursor
 
-    @retry(stop_max_attempt_number=3, wait_fixed=180000)
+    # @retry(stop_max_attempt_number=3, wait_fixed=180000)
     def create_connection(self):
         self.logger.info(f"Create connection to {self.host}:{self.port}")
 
@@ -53,7 +54,7 @@ class PostgreSQL:
             user=self.username,
             password=self.password,
         )
-        self._cursor = self.client.cursor(cursor_factory=extras.DictCursor)
+        self._cursor = self._client.cursor(cursor_factory=extras.DictCursor)
 
     def execute_query(self, query: str, params: Optional[Union[tuple, dict[str, Any]]] = None) -> None:
         self.logger.debug(f"Fetch rows from DB by query {query} with params {params}")

{python_databases-0.1.2 → python_databases-0.1.4/python_databases.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-databases
-Version: 0.1.2
+Version: 0.1.4
 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.2 → python_databases-0.1.4}/python_databases.egg-info/SOURCES.txt

@@ -13,4 +13,5 @@ python_databases.egg-info/top_level.txt
 python_databases/elasticsearch_infrastructure/__init__.py
 python_databases/elasticsearch_infrastructure/elasticsearch.py
 python_databases/postgresql_infrastructure/__init__.py
-python_databases/postgresql_infrastructure/postgresql.py
+python_databases/postgresql_infrastructure/postgresql.py
+tests/test_postgres.py

{python_databases-0.1.2 → python_databases-0.1.4}/setup.py

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

python_databases-0.1.4/tests/test_postgres.py

@@ -0,0 +1,46 @@
+# test_postgresql.py
+
+import pytest
+from unittest.mock import patch, MagicMock
+from python_databases.postgresql_infrastructure import PostgreSQL
+
+
+@pytest.fixture
+def mock_connection():
+    with patch("psycopg2.connect") as mock_connect:
+        mock_conn = MagicMock()
+        mock_cursor = MagicMock()
+        mock_conn.cursor.return_value = mock_cursor
+        mock_connect.return_value = mock_conn
+        yield mock_conn, mock_cursor
+
+
+def test_connection_created(mock_connection):
+    conn, _ = mock_connection
+    db = PostgreSQL(name="test_db", host="localhost", port="5432", username="user", password="pass")
+    assert db.client == conn
+    assert conn.cursor.call_count == 2
+
+
+def test_execute_query_success(mock_connection):
+    _, cursor = mock_connection
+    db = PostgreSQL(name="test_db", host="localhost", port="5432", username="user", password="pass")
+    db.execute_query("SELECT 1", None)
+    cursor.execute.assert_called_with("SELECT 1", None)
+
+
+def test_fetch_all_success(mock_connection):
+    _, cursor = mock_connection
+    cursor.fetchall.return_value = [{"id": 1}]
+    db = PostgreSQL(name="test_db", host="localhost", port="5432", username="user", password="pass")
+    results = db.fetch_all("SELECT id FROM test")
+    cursor.execute.assert_called_with("SELECT id FROM test", None)
+    assert results == [{"id": 1}]
+
+
+def test_context_manager_closes_connection(mock_connection):
+    conn, cursor = mock_connection
+    with PostgreSQL(name="test_db", host="localhost", port="5432", username="user", password="pass") as db:
+        pass
+    cursor.close.assert_called_once()
+    conn.close.assert_called_once()

python_databases-0.1.2/python_databases/postgresql_infrastructure/__init__.py

@@ -1,3 +0,0 @@
-from dotenv import load_dotenv
-
-load_dotenv()