Skip to content

Move all BaseHook usages to version_compat in openai #52819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amoghrajesh merged 9 commits into from
Jul 6, 2025
Merged

Move all BaseHook usages to version_compat in openai #52819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ed788f
#52676 Move all BaseHook usages to version_compat in openai
mingdaoy Jul 3, 2025
6df2f2c
Merge branch 'apache:main' into 52676-BaseHook-openai
mingdaoy Jul 4, 2025
5885949
Merge branch 'apache:main' into 52676-BaseHook-openai
mingdaoy Jul 4, 2025
098269a
Fix minor error
mingdaoy Jul 4, 2025
0e2d3f0
Merge branch 'apache:main' into 52676-BaseHook-openai
mingdaoy Jul 5, 2025
31d02dd
Merge branch 'apache:main' into 52676-BaseHook-openai
mingdaoy Jul 5, 2025
55eb1f1
Fix a formatting problem
mingdaoy Jul 5, 2025
ede28bb
Merge branch 'main' into 52676-BaseHook-openai
amoghrajesh Jul 5, 2025
4ff03cd
Merge branch 'main' into 52676-BaseHook-openai
amoghrajesh Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions providers/openai/src/airflow/providers/openai/hooks/openai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@
)
from openai.types.vector_stores import VectorStoreFile, VectorStoreFileBatch, VectorStoreFileDeleted
from airflow.providers.openai.exceptions import OpenAIBatchJobException, OpenAIBatchTimeout

try:
from airflow.sdk import BaseHook
except ImportError:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]
from airflow.providers.openai.version_compat import BaseHook


class BatchStatus(str, Enum):
Expand Down
14 changes: 13 additions & 1 deletion providers/openai/src/airflow/providers/openai/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,22 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:


AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)


if AIRFLOW_V_3_1_PLUS:
from airflow.sdk import BaseHook
else:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseOperator
else:
from airflow.models import BaseOperator # type: ignore[no-redef]

__all__ = ["AIRFLOW_V_3_0_PLUS", "BaseOperator"]
__all__ = [
"AIRFLOW_V_3_0_PLUS",
"AIRFLOW_V_3_1_PLUS",
"BaseHook",
"BaseOperator",
]