Merge pull request #101 from mitdbg/main

fix BACKEND_ROOT and remove code

Author: mdr223

app/backend/app/env.py

@@ -4,7 +4,7 @@
 FILESYSTEM = "file" if IS_LOCAL_ENV else "s3"
 REGION_NAME = os.getenv("AWS_REGION", "us-east-1")
 COMPANY_ENV = os.getenv("COMPANY_ENV", "dev")
-BACKEND_ROOT = "/code/backend/"
+BACKEND_ROOT = "/code/"
 BASE_DIR = f"s3://carnot-research-{COMPANY_ENV}/" 
 DATA_DIR = f"s3://carnot-research-{COMPANY_ENV}/data/"
 SHARED_DATA_DIR = f"s3://carnot-research-{COMPANY_ENV}/shared/"

app/backend/app/routes/query.py

@@ -314,17 +314,12 @@ def run_query_with_capture():
 
                     # If we found a filename, check if that file exists and use it
                     if csv_filename_from_output:
-                        actual_csv_path = os.path.join(BACKEND_ROOT, csv_filename_from_output)
-                        if os.path.exists(actual_csv_path) and actual_csv_path != csv_path:
+                        actual_csv_path = Path(BACKEND_ROOT) / csv_filename_from_output
+                        if actual_csv_path.exists() and actual_csv_path != csv_path:
                             # Use the file that Carnot created
                             csv_filename = csv_filename_from_output
                             csv_path = actual_csv_path
-                            df = pd.read_csv(csv_path)  # Re-read from the actual file
-                        else:
-                            # File doesn't exist, rename our file to match
-                            csv_path.rename(actual_csv_path)
-                            csv_path = actual_csv_path
-                            csv_filename = csv_filename_from_output
+                            df = pd.read_csv(str(csv_path))  # Re-read from the actual file
 
                 if df.empty:
                     message_text = "No results found for your query."

src/carnot/core/data/context.py

@@ -24,7 +24,7 @@
 IS_LOCAL_ENV = os.getenv("LOCAL_ENV").lower() == "true"
 FILESYSTEM = "file" if IS_LOCAL_ENV else "s3"
 COMPANY_ENV = os.getenv("COMPANY_ENV", "dev")
-BACKEND_ROOT = "/code/backend/"
+BACKEND_ROOT = "/code/"
 BASE_DIR = f"s3://carnot-research-{COMPANY_ENV}/"
 DATA_DIR = f"s3://carnot-research-{COMPANY_ENV}/data/"
 SHARED_DATA_DIR = f"s3://carnot-research-{COMPANY_ENV}/shared/"