[OPENAI]: Update version

Author: amadolid

jaseci_ai_kit/jac_misc/jac_misc/openai/main.py

@@ -8,39 +8,66 @@
 
 Requires OpenAI API Key
 """
-
+import httpx
 from jaseci.jsorc.live_actions import jaseci_action
 from jaseci.utils.utils import logger
-import openai
-from typing import Union
+from openai import OpenAI
+from openai._types import Timeout, NotGiven, NOT_GIVEN
+from openai._base_client import DEFAULT_MAX_RETRIES
+from typing import Union, Mapping
+
+openai_client = None
+
+
+def client() -> OpenAI:
+    if openai_client:
+        return openai_client
+    else:
+        raise Exception("Openai not initilized yet!")
 
 
 @jaseci_action(act_group=["openai"], allow_remote=True)
 def setup(
-    api_key=openai.api_key,
-    api_type=openai.api_type,
-    api_base=openai.api_base,
-    api_version=openai.api_version,
+    api_key: str | None = None,
+    organization: str | None = None,
+    base_url: str | httpx.URL | None = None,
+    timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
+    max_retries: int = DEFAULT_MAX_RETRIES,
+    default_headers: Mapping[str, str] | None = None,
+    default_query: Mapping[str, object] | None = None,
+    # Configure a custom httpx client. See the [httpx documentation](https://www.python-httpx.org/api/#client) for more details.
+    http_client: httpx.Client | None = None,
+    # Enable or disable schema validation for data returned by the API.
+    # When enabled an error APIResponseValidationError is raised
+    # if the API responds with invalid data for the expected schema.
+    #
+    # This parameter may be removed or changed in the future.
+    # If you rely on this feature, please open a GitHub issue
+    # outlining your use-case to help us decide if it should be
+    # part of our public interface in the future.
+    _strict_response_validation: bool = False,
 ):
     """
-    Sets up OpenAI API Key
-
-    :param api_key: str, required, default=None
-                   OpenAI API key
-    :return: bool
-             Returns True if api_key is set, False otherwise
+    You may check on openai documentation for further information
+    https://github.com/openai/openai-python
     """
-    if not api_key:
-        logger.error(
-            "No OpenAI API Key Provided. Please set OPENAI_API_KEY environment variable or pass in api_key parameter though actions call openai.setup"
+    try:
+        global openai_client
+        openai_client = OpenAI(
+            api_key=api_key,
+            organization=organization,
+            base_url=base_url,
+            timeout=timeout,
+            max_retries=max_retries,
+            default_headers=default_headers,
+            default_query=default_query,
+            http_client=http_client,
+            _strict_response_validation=_strict_response_validation,
         )
-        return False
-    else:
-        openai.api_key = api_key
-        openai.api_type = api_type
-        openai.api_base = api_base
-        openai.api_version = api_version
         return True
+    except Exception:
+        logger.error("Error occured during initialization!")
+        return False
 
 
 @jaseci_action(act_group=["openai"], allow_remote=True)
@@ -97,7 +124,7 @@ def completion(
         A list of completions generated by the GPT-3 model based on the provided prompt(s).
     """
 
-    response = openai.Completion.create(
+    response = client().completions.create(
         model=model,
         prompt=prompt,
         suffix=suffix,
@@ -156,7 +183,7 @@ def chat(
         A list of responses generated by the GPT-3.5 model based on the provided messages.
     """
 
-    response = openai.ChatCompletion.create(
+    response = client().chat.completions.create(
         model=model,
         messages=messages,
         temperature=temperature,
@@ -188,7 +215,7 @@ def get_embeddings(input: Union[str, list], model: str = "text-embedding-ada-002
     List[List[float]]:
         A list of embeddings, where each embedding is a list of floating-point numbers.
     """
-    response = openai.Embedding.create(model=model, inputs=input)
+    response = client().embeddings.create(model=model, inputs=input)
     response = [x.embedding for x in response.data]
     return response
 
@@ -251,15 +278,15 @@ def transcribe(
 
     audio_file = open(audio_file, "rb")
     if not translate:
-        transcription = openai.Audio.transcribe(
+        transcription = client().audio.transcriptions.create(
             file=audio_file,
             model=model,
             prompt=prompt,
             temperature=temperature,
             language=language,
         )
     else:
-        transcription = openai.Audio.translate(
+        transcription = client().audio.translations.create(
             file=audio_file,
             model=model,
             prompt=prompt,
@@ -293,7 +320,7 @@ def generate_image(
     A list of generated images, either as URLs or Base64-encoded JSON strings,
     depending on the value of `response_format`.
     """
-    response = openai.Image.create(
+    response = client().images.generate(
         prompt=prompt, n=n, size=size, response_format=response_format
     )
     response = [
@@ -349,7 +376,7 @@ def edit_image(
     image = open(image_file, "rb")
     mask = open(mask_file, "rb")
 
-    response = openai.Image.create_edit(
+    response = client().images.edit(
         prompt=prompt,
         n=n,
         size=size,
@@ -399,7 +426,7 @@ def variations_image(
 
     image = open(image_file, "rb")
 
-    response = openai.Image.create_variation(
+    response = client().images.create_variation(
         n=n, size=size, response_format=response_format, image=image
     )
     response = [

jaseci_ai_kit/jac_misc/jac_misc/openai/requirements.txt

@@ -1,2 +1,2 @@
-openai>=0.27.4, <0.28
+openai==1.3.0
 soundfile>=0.12.1, <0.13