Billing Enums & Filter fixes (#663)

* Fixing Billing Enum imports.

* Adding missing Billing Filter for day for gcp_billing_daily_cost table.

api/routes/billing.py

@@ -7,11 +7,11 @@
 from api.settings import BILLING_CACHE_RESPONSE_TTL, BQ_AGGREG_VIEW
 from api.utils.db import BqConnection, get_author
 from db.python.layers.billing import BillingLayer
+from models.enums import BillingSource
 from models.models import (
     BillingColumn,
     BillingCostBudgetRecord,
     BillingHailBatchCostRecord,
-    BillingSource,
     BillingTotalCostQueryModel,
     BillingTotalCostRecord,
 )

db/python/layers/billing.py

@@ -4,13 +4,11 @@
 from db.python.tables.bq.billing_daily_extended import BillingDailyExtendedTable
 from db.python.tables.bq.billing_gcp_daily import BillingGcpDailyTable
 from db.python.tables.bq.billing_raw import BillingRawTable
+from models.enums import BillingSource, BillingTimeColumn, BillingTimePeriods
 from models.models import (
     BillingColumn,
     BillingCostBudgetRecord,
     BillingHailBatchCostRecord,
-    BillingSource,
-    BillingTimeColumn,
-    BillingTimePeriods,
     BillingTotalCostQueryModel,
 )
 

db/python/tables/bq/billing_base.py

@@ -12,11 +12,11 @@
 from db.python.tables.bq.billing_filter import BillingFilter
 from db.python.tables.bq.function_bq_filter import FunctionBQFilter
 from db.python.tables.bq.generic_bq_filter import GenericBQFilter
+from models.enums import BillingTimePeriods
 from models.models import (
     BillingColumn,
     BillingCostBudgetRecord,
     BillingCostDetailsRecord,
-    BillingTimePeriods,
     BillingTotalCostQueryModel,
 )
 

db/python/tables/bq/billing_gcp_daily.py

@@ -42,6 +42,15 @@ def _query_to_partitioned_filter(
             if query.end_date
             else None,
         )
+        # add day filter after partition filter is applied
+        billing_filter.day = GenericBQFilter[datetime](
+            gte=datetime.strptime(query.start_date, '%Y-%m-%d')
+            if query.start_date
+            else None,
+            lte=datetime.strptime(query.end_date, '%Y-%m-%d')
+            if query.end_date
+            else None,
+        )
         return billing_filter
 
     async def _last_loaded_day(self):

models/enums/__init__.py

@@ -1,3 +1,4 @@
 from models.enums.analysis import AnalysisStatus
+from models.enums.billing import BillingSource, BillingTimeColumn, BillingTimePeriods
 from models.enums.search import SearchResponseType
 from models.enums.web import MetaSearchEntityPrefix

models/models/__init__.py

@@ -17,9 +17,6 @@
     BillingCostDetailsRecord,
     BillingHailBatchCostRecord,
     BillingInternal,
-    BillingSource,
-    BillingTimeColumn,
-    BillingTimePeriods,
     BillingTotalCostQueryModel,
     BillingTotalCostRecord,
 )