fdc-shared-kernel 0.0.174__tar.gz → 0.0.176__tar.gz

{fdc_shared_kernel-0.0.174 → fdc_shared_kernel-0.0.176}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.174
+Version: 0.0.176
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.174 → fdc_shared_kernel-0.0.176}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.174
+Version: 0.0.176
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.174 → fdc_shared_kernel-0.0.176}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fdc_shared_kernel"
-version = "0.0.174"
+version = "0.0.176"
 requires-python = ">=3.7"
 readme = "README_pypi.md"
 description = "Shared library for microservice"

{fdc_shared_kernel-0.0.174 → fdc_shared_kernel-0.0.176}/shared_kernel/auth/token_handler.py

@@ -32,7 +32,8 @@ def token_required(f):
             "user_name": payload.get('name'),
             "email": payload.get('email'),
             "organization_name": payload.get('organization_name'),
-            "data_views": payload.get('data_views')
+            "data_views": payload.get('data_views'),
+            "claims": payload.get('claims'),
         }
 
         # ensure_sync is used to ensure that the decorated function is

{fdc_shared_kernel-0.0.174 → fdc_shared_kernel-0.0.176}/shared_kernel/auth/workbook_permission_handler.py

@@ -66,8 +66,14 @@ def workbook_permission_required(f):
 
         # Add user information to the request context
         current_user = {
-            "user_id": payload["user_id"],
-            "organization_id": payload["organization_id"],
+            "user_id": payload.get('user_id'),
+            "organization_id": payload.get('organization_id'),
+            "organization_license_type": payload.get('organization_license_type'),
+            "user_name": payload.get('name'),
+            "email": payload.get('email'),
+            "organization_name": payload.get('organization_name'),
+            "data_views": payload.get('data_views'),
+            "claims": payload.get('claims'),
         }
 
         # Owner Access

{fdc_shared_kernel-0.0.174 → fdc_shared_kernel-0.0.176}/shared_kernel/data_warehouse_handlers/query_executors/databricks_query_executor.py

@@ -84,6 +84,35 @@ class DatabricksQueryExecutor(DataWarehouseQueryExecutor):
 
         return results
     
-    def execute_query_with_column_types(self, query, params = None):
-        pass
+    def execute_query_with_column_types(
+        self,
+        query: str,
+        params: Optional[tuple] = None,
+    ) -> Tuple[List[Dict[str, Any]], List[Tuple]]:
+        with self.warehouse_connection.get_connection() as cursor:
+            try:
+                logger.info(f"Executing query with column types: {query}")
+                start = time.perf_counter()
+
+                if params:
+                    cursor.execute(query, params)
+                else:
+                    cursor.execute(query)
+
+                elapsed = time.perf_counter() - start
+                logger.info(f"Query executed in {elapsed:.6f}s")
+
+                description = cursor.description or []
+                if not description:
+                    return [], []
+
+                columns = [col[0].lower() for col in description]
+                rows = [dict(zip(columns, row)) for row in cursor.fetchall()]
+                return rows, description
+
+            except (OperationalError, ProgrammingError, InterfaceError) as e:
+                logger.error(f"Query failed: {query} — {e}", exc_info=True)
+                raise Exception(f"Query execution failed: {str(e)}") from e
+            except Exception as e:
+                raise Exception(f"Query execution failed: {str(e)}") from e
     

{fdc_shared_kernel-0.0.174 → fdc_shared_kernel-0.0.176}/shared_kernel/data_warehouse_handlers/warehouse_handlers_map.py

@@ -1,5 +1,6 @@
 """Factory map for warehouse handlers based on connection engine type."""
 
+from shared_kernel.data_warehouse_handlers.databricks_handler import DatabricksWarehouseHandler
 from shared_kernel.data_warehouse_handlers.mysql_handler import MySQLWarehouseHandler
 from shared_kernel.data_warehouse_handlers.mssql_handler import MSSQLWarehouseHandler
 from shared_kernel.data_warehouse_handlers.postgresql_handler import PostgreSQLWarehouseHandler
@@ -16,4 +17,5 @@ warehouse_handlers = {
     ConnectionEngine.FACTWEAVERS_DW.value: RedshiftWarehouseHandler,
     ConnectionEngine.MYSQL.value: MySQLWarehouseHandler,
     ConnectionEngine.AZURESQL.value: MSSQLWarehouseHandler,
+    ConnectionEngine.DATABRICKS.value: DatabricksWarehouseHandler,
 }

{fdc_shared_kernel-0.0.174 → fdc_shared_kernel-0.0.176}/shared_kernel/dataclasses/warehouse_configs.py

@@ -49,7 +49,7 @@ class DatabricksConfig(BaseConfig):
     server_hostname: str
     http_path: str
     access_token: str
-    catalog: str
+    database: str
     default_schema: str = "default"
 
 

{fdc_shared_kernel-0.0.174 → fdc_shared_kernel-0.0.176}/shared_kernel/messaging/http_databus.py

@@ -1,13 +1,14 @@
 import asyncio
-import logging
 from typing import Callable, Any, Dict
 from shared_kernel.exceptions.http_exceptions import BadRequest, InternalServerError, NotFound
 from shared_kernel.interfaces import DataBus
 from concurrent.futures import ThreadPoolExecutor
 from shared_kernel.http import HttpClient
+from shared_kernel.logger import Logger
+from shared_kernel.config import Config
 
-logging.getLogger().setLevel(logging.INFO)
-
+config = Config()
+logger = Logger(config.get("APP_NAME"))
 
 class HTTPDataBus(DataBus):
     """
@@ -73,6 +74,7 @@ class HTTPDataBus(DataBus):
         Returns:
             Any: The response from the HTTP endpoint.
         """
+        logger.info(f"Senting sync event with payload : {event_payload}")
         response = self.http_client.post(url=event_name, json=event_payload)
 
         # handling success cases