hawk-sdk 0.0.11__tar.gz → 0.0.12__tar.gz

{hawk_sdk-0.0.11 → hawk_sdk-0.0.12}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.1
 Name: hawk-sdk
-Version: 0.0.11
+Version: 0.0.12
 Requires-Dist: google-cloud-bigquery
 Requires-Dist: pandas

{hawk_sdk-0.0.11 → hawk_sdk-0.0.12}/hawk_sdk/api/equities/main.py

@@ -17,7 +17,7 @@ class Equities:
         self.repository = EquitiesRepository(environment=environment)
         self.service = EquitiesService(self.repository)
 
-    def get_adjusted_ohlc(self, start_date: str, end_date: str, interval: str, hawk_ids: List[int]) -> DataObject:
+    def get_adjusted_ohlcv(self, start_date: str, end_date: str, interval: str, hawk_ids: List[int]) -> DataObject:
         """Fetch open, high, low, close data for the given date range and hawk_ids.
 
         :param start_date: The start date for the data query (YYYY-MM-DD).
@@ -28,5 +28,17 @@ class Equities:
         """
         return DataObject(
             name="adjusted_equities_ohlcv",
-            data=self.service.get_adjusted_ohlc(start_date, end_date, interval, hawk_ids)
+            data=self.service.get_adjusted_ohlcv(start_date, end_date, interval, hawk_ids)
+        )
+
+    def get_adjusted_ohlcv_snapshot(self, timestamp: str, hawk_ids: List[int]) -> DataObject:
+        """Fetch snapshot data for the given date and hawk_ids.
+
+        :param timestamp: The timestamp for the data query (YYYY-MM-DD HH:MM:SS).
+        :param hawk_ids: A list of specific hawk_ids to filter by.
+        :return: A hawk DataObject containing the data.
+        """
+        return DataObject(
+            name="equities_adjusted_ohlcv_snapshot",
+            data=self.service.get_adjusted_ohlcv_snapshot(timestamp, hawk_ids)
         )

{hawk_sdk-0.0.11/hawk_sdk/api/futures → hawk_sdk-0.0.12/hawk_sdk/api/equities}/repository.py

@@ -1,5 +1,5 @@
 """
-@description: Repository layer for fetching Futures data from BigQuery.
+@description: Repository layer for fetching Equities data from BigQuery.
 @author: Rithwik Babu
 """
 import logging
@@ -10,8 +10,8 @@ from google.cloud import bigquery
 from hawk_sdk.core.common.utils import get_bigquery_client
 
 
