bw-essentials-core 0.1.9__tar.gz → 0.1.11__tar.gz

{bw_essentials_core-0.1.9 → bw_essentials_core-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bw-essentials-core
-Version: 0.1.9
+Version: 0.1.11
 Summary: Reusable utilities for S3, email, Data Loch, Microsoft Teams Notifications and more.
 Author: InvestorAI
 Author-email: support+tech@investorai.in

{bw_essentials_core-0.1.9 → bw_essentials_core-0.1.11}/bw_essentials/services/api_client.py

@@ -80,6 +80,19 @@ class ApiClient:
         env_key = f"{service_name.upper()}_BASE_URL"
         return self._get_env_var(env_key)
 
+    def get_api_key(self, service_name: str) -> str:
+        """
+        Resolve the service API Key for a given service name using environment variables.
+
+        Args:
+            service_name (str): The logical name of the service.
+
+        Returns:
+            str: The resolved api key from the environment.
+        """
+        env_key = f"{service_name.upper()}_API_KEY"
+        return self._get_env_var(env_key)
+
     def set_tenant_id(self, tenant_id: str) -> None:
         """
         Set the tenant ID in the request headers.

{bw_essentials_core-0.1.9 → bw_essentials_core-0.1.11}/bw_essentials/services/broker.py

@@ -62,7 +62,8 @@ class Broker(ApiClient):
             "authorised_holdings": "brokers/{}/holdings/authorise",
             "user_instructions": "brokers/{}/user/instructions",
             "details": "brokers/{}/trade/details",
-            "surveillance_orders": "brokers/{}/surveillance/orders"
+            "surveillance_orders": "brokers/{}/surveillance/orders",
+            "profile": "brokers/{}/profile"
         }
 
     def authenticate(self, broker_name: str, user_id: str, entity_id: str,
@@ -118,6 +119,26 @@ class Broker(ApiClient):
         logger.info(f"{response =}")
         return response["data"]["balance"]
 
+    def get_profile(self, broker_name: str, user_id: str) -> dict:
+        """
+        Fetch user profile from the broker service.
+
+        Args:
+            broker_name (str): Broker name.
+            user_id (str): User ID.
+
+        Returns:
+            Dict: User Profile.
+        """
+        logger.info(f"In - get_profile {user_id =}")
+        response = self._get(
+            url=self.base_url,
+            endpoint=self.urls["profile"].format(broker_name),
+            params={"user_id": user_id}
+        )
+        logger.info(f"{response =}")
+        return response["data"]
+
     def get_holdings(self, broker_name: str, user_id: str) -> list:
         """
         Fetch user holdings from the broker service.

{bw_essentials_core-0.1.9 → bw_essentials_core-0.1.11}/bw_essentials/services/payment.py

@@ -33,7 +33,7 @@ class Payment(ApiClient):
             available, otherwise `None`.
         """
         logger.info(f"Received request to get subscription with {user_id =}")
-        url = f"{self.base_url}/{self.urls.get('get_subscription')}"
-        subscription = self._get(url, params={'userId': user_id})
+        url = f"{self.base_url}"
+        subscription = self._get(url=url, endpoint=self.urls.get('get_subscription'), params={'userId': user_id})
         logger.info(f"Successfully fetched subscription data. {subscription =}")
         return subscription.get('data')

{bw_essentials_core-0.1.9 → bw_essentials_core-0.1.11}/bw_essentials/services/portfolio_catalogue.py

@@ -178,11 +178,11 @@ class PortfolioCatalogue(ApiClient):
             otherwise an empty list.
         """
         logger.info(f"In get_subscriptions_by_ids {plans_ids =}")
-        url = f"{self.base_url}/{self.urls.get('subscriptions_by_ids')}"
+        url = f"{self.base_url}"
         data = {
-            'planId': plans_ids
+            "planId": plans_ids
         }
-        response = self._post(url, self.headers, data)
+        response = self._post(url=url, endpoint=self.urls.get('subscriptions_by_ids'), json=data)
         logger.info(f"Successfully fetched subscriptions by ids data. {response =}")
         return response.get('data', [])
 
@@ -204,10 +204,10 @@ class PortfolioCatalogue(ApiClient):
             otherwise an empty list.
         """
         logger.info(f"In get_otp_subscriptions_by_ids {plans_ids =}")
-        url = f"{self.base_url}/{self.urls.get('otp_subscriptions_by_ids')}"
+        url = f"{self.base_url}"
         data = {
-            'id': plans_ids
+            "id": plans_ids
         }
-        response  = self._post(url, self.headers, data)
+        response  = self._post(url=url, endpoint=self.urls.get('otp_subscriptions_by_ids'), json=data)
         logger.info(f"Successfully fetched otp subscriptions by ids data. {response =}")
         return response.get('data', [])

{bw_essentials_core-0.1.9 → bw_essentials_core-0.1.11}/bw_essentials/services/user_app.py

@@ -34,16 +34,20 @@ class PrometheusUserApp(ApiClient):
         urls (Dict[str, str]): A dictionary of endpoint path templates
     """
 
-    def __init__(self, service_user: str):
+    def __init__(self, service_user: str, tenant_id: str = None):
         """
-        Initialize the PrometheusUserApp client with the given service user.
+        Initialize the PrometheusUserApp client with the given service user and tenant id.
 
         Args:
             service_user (str): Username or service identifier for authentication.
+            tenant_id (str, optional): Tenant identifier for multi-tenant usage.
+                                       Defaults to None if not applicable.
         """
         super().__init__(user=service_user)
         self.base_url = self.get_base_url(Services.PROMETHEUS_USER_APP.value)
+        self.api_key = self.get_api_key(Services.PROMETHEUS_USER_APP.value)
         self.name = Services.PROMETHEUS_USER_APP.value
+        self.tenant_id = tenant_id
         self.urls = {
             "user_details": "user/details",
             "profile": "user/profile",
@@ -60,6 +64,20 @@ class PrometheusUserApp(ApiClient):
             "sso": "user/{}/sso"
         }
 
+
+    def _headers(self):
+        """
+        Prepares headers for API calls.
+
+        Returns:
+            dict: Headers
+        """
+        return {
+            'Content-Type': 'application/json',
+            **({'X-Tenant-ID': self.tenant_id} if self.tenant_id else {}),
+            'x-api-key': self.api_key
+        }
+
     def get_user_details(self, user_id: str) -> Optional[Dict[str, Any]]:
         """
         Fetch detailed user information by user ID.
@@ -71,10 +89,11 @@ class PrometheusUserApp(ApiClient):
             Optional[Dict[str, Any]]: Parsed user data if found, else None.
         """
         logger.info("Fetching user details for user_id=%s", user_id)
+        self.headers = self._headers()
         response = self._get(
             endpoint=self.urls["user_details"],
             url=self.base_url,
-            params={'user_id': user_id}
+            params={'user_id': user_id},
         )
         return response.get('data')
 

{bw_essentials_core-0.1.9 → bw_essentials_core-0.1.11}/bw_essentials_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bw-essentials-core
-Version: 0.1.9
+Version: 0.1.11
 Summary: Reusable utilities for S3, email, Data Loch, Microsoft Teams Notifications and more.
 Author: InvestorAI
 Author-email: support+tech@investorai.in

{bw_essentials_core-0.1.9 → bw_essentials_core-0.1.11}/setup.py

@@ -10,7 +10,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="bw-essentials-core",
-    version="0.1.9",
+    version="0.1.11",
     author="InvestorAI",
     author_email="support+tech@investorai.in",
     description="Reusable utilities for S3, email, Data Loch, Microsoft Teams Notifications and more.",