ecoscape-utilities 0.0.37__py3-none-any.whl → 0.0.38__py3-none-any.whl

ecoscape_utilities/ebird_db.py

@@ -11,6 +11,34 @@ from pyproj.crs import CRS
 
 from scgt import GeoTiff
 
+def expand_sqlite_query(query, params):
+    """
+    Expands an SQLite query string with named parameters from a dictionary.
+
+    Args:
+        query (str): The SQL query string with :variable placeholders.
+        params (dict): A dictionary mapping variable names to their values.
+
+    Returns:
+        str: The expanded SQL query string.
+    """
+    expanded_query = query
+    for key, value in params.items():
+        placeholder = f":{key}"
+        if isinstance(value, str):
+            # Escape any single quotes within the string
+            formatted_value = f"'{value.replace("'", "''")}'"
+        elif value is None:
+            formatted_value = 'NULL'
+        else:
+            # For integers, floats, and other types
+            formatted_value = str(value)
+        
+        expanded_query = expanded_query.replace(placeholder, formatted_value)
+        
+    return expanded_query
+    
+    
 """
 A module for interaction with a sqlite database. Contains functions for query execution, 
 and some common functionality we need to run on the DB
@@ -120,6 +148,7 @@ class EbirdObservations(Connection):
         query_string = " ".join(query_string)
         if verbose:
             print("Query:", query_string)
+            print("Expanded query:", expand_sqlite_query(query_string, d))
         squares_list = self.execute_query((query_string, d))
         return [sq[0] for sq in squares_list]
 
@@ -220,6 +249,7 @@ class EbirdObservations(Connection):
         query_string = " ".join(query_string)
         if verbose:
             print("Query:", query_string)
+            print("Expanded query:", expand_sqlite_query(query_string, d))
         r = self.execute_query((query_string, d))
         if r is None:
             num_birds = 0
@@ -324,6 +354,7 @@ class EbirdObservations(Connection):
         query_string = " ".join(query_string)
         if verbose:
             print("Query:", query_string)
+            print("Expanded query:", expand_sqlite_query(query_string, d))
         rows = self.execute_query((query_string, d))
         counts = defaultdict(int)
         for r in rows:
@@ -380,6 +411,7 @@ class EbirdObservations(Connection):
         query_string = " ".join(query_string)
         if verbose:
             print("Query:", query_string)
+            print("Expanded query:", expand_sqlite_query(query_string, d))
         r = self.execute_query((query_string, d))
         return [row[0] for row in r]
 

{ecoscape_utilities-0.0.37.dist-info → ecoscape_utilities-0.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecoscape-utilities
-Version: 0.0.37
+Version: 0.0.38
 Summary: A collection of EcoScape utilities.
 Author-email: Luca de Alfaro <luca@ucsc.edu>, Coen Adler <ctadler@ucsc.edu>, Artie Nazarov <anazarov@ucsc.edu>, Natalia Ocampo-Peñuela <nocampop@ucsc.edu>, Jasmine Tai <cjtai@ucsc.edu>, Natalie Valett <nvalett@ucsc.edu>
 Project-URL: Homepage, https://github.com/ecoscape-earth/ecoscape-utilities

ecoscape_utilities-0.0.38.dist-info/RECORD

@@ -0,0 +1,8 @@
+ecoscape_utilities/__init__.py,sha256=LXt1rL9JVsjnCmsNZwZ2aoElphIK-koaEDdW6ffZsMQ,50
+ecoscape_utilities/bird_runs.py,sha256=v43PfH_4ojpkTE-EFOJxr0oOW3M9suNm_1zMjZ9P-eI,5409
+ecoscape_utilities/ebird_db.py,sha256=vMezw5AFIrd4RVITWbLpsZlDGBxig5CoVQMzT7XDeNk,28067
+ecoscape_utilities-0.0.38.dist-info/licenses/LICENSE.md,sha256=3vh2mpA_XIR3FJot6a5F9DqktAoq45sEGIRkYjvAEeU,1304
+ecoscape_utilities-0.0.38.dist-info/METADATA,sha256=E9tCnd-2Ipwy9tzDGz30uICoVmJ2mzuxrGUcuuZFGSs,1382
+ecoscape_utilities-0.0.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecoscape_utilities-0.0.38.dist-info/top_level.txt,sha256=jLf7iMlySaJg0Vh8z4lbAaqOc5W5ruMgKFvp797CryQ,19
+ecoscape_utilities-0.0.38.dist-info/RECORD,,

ecoscape_utilities-0.0.37.dist-info/RECORD

@@ -1,8 +0,0 @@
-ecoscape_utilities/__init__.py,sha256=LXt1rL9JVsjnCmsNZwZ2aoElphIK-koaEDdW6ffZsMQ,50
-ecoscape_utilities/bird_runs.py,sha256=v43PfH_4ojpkTE-EFOJxr0oOW3M9suNm_1zMjZ9P-eI,5409
-ecoscape_utilities/ebird_db.py,sha256=gFtsQQaK8SoYl2aFyA-sq0qGRMjs2R1vPc_nohA4S48,26864
-ecoscape_utilities-0.0.37.dist-info/licenses/LICENSE.md,sha256=3vh2mpA_XIR3FJot6a5F9DqktAoq45sEGIRkYjvAEeU,1304
-ecoscape_utilities-0.0.37.dist-info/METADATA,sha256=uq0uWLLS5_cRjwB6Z0bTe3cnXRRSZuo-JrIfgIi3rKo,1382
-ecoscape_utilities-0.0.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ecoscape_utilities-0.0.37.dist-info/top_level.txt,sha256=jLf7iMlySaJg0Vh8z4lbAaqOc5W5ruMgKFvp797CryQ,19
-ecoscape_utilities-0.0.37.dist-info/RECORD,,