Update Openai support to >= v1.0.0 (#211)

Hi, I upgraded the oss-fuzz-gen project’s OpenAI SDK dependency from
version 0.27.8 to version >=1.0.0, in line with OpenAI's official
recommendations. This move is motivated by the significant enhancements
introduced in version 1.0.0, which OpenAI details
[here](openai/openai-python#742).

Key improvements include:
- A complete rewrite of the library for robustness and error resilience.
- Introduction of explicit client instantiation, replacing the global
default and offering more flexible SDK interaction.

After upgrading to v1.16.2 (the latest available), I tested the
integration with my API key and confirmed full functionality. This
upgrade aligns oss-fuzz-gen with current best practices and ensures
compatibility with future developments in AI technologies.

Hope it helps.

Author: MarkLee131

llm_toolkit/models.py

@@ -196,18 +196,18 @@ def generate_code(self,
     """Generates code with OpenAI's API."""
     if self.ai_binary:
       print(f'OpenAI does not use local AI binary: {self.ai_binary}')
-    openai.api_key = os.getenv('OPENAI_API_KEY')
+    client = openai.OpenAI(api_key=os.getenv('OPENAI_API_KEY'))
 
     completion = self.with_retry_on_error(
-        lambda: openai.ChatCompletion.create(messages=prompt.get(),
-                                             model=self.name,
-                                             n=self.num_samples,
-                                             temperature=self.temperature),
+        lambda: client.chat.completions.create(messages=prompt.get(),
+                                               model=self.name,
+                                               n=self.num_samples,
+                                               temperature=self.temperature),
         openai.OpenAIError)
     if log_output:
       print(completion)
     for index, choice in enumerate(completion.choices):  # type: ignore
-      content = choice.message['content']
+      content = choice.message.content
       self._save_output(index, content, response_dir)
 
 

requirements.in

@@ -1,7 +1,7 @@
 google-cloud-aiplatform==1.39.0
 google-cloud-storage==2.9.0
 PyYAML==6.0
-openai==0.27.8
+openai==1.16.2
 requests==2.31.0
 #pytype==2023.7.28
 Flask==2.3.2

requirements.txt

@@ -4,53 +4,56 @@
 #
 #    pip-compile requirements.in
 #
-aiohttp==3.9.2
-    # via openai
-aiosignal==1.3.1
-    # via aiohttp
+annotated-types==0.6.0
+    # via pydantic
+anyio==4.3.0
+    # via
+    #   httpx
+    #   openai
 astroid==2.15.8
     # via pylint
-attrs==23.2.0
-    # via aiohttp
 blinker==1.7.0
     # via flask
-cachetools==5.3.2
+cachetools==5.3.3
     # via google-auth
-certifi==2023.11.17
-    # via requests
-charset-normalizer==2.1.1
+certifi==2024.2.2
+    # via
+    #   httpcore
+    #   httpx
+    #   requests
+charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via flask
-dill==0.3.7
+dill==0.3.8
     # via pylint
+distro==1.9.0
+    # via openai
 flask==2.3.2
     # via -r requirements.in
-frozenlist==1.4.1
-    # via
-    #   aiohttp
-    #   aiosignal
-google-api-core[grpc]==2.15.0
+google-api-core[grpc]==2.18.0
     # via
     #   google-cloud-aiplatform
     #   google-cloud-bigquery
     #   google-cloud-core
     #   google-cloud-resource-manager
     #   google-cloud-storage
-google-auth==2.26.2
+google-auth==2.29.0
     # via
     #   google-api-core
+    #   google-cloud-bigquery
     #   google-cloud-core
+    #   google-cloud-resource-manager
     #   google-cloud-storage
 google-cloud-aiplatform==1.39.0
     # via -r requirements.in
-google-cloud-bigquery==3.16.0
+google-cloud-bigquery==3.20.1
     # via google-cloud-aiplatform
 google-cloud-core==2.4.1
     # via
     #   google-cloud-bigquery
     #   google-cloud-storage
-google-cloud-resource-manager==1.11.0
+google-cloud-resource-manager==1.12.3
     # via google-cloud-aiplatform
 google-cloud-storage==2.9.0
     # via
@@ -62,26 +65,33 @@ google-resumable-media==2.7.0
     # via
     #   google-cloud-bigquery
     #   google-cloud-storage
-googleapis-common-protos[grpc]==1.62.0
+googleapis-common-protos[grpc]==1.63.0
     # via
     #   google-api-core
     #   grpc-google-iam-v1
     #   grpcio-status
 grpc-google-iam-v1==0.13.0
     # via google-cloud-resource-manager
-grpcio==1.60.0
+grpcio==1.62.1
     # via
     #   google-api-core
     #   googleapis-common-protos
     #   grpc-google-iam-v1
     #   grpcio-status
-grpcio-status==1.60.0
+grpcio-status==1.62.1
     # via google-api-core
+h11==0.14.0
+    # via httpcore
+httpcore==1.0.5
+    # via httpx
+httpx==0.27.0
+    # via openai
 idna==3.6
     # via
+    #   anyio
+    #   httpx
     #   requests
-    #   yarl
-importlib-metadata==7.0.1
+importlib-metadata==7.1.0
     # via yapf
 isort==5.13.2
     # via pylint
@@ -91,39 +101,36 @@ jinja2==3.1.3
     # via flask
 lazy-object-proxy==1.10.0
     # via astroid
-markupsafe==2.1.3
+markupsafe==2.1.5
     # via
     #   jinja2
     #   werkzeug
 mccabe==0.7.0
     # via pylint
-multidict==6.0.4
-    # via
-    #   aiohttp
-    #   yarl
 nodeenv==1.8.0
     # via pyright
-numpy==1.26.3
+numpy==1.26.4
     # via
     #   pandas
     #   shapely
-openai==0.27.8
+openai==1.16.2
     # via -r requirements.in
-packaging==23.2
+packaging==24.0
     # via
     #   google-cloud-aiplatform
     #   google-cloud-bigquery
 pandas==2.1.1
     # via -r requirements.in
-platformdirs==4.1.0
+platformdirs==4.2.0
     # via
     #   pylint
     #   yapf
 proto-plus==1.23.0
     # via
+    #   google-api-core
     #   google-cloud-aiplatform
     #   google-cloud-resource-manager
-protobuf==4.25.2
+protobuf==4.25.3
     # via
     #   google-api-core
     #   google-cloud-aiplatform
@@ -132,21 +139,25 @@ protobuf==4.25.2
     #   grpc-google-iam-v1
     #   grpcio-status
     #   proto-plus
-pyasn1==0.5.1
+pyasn1==0.6.0
     # via
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.3.0
+pyasn1-modules==0.4.0
     # via google-auth
+pydantic==2.6.4
+    # via openai
+pydantic-core==2.16.3
+    # via pydantic
 pylint==2.17.5
     # via -r requirements.in
 pyright==1.1.345
     # via -r requirements.in
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via
     #   google-cloud-bigquery
     #   pandas
-pytz==2023.3.post1
+pytz==2024.1
     # via pandas
 pyyaml==6.0
     # via -r requirements.in
@@ -158,35 +169,42 @@ requests==2.31.0
     #   google-api-core
     #   google-cloud-bigquery
     #   google-cloud-storage
-    #   openai
     #   tiktoken
 rsa==4.9
     # via google-auth
-shapely==2.0.2
+shapely==2.0.3
     # via google-cloud-aiplatform
 six==1.16.0
     # via python-dateutil
+sniffio==1.3.1
+    # via
+    #   anyio
+    #   httpx
+    #   openai
 tiktoken==0.5.1
     # via -r requirements.in
 tomli==2.0.1
     # via yapf
-tomlkit==0.12.3
+tomlkit==0.12.4
     # via pylint
-tqdm==4.66.1
+tqdm==4.66.2
     # via openai
-tzdata==2023.4
+typing-extensions==4.11.0
+    # via
+    #   openai
+    #   pydantic
+    #   pydantic-core
+tzdata==2024.1
     # via pandas
-urllib3==1.26.18
+urllib3==2.2.1
     # via requests
-werkzeug==3.0.1
+werkzeug==3.0.2
     # via flask
 wrapt==1.16.0
     # via astroid
 yapf==0.40.1
     # via -r requirements.in
-yarl==1.9.4
-    # via aiohttp
-zipp==3.17.0
+zipp==3.18.1
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file: