upgini 1.2.28__tar.gz → 1.2.29a1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.28
+Version: 1.2.29a1
 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.29a1/src/upgini/__about__.py

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

{upgini-1.2.28 → upgini-1.2.29a1}/src/upgini/resource_bundle/strings.properties

@@ -82,7 +82,7 @@ unregistered_only_personal_keys=Only personal search keys used. Api_key from pro
 search_key_not_found=Column `{}` from search_keys was not found in X dataframe: {}
 numeric_search_key_not_found=Index {} in search_keys is out of bounds for {} columns of X dataframe
 unsupported_search_key_type=Unsupported type of key in search_keys: {}
-unsupported_type_of_search_key=Unsupported type of search key: {}. It should be a member of SearcKey
+unsupported_type_of_search_key=Unsupported type of search key: {}. It should be a member of SearchKey
 search_key_country_and_country_code=SearchKey.COUNTRY and country_code parameter were passed simultaniously. Parameter country_code will be ignored
 empty_search_key=Search key {} is empty. Please fill values or remove this search key
 single_constant_search_key=Constant value detected for the {} search key in the X dataframe: {}.\nThat search key will add constant features for different y values.\nPlease add extra search keys with non constant values, like the COUNTRY, POSTAL_CODE, DATE, PHONE NUMBER, EMAIL/HEM or IPv4

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

@@ -114,16 +114,50 @@ class DateTimeSearchKeyConverter:
         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")
-            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)
+
+            # Extract time 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
+            add_cyclical_features(df, "second", 60)  # Seconds in a minute
+            add_cyclical_features(df, "minute", 60)  # Minutes in 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"])
+
         df.drop(columns=seconds, inplace=True)
 
         if keep_time:

upgini-1.2.28/src/upgini/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.2.28"