bw-essentials-core 0.1.18__py3-none-any.whl → 0.1.20__py3-none-any.whl

bw_essentials/services/api_client.py

@@ -15,6 +15,7 @@ import logging
 import os
 import sys
 import time
+import httpx
 from importlib.util import spec_from_file_location, module_from_spec
 from typing import Optional, Dict, Any
 
@@ -195,6 +196,41 @@ class ApiClient:
         """
         return self._request("get", url, endpoint, params=params)
 
+    async def _async_get(self, url: str, endpoint: str, headers: dict | None = None, params: dict | None = None):
+        """
+        Async GET request, aligned with the sync _request() style.
+        """
+        headers = self._update_headers(headers or {})
+        params = params or {}
+        formatted_url = f"{url.rstrip('/')}/{endpoint.lstrip('/')}"
+
+        logger.info(f"GET {formatted_url} | Headers: {headers} | Params: {params}")
+
+        start = time.time()
+        try:
+            async with httpx.AsyncClient() as client:
+                response = await client.get(formatted_url, headers=headers, params=params)
+
+            elapsed_time_ms = (time.time() - start) * 1000
+
+            # parse JSON safely
+            try:
+                json_data = response.json()
+            except ValueError:
+                logger.error(f"Non-JSON response from {formatted_url}")
+                json_data = None
+
+            self._log_response("GET", formatted_url, response.status_code, elapsed_time_ms, json_data)
+
+            response.raise_for_status()
+            return json_data
+
+        except Exception as exc:
+            elapsed_time_ms = (time.time() - start) * 1000
+            logger.error(f"GET {formatted_url} failed after {elapsed_time_ms:.2f}ms")
+            logger.exception(exc)
+            raise
+
     def _post(
         self,
         url: str,

bw_essentials/services/master_data.py

@@ -299,3 +299,54 @@ class MasterData(ApiClient):
         response = self._get(url=self.base_url, endpoint=self.urls["broker_partner_mapping_details"].format(broker_partner, broker))
         logger.info(f"Broker partner mapping {response =}")
         return response.get('data', {})
+
+    async def get_broker_data_async(self, symbols, broker, username=None):
+        """
+        Asynchronously retrieve broker-specific data for specified symbols.
+
+        This function fetches broker-specific details such as margin and leverage
+        for a list of provided trading symbols from the broker master service.
+
+        Args:
+            username (str) [Optional]: The user_id for whom data is requested.
+            symbols (str): A comma-separated string of trading symbols.
+            broker (str): The broker identifier for which data is requested.
+
+        Returns:
+            list: A list of dictionaries containing broker data for each symbol
+                  or an empty list if no data is available.
+        """
+        logger.info(f"In - get_broker_data_async {broker =}")
+        broker_data_response = await self._async_get(
+            url=f"{self.base_url}",
+            endpoint = self.urls["broker_details"].format(broker),
+            params={"symbols": symbols, "user_id": username},
+            headers={}
+        )
+        return broker_data_response.get('data', [])
+
+    def get_broker_data_all(self, symbols, broker, username=None):
+        """
+        Retrieve broker-specific data for specified symbols.
+
+        This function fetches broker-specific details such as margin and leverage
+        for a list of provided trading symbols from the broker master service.
+
+        Args:
+            username (str) [Optional]: The user_id for whom data is requested.
+            symbols (str): A comma-separated string of trading symbols.
+            broker (str): The broker identifier for which data is requested.
+
+        Returns:
+            dict: A dictionary containing broker data for the first symbol or
+                  an empty dictionary if no data is available.
+        """
+        logger.info(f"In - get_broker_data {broker =}")
+        broker_data_response = self._get(
+            url=f"{self.base_url}",
+            endpoint=self.urls['broker_details'].format(broker),
+            params={"symbols": symbols, "user_id": username},
+        )
+        if broker_data_response.get('data'):
+            return broker_data_response.get('data')
+        return {}

bw_essentials/services/notification.py

@@ -32,7 +32,7 @@ class NotificationService(ApiClient):
             "email": "email"
         }
 
-    def _whatsapp(self, title, template, platform, params, to, user_id) -> None:
+    def _whatsapp(self, title, template, platform, params, to, user_id) -> dict:
         """
         Sends a WhatsApp notification.
 
@@ -46,7 +46,7 @@ class NotificationService(ApiClient):
         - params: Parameters for the notification message.
 
         Returns:
-        None
+            returns the response data from the notification service.
         """
         logger.info(f"In - whatsapp {user_id =}, {to =}, "
                     f"{title =}, {template =}, {platform =}, {params =}")
@@ -66,8 +66,9 @@ class NotificationService(ApiClient):
         self.set_headers(headers)
         resp_data = self._post(url=self.base_url, endpoint=self.urls.get('whatsapp'), data=payload)
         logger.info(f"Whatsapp response {resp_data =}")
+        return resp_data
 
-    def send_whatsapp(self, template, title, params, to, user_id) -> None:
+    def send_whatsapp(self, template, title, params, to, user_id) -> dict:
         """
 
         Args:
@@ -78,17 +79,18 @@ class NotificationService(ApiClient):
             user_id (str): The ID of the user receiving the notification.
 
         Returns:
-            None
+            Returns the response of calling function
         """
         logger.info(f"In - send_whatsapp_notification {user_id =} {title = } {params = } {to = }")
-        self._whatsapp(title=title,
+        response = self._whatsapp(title=title,
                        template=template,
                        platform=self._get_env_var(NotificationService.PLATFORM),
                        params=params,
                        to=to,
                        user_id=user_id)
+        return response
 
-    def _email(self, title: str, content: str, platform: str, to: str, user_id: str) -> None:
+    def _email(self, title: str, content: str, platform: str, to: str, user_id: str) -> dict:
         """
         Sends an email notification using the internal notification service.
 
@@ -100,7 +102,7 @@ class NotificationService(ApiClient):
             user_id (str): The ID of the user for tracking or logging purposes.
 
         Returns:
-            None
+            returns the response data from the notification service.
 
         """
         logger.info(f"In - email {user_id =}, {to =}, {title =}, {platform =}, {content =}")
@@ -119,8 +121,9 @@ class NotificationService(ApiClient):
         self.set_headers(headers)
         resp_data = self._post(url=self.base_url, endpoint=self.urls.get('email'), json=payload)
         logger.info(f"Email response {resp_data =}")
+        return resp_data
 
-    def send_email(self, title: str, content: str, to: str, user_id: str) -> None:
+    def send_email(self, title: str, content: str, to: str, user_id: str) -> dict:
         """
         Sends an email notification to the specified recipient.
 
@@ -131,13 +134,14 @@ class NotificationService(ApiClient):
             user_id (str): The ID of the user associated with the notification.
 
         Returns:
-            None
+            return the response of calling function
         """
         logger.info(f"In - send_email {user_id =}, {title =}, {to =}")
-        self._email(
-            title=title,
-            content=content,
-            platform=self._get_env_var(NotificationService.PLATFORM),
-            to=to,
-            user_id=user_id
+        response = self._email(
+                title=title,
+                content=content,
+                platform=self._get_env_var(NotificationService.PLATFORM),
+                to=to,
+                user_id=user_id
         )
+        return response

{bw_essentials_core-0.1.18.dist-info → bw_essentials_core-0.1.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bw-essentials-core
-Version: 0.1.18
+Version: 0.1.20
 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.18.dist-info → bw_essentials_core-0.1.20.dist-info}/RECORD

@@ -11,13 +11,13 @@ bw_essentials/notifications/teams_notifications.py,sha256=1tkS3tTJQZ5ByMwK2WXpFg
 bw_essentials/s3_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bw_essentials/s3_utils/s3_utils.py,sha256=wzjVrTX22_8PMX86svKFYGMZwgjBHbOaeEsxO-lR7BY,12922
 bw_essentials/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bw_essentials/services/api_client.py,sha256=5XFbdw5gfxXz7mQlLWNC8efDrvZgAztM-Oo0Dp1jDF8,8215
+bw_essentials/services/api_client.py,sha256=hGgM1rwiI7Yvq0tj0XfqZUV_hSXEm4S5Vw0lyNvSVDY,9553
 bw_essentials/services/broker.py,sha256=W4y31K7dF4LHfQSvnAwVWfGoYKkdz-W2TXqTLhkUxn8,9348
 bw_essentials/services/job_scheduler.py,sha256=1fQDWBvNa3bMCm3YzlJehoS-HONUSu4_oquuBv6t0Lg,1966
 bw_essentials/services/market_pricer.py,sha256=Qc9lxzAjhefAvjyEKsBPDu60bF6_61cnSpZNfjGMyDg,11755
-bw_essentials/services/master_data.py,sha256=2o_r2gdhIKBeTFgn5IIY-becgCEpYBymO4BKmixdV1g,11987
+bw_essentials/services/master_data.py,sha256=rybavhEbrasaf2NDgSlbn6Jy0jmEDkSqH5XtQ6FrGp4,14195
 bw_essentials/services/model_portfolio_reporting.py,sha256=VLSvfRZOdn-nI3MtgfcqP0ZE3aTqBU0NcncLffPVtD8,4407
-bw_essentials/services/notification.py,sha256=q4jIZzIWIHvn-XaIIbkEjjhkYUV8ZGQWUXaY4NNRFgI,5078
+bw_essentials/services/notification.py,sha256=nnvtEqUphhCSTavsV75XvLp1ZNVV-kLU_cFc8zLNIec,5396
 bw_essentials/services/payment.py,sha256=Em8Lvg7aX1Ga4CJDpJimyE_ByZhJZKM6W6rw2cUUIvw,1479
 bw_essentials/services/portfolio_catalogue.py,sha256=Eal2wJd2qQB_qk2B_7u0-SwsZTN9nMsSxwgoIud845Y,7201
 bw_essentials/services/portfolio_content.py,sha256=etdbPqacUJscM1DqdtqSsuH3IQX6oPJEsE3nM6d8YvI,3038
@@ -25,7 +25,7 @@ bw_essentials/services/trade_placement.py,sha256=PrzeU2XXC9HF1IQ1dMDM_ZHxmC491sO
 bw_essentials/services/user_app.py,sha256=1z73G91TygW_MgHjkUVA2WIdN4CQjx_oSZWW6NqFit8,11774
 bw_essentials/services/user_portfolio.py,sha256=uUQUCG8Av8eKBIw-TlNtOPpQluO9HjAkxMzzO5jfzbo,22179
 bw_essentials/services/user_portfolio_reporting.py,sha256=pwqfW95LTiGOGufcTphljFxPlOd-G4Q263UtoQURPxM,6772
-bw_essentials_core-0.1.18.dist-info/METADATA,sha256=7Jbm6MRXIKxsoPYYas102hfzY8VeeoueNg6Cc5ppDZ0,7502
-bw_essentials_core-0.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bw_essentials_core-0.1.18.dist-info/top_level.txt,sha256=gDc5T_y5snwKGXDQUusEus-FEt0RFwG644Yn_58wQOQ,14
-bw_essentials_core-0.1.18.dist-info/RECORD,,
+bw_essentials_core-0.1.20.dist-info/METADATA,sha256=pcM0NUKJCPJNkAiOjqSJmTMmCEIjWnYHkBvpKeOK0M8,7502
+bw_essentials_core-0.1.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bw_essentials_core-0.1.20.dist-info/top_level.txt,sha256=gDc5T_y5snwKGXDQUusEus-FEt0RFwG644Yn_58wQOQ,14
+bw_essentials_core-0.1.20.dist-info/RECORD,,