imsciences 0.9.5__tar.gz → 0.9.5.1__tar.gz

{imsciences-0.9.5 → imsciences-0.9.5.1}/PKG-INFO

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

{imsciences-0.9.5 → imsciences-0.9.5.1}/imsciences/geo.py

@@ -199,14 +199,14 @@ class geoprocessing:
 
         return analysis_df
     
-    def process_city_analysis(self, raw_df, spend_df, output_path, group1, group2, response_column):
+    def process_city_analysis(self, raw_input_path, spend_input_path, output_path, group1, group2, response_column):
         """
         Process city analysis by grouping data, analyzing user metrics, and merging with spend data.
 
         Parameters:
-            raw_df (pd.DataFrame): Raw input data containing at least 'date' and 'city' columns, along with the specified response column.
-            spend_df (pd.DataFrame): DataFrame containing media spend data with 'date', 'geo', and 'cost' columns. Costs should be numeric.
-            output_path (str): Path to save the final output CSV file.
+            raw_input_path (str): Path to the raw input data file (CSV or XLSX) containing at least 'date', 'city', and the specified response column.
+            spend_input_path (str): Path to the media spend data file (CSV or XLSX) with 'date', 'geo', and 'cost' columns. Costs should be numeric.
+            output_path (str): Path to save the final output file (CSV or XLSX).
             group1 (list): List of city regions for group 1.
             group2 (list): List of city regions for group 2.
             response_column (str): Column name to be used as the response metric.
@@ -215,6 +215,31 @@ class geoprocessing:
             pd.DataFrame: Processed DataFrame.
         """
         import pandas as pd
+        import os
+
+        def read_file(file_path):
+            """Helper function to read CSV or XLSX files."""
+            ext = os.path.splitext(file_path)[1].lower()
+            if ext == '.csv':
+                return pd.read_csv(file_path)
+            elif ext in ['.xlsx', '.xls']:
+                return pd.read_excel(file_path)
+            else:
+                raise ValueError("Unsupported file type. Please use a CSV or XLSX file.")
+
+        def write_file(df, file_path):
+            """Helper function to write DataFrame to CSV or XLSX files."""
+            ext = os.path.splitext(file_path)[1].lower()
+            if ext == '.csv':
+                df.to_csv(file_path, index=False)
+            elif ext in ['.xlsx', '.xls']:
+                df.to_excel(file_path, index=False, engine='openpyxl')
+            else:
+                raise ValueError("Unsupported file type. Please use a CSV or XLSX file.")
+
+        # Read input files
+        raw_df = read_file(raw_input_path)
+        spend_df = read_file(spend_input_path)
 
         # Ensure necessary columns are present
         required_columns = {'date', 'city', response_column}
@@ -245,6 +270,6 @@ class geoprocessing:
         merged_df['cost'] = merged_df['cost'].fillna(0)
 
         # Save the final output
-        merged_df.to_csv(output_path, index=False)
+        write_file(merged_df, output_path)
 
-        return merged_df
+        return merged_df

{imsciences-0.9.5 → imsciences-0.9.5.1}/imsciences.egg-info/PKG-INFO

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

{imsciences-0.9.5 → imsciences-0.9.5.1}/setup.py

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