Moved chat classes into chats directory

esbmc · Jul 13, 2024 · 72d65db · 72d65db
1 parent 154b6e8
commit 72d65db
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 49 deletions.
diff --git a/esbmc_ai/__main__.py b/esbmc_ai/__main__.py
@@ -30,7 +30,7 @@
 )
 
 from esbmc_ai.loading_widget import LoadingWidget, create_loading_widget
-from esbmc_ai.user_chat import UserChat
+from esbmc_ai.chats import UserChat
 from esbmc_ai.logging import print_horizontal_line, printv, printvv
 from esbmc_ai.esbmc_util import esbmc
 from esbmc_ai.chat_response import FinishReason, ChatResponse

diff --git a/esbmc_ai/chats/__init__.py b/esbmc_ai/chats/__init__.py
@@ -0,0 +1,13 @@
+# Author: Yiannis Charalambous
+
+from .base_chat_interface import BaseChatInterface
+from .latest_state_solution_generator import LatestStateSolutionGenerator
+from .solution_generator import SolutionGenerator
+from .user_chat import UserChat
+
+__all__ = [
+    "BaseChatInterface",
+    "LatestStateSolutionGenerator",
+    "SolutionGenerator",
+    "UserChat",
+]
diff --git a/esbmc_ai/base_chat_interface.py → esbmc_ai/chats/base_chat_interface.py b/esbmc_ai/base_chat_interface.py → esbmc_ai/chats/base_chat_interface.py
@@ -13,8 +13,8 @@
 )
 
 from esbmc_ai.config import ChatPromptSettings
-from .chat_response import ChatResponse, FinishReason
-from .ai_models import AIModel
+from esbmc_ai.chat_response import ChatResponse, FinishReason
+from esbmc_ai.ai_models import AIModel
 
 
 class BaseChatInterface(object):

diff --git a/esbmc_ai/latest_state_solution_generator.py → .../chats/latest_state_solution_generator.py b/esbmc_ai/latest_state_solution_generator.py → .../chats/latest_state_solution_generator.py
@@ -2,7 +2,7 @@
 
 from typing_extensions import override
 from langchain_core.messages import BaseMessage
-from esbmc_ai.solution_generator import SolutionGenerator
+from esbmc_ai.chats.solution_generator import SolutionGenerator
 from esbmc_ai.chat_response import FinishReason
 
 # TODO Test me

diff --git a/esbmc_ai/solution_generator.py → esbmc_ai/chats/solution_generator.py b/esbmc_ai/solution_generator.py → esbmc_ai/chats/solution_generator.py
@@ -10,7 +10,7 @@
 from esbmc_ai.config import ChatPromptSettings, DynamicAIModelAgent
 from esbmc_ai.frontend.solution import apply_line_patch
 
-from .ai_models import AIModel
+from esbmc_ai.ai_models import AIModel
 from .base_chat_interface import BaseChatInterface
 from esbmc_ai.esbmc_util import (
     esbmc_get_counter_example,

diff --git a/esbmc_ai/user_chat.py → esbmc_ai/chats/user_chat.py b/esbmc_ai/user_chat.py → esbmc_ai/chats/user_chat.py
@@ -9,8 +9,8 @@
 from langchain.schema import BaseMessage, SystemMessage
 
 from esbmc_ai.config import AIAgentConversation, ChatPromptSettings
+from esbmc_ai.ai_models import AIModel
 
-from .ai_models import AIModel
 from .base_chat_interface import BaseChatInterface
 
 

diff --git a/esbmc_ai/commands/fix_code_command.py b/esbmc_ai/commands/fix_code_command.py
@@ -5,7 +5,8 @@
 from typing_extensions import override
 
 from esbmc_ai.chat_response import FinishReason
-from esbmc_ai.latest_state_solution_generator import LatestStateSolutionGenerator
+from esbmc_ai.chats import LatestStateSolutionGenerator, SolutionGenerator
+from esbmc_ai.chats.solution_generator import ESBMCTimedOutException
 from esbmc_ai.reverse_order_solution_generator import ReverseOrderSolutionGenerator
 
 from .chat_command import ChatCommand
@@ -16,10 +17,6 @@
     esbmc_get_error_type,
     esbmc_load_source_code,
 )
-from ..solution_generator import (
-    ESBMCTimedOutException,
-    SolutionGenerator,
-)
 from ..logging import print_horizontal_line, printv, printvv
 
 

diff --git a/esbmc_ai/optimize_code.py b/esbmc_ai/optimize_code.py
diff --git a/esbmc_ai/reverse_order_solution_generator.py b/esbmc_ai/reverse_order_solution_generator.py
@@ -2,7 +2,7 @@
 
 from langchain.schema import BaseMessage
 from typing_extensions import override, Optional
-from esbmc_ai.solution_generator import SolutionGenerator
+from esbmc_ai.chats.solution_generator import SolutionGenerator
 from esbmc_ai.chat_response import ChatResponse
 
 # TODO Test me