upgini 1.2.29a1__tar.gz → 1.2.29a3__tar.gz

{upgini-1.2.29a1 → upgini-1.2.29a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.29a1
+Version: 1.2.29a3
 Summary: Intelligent data search & enrichment for Machine Learning
 Project-URL: Bug Reports, https://github.com/upgini/upgini/issues
 Project-URL: Homepage, https://upgini.com/

upgini-1.2.29a3/src/upgini/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.2.29a3"

{upgini-1.2.29a1 → upgini-1.2.29a3}/src/upgini/utils/datetime_utils.py

@@ -109,54 +109,60 @@ class DateTimeSearchKeyConverter:
 
         df = self.clean_old_dates(df)
 
+        # Define function to apply sine and cosine transformations
+        def add_cyclical_features(df, column, period):
+            period_suffix = f"_{period}" if column != 'day_in_quarter' else ""
+            sin_feature = f"datetime_{column}_sin{period_suffix}"
+            cos_feature = f"datetime_{column}_cos{period_suffix}"
+            df[sin_feature] = np.sin(2 * np.pi * df[column] / period)
+            df[cos_feature] = np.cos(2 * np.pi * df[column] / period)
+            self.generated_features.append(sin_feature)
+            self.generated_features.append(cos_feature)
+
+        df["quarter"] = df[self.date_column].dt.quarter
+
+        # Calculate the start date of the quarter for each timestamp
+        df["quarter_start"] = df[self.date_column].dt.to_period("Q").dt.start_time
+
+        # Calculate the day in the quarter
+        df["day_in_quarter"] = (df[self.date_column] - df["quarter_start"]).dt.days + 1
+
+        # Vectorized calculation of days_in_quarter
+        quarter = df["quarter"]
+        start = df["quarter_start"]
+        year = start.dt.year
+        month = start.dt.month
+
+        quarter_end_year = np.where(quarter == 4, year + 1, year)
+        quarter_end_month = np.where(quarter == 4, 1, month + 3)
+
+        end = pd.to_datetime({"year": quarter_end_year, "month": quarter_end_month, "day": 1})
+
+        df["days_in_quarter"] = (end - start).dt.days
+
+        add_cyclical_features(df, "day_in_quarter", df["days_in_quarter"])  # Days in the quarter
+
+        df.drop(columns=["quarter", "quarter_start", "day_in_quarter", "days_in_quarter"], inplace=True)
+
         df[seconds] = (df[self.date_column] - df[self.date_column].dt.floor("D")).dt.seconds
 
         seconds_without_na = df[seconds].dropna()
         if (seconds_without_na != 0).any() and seconds_without_na.nunique() > 1:
             self.logger.info("Time found in date search key. Add extra features based on time")
 
-            # Extract time components
+            # Extract basic components
             df["second"] = df[self.date_column].dt.second
             df["minute"] = df[self.date_column].dt.minute
             df["hour"] = df[self.date_column].dt.hour
-            df["day"] = df[self.date_column].dt.day
-            df["month"] = df[self.date_column].dt.month
-
-            # Get the actual number of days in each month
-            df["days_in_month"] = df[self.date_column].dt.days_in_month
-
-            # Define function to apply sine and cosine transformations
-            def add_cyclical_features(df, column, period):
-                sin_feature = f"datetime_{column}_sin_{period}"
-                cos_feature = f"datetime_{column}_cos_{period}"
-                df[sin_feature] = np.sin(2 * np.pi * df[column] / period)
-                df[cos_feature] = np.cos(2 * np.pi * df[column] / period)
-                self.generated_features.append(sin_feature)
-                self.generated_features.append(cos_feature)
-
-            # Apply transformations using vectorized operations
+
+            # Apply cyclical transformations
             add_cyclical_features(df, "second", 60)  # Seconds in a minute
             add_cyclical_features(df, "minute", 60)  # Minutes in an hour
+            add_cyclical_features(df, "minute", 30)  # Minutes in half an hour
             add_cyclical_features(df, "hour", 24)  # Hours in a day
-            add_cyclical_features(df, "day", df["days_in_month"])  # Days in the specific month
-            add_cyclical_features(df, "month", 12)  # Months in a year
-
-            # Extract quarter information
-            df["quarter"] = df[self.date_column].dt.quarter
-
-            # Apply transformations for quarters
-            add_cyclical_features(df, "quarter", 4)  # Quarters in a year
-            # seconds_in_day = 60 * 60 * 24
-            # orders = [1, 2, 24, 48]
-            # for order in orders:
-            #     sin_feature = f"datetime_time_sin_{order}"
-            #     cos_feature = f"datetime_time_cos_{order}"
-            #     df[sin_feature] = np.round(np.sin(2 * np.pi * order * df[seconds] / seconds_in_day), 10)
-            #     df[cos_feature] = np.round(np.cos(2 * np.pi * order * df[seconds] / seconds_in_day), 10)
-            #     self.generated_features.append(sin_feature)
-            #     self.generated_features.append(cos_feature)
-
-            df.drop(columns=["second", "minute", "hour", "day", "month", "days_in_month", "quarter"])
+
+            # Drop intermediate columns if not needed
+            df.drop(columns=["second", "minute", "hour"], inplace=True)
 
         df.drop(columns=seconds, inplace=True)
 

upgini-1.2.29a1/src/upgini/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.2.29a1"