fixed uploading files functionality and finding files

requirements.txt

@@ -22,4 +22,5 @@ openai~=1.44.0
 pip~=24.0
 distro~=1.9.0
 APScheduler~=3.10.4
-attrs~=24.2.0
+attrs~=24.2.0
+nltk~=3.9.1

src/__main__.py

@@ -26,7 +26,7 @@
 # Imported routes
 from src.routes import index, blog, login, user, experiences, links, register, contact, projects, newsletter, \
     subscriber, comments, github, book, media, angular, vue, typescript, javascript, mongodb, python, language, chatgpt, \
-    chat, dev_to_api
+    chat, dev_to_api, send_sms, screenshot
 from src.services import db
 from src.tags_metadata import tags_metadata
 from src.utils.domain_to_txt import write_fields_to_txt
@@ -44,8 +44,10 @@
 
 app.include_router(index.router, prefix='/index', tags=['Index'])
 app.include_router(blog.router, prefix='/blog', tags=['Blog'])
+app.include_router(send_sms.router, prefix='/sms', tags=['SMS'])
 app.include_router(dev_to_api.router, prefix='/dev', tags=['Dev'])
 app.include_router(media.router, prefix='/media', tags=['Media'])
+app.include_router(screenshot.router, prefix='/screenshot', tags=['Media'])
 app.include_router(github.router, prefix='/github', tags=['Github'])
 app.include_router(book.router, prefix='/book', tags=['Book'])
 

src/env.py

@@ -33,3 +33,11 @@
 # TESTING
 EMAIL_1 = str(os.getenv('EMAIL_1'))
 EMAIL_2 = str(os.getenv('EMAIL_2'))
+
+# TWILIO
+ACCOUNT_SID = str(os.getenv('ACCOUNT_SID'))
+AUTH_TOKEN = str(os.getenv('AUTH_TOKEN'))
+PHONE_NUMBER_TWILIO = str(os.getenv('PHONE_NUMBER_TWILIO'))
+PHONE_NUMBER_MY = str(os.getenv('PHONE_NUMBER_MY'))
+
+NGROK = str(os.getenv('NGROK'))

src/routes/angular.py

@@ -21,7 +21,7 @@
 
 # Define the root media directory and the subdirectory for media files
 angular_root_directory = 'media'  # The root directory where all media files are stored
-angular_media_directory = os.path.join(angular_root_directory, 'angular_media')  # Subdirectory for specific media files
+media_directory = os.path.join(angular_root_directory, 'angular_media')  # Subdirectory for specific media files
 
 router = APIRouter()
 
@@ -246,19 +246,19 @@ async def get_angular_image(filename: str):
     :param filename: The name of the file to be retrieved.
     :return: The file if found; otherwise, raises a 404 error.
     """
-    file_path = os.path.join(angular_media_directory, filename)
+    file_path = os.path.join(media_directory, filename)
 
     # Check if the file exists
     if not os.path.exists(file_path):
         # Raise a 404 error if the file is not found
-        raise HTTPException(status_code=404, detail='Image not found!')
+        return {"message": f"Image '{filename}' not found in the directory."}
 
     try:
         # Return the file as a response
         return FileResponse(file_path)
     except Exception as e:
         # Raise an HTTP 500 error if there was an issue serving the file
-        raise HTTPException(status_code=500, detail=f'Error serving file: {str(e)}')
+        return {"message": f"Error serving file: {str(e)}"}
 
 
 # PRIVATE
@@ -275,18 +275,17 @@ async def upload_angular_file(file: UploadFile = File(...), current_user: User =
     :return: A success message indicating the file was uploaded.
     """
     try:
-        upload_directory = angular_media_directory
-        os.makedirs(upload_directory, exist_ok=True)
+        os.makedirs(media_directory, exist_ok=True)
         contents = await file.read()
         file_name = file.filename if file.filename else 'uploaded_file'
-        file_path = os.path.join(upload_directory, file_name)
+        file_path = os.path.join(media_directory, file_name)
         with open(file_path, 'wb') as f:
             f.write(contents)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f'There was an error uploading the file: {str(e)}')
     finally:
         await file.close()
-    return {"message": f"Successfully uploaded {file_name} to {upload_directory}"}
+    return {"message": f"Successfully uploaded {file_name} to {media_directory}"}
 
 
 