-class FuturesRepository:
-    """Repository for accessing Futures raw data."""
+class EquitiesRepository:
+    """Repository for accessing Equities raw data."""
 
     def __init__(self, environment: str) -> None:
         """Initializes the repository with a BigQuery client.
@@ -21,19 +21,25 @@ class FuturesRepository:
         self.bq_client = get_bigquery_client()
         self.environment = environment
 
-    def fetch_ohlcvo(self, start_date: str, end_date: str, interval: str, hawk_ids: List[int]) -> Iterator[dict]:
-        """Fetches raw OHLCVO data from BigQuery for the given date range and hawk_ids using query parameters."""
+    def fetch_adjusted_ohlcv(self, start_date: str, end_date: str, interval: str, hawk_ids: List[int]) -> Iterator[
+        dict]:
+        """Fetches raw adjusted OHLCV data from BigQuery for the given date range and hawk_ids using query parameters."""
+        open_field = f"adjusted_open_{interval}"
+        high_field = f"adjusted_high_{interval}"
+        low_field = f"adjusted_low_{interval}"
+        close_field = f"adjusted_close_{interval}"
+        volume_field = f"volume_{interval}"
+
         query = f"""
         WITH records_data AS (
           SELECT 
             r.record_timestamp AS date,
             hi.value AS ticker,
-            MAX(CASE WHEN f.field_name = @open_field THEN r.double_value END) AS open,
-            MAX(CASE WHEN f.field_name = @high_field THEN r.double_value END) AS high,
-            MAX(CASE WHEN f.field_name = @low_field THEN r.double_value END) AS low,
-            MAX(CASE WHEN f.field_name = @close_field THEN r.double_value END) AS close,
-            MAX(CASE WHEN f.field_name = @volume_field THEN r.int_value END) AS volume,
-            MAX(CASE WHEN f.field_name = @open_interest_field THEN r.int_value END) AS open_interest
+            MAX(CASE WHEN f.field_name = @open_field THEN r.double_value END) AS {open_field},
+            MAX(CASE WHEN f.field_name = @high_field THEN r.double_value END) AS {high_field},
+            MAX(CASE WHEN f.field_name = @low_field THEN r.double_value END) AS {low_field},
+            MAX(CASE WHEN f.field_name = @close_field THEN r.double_value END) AS {close_field},
+            MAX(CASE WHEN f.field_name = @volume_field THEN r.int_value END) AS {volume_field}
           FROM 
             `wsb-hc-qasap-ae2e.{self.environment}.records` AS r
           JOIN 
@@ -44,7 +50,7 @@ class FuturesRepository:
             ON r.hawk_id = hi.hawk_id
           WHERE 
             r.hawk_id IN UNNEST(@hawk_ids)
-            AND f.field_name IN (@open_field, @high_field, @low_field, @close_field, @volume_field, @open_interest_field)
+            AND f.field_name IN (@open_field, @high_field, @low_field, @close_field, @volume_field)
             AND r.record_timestamp BETWEEN @start_date AND @end_date
           GROUP BY 
             date, ticker
@@ -52,12 +58,11 @@ class FuturesRepository:
         SELECT DISTINCT
           date,
           ticker,
-          open,
-          high,
-          low,
-          close,
-          volume,
-          open_interest
+          {open_field},
+          {high_field},
+          {low_field},
+          {close_field},
+          {volume_field}
         FROM 
           records_data
         ORDER BY 
@@ -68,12 +73,11 @@ class FuturesRepository:
             bigquery.ArrayQueryParameter("hawk_ids", "INT64", hawk_ids),
             bigquery.ScalarQueryParameter("start_date", "STRING", start_date),
             bigquery.ScalarQueryParameter("end_date", "STRING", end_date),
-            bigquery.ScalarQueryParameter("open_field", "STRING", f"open_{interval}"),
-            bigquery.ScalarQueryParameter("high_field", "STRING", f"high_{interval}"),
-            bigquery.ScalarQueryParameter("low_field", "STRING", f"low_{interval}"),
-            bigquery.ScalarQueryParameter("close_field", "STRING", f"close_{interval}"),
-            bigquery.ScalarQueryParameter("volume_field", "STRING", f"volume_{interval}"),
-            bigquery.ScalarQueryParameter("open_interest_field", "STRING", f"open_interest_{interval}"),
+            bigquery.ScalarQueryParameter("open_field", "STRING", open_field),
+            bigquery.ScalarQueryParameter("high_field", "STRING", high_field),
+            bigquery.ScalarQueryParameter("low_field", "STRING", low_field),
+            bigquery.ScalarQueryParameter("close_field", "STRING", close_field),
+            bigquery.ScalarQueryParameter("volume_field", "STRING", volume_field)
         ]
 
         job_config = bigquery.QueryJobConfig(query_parameters=query_params)
@@ -82,22 +86,21 @@ class FuturesRepository:
             query_job = self.bq_client.query(query, job_config=job_config)
             return query_job.result()
         except Exception as e:
-            logging.error(f"Failed to fetch OHLCVO data: {e}")
+            logging.error(f"Failed to fetch OHLC data: {e}")
             raise
 
