Fix for s3 location

app/cache.py

@@ -32,7 +32,7 @@ def upload_file_to_s3(filename):
         s3_client = session.client('s3')
         with open(filename, "rb") as f:
             ## Upload to Production Folder
-            s3_client.upload_fileobj(f, bucket, f'dev/users/{user_id}.pkl')
+            s3_client.upload_fileobj(f, bucket, f'staging/users/{user_id}.pkl')
         logger.info(f"File {filename} uploaded successfully to S3", extra={'user_id': user_id, 'endpoint': function_name})
         
         os.remove(filename)

app/main.py

@@ -359,7 +359,7 @@ def migrate_user(request: CreateUserItem, api_key: str = Security(get_api_key)):
     def download_file_from_s3(filename, bucket):
         user_id = filename.split('.')[0]
         function_name = download_file_from_s3.__name__
-        logger.info(f"Downloading file {filename} from [dev] S3 bucket {bucket}", extra={'user_id': user_id, 'endpoint': function_name})
+        logger.info(f"Downloading file {filename} from [staging] S3 bucket {bucket}", extra={'user_id': user_id, 'endpoint': function_name})
         file_path = os.path.join('users', 'data', filename)
         try:
             if (AWS_ACCESS_KEY and AWS_SECRET_KEY):
@@ -368,8 +368,8 @@ def migrate_user(request: CreateUserItem, api_key: str = Security(get_api_key)):
                 session = boto3.session.Session()
             s3_client = session.client('s3')
             with open(file_path, 'wb') as f:
-                ## Upload to dev Folder
-                s3_client.download_fileobj(bucket, f"dev/users/{filename}", f)
+                ## Upload to staging Folder
+                s3_client.download_fileobj(bucket, f"staging/users/{filename}", f)
             logger.info(f"File {filename} downloaded successfully from S3", extra={'user_id': user_id, 'endpoint': function_name})
             return True
         except Exception as e:
@@ -590,10 +590,10 @@ def create_user(request: CreateUserItem, api_key: str = Security(get_api_key)):
         client = OpenAI(api_key=os.getenv('OPENAI_API_KEY'))
 
         # check if user exists by looking for pickle file in users/data
-        if os.path.exists(f'users/data/{request.user_id}.pkl'):
-            print_log("INFO",f"User already exists: {request.user_id}", extra={"user_id": request.user_id, "endpoint": "/create_user"})
-            logger.info(f"User already exists: {request.user_id}", extra={"user_id": request.user_id, "endpoint": "/create_user"})
-            return {"message": f"[OK] User already exists: {request.user_id}"}
+        # if os.path.exists(f'users/data/{request.user_id}.pkl'):
+        #     print_log("INFO",f"User already exists: {request.user_id}", extra={"user_id": request.user_id, "endpoint": "/create_user"})
+        #     logger.info(f"User already exists: {request.user_id}", extra={"user_id": request.user_id, "endpoint": "/create_user"})
+        #     return {"message": f"[OK] User already exists: {request.user_id}"}
         
         user_info, _ = get_user_info(request.user_id)
         if not user_info:

app/utils.py

@@ -1224,7 +1224,7 @@ def download_file_from_s3(filename, bucket):
         s3_client = session.client('s3')
         with open(file_path, 'wb') as f:
             ## Upload to Production Folder
-            s3_client.download_fileobj(bucket, f"dev/users/{filename}", f)
+            s3_client.download_fileobj(bucket, f"staging/users/{filename}", f)
         logger.info(f"File {filename} downloaded successfully from S3", extra={'user_id': user_id, 'endpoint': function_name})
         return True
     except Exception as e: