reginaldCog/llm_clients/llm_client.py

@@ -1,154 +0,0 @@
-from itertools import zip_longest
-from abc import ABC, abstractmethod
-from enum import Enum
-from openai import OpenAI
-
-
-class ILLMContent(ABC):
-    pass
-
-
-class OpenAIContent(ILLMContent):
-    def __init__(self):
-        self._content_items: list[dict[str, str]] = []
-
-    @property
-    def content_items(self) -> list[dict]:
-        return self._content_items
-
-    @content_items.setter
-    def content_items(self, value: list[dict[str, str]]):
-        self._content_items = value
-
-
-class ILLMContentBuilder(ABC):
-    pass
-
-
-class OpenAIContentBuilder(ILLMContentBuilder):
-    def __init__(self, content: OpenAIContent):
-        self.content = content
-
-    def add_output_text(self, text: str):
-        item = {"type": "output_text", "text": text}
-        self.content.content_items.append(item)
-        return self
-
-    def add_input_text(self, text: str):
-        item = {"type": "input_text", "text": text}
-        self.content.content_items.append(item)
-        return self
-
-    def add_input_image(self, image_url: str):
-        item = {"type": "input_image", "image_url": image_url}
-        self.content.content_items.append(item)
-        return self
-
-
-class ILLMMessage(ABC):
-    pass
-
-
-class OpenAIMessage(ILLMMessage):
-    def __init__(self):
-        self.content = OpenAIContent()
-        self.role = ""
-
-    @property
-    def to_dict(self):
-        return {"role": self.role, "content": self.content.content_items}
-
-
-class ILLMMessageBuilder(ABC):
-    pass
-
-
-class OpenAIMessageBuilder(ILLMMessageBuilder):
-    def __init__(self, message: OpenAIMessage):
-        self.message = message
-
-    def set_role(self, role: str):
-        self.message.role = role
-        return self
-
-    def set_content(self, content: OpenAIContent):
-        self.message.content = content
-        return self
-
-
-class ILLMPrompt(ABC):
-    pass
-
-
-class OpenAIPrompt(ILLMPrompt):
-    def __init__(self):
-        self.messages = []
-
-    @property
-    def to_list(self):
-        return [i_message.to_dict for i_message in self.messages]
-
-
-class ILLMPromptBuilder(ABC):
-    @abstractmethod
-    def __init__(self, prompt: ILLMPrompt):
-        pass
-
-    @abstractmethod
-    def add_message(self, message: ILLMMessage):
-        pass
-
-
-class OpenAIPromptBuilder(ILLMPromptBuilder):
-    def __init__(self, prompt: OpenAIPrompt):
-        self.prompt = prompt
-
-    def add_message(self, message: OpenAIMessage):
-        self.prompt.messages.append(message)
-
-
-class ILLMClient(ABC):
-    @abstractmethod
-    def get_response(self, prompt: ILLMPrompt):
-        pass
-
-
-class OpenAIClient(ILLMClient):
-    def __init__(self):
-        self.model = 'gpt-4.1-mini'
-        self.client = OpenAI()
-
-    def get_response(self, prompt: OpenAIPrompt):
-        response_input = {"model": self.model, "input": prompt.to_list}
-        return self.client.responses.create(**response_input)
-
-
-if __name__ == "__main__":
-    dev_message_text = "You are a butler named Reginald. Give your answers in a refined manners of the English butler."
-    user_message_text = "Hi! Tell me about yourself!"
-
-    # Create developer message content and message
-    dev_content = OpenAIContent()
-    dev_content_builder = OpenAIContentBuilder(dev_content).add_input_text(dev_message_text)
-    dev_message = OpenAIMessage()
-    OpenAIMessageBuilder(dev_message).set_role("developer").set_content(dev_content)
-
-    # Create user message content and message
-    user_content = OpenAIContent()
-    OpenAIContentBuilder(user_content).add_input_text(user_message_text)
-    user_message = OpenAIMessage()
-    OpenAIMessageBuilder(user_message).set_role("user").set_content(user_content)
-
-    # Create prompt and add messages
-    test_prompt = OpenAIPrompt()
-    prompt_builder = OpenAIPromptBuilder(test_prompt)
-    prompt_builder.add_message(dev_message)
-    prompt_builder.add_message(user_message)
-
-    # Create client and get response
-    client = OpenAIClient()
-    response = client.get_response(test_prompt)
-
-    # Print messages and response
-    print(test_prompt.to_list)
-    print(response)

reginaldCog/llm_clients/openai_data_models.py

@@ -23,8 +23,8 @@ class OutputText(Content):
 @dataclass(frozen=True)
 class InputImage(Content):
     type: str = field(init=False, default='input_image')
-    image_url: str | None = field(default=None)
-    file_id: str | None = field(default=None)
+    image_url: str = field(default=None)
+    file_id: str = field(default=None)
 
     def __post_init__(self):
         if self.image_url is None and self.file_id is None:

reginaldCog/messenger_clients/messenger_client.py

@@ -78,7 +78,6 @@ if __name__ == "__main__":
     class TestMessage:
         content = 'Hello!'
         author = TestAuthor()
-        attachments = []
 
 
     message = DiscordMessageBuilder(raw_message=TestMessage).create_message()