From 4cb232a5bd3e9680661a6840ef3f9fd3d887d9a8 Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Fri, 7 Jun 2024 09:08:40 +0200
Subject: [PATCH] Fix openai 1.32 breaking openai tests

The new openai release adds new required parameter `parallel_tool_calls`
and our mock did not have it. Bumping version and adding the parameter
should solve the problem.
---
 airflow/providers/facebook/provider.yaml    | 1 +
 airflow/providers/google/provider.yaml      | 4 +---
 airflow/providers/openai/provider.yaml      | 2 +-
 generated/provider_dependencies.json        | 6 +++---
 tests/providers/openai/hooks/test_openai.py | 1 +
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/airflow/providers/facebook/provider.yaml b/airflow/providers/facebook/provider.yaml
index 25ec2e8f364aa1..9cb75d9aaca94e 100644
--- a/airflow/providers/facebook/provider.yaml
+++ b/airflow/providers/facebook/provider.yaml
@@ -49,6 +49,7 @@ versions:
 dependencies:
   - apache-airflow>=2.7.0
   - facebook-business>=15.0.2
+  - aiohttp>=3.9.0
 
 integrations:
   - integration-name: Facebook Ads
diff --git a/airflow/providers/google/provider.yaml b/airflow/providers/google/provider.yaml
index 8cdf5967f1bfbc..4288e0938c734d 100644
--- a/airflow/providers/google/provider.yaml
+++ b/airflow/providers/google/provider.yaml
@@ -162,9 +162,7 @@ dependencies:
   # https://pandas.pydata.org/docs/whatsnew/v2.2.0.html#increased-minimum-versions-for-dependencies
   # However Airflow not fully supports it yet: https://github.com/apache/airflow/issues/28723
   # In addition FAB also limit sqlalchemy to < 2.0
-  - pandas>=1.5.3,<2.2;python_version<"3.12"
-  - pandas>=2.1.1,<2.2;python_version>="3.12"
-
+  - pandas>=2.1.1,<2.2.0
   # A transient dependency of google-cloud-bigquery-datatransfer, but we
   # further constrain it since older versions are buggy.
   - proto-plus>=1.19.6
diff --git a/airflow/providers/openai/provider.yaml b/airflow/providers/openai/provider.yaml
index 607730d6710d8a..f1caa174bfa046 100644
--- a/airflow/providers/openai/provider.yaml
+++ b/airflow/providers/openai/provider.yaml
@@ -43,7 +43,7 @@ integrations:
 
 dependencies:
   - apache-airflow>=2.7.0
-  - openai[datalib]>=1.23
+  - openai[datalib]>=1.32.0
 
 hooks:
   - integration-name: OpenAI
diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json
index 4a2191f6a2c767..04b7d16853752e 100644
--- a/generated/provider_dependencies.json
+++ b/generated/provider_dependencies.json
@@ -544,6 +544,7 @@
   },
   "facebook": {
     "deps": [
+      "aiohttp>=3.9.0",
       "apache-airflow>=2.7.0",
       "facebook-business>=15.0.2"
     ],
@@ -635,8 +636,7 @@
       "json-merge-patch>=0.2",
       "looker-sdk>=22.4.0",
       "pandas-gbq>=0.7.0",
-      "pandas>=1.5.3,<2.2;python_version<\"3.12\"",
-      "pandas>=2.1.1,<2.2;python_version>=\"3.12\"",
+      "pandas>=2.1.1,<2.2.0",
       "proto-plus>=1.19.6",
       "python-slugify>=7.0.0",
       "sqlalchemy-bigquery>=1.2.1",
@@ -890,7 +890,7 @@
   "openai": {
     "deps": [
       "apache-airflow>=2.7.0",
-      "openai[datalib]>=1.23"
+      "openai[datalib]>=1.32.0"
     ],
     "devel-deps": [],
     "plugins": [],
diff --git a/tests/providers/openai/hooks/test_openai.py b/tests/providers/openai/hooks/test_openai.py
index 374e0f61c99e7f..a4e4cdbbbf2906 100644
--- a/tests/providers/openai/hooks/test_openai.py
+++ b/tests/providers/openai/hooks/test_openai.py
@@ -159,6 +159,7 @@ def mock_run():
         object="thread.run",
         created_at=1698107661,
         assistant_id=ASSISTANT_ID,
+        parallel_tool_calls=False,
         thread_id=THREAD_ID,
         status="completed",
         started_at=1699073476,