@@ -298,12 +297,16 @@ async def list_angular_images(current_user: User = Depends(require_role('admin')
 
     :return: A list of filenames in the upload directory.
     """
-    upload_directory = angular_media_directory
-    if not os.path.exists(upload_directory):
-        raise HTTPException(status_code=404, detail='Upload directory not found!')
-    image_names = [f for f in os.listdir(upload_directory) if os.path.isfile(os.path.join(upload_directory, f))]
-    return {"images": image_names}
+    if not os.path.exists(media_directory):
+        return {"images": [], "message": "No images found. Directory does not exist."}
+
+    image_names = [f for f in os.listdir(media_directory) if os.path.isfile(os.path.join(media_directory, f))]
+    # If no images are found, return an empty list with a message
+    if not image_names:
+        return {"images": [], "message": "No images found in the directory."}
 
+    # Return the list of filenames
+    return {"images": image_names}
 
 # Delete a media file by filename
 @router.delete("/media/{filename}")
@@ -315,12 +318,11 @@ async def delete_angular_image(filename: str, current_user: User = Depends(requi
     :param filename: The name of the file to be deleted.
     :return: A success message if the file is deleted; otherwise, raises a 404 error.
     """
-    upload_directory = angular_media_directory
-    file_path = os.path.join(upload_directory, filename)
+    file_path = os.path.join(media_directory, filename)
     if not os.path.exists(file_path):
         raise HTTPException(status_code=404, detail="Image not found")
     try:
         os.remove(file_path)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"There was an error deleting the file: {str(e)}")
-    return {"message": f"Successfully deleted {filename} from {upload_directory}"}
+    return {"message": f"Successfully deleted {filename} from {media_directory}"}

src/routes/blog.py

@@ -21,8 +21,8 @@
 from src.template import blog_notifications
 
 # Define the root media directory and the subdirectory for media files
-blogs_root_directory = 'media'  # The root directory where all media files are stored
-blogs_media_directory = os.path.join(blogs_root_directory, 'blogs_media')  # Subdirectory for specific media files
+root_directory = 'media'  # The root directory where all media files are stored
+media_directory = os.path.join(root_directory, 'blogs_media')  # Subdirectory for specific media files
 
 router = APIRouter()
 
@@ -254,18 +254,17 @@ async def upload_blog_file(file: UploadFile = File(...),  current_user: User = D
     :return: A success message indicating the file was uploaded.
     """
     try:
-        upload_directory = blogs_media_directory
-        os.makedirs(upload_directory, exist_ok=True)
+        os.makedirs(media_directory, exist_ok=True)
         contents = await file.read()
         file_name = file.filename if file.filename else 'uploaded_file'
-        file_path = os.path.join(upload_directory, file_name)
+        file_path = os.path.join(media_directory, file_name)
         with open(file_path, 'wb') as f:
             f.write(contents)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f'There was an error uploading the file: {str(e)}')
     finally:
         await file.close()
-    return {"message": f"Successfully uploaded {file_name} to {upload_directory}"}
+    return {"message": f"Successfully uploaded {file_name} to {media_directory}"}
 
 
 # Retrieve a media file by filename
@@ -277,19 +276,19 @@ async def get_blog_image(filename: str):
     :param filename: The name of the file to be retrieved.
     :return: The file if found; otherwise, raises a 404 error.
     """
-    file_path = os.path.join(blogs_media_directory, filename)
+    file_path = os.path.join(media_directory, filename)
 
     # Check if the file exists
     if not os.path.exists(file_path):
         # Raise a 404 error if the file is not found
-        raise HTTPException(status_code=404, detail='Image not found!')
+        return {"message": f"Image '{filename}' not found in the directory."}
 
     try:
         # Return the file as a response
         return FileResponse(file_path)
     except Exception as e:
         # Raise an HTTP 500 error if there was an issue serving the file
-        raise HTTPException(status_code=500, detail=f'Error serving file: {str(e)}')
+        return {"message": f"Error serving file: {str(e)}"}
 
 
 # List all media files
@@ -300,10 +299,15 @@ async def list_blog_images(current_user: User = Depends(require_role('admin'))):
 
     :return: A list of filenames in the upload directory.
     """
-    upload_directory = blogs_media_directory
-    if not os.path.exists(upload_directory):
-        raise HTTPException(status_code=404, detail='Upload directory not found!')
-    image_names = [f for f in os.listdir(upload_directory) if os.path.isfile(os.path.join(upload_directory, f))]
+    if not os.path.exists(media_directory):
+        return {"images": [], "message": "No images found. Directory does not exist."}
+
+    image_names = [f for f in os.listdir(media_directory) if os.path.isfile(os.path.join(media_directory, f))]
+    # If no images are found, return an empty list with a message
+    if not image_names:
+        return {"images": [], "message": "No images found in the directory."}
+
+    # Return the list of filenames
     return {"images": image_names}
 
 
@@ -317,12 +321,11 @@ async def delete_blog_image(filename: str,  current_user: User = Depends(require
     :param filename: The name of the file to be deleted.
     :return: A success message if the file is deleted; otherwise, raises a 404 error.
     """
-    upload_directory = blogs_media_directory
-    file_path = os.path.join(upload_directory, filename)
+    file_path = os.path.join(media_directory, filename)
     if not os.path.exists(file_path):
         raise HTTPException(status_code=404, detail="Image not found")
     try:
         os.remove(file_path)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"There was an error deleting the file: {str(e)}")
-    return {"message": f"Successfully deleted {filename} from {upload_directory}"}
+    return {"message": f"Successfully deleted {filename} from {media_directory}"}

src/routes/book.py

@@ -8,7 +8,7 @@
 
 # Define the root media directory and the subdirectory for media files
 media_root_directory = 'media'  # The root directory where all media files are stored
-book_media_directory = os.path.join(media_root_directory, 'books_media')  # Subdirectory for specific media files
+media_directory = os.path.join(media_root_directory, 'books_media')  # Subdirectory for specific media files
 
 router = APIRouter()
 
@@ -163,18 +163,17 @@ async def upload_book_file(file: UploadFile = File(...), current_user: User = De
     :return: A success message indicating the file was uploaded.
     """
     try:
-        upload_directory = book_media_directory
-        os.makedirs(upload_directory, exist_ok=True)
+        os.makedirs(media_directory, exist_ok=True)
         contents = await file.read()
         file_name = file.filename if file.filename else 'uploaded_file'
-        file_path = os.path.join(upload_directory, file_name)
+        file_path = os.path.join(media_directory, file_name)
         with open(file_path, 'wb') as f:
             f.write(contents)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f'There was an error uploading the file: {str(e)}')
     finally:
         await file.close()
-    return {"message": f"Successfully uploaded {file_name} to {upload_directory}"}
+    return {"message": f"Successfully uploaded {file_name} to {media_directory}"}
 
 
 # Retrieve a media file by filename
@@ -186,19 +185,19 @@ async def get_book_image(filename: str):
     :param filename: The name of the file to be retrieved.
     :return: The file if found; otherwise, raises a 404 error.
     """
-    file_path = os.path.join(book_media_directory, filename)
+    file_path = os.path.join(media_directory, filename)
 
     # Check if the file exists
     if not os.path.exists(file_path):
         # Raise a 404 error if the file is not found
-        raise HTTPException(status_code=404, detail='Image not found!')
+        return {"message": f"Image '{filename}' not found in the directory."}
 
     try:
         # Return the file as a response
         return FileResponse(file_path)
     except Exception as e:
         # Raise an HTTP 500 error if there was an issue serving the file
-        raise HTTPException(status_code=500, detail=f'Error serving file: {str(e)}')
+        return {"message": f"Error serving file: {str(e)}"}
 
 
 # List all media files
@@ -209,10 +208,15 @@ async def list_book_images(current_user: User = Depends(require_role('admin'))):
 
     :return: A list of filenames in the upload directory.
     """
-    upload_directory = book_media_directory
-    if not os.path.exists(upload_directory):
-        raise HTTPException(status_code=404, detail='Upload directory not found!')
-    image_names = [f for f in os.listdir(upload_directory) if os.path.isfile(os.path.join(upload_directory, f))]
+    if not os.path.exists(media_directory):
+        return {"images": [], "message": "No images found. Directory does not exist."}
+
+    image_names = [f for f in os.listdir(media_directory) if os.path.isfile(os.path.join(media_directory, f))]
+    # If no images are found, return an empty list with a message
+    if not image_names:
+        return {"images": [], "message": "No images found in the directory."}
+
+    # Return the list of filenames
     return {"images": image_names}
 
 
@@ -226,12 +230,11 @@ async def delete_book_image(filename: str, current_user: User = Depends(require_
     :param filename: The name of the file to be deleted.
     :return: A success message if the file is deleted; otherwise, raises a 404 error.
     """
-    upload_directory = book_media_directory
-    file_path = os.path.join(upload_directory, filename)
+    file_path = os.path.join(media_directory, filename)
     if not os.path.exists(file_path):
         raise HTTPException(status_code=404, detail="Image not found")
     try:
         os.remove(file_path)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"There was an error deleting the file: {str(e)}")
-    return {"message": f"Successfully deleted {filename} from {upload_directory}"}
+    return {"message": f"Successfully deleted {filename} from {media_directory}"}