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

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

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

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

@@ -92,42 +92,55 @@ class EquitiesRepository:
     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 = '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 
-                `wsb-hc-qasap-ae2e.{self.environment}.fields` AS f
-                ON r.field_id = f.field_id
-            JOIN 
-                `wsb-hc-qasap-ae2e.{self.environment}.hawk_identifiers` AS hi
-                ON r.hawk_id = hi.hawk_id
-            WHERE 
-                r.hawk_id IN UNNEST(@hawk_ids)
-                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
+        WITH latest_timestamp AS (
+          SELECT
+            MAX(r.record_timestamp) AS max_ts
+          FROM
+            `wsb-hc-qasap-ae2e.{self.environment}.records` AS r
+          WHERE
+            r.hawk_id IN UNNEST(@hawk_ids)
+            AND r.record_timestamp <= @timestamp
+        ),
+        records_data AS (
+          SELECT
+            r.record_timestamp AS date,
+            hi.value            AS ticker,
+            MAX(IF(f.field_name = 'adjusted_open_snapshot',  r.double_value, NULL)) AS adjusted_open_snapshot,
+            MAX(IF(f.field_name = 'adjusted_high_snapshot',  r.double_value, NULL)) AS adjusted_high_snapshot,
+            MAX(IF(f.field_name = 'adjusted_low_snapshot',   r.double_value, NULL)) AS adjusted_low_snapshot,
+            MAX(IF(f.field_name = 'adjusted_close_snapshot', r.double_value, NULL)) AS adjusted_close_snapshot,
+            MAX(IF(f.field_name = 'volume_snapshot',         r.int_value,    NULL)) AS volume_snapshot
+          FROM
+            `wsb-hc-qasap-ae2e.{self.environment}.records`            AS r
+          JOIN
+            `wsb-hc-qasap-ae2e.{self.environment}.fields`             AS f
+              ON r.field_id = f.field_id
+          JOIN
+            `wsb-hc-qasap-ae2e.{self.environment}.hawk_identifiers`   AS hi
+              ON r.hawk_id = hi.hawk_id
+          WHERE
+            r.hawk_id   IN UNNEST(@hawk_ids)
+            AND f.field_name IN (
+              'adjusted_open_snapshot', 'adjusted_high_snapshot',
+              'adjusted_low_snapshot',  'adjusted_close_snapshot',
+              'volume_snapshot'
+            )
+            AND r.record_timestamp = (SELECT max_ts FROM latest_timestamp)
+          GROUP BY
+            date, ticker
         )
-        SELECT DISTINCT
-            date,
-            ticker,
-            adjusted_open_snapshot,
-            adjusted_high_snapshot,
-            adjusted_low_snapshot,
-            adjusted_close_snapshot,
-            volume_snapshot,
-        FROM 
-            records_data
-        ORDER BY 
-            date;
+        SELECT
+          date,
+          ticker,
+          adjusted_open_snapshot,
+          adjusted_high_snapshot,
+          adjusted_low_snapshot,
+          adjusted_close_snapshot,
+          volume_snapshot
+        FROM
+          records_data
+        ORDER BY
+          ticker;
         """
 
         query_params = [

{hawk_sdk-0.0.12 → hawk_sdk-0.0.14}/hawk_sdk/core/common/utils.py

@@ -8,14 +8,16 @@ from hawk_sdk.core.common.constants import PROJECT_ID
 
 
 def get_bigquery_client() -> bigquery.Client:
-    if 'GOOGLE_APPLICATION_CREDENTIALS' in os.environ:
-        # Initialize the client using the json file in the environment variable
-        return bigquery.Client(project=PROJECT_ID)
-
-    else:
-        # Load the service account credentials from the JSON string
-        service_account_json = os.environ.get('SERVICE_ACCOUNT_JSON')
+    service_account_json = os.environ.get('SERVICE_ACCOUNT_JSON')
+    if service_account_json:
+        # Use credentials provided in SERVICE_ACCOUNT_JSON
         credentials = service_account.Credentials.from_service_account_info(
             json.loads(service_account_json)
         )
         return bigquery.Client(project=PROJECT_ID, credentials=credentials)
+    else:
+        # Rely on Application Default Credentials (ADC),
+        # which will automatically use GOOGLE_APPLICATION_CREDENTIALS if set,
+        # or use the built-in credentials if running in GCP.
+        return bigquery.Client(project=PROJECT_ID)
+

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

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

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

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