From e1548bcc906ed76faac12768c269c32a37973702 Mon Sep 17 00:00:00 2001 From: cp-james-harbeck Date: Sat, 19 Aug 2023 14:28:15 -0400 Subject: [PATCH] Complete refactor - must fix broken tests. --- lucidserver/actions/__init__.py | 2 +- lucidserver/actions/{actions_main.py => main.py} | 2 +- lucidserver/actions/tests/actions_tests.py | 4 ++-- lucidserver/app.py | 2 +- lucidserver/endpoints/__init__.py | 2 +- lucidserver/endpoints/{endpoints_main.py => main.py} | 6 +++--- lucidserver/endpoints/tests/endpoints_tests.py | 2 +- lucidserver/memories/__init__.py | 2 +- lucidserver/memories/{memories_main.py => main.py} | 2 +- lucidserver/memories/tests/memories_tests.py | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) rename lucidserver/actions/{actions_main.py => main.py} (99%) rename lucidserver/endpoints/{endpoints_main.py => main.py} (98%) rename lucidserver/memories/{memories_main.py => main.py} (98%) diff --git a/lucidserver/actions/__init__.py b/lucidserver/actions/__init__.py index 53e2fcd..6563fa6 100644 --- a/lucidserver/actions/__init__.py +++ b/lucidserver/actions/__init__.py @@ -1,4 +1,4 @@ -from .actions_main import ( +from .main import ( get_image_summary, generate_dream_analysis, generate_dream_image, diff --git a/lucidserver/actions/actions_main.py b/lucidserver/actions/main.py similarity index 99% rename from lucidserver/actions/actions_main.py rename to lucidserver/actions/main.py index 8872ce7..a69a54f 100644 --- a/lucidserver/actions/actions_main.py +++ b/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: diff --git a/lucidserver/actions/tests/actions_tests.py b/lucidserver/actions/tests/actions_tests.py index 1d02adc..a6983b1 100644 --- a/lucidserver/actions/tests/actions_tests.py +++ b/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 diff --git a/lucidserver/app.py b/lucidserver/app.py index 433a1f2..5f126de 100644 --- a/lucidserver/app.py +++ b/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__) diff --git a/lucidserver/endpoints/__init__.py b/lucidserver/endpoints/__init__.py index 84c3ccc..3855d5b 100644 --- a/lucidserver/endpoints/__init__.py +++ b/lucidserver/endpoints/__init__.py @@ -1,4 +1,4 @@ -from .endpoints_main import ( +from .main import ( register_endpoints, create_dream, get_dreams, diff --git a/lucidserver/endpoints/endpoints_main.py b/lucidserver/endpoints/main.py similarity index 98% rename from lucidserver/endpoints/endpoints_main.py rename to lucidserver/endpoints/main.py index f620058..7a7e749 100644 --- a/lucidserver/endpoints/endpoints_main.py +++ b/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 diff --git a/lucidserver/endpoints/tests/endpoints_tests.py b/lucidserver/endpoints/tests/endpoints_tests.py index 03c9492..ed28762 100644 --- a/lucidserver/endpoints/tests/endpoints_tests.py +++ b/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 diff --git a/lucidserver/memories/__init__.py b/lucidserver/memories/__init__.py index 3e51b91..97013c5 100644 --- a/lucidserver/memories/__init__.py +++ b/lucidserver/memories/__init__.py @@ -1,4 +1,4 @@ -from .memories_main import ( +from .main import ( create_dream, get_dream, get_dreams, diff --git a/lucidserver/memories/memories_main.py b/lucidserver/memories/main.py similarity index 98% rename from lucidserver/memories/memories_main.py rename to lucidserver/memories/main.py index f820840..3af63df 100644 --- a/lucidserver/memories/memories_main.py +++ b/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. diff --git a/lucidserver/memories/tests/memories_tests.py b/lucidserver/memories/tests/memories_tests.py index 7224a4d..9cbc438 100644 --- a/lucidserver/memories/tests/memories_tests.py +++ b/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 //////////////////////////////////////////////////////////////////////////////////////////////////////