lfg

src/routes/session_routes.py

@@ -153,11 +153,9 @@ async def upload_excel(
                         continue
                     
                     # Register each sheet in DuckDB with a clean table name
-                    clean_sheet_name = sheet_name.replace(' ', '_').replace('-', '_').lower()
+                    clean_sheet_name = clean_dataset_name(sheet_name)
                     # Check if the clean_sheet_name is a safe Python variable name; if not, append a random int
-                    if not is_safe_variable_name(clean_sheet_name):
-                        
-                        clean_sheet_name = f"{clean_sheet_name}_{random.randint(1000, 9999)}"
+
                     # First drop the table if it exists
 
 
@@ -237,10 +235,7 @@ def clean_dataset_name(name: str) -> str:
     if not re.match(r'^[a-zA-Z_]', name):
         name = f"dataset_{name}"
     
-    # Final validation - ensure it's a safe Python identifier
-    if not is_safe_variable_name(name):
-        import random
-        name = f"{name}_{random.randint(1000, 9999)}"
+
     
     return name
 @router.post("/upload_dataframe")
@@ -282,9 +277,7 @@ async def upload_dataframe(
             name = name[:30]
         
         # Ensure it's a safe Python identifier
-        if not is_safe_variable_name(name):
-            import random
-            name = f"{name}_{random.randint(1000, 9999)}"
+
         
         # Read and process the CSV file
         content = await file.read()
@@ -869,13 +862,10 @@ async def preview_csv_upload(
         name = file.filename.replace('.csv', '').replace(' ', '_').lower().strip()
         
         # Validate name length and create safe variable name
-        if len(name) > 30:
-            name = name[:30]
+        name = clean_dataset_name(name)
         
         # Ensure it's a safe Python identifier
-        if not is_safe_variable_name(name):
-            import random
-            name = f"{name}_{random.randint(1000, 9999)}"
+
         
         # Format the description
         desc = f" exact_python_name: `{name}` Dataset: {file.filename}"