From bc9f9a7f03b325fddcf7b94996cf541d809ecef7 Mon Sep 17 00:00:00 2001 From: Amogh Desai Date: Wed, 21 May 2025 10:44:06 +0530 Subject: [PATCH 1/5] Fixing mypy checks on pinecone provider --- .../pinecone/src/airflow/providers/pinecone/hooks/pinecone.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py index 932fd04acd6ea..5f4bfb10c1f57 100644 --- a/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py +++ b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py @@ -182,7 +182,7 @@ def get_pod_spec_obj( replicas: int | None = None, shards: int | None = None, pods: int | None = None, - pod_type: str | None = "p1.x1", + pod_type: str = "p1.x1", metadata_config: dict | None = None, source_collection: str | None = None, environment: str | None = None, @@ -203,7 +203,7 @@ def get_pod_spec_obj( replicas=replicas, shards=shards, pods=pods, - pod_type=pod_type, + pod_type=pod_type, # type: ignore[arg-type] metadata_config=metadata_config, source_collection=source_collection, ) From f903e7983ad1314781d88653e72633bb4ec66978 Mon Sep 17 00:00:00 2001 From: Amogh Desai Date: Wed, 21 May 2025 11:58:26 +0530 Subject: [PATCH 2/5] handling better --- .../src/airflow/providers/pinecone/hooks/pinecone.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py index 5f4bfb10c1f57..cfb354974b559 100644 --- a/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py +++ b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py @@ -24,7 +24,7 @@ from functools import cached_property from typing import TYPE_CHECKING, Any -from pinecone import Pinecone, PodSpec, ServerlessSpec +from pinecone import Pinecone, PodSpec, PodType, ServerlessSpec from airflow.hooks.base import BaseHook @@ -182,7 +182,7 @@ def get_pod_spec_obj( replicas: int | None = None, shards: int | None = None, pods: int | None = None, - pod_type: str = "p1.x1", + pod_type: str | PodType = PodType.P1_X1, metadata_config: dict | None = None, source_collection: str | None = None, environment: str | None = None, @@ -203,7 +203,7 @@ def get_pod_spec_obj( replicas=replicas, shards=shards, pods=pods, - pod_type=pod_type, # type: ignore[arg-type] + pod_type=pod_type if isinstance(pod_type, PodType) else PodType(pod_type), metadata_config=metadata_config, source_collection=source_collection, ) From 74b8104b09b4790d4267db45e780dcfc7d43db43 Mon Sep 17 00:00:00 2001 From: Amogh Desai Date: Wed, 21 May 2025 12:19:36 +0530 Subject: [PATCH 3/5] handling better --- .../pinecone/src/airflow/providers/pinecone/hooks/pinecone.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py index cfb354974b559..76fd3b1ce1d60 100644 --- a/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py +++ b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py @@ -24,7 +24,8 @@ from functools import cached_property from typing import TYPE_CHECKING, Any -from pinecone import Pinecone, PodSpec, PodType, ServerlessSpec +from pinecone import Pinecone, PodSpec, ServerlessSpec +from pinecone.db_control.enums import PodType from airflow.hooks.base import BaseHook From 000b45c63586719018eb179cfdf4d8ae9dcf2b2d Mon Sep 17 00:00:00 2001 From: Amogh Desai Date: Wed, 21 May 2025 12:56:13 +0530 Subject: [PATCH 4/5] handling better --- .../pinecone/src/airflow/providers/pinecone/hooks/pinecone.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py index 76fd3b1ce1d60..cfb354974b559 100644 --- a/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py +++ b/providers/pinecone/src/airflow/providers/pinecone/hooks/pinecone.py @@ -24,8 +24,7 @@ from functools import cached_property from typing import TYPE_CHECKING, Any -from pinecone import Pinecone, PodSpec, ServerlessSpec -from pinecone.db_control.enums import PodType +from pinecone import Pinecone, PodSpec, PodType, ServerlessSpec from airflow.hooks.base import BaseHook From 074084464766d741a3d66d077123b95f330203e3 Mon Sep 17 00:00:00 2001 From: Amogh Desai Date: Wed, 21 May 2025 14:05:35 +0530 Subject: [PATCH 5/5] bump pinecone to 7.0.0 --- providers/pinecone/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/pinecone/pyproject.toml b/providers/pinecone/pyproject.toml index bd6b11e88bc49..691654af213b1 100644 --- a/providers/pinecone/pyproject.toml +++ b/providers/pinecone/pyproject.toml @@ -58,7 +58,7 @@ requires-python = "~=3.9" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=2.10.0", - "pinecone>=3.1.0", + "pinecone>=7.0.0", ] [dependency-groups]