0.2 - fix testing

wwakabobik · Nov 2, 2023 · 9bc319b · 9bc319b
1 parent 47c636c
commit 9bc319b
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 183 deletions.
diff --git a/__init__.py b/__init__.py
@@ -11,14 +11,6 @@
 This file is init point for project-wide structure.
 """
 
-# Engines
-from .openai_api.src.openai_api.chatgpt import ChatGPT  # pylint: disable=unused-import
-from .openai_api.src.openai_api.dalle import DALLE  # pylint: disable=unused-import
-from .leonardo_api.src.leonardo_api.leonardo_sync import Leonardo  # pylint: disable=unused-import
-from .leonardo_api.src.leonardo_api.leonardo_async import Leonardo as LeonardoAsync  # pylint: disable=unused-import
-
-
-# Utils
 from .utils.tts import CustomTTS  # pylint: disable=unused-import
 from .utils.transcriptors import CustomTranscriptor  # pylint: disable=unused-import
 from .utils.translators import CustomTranslator  # pylint: disable=unused-import

diff --git a/__main__.py b/__main__.py
@@ -11,13 +11,6 @@
 This file is entry point for project-wide structure.
 """
 
-# Engines
-from .openai_api.src.openai_api.chatgpt import ChatGPT  # pylint: disable=unused-import
-from .openai_api.src.openai_api.dalle import DALLE  # pylint: disable=unused-import
-from .leonardo_api.src.leonardo_api.leonardo_sync import Leonardo  # pylint: disable=unused-import
-from .leonardo_api.src.leonardo_api.leonardo_async import Leonardo as LeonardoAsync  # pylint: disable=unused-import
-
-# Utils
 from .utils.tts import CustomTTS  # pylint: disable=unused-import
 from .utils.transcriptors import CustomTranscriptor  # pylint: disable=unused-import
 from .utils.translators import CustomTranslator  # pylint: disable=unused-import

diff --git a/examples/image_generation/dalle_test.py b/examples/image_generation/dalle_test.py
@@ -11,9 +11,9 @@
 This file contains testing procedures for DALLE experiments
 """
 import asyncio
+from openai_python_api import DALLE
 
 from examples.creds import oai_token, oai_organization
-from openai_api.src.openai_api import DALLE
 
 dalle = DALLE(auth_token=oai_token, organization=oai_organization)
 

diff --git a/examples/image_generation/gpt_functions.py b/examples/image_generation/gpt_functions.py
@@ -15,10 +15,10 @@
 
 import requests
 from PIL import Image
+from leonardo_api import Leonardo
+from openai_python_api import DALLE
 
 from examples.creds import oai_token, oai_organization
-from leonardo_api.src.leonardo_api.leonardo_sync import Leonardo
-from openai_api.src.openai_api.dalle import DALLE
 
 
 def get_weather(city, units):

diff --git a/examples/image_generation/test_leonardo.py b/examples/image_generation/test_leonardo.py
@@ -10,10 +10,10 @@
 Description:
 This file contains testing procedures for Leonardo experiments
 """
-import asyncio
 import json
 
-from leonardo_api.src.leonardo_api.leonardo_async import Leonardo
+import asyncio
+from leonardo_api.leonardo_async import Leonardo
 
 
 async def main():

diff --git a/examples/speak_and_hear/test_gpt.py b/examples/speak_and_hear/test_gpt.py
@@ -11,15 +11,16 @@
 This file contains testing procedures for ChatGPT experiments
 """
 
-import asyncio
 import string
 import sys
 
+import asyncio
+from openai_python_api import ChatGPT
+
+from examples.creds import oai_token, oai_organization
 from utils.audio_recorder import AudioRecorder
 from utils.transcriptors import CustomTranscriptor
 from utils.tts import CustomTTS
-from ..creds import oai_token, oai_organization
-from ...openai_api import ChatGPT
 
 gpt = ChatGPT(auth_token=oai_token, organization=oai_organization, model="gpt-3.5-turbo")
 gpt.max_tokens = 200

diff --git a/examples/speak_and_hear/test_gpt_orig.py b/examples/speak_and_hear/test_gpt_orig.py
diff --git a/examples/test_generator/generator_test.py b/examples/test_generator/generator_test.py
@@ -11,15 +11,16 @@
 This file contains testing procedures for ChatGPT experiments
 """
 
-import asyncio
 import json
 import logging
 
+import asyncio
+from openai_python_api import ChatGPT
+
 from examples.creds import oai_token, oai_organization
 from examples.test_generator.gpt_functions import gpt_functions, gpt_functions_dict
 from examples.test_generator.pom_case_generator import PomTestCaseGenerator
-from openai_api.src.openai_api import ChatGPT
-from openai_api.src.openai_api.logger_config import setup_logger
+from utils.logger_config import setup_logger
 
 generator = PomTestCaseGenerator(url="https://www.saucedemo.com/")
 # generator = PomTestCaseGenerator(url='https://automationintesting.com/selenium/testpage/')
@@ -62,7 +63,7 @@ def calculate_button(self):\\n
 def setup_gpt():
     """Setup GPT bot with appropriate functions and settings"""
     gpt = ChatGPT(auth_token=oai_token, organization=oai_organization, model="gpt-4-0613")
-    gpt.logger = setup_logger("gpt", "gpt.log", logging.INFO)
+    gpt.logger = setup_logger("gpt", "gpt.log", logging.INFO)  # supress DEBUG output of the ChatGPT
     gpt.system_settings = ""
     gpt.function_dict = gpt_functions_dict
     gpt.function_call = "auto"

diff --git a/leonardo_api b/leonardo_api
diff --git a/openai_api b/openai_api
diff --git a/requirements.txt b/requirements.txt
@@ -19,10 +19,15 @@ pillow==10.1.0
 readability==0.3.1
 # Testing
 webdriver_manager==4.0.1
-selenium==4.15.0
+selenium==4.15.1
 pytest==7.4.3
 pytest-json-report==1.5.0
 pytest-xdist==3.3.1
 # Third-party-test
 cohere==4.32
 llamaapi==0.1.36
+# My AI APIs
+leonardo-api==0.0.7
+openai-python-api==0.0.4
+
+