imsciences 0.9.6.5__tar.gz → 0.9.6.7__tar.gz

{imsciences-0.9.6.5 → imsciences-0.9.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imsciences
-Version: 0.9.6.5
+Version: 0.9.6.7
 Summary: IMS Data Processing Package
 Author: IMS
 Author-email: cam@im-sciences.com

{imsciences-0.9.6.5 → imsciences-0.9.6.7}/imsciences/pull.py

@@ -379,7 +379,7 @@ class datapull:
         
     ###############################################################  Seasonality  ##########################################################################
 
-    def pull_seasonality(self, week_commencing, start_date, countries):
+    def pull_seasonality(week_commencing, start_date, countries):
             """
             Generates a DataFrame with weekly seasonality features.
 
@@ -597,7 +597,7 @@ class datapull:
 
 
             # ---------------------------------------------------------------------
-            # 4. Add daily indicators for last day & last Friday of month
+            # 4. Add daily indicators for last day & last Friday of month & payday
             # ---------------------------------------------------------------------
             df_daily["is_last_day_of_month"] = df_daily["Date"].dt.is_month_end
 
@@ -608,22 +608,27 @@ class datapull:
                 # Check if next Friday is in the next month
                 next_friday = date + timedelta(days=7)
                 return 1 if next_friday.month != date.month else 0
+            
+            def is_payday(date):
+                return 1 if date.day >= 25 else 0
 
             df_daily["is_last_friday_of_month"] = df_daily["Date"].apply(is_last_friday)
-
+            
+            df_daily["is_payday"] = df_daily["Date"].apply(is_payday)
+            
             # Rename for clarity prefix
             df_daily.rename(columns={
                 "is_last_day_of_month": "seas_last_day_of_month",
-                "is_last_friday_of_month": "seas_last_friday_of_month"
+                "is_last_friday_of_month": "seas_last_friday_of_month",
+                "is_payday": "seas_payday"
             }, inplace=True)
 
-
             # ---------------------------------------------------------------------
             # 5. Weekly aggregation
             # ---------------------------------------------------------------------
 
             # Select only columns that are indicators/flags (intended for max aggregation)
-            flag_cols = [col for col in df_daily.columns if col.startswith('seas_') or col.startswith('is_')]
+            flag_cols = [col for col in df_daily.columns if (col.startswith('seas_') or col.startswith('is_')) and col != "seas_payday"]
             # Ensure 'week_start' is present for grouping
             df_to_agg = df_daily[['week_start'] + flag_cols]
 
@@ -635,7 +640,26 @@ class datapull:
                 .rename(columns={'week_start': "Date"})
                 .set_index("Date")
             )
+            
+            # Do specific aggregation for payday
+            # Make sure 'date' column exists in df_daily
+            df_daily["month"] = df_daily["Date"].dt.month
+            df_daily["year"] = df_daily["Date"].dt.year
+            
+            # Sum of seas_payday flags per week
+            week_payday_sum = df_daily.groupby("week_start")["seas_payday"].sum()
 
+            # Divide the number of payday flags by number of paydays per month
+            payday_days_in_month = (
+                df_daily.groupby(["year", "month"])["seas_payday"].sum()
+            )
+            week_month = df_daily.groupby("week_start").first()[["month", "year"]]
+            week_days_in_month = week_month.apply(lambda row: payday_days_in_month.loc[(row["year"], row["month"])], axis=1)
+            df_weekly_flags["seas_payday"] = (week_payday_sum / week_days_in_month).fillna(0).values
+
+            # # Drop intermediate columns
+            # df_weekly_flags = df_weekly_flags.drop(columns=["month", "year"])
+            
             # --- Aggregate Week Number using MODE ---
             # Define aggregation function for mode (handling potential multi-modal cases by taking the first)
             def get_mode(x):
@@ -678,7 +702,6 @@ class datapull:
             df_weekly_monthly_dummies.rename(columns={'week_start': 'Date'}, inplace=True)
             df_weekly_monthly_dummies.set_index('Date', inplace=True)
 
-
             # ---------------------------------------------------------------------
             # 6. Combine all weekly components
             # ---------------------------------------------------------------------
@@ -697,15 +720,15 @@ class datapull:
 
             # Ensure correct types for flag columns (int)
             for col in df_weekly_flags.columns:
-                if col in df_combined.columns:
-                    df_combined[col] = df_combined[col].astype(int)
+                if col != 'seas_payday':
+                    if col in df_combined.columns:
+                        df_combined[col] = df_combined[col].astype(int)
 
             # Ensure correct types for month columns (float)
             for col in df_weekly_monthly_dummies.columns:
                 if col in df_combined.columns:
                     df_combined[col] = df_combined[col].astype(float)
 
-
             # ---------------------------------------------------------------------
             # 7. Create weekly dummies for Week of Year & yearly dummies from aggregated cols
             # ---------------------------------------------------------------------
@@ -737,7 +760,7 @@ class datapull:
             # Filter out columns not in the desired order list (handles case where dum_ cols are off)
             final_cols = [col for col in cols_order if col in df_combined.columns]
             df_combined = df_combined[final_cols]
-
+            
             return df_combined
     
     def pull_weather(self, week_commencing, start_date, country_codes) -> pd.DataFrame:

{imsciences-0.9.6.5 → imsciences-0.9.6.7}/imsciences.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imsciences
-Version: 0.9.6.5
+Version: 0.9.6.7
 Summary: IMS Data Processing Package
 Author: IMS
 Author-email: cam@im-sciences.com

{imsciences-0.9.6.5 → imsciences-0.9.6.7}/setup.py

@@ -8,7 +8,7 @@ def read_md(file_name):
             return f.read()
     return ''
 
-VERSION = '0.9.6.5'
+VERSION = '0.9.6.7'
 DESCRIPTION = 'IMS Data Processing Package'
 LONG_DESCRIPTION = read_md('README.md')