imsciences 0.6.2.7__tar.gz → 0.6.2.9__tar.gz

{imsciences-0.6.2.7 → imsciences-0.6.2.9}/PKG-INFO

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

{imsciences-0.6.2.7 → imsciences-0.6.2.9}/imsciences/datafunctions.py

@@ -232,10 +232,10 @@ class dataprocessing:
         print("    - Usage: week_commencing_2_week_commencing_conversion(df,date_col,week_commencing='sun')")
         print("    - Example: week_commencing_2_week_commencing_conversion(df,'obs,week_commencing='mon')")          
 
-        print("\n42. week_commencing_2_week_commencing_conversion")
-        print("    - Description: Take a week commencing column say sunday and creates a new column with a different week commencing e.g. monday")
-        print("    - Usage: week_commencing_2_week_commencing_conversion(df,date_col,week_commencing='sun')")
-        print("    - Example: week_commencing_2_week_commencing_conversion(df,'obs,week_commencing='mon')")           
+        print("\n42. plot_chart")
+        print("    - Description: Plots a range of charts including line, area, scatter, bubble, bar etc.")
+        print("    - Usage: plot_chart(df, date_col, value_cols, chart_type='line', title='Chart', x_title='Date', y_title='Values', **kwargs)")
+        print("    - Example: plot_chart(df, 'obs', df.cols, chart_type='line', title='Spend Over Time', x_title='Date', y_title='Spend')")           
         
         
                 
@@ -763,8 +763,8 @@ class dataprocessing:
         pandas.DataFrame: DataFrame with a new column containing the look up table results.
         """
 
-        # Create regex pattern from the dictionary keys
-        regex_pattern = "|".join(re.escape(key) for key in to_find_dict.keys())
+        # Create regex pattern with word boundaries from the dictionary
+        regex_pattern = "|".join(r'\b' + re.escape(key) + r'\b' for key in to_find_dict.keys())
         
         # Preprocess DataFrame if multiple columns
         if len(col_names) > 1:
@@ -1498,7 +1498,7 @@ class dataprocessing:
         df[new_col_name] = df[column_name].apply(categorize_text)
         return df
 
-    def compare_overlap(df1, df2, date_col):
+    def compare_overlap(self,df1, df2, date_col):
         """
         Compare overlapping periods between two DataFrames and provide a summary of total differences.
 
@@ -1554,7 +1554,7 @@ class dataprocessing:
         return diff_df, total_diff_df
     
     # Convert week commencing col (should be most likely monday to sunday or vice versa)
-    def week_commencing_2_week_commencing_conversion(df,date_col,week_commencing='sun'):
+    def week_commencing_2_week_commencing_conversion(self,df,date_col,week_commencing='sun'):
         """
         Convert week commencing column in a DataFrame to the start of another day specified.
 
@@ -1572,7 +1572,7 @@ class dataprocessing:
         
         return df
     
-    def plot_chart(df, date_col, value_cols, chart_type='line', title='Chart', x_title='Date', y_title='Values', **kwargs):
+    def plot_chart(self, df, date_col, value_cols, chart_type='line', title='Chart', x_title='Date', y_title='Values', **kwargs):
         """
         Plot various types of charts using Plotly.
 

{imsciences-0.6.2.7 → imsciences-0.6.2.9}/imsciences.egg-info/PKG-INFO

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

{imsciences-0.6.2.7 → imsciences-0.6.2.9}/setup.py

@@ -8,7 +8,7 @@ def read_md(file_name):
             return f.read()
     return ''
 
-VERSION = '0.6.2.7'
+VERSION = '0.6.2.9'
 DESCRIPTION = 'IMS Data Processing Package'
 LONG_DESCRIPTION = read_md('README.md')  # Reading from README.md