Complete refactor - must fix broken tests.

lucidserver/actions/__init__.py

@@ -1,4 +1,4 @@
-from .actions_main import (
+from .main import (
     get_image_summary,
     generate_dream_analysis,
     generate_dream_image,

lucidserver/actions/actions_main.py → lucidserver/actions/main.py

@@ -331,7 +331,7 @@ def call_function_by_name(function_name, prompt, messages):
     return response
 
 def search_chat_with_dreams(function_name, prompt, user_email, messages=None):
-    from memories.memories_main import search_dreams
+    from memories import search_dreams
     global message_histories  # Access the global dictionary
 
     try:

lucidserver/actions/tests/actions_tests.py

@@ -2,8 +2,8 @@
 sys.path.append('.')
 
 import pytest
-from lucidserver.memories.memories_main import search_dreams
-from lucidserver.actions.actions_main import get_image_summary, generate_dream_analysis, generate_dream_image, regular_chat, call_function_by_name, search_chat_with_dreams
+from lucidserver.memories.main import search_dreams
+from lucidserver.actions.main import get_image_summary, generate_dream_analysis, generate_dream_image, regular_chat, call_function_by_name, search_chat_with_dreams
 from unittest.mock import patch, Mock
 
 

lucidserver/app.py

@@ -1,7 +1,7 @@
 # app.py
 
 from flask import Flask
-from endpoints.endpoints_main import register_endpoints
+from endpoints import register_endpoints
 from agentlogger import print_header
 
 app = Flask(__name__)

lucidserver/endpoints/__init__.py

@@ -1,4 +1,4 @@
-from .endpoints_main import (
+from .main import (
     register_endpoints,
     create_dream,
     get_dreams,

lucidserver/endpoints/endpoints_main.py → lucidserver/endpoints/main.py

@@ -5,7 +5,7 @@
 import json
 from webargs import fields
 from webargs.flaskparser import use_args
-from memories.memories_main import (
+from memories import (
     create_dream,
     get_dreams,
     get_dream,
@@ -15,8 +15,8 @@
     search_dreams,
     delete_dream
 )
-from actions.actions_main import search_chat_with_dreams, regular_chat
-from agentlogger import log, print_header
+from actions import search_chat_with_dreams, regular_chat
+from agentlogger import log
 import traceback
 
 # Define all your endpoints here, and use the app object passed as an argument to bind them

lucidserver/endpoints/tests/endpoints_tests.py

@@ -3,7 +3,7 @@
 
 from unittest.mock import patch
 from lucidserver.app import app
-from lucidserver.endpoints.endpoints_main import *
+from lucidserver.endpoints.main import *
 import pytest
 import json
 

lucidserver/memories/__init__.py

@@ -1,4 +1,4 @@
-from .memories_main import (
+from .main import (
     create_dream,
     get_dream,
     get_dreams,

lucidserver/memories/memories_main.py → lucidserver/memories/main.py

@@ -1,7 +1,7 @@
 import time
 from agentlogger import log
 from agentmemory import create_memory, get_memories, update_memory, get_memory, search_memory, delete_memory
-from actions.actions_main import generate_dream_analysis, generate_dream_image, get_image_summary
+from actions import generate_dream_analysis, generate_dream_image, get_image_summary
 
 def create_dream(title, date, entry, userEmail):
     """Create a new dream in the memory.

lucidserver/memories/tests/memories_tests.py

@@ -2,7 +2,7 @@
 sys.path.append('.')
 
 import pytest
-from lucidserver.memories.memories_main import create_dream, get_dream, get_dreams, get_dream_analysis, get_dream_image, update_dream_analysis_and_image, search_dreams
+from lucidserver.memories.main import create_dream, get_dream, get_dreams, get_dream_analysis, get_dream_image, update_dream_analysis_and_image, search_dreams
 
 
 # Mocking the create_memory function //////////////////////////////////////////////////////////////////////////////////////////////////////