-    def fetch_snapshot(self, timestamp: str, hawk_ids: List[int]) -> Iterator[dict]:
+    def fetch_adjusted_ohlcv_snapshot(self, timestamp: str, hawk_ids: List[int]) -> Iterator[dict]:
         """Fetches the most recent snapshot data from BigQuery for the given time and hawk_ids."""
         query = f"""
         WITH records_data AS (
             SELECT 
                 r.record_timestamp AS date,
                 hi.value AS ticker,
-                MAX(CASE WHEN f.field_name = 'close_snapshot' THEN r.double_value END) AS close_snapshot,
-                MAX(CASE WHEN f.field_name = 'high_snapshot' THEN r.double_value END) AS high_snapshot,
-                MAX(CASE WHEN f.field_name = 'low_snapshot' THEN r.double_value END) AS low_snapshot,
-                MAX(CASE WHEN f.field_name = 'cvol_snapshot' THEN r.int_value END) AS cvol_snapshot,
-                MAX(CASE WHEN f.field_name = 'bid_snapshot' THEN r.double_value END) AS bid_snapshot,
-                MAX(CASE WHEN f.field_name = 'ask_snapshot' THEN r.double_value END) AS ask_snapshot
+                MAX(CASE WHEN f.field_name = 'adjusted_open_snapshot' THEN r.double_value END) AS adjusted_open_snapshot,
+                MAX(CASE WHEN f.field_name = 'adjusted_high_snapshot' THEN r.double_value END) AS adjusted_high_snapshot,
+                MAX(CASE WHEN f.field_name = 'adjusted_low_snapshot' THEN r.double_value END) AS adjusted_low_snapshot,
+                MAX(CASE WHEN f.field_name = 'adjusted_close_snapshot' THEN r.double_value END) AS adjusted_close_snapshot,
+                MAX(CASE WHEN f.field_name = 'volume_snapshot' THEN r.int_value END) AS volume_snapshot,
             FROM 
                 `wsb-hc-qasap-ae2e.{self.environment}.records` AS r
             JOIN 
@@ -108,7 +111,7 @@ class FuturesRepository:
                 ON r.hawk_id = hi.hawk_id
             WHERE 
                 r.hawk_id IN UNNEST(@hawk_ids)
-                AND f.field_name IN ('close_snapshot', 'high_snapshot', 'low_snapshot', 'cvol_snapshot', 'bid_snapshot', 'ask_snapshot')
+                AND f.field_name IN ('adjusted_open_snapshot', 'adjusted_high_snapshot', 'adjusted_low_snapshot', 'adjusted_close_snapshot', 'volume_snapshot')
                 AND r.record_timestamp <= @timestamp
             GROUP BY 
                 date, ticker
@@ -116,12 +119,11 @@ class FuturesRepository:
         SELECT DISTINCT
             date,
             ticker,
-            close_snapshot,
-            high_snapshot,
-            low_snapshot,
-            cvol_snapshot,
-            bid_snapshot,
-            ask_snapshot
+            adjusted_open_snapshot,
+            adjusted_high_snapshot,
+            adjusted_low_snapshot,
+            adjusted_close_snapshot,
+            volume_snapshot,
         FROM 
             records_data
         ORDER BY 
@@ -130,7 +132,7 @@ class FuturesRepository:
 
         query_params = [
             bigquery.ArrayQueryParameter("hawk_ids", "INT64", hawk_ids),
-            bigquery.ScalarQueryParameter("timestamp", "DATETIME", timestamp)
+            bigquery.ScalarQueryParameter("timestamp", "TIMESTAMP", timestamp)
         ]
 
         job_config = bigquery.QueryJobConfig(query_parameters=query_params)

{hawk_sdk-0.0.11 → hawk_sdk-0.0.12}/hawk_sdk/api/equities/service.py

@@ -19,7 +19,7 @@ class EquitiesService:
         """
         self.repository = repository
 
-    def get_adjusted_ohlc(self, start_date: str, end_date: str, interval: str, hawk_ids: List[int]) -> pd.DataFrame:
+    def get_adjusted_ohlcv(self, start_date: str, end_date: str, interval: str, hawk_ids: List[int]) -> pd.DataFrame:
         """Equities and normalizes data into a pandas DataFrame.
 
         :param start_date: The start date for the data query (YYYY-MM-DD).
@@ -28,7 +28,17 @@ class EquitiesService:
         :param hawk_ids: A list of specific hawk_ids to filter by.
         :return: A pandas DataFrame containing the normalized data.
         """
