spacr 0.3.35__py3-none-any.whl → 0.3.36__py3-none-any.whl

spacr/utils.py

@@ -5045,14 +5045,15 @@ def generate_cytoplasm_mask(nucleus_mask, cell_mask):
 
 def add_column_to_database(settings):
     """
-    Updates a column in the database by matching on a common column from the DataFrame.
-
+    Adds a new column to the database table by matching on a common column from the DataFrame.
+    If the column already exists in the database, it adds the column with a suffix.
+    
     Parameters:
     - settings: A dictionary containing the following keys:
         - 'csv_path': Path to the CSV file with the data to be added.
         - 'db_path': Path to the SQLite database (or connection string for other databases).
         - 'table_name': The name of the table in the database.
-        - 'update_column': The column to update in the database.
+        - 'update_column': The name of the new column in the DataFrame to add to the database.
         - 'match_column': The common column used to match rows.
     """
 
@@ -5063,7 +5064,28 @@ def add_column_to_database(settings):
     conn = sqlite3.connect(settings['db_path'])
     cursor = conn.cursor()
 
-    # Iterate over the DataFrame and update the database
+    # Get the existing columns in the database table
+    cursor.execute(f"PRAGMA table_info({settings['table_name']})")
+    columns_in_db = [col[1] for col in cursor.fetchall()]
+
+    # Check if the update column already exists in the database
+    if settings['update_column'] in columns_in_db:
+        # Add a suffix to the column name (e.g., '_new', '_1', or similar)
+        suffix = 1
+        new_column_name = f"{settings['update_column']}_{suffix}"
+        # Ensure uniqueness by incrementing the suffix if needed
+        while new_column_name in columns_in_db:
+            suffix += 1
+            new_column_name = f"{settings['update_column']}_{suffix}"
+        print(f"Column '{settings['update_column']}' already exists. Using new column name: '{new_column_name}'")
+    else:
+        new_column_name = settings['update_column']
+
+    # Add the new column to the database table
+    cursor.execute(f"ALTER TABLE {settings['table_name']} ADD COLUMN {new_column_name} TEXT")
+    print(f"Added new column '{new_column_name}' to the table '{settings['table_name']}'.")
+
+    # Iterate over the DataFrame and update the new column in the database
     for index, row in df.iterrows():
         value_to_update = row[settings['update_column']]
         match_value = row[settings['match_column']]
@@ -5071,7 +5093,7 @@ def add_column_to_database(settings):
         # Prepare and execute the SQL update query
         query = f"""
             UPDATE {settings['table_name']}
-            SET {settings['update_column']} = ?
+            SET {new_column_name} = ?
             WHERE {settings['match_column']} = ?
         """
         cursor.execute(query, (value_to_update, match_value))
@@ -5080,6 +5102,7 @@ def add_column_to_database(settings):
     conn.commit()
     conn.close()
 
-    print(f"Updated '{settings['update_column']}' in '{settings['table_name']}' using '{settings['match_column']}'.")
+    print(f"Updated '{new_column_name}' in '{settings['table_name']}' using '{settings['match_column']}'.")
+
 
 

{spacr-0.3.35.dist-info → spacr-0.3.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spacr
-Version: 0.3.35
+Version: 0.3.36
 Summary: Spatial phenotype analysis of crisp screens (SpaCr)
 Home-page: https://github.com/EinarOlafsson/spacr
 Author: Einar Birnir Olafsson

{spacr-0.3.35.dist-info → spacr-0.3.36.dist-info}/RECORD

@@ -27,7 +27,7 @@ spacr/sim.py,sha256=1xKhXimNU3ukzIw-3l9cF3Znc_brW8h20yv8fSTzvss,71173
 spacr/submodules.py,sha256=AB7s6-cULsaqz-haAaCtXfGEIi8uPZGT4xoCslUJC3Y,18391
 spacr/timelapse.py,sha256=FSYpUtAVy6xc3lwprRYgyDTT9ysUhfRQ4zrP9_h2mvg,39465
 spacr/toxo.py,sha256=us3pQyULtMTyfTq0MWPn4QJTTmQ6BwAJKChNf75jo3I,10082
-spacr/utils.py,sha256=hqxgN3tZTUyYvntaDc7tCRxgqlST0suAtkV3HYfbOO4,214847
+spacr/utils.py,sha256=iCbweRXWjJgKGbp8DAVC20xUG9nwy2K9cvIsXORAKwA,216043
 spacr/version.py,sha256=axH5tnGwtgSnJHb5IDhiu4Zjk5GhLyAEDRe-rnaoFOA,409
 spacr/resources/MEDIAR/.gitignore,sha256=Ff1q9Nme14JUd-4Q3jZ65aeQ5X4uttptssVDgBVHYo8,152
 spacr/resources/MEDIAR/LICENSE,sha256=yEj_TRDLUfDpHDNM0StALXIt6mLqSgaV2hcCwa6_TcY,1065
@@ -150,9 +150,9 @@ spacr/resources/icons/umap.png,sha256=dOLF3DeLYy9k0nkUybiZMe1wzHQwLJFRmgccppw-8b
 spacr/resources/images/plate1_E01_T0001F001L01A01Z01C02.tif,sha256=Tl0ZUfZ_AYAbu0up_nO0tPRtF1BxXhWQ3T3pURBCCRo,7958528
 spacr/resources/images/plate1_E01_T0001F001L01A02Z01C01.tif,sha256=m8N-V71rA1TT4dFlENNg8s0Q0YEXXs8slIn7yObmZJQ,7958528
 spacr/resources/images/plate1_E01_T0001F001L01A03Z01C03.tif,sha256=Pbhk7xn-KUP6RSIhJsxQcrHFImBm3GEpLkzx7WOc-5M,7958528
-spacr-0.3.35.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
-spacr-0.3.35.dist-info/METADATA,sha256=xBdKUQpQuuru72Lgt9dirwo_Of5GdAwOKqs7bH7Sd0k,5949
-spacr-0.3.35.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-spacr-0.3.35.dist-info/entry_points.txt,sha256=BMC0ql9aNNpv8lUZ8sgDLQMsqaVnX5L535gEhKUP5ho,296
-spacr-0.3.35.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
-spacr-0.3.35.dist-info/RECORD,,
+spacr-0.3.36.dist-info/LICENSE,sha256=SR-2MeGc6SCM1UORJYyarSWY_A-JaOMFDj7ReSs9tRM,1083
+spacr-0.3.36.dist-info/METADATA,sha256=NvcSKD3mIWOPeTDAAbugslvW-1_T0Dzd9k8WzSVNwbY,5949
+spacr-0.3.36.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+spacr-0.3.36.dist-info/entry_points.txt,sha256=BMC0ql9aNNpv8lUZ8sgDLQMsqaVnX5L535gEhKUP5ho,296
+spacr-0.3.36.dist-info/top_level.txt,sha256=GJPU8FgwRXGzKeut6JopsSRY2R8T3i9lDgya42tLInY,6
+spacr-0.3.36.dist-info/RECORD,,