-        raw_data = self.repository.fetch_adjusted_ohlc(start_date, end_date, interval, hawk_ids)
+        raw_data = self.repository.fetch_adjusted_ohlcv(start_date, end_date, interval, hawk_ids)
+        return self._normalize_data(raw_data)
+
+    def get_adjusted_ohlcv_snapshot(self, timestamp: str, hawk_ids: List[int]) -> pd.DataFrame:
+        """Fetches and normalizes snapshot data for the given date and hawk_ids.
+
+        :param timestamp: The timestamp for the data query (YYYY-MM-DD HH:MM:SS).
+        :param hawk_ids: A list of specific hawk_ids to filter by.
+        :return: A pandas DataFrame containing the normalized data.
+        """
+        raw_data = self.repository.fetch_adjusted_ohlcv_snapshot(timestamp, hawk_ids)
         return self._normalize_data(raw_data)
 
     @staticmethod

{hawk_sdk-0.0.11 → hawk_sdk-0.0.12}/hawk_sdk/api/futures/main.py

@@ -30,15 +30,3 @@ class Futures:
             name="futures_ohlcvo",
             data=self.service.get_ohlcvo(start_date, end_date, interval, hawk_ids)
         )
-
-    def get_snapshot(self, timestamp: str, hawk_ids: List[int]) -> DataObject:
-        """Fetch snapshot data for the specified timestamp and hawk_ids.
-
-        :param timestamp: The timestamp for the data query (YYYY-MM-DD HH:MM:SS).
-        :param hawk_ids: A list of specific hawk_ids to filter by.
-        :return: A hawk DataObject containing the snapshot data.
-        """
-        return DataObject(
-            name="futures_snapshot",
-            data=self.service.get_snapshot(timestamp, hawk_ids)
-        )

{hawk_sdk-0.0.11/hawk_sdk/api/equities → hawk_sdk-0.0.12/hawk_sdk/api/futures}/repository.py

@@ -1,5 +1,5 @@
 """
-@description: Repository layer for fetching Equities data from BigQuery.
+@description: Repository layer for fetching Futures data from BigQuery.
 @author: Rithwik Babu
 """
 import logging
@@ -10,8 +10,8 @@ from google.cloud import bigquery
 from hawk_sdk.core.common.utils import get_bigquery_client
 
 
-class EquitiesRepository:
-    """Repository for accessing Equities raw data."""
+class FuturesRepository:
+    """Repository for accessing Futures raw data."""
 
     def __init__(self, environment: str) -> None:
         """Initializes the repository with a BigQuery client.
@@ -21,22 +21,19 @@ class EquitiesRepository:
         self.bq_client = get_bigquery_client()
         self.environment = environment
 
-    def fetch_adjusted_ohlc(self, start_date: str, end_date: str, interval: str, hawk_ids: List[int]) -> Iterator[dict]:
-        """Fetches raw adjusted OHLC data from BigQuery for the given date range and hawk_ids using query parameters."""
-        open_field = f"adjusted_open_{interval}"
-        high_field = f"adjusted_high_{interval}"
-        low_field = f"adjusted_low_{interval}"
-        close_field = f"adjusted_close_{interval}"
-
+    def fetch_ohlcvo(self, start_date: str, end_date: str, interval: str, hawk_ids: List[int]) -> Iterator[dict]:
+        """Fetches raw OHLCVO data from BigQuery for the given date range and hawk_ids using query parameters."""
         query = f"""
         WITH records_data AS (
           SELECT 
             r.record_timestamp AS date,
             hi.value AS ticker,
-            MAX(CASE WHEN f.field_name = @open_field THEN r.double_value END) AS {open_field},
-            MAX(CASE WHEN f.field_name = @high_field THEN r.double_value END) AS {high_field},
-            MAX(CASE WHEN f.field_name = @low_field THEN r.double_value END) AS {low_field},
-            MAX(CASE WHEN f.field_name = @close_field THEN r.double_value END) AS {close_field}
+            MAX(CASE WHEN f.field_name = @open_field THEN r.double_value END) AS open,
+            MAX(CASE WHEN f.field_name = @high_field THEN r.double_value END) AS high,
+            MAX(CASE WHEN f.field_name = @low_field THEN r.double_value END) AS low,
+            MAX(CASE WHEN f.field_name = @close_field THEN r.double_value END) AS close,
+            MAX(CASE WHEN f.field_name = @volume_field THEN r.int_value END) AS volume,
+            MAX(CASE WHEN f.field_name = @open_interest_field THEN r.int_value END) AS open_interest
           FROM 
             `wsb-hc-qasap-ae2e.{self.environment}.records` AS r
           JOIN 
@@ -47,7 +44,7 @@ class EquitiesRepository:
             ON r.hawk_id = hi.hawk_id
           WHERE 
             r.hawk_id IN UNNEST(@hawk_ids)
-            AND f.field_name IN (@open_field, @high_field, @low_field, @close_field)
+            AND f.field_name IN (@open_field, @high_field, @low_field, @close_field, @volume_field, @open_interest_field)
             AND r.record_timestamp BETWEEN @start_date AND @end_date
           GROUP BY 
             date, ticker
@@ -55,26 +52,28 @@ class EquitiesRepository:
         SELECT DISTINCT
           date,
           ticker,
-          {open_field},
-          {high_field},
-          {low_field},
-          {close_field},
+          open,
+          high,
+          low,
+          close,
+          volume,
+          open_interest
         FROM 
           records_data
         ORDER BY 
           date;
         """
 
-
-
         query_params = [
             bigquery.ArrayQueryParameter("hawk_ids", "INT64", hawk_ids),
             bigquery.ScalarQueryParameter("start_date", "STRING", start_date),
             bigquery.ScalarQueryParameter("end_date", "STRING", end_date),
-            bigquery.ScalarQueryParameter("open_field", "STRING", open_field),
-            bigquery.ScalarQueryParameter("high_field", "STRING", high_field),
-            bigquery.ScalarQueryParameter("low_field", "STRING", low_field),
-            bigquery.ScalarQueryParameter("close_field", "STRING", close_field)
+            bigquery.ScalarQueryParameter("open_field", "STRING", f"open_{interval}"),
+            bigquery.ScalarQueryParameter("high_field", "STRING", f"high_{interval}"),
+            bigquery.ScalarQueryParameter("low_field", "STRING", f"low_{interval}"),
+            bigquery.ScalarQueryParameter("close_field", "STRING", f"close_{interval}"),
+            bigquery.ScalarQueryParameter("volume_field", "STRING", f"volume_{interval}"),
+            bigquery.ScalarQueryParameter("open_interest_field", "STRING", f"open_interest_{interval}"),
         ]
 
         job_config = bigquery.QueryJobConfig(query_parameters=query_params)
@@ -83,5 +82,5 @@ class EquitiesRepository:
             query_job = self.bq_client.query(query, job_config=job_config)
             return query_job.result()
         except Exception as e:
-            logging.error(f"Failed to fetch OHLC data: {e}")
+            logging.error(f"Failed to fetch OHLCVO data: {e}")
             raise

{hawk_sdk-0.0.11 → hawk_sdk-0.0.12}/hawk_sdk/api/futures/service.py

@@ -31,16 +31,6 @@ class FuturesService:
         raw_data = self.repository.fetch_ohlcvo(start_date, end_date, interval, hawk_ids)
         return self._normalize_data(raw_data)
 
-    def get_snapshot(self, timestamp: str, hawk_ids: List[int]) -> pd.DataFrame:
-        """Fetches snapshot data and normalizes it into a pandas DataFrame.
-
-        :param timestamp: The timestamp for the data query (YYYY-MM-DD HH:MM:SS).
-        :param hawk_ids: A list of specific hawk_ids to filter by.
-        :return: A pandas DataFrame containing the normalized snapshot data.
-        """
-        raw_data = self.repository.fetch_snapshot(timestamp, hawk_ids)
-        return self._normalize_data(raw_data)
-
     @staticmethod
     def _normalize_data(data: Iterator[dict]) -> pd.DataFrame:
         """Converts raw data into a normalized pandas DataFrame.

{hawk_sdk-0.0.11 → hawk_sdk-0.0.12}/hawk_sdk.egg-info/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.1
 Name: hawk-sdk
-Version: 0.0.11
+Version: 0.0.12
 Requires-Dist: google-cloud-bigquery
 Requires-Dist: pandas

{hawk_sdk-0.0.11 → hawk_sdk-0.0.12}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='hawk-sdk',
-    version='0.0.11',
+    version='0.0.12',
     packages=find_packages(),
     install_requires=[
         'google-cloud-bigquery',