Skip to content

Commit 2240bc8

Browse files
vblagojevblagoje
authored
archive google-ai and google-vertex integrations, migrate path to google-genai-haystack (#2521)
1 parent 07db864 commit 2240bc8

File tree

6 files changed

+46
-6
lines changed

6 files changed

+46
-6
lines changed

‎.github/utils/validate_version.py‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
import requests
33

44
# * integrations/<INTEGRATION_FOLDER_NAME>-v1.0.0
5-
INTEGRATION_VERSION_REGEX = r"integrations/([a-zA-Z_]+)-v([0-9]\.[0-9]+\.[0-9]+)"
5+
# * integrations/<INTEGRATION_FOLDER_NAME>-v1.0.0.post0 (for post-releases)
6+
INTEGRATION_VERSION_REGEX = r"integrations/([a-zA-Z_]+)-v([0-9]\.[0-9]+\.[0-9]+(?:\.post[0-9]+)?)"
67

78

89
def validate_version_number(tag: str):
910
"""
1011
Verify that a release version number follows semantic versioning rules by checking the latest version on PyPI.
12+
Supports both regular versions (x.y.z) and post-release versions (x.y.z.postN) per PEP 440.
1113
"""
1214

1315
matches = re.match(INTEGRATION_VERSION_REGEX, tag)
@@ -34,6 +36,21 @@ def validate_version_number(tag: str):
3436
return
3537
raise e
3638

39+
# Check if this is a post-release version
40+
if ".post" in version_to_release:
41+
# For post-releases (e.g., 5.4.0.post0), the base version should match the latest on PyPI
42+
base_version = version_to_release.split(".post")[0]
43+
if base_version == latest_version:
44+
print(f"Post-release version {version_to_release} is valid for base version {base_version}")
45+
return
46+
else:
47+
msg = (
48+
f"Invalid post-release version: {version_to_release}. "
49+
f"Post-release must be based on the latest PyPI version: {latest_version}"
50+
)
51+
raise ValueError(msg)
52+
53+
# Regular version check
3754
x, y, z = [int(i) for i in latest_version.split(".")]
3855

3956
acceptable_new_versions = [

‎.github/workflows/CI_docusaurus_sync.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: Core / Sync API reference with Docusaurus
33
on:
44
push:
55
tags:
6-
- "**-v[0-9].[0-9]+.[0-9]+"
6+
- "**-v[0-9].[0-9]+.[0-9]+*"
77

88
workflow_dispatch: # Activate this workflow manually
99
inputs:
1010
tag:
11-
description: "Tag with this format: integrations/<INTEGRATION_FOLDER_NAME>-v1.0.0. When running this workflow manually, version is irrelevant so you can use any value."
11+
description: "Tag with this format: integrations/<INTEGRATION_FOLDER_NAME>-v1.0.0 or integrations/<INTEGRATION_FOLDER_NAME>-v1.0.0.post0. When running this workflow manually, version is irrelevant so you can use any value."
1212
required: true
1313
type: string
1414
default: integrations/<INTEGRATION_FOLDER_NAME>-v1.0.0

‎.github/workflows/CI_pypi_release.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,21 @@ name: Core / Project release on PyPi
22

33
# The pushed tag must be formatted like so:
44
# * integrations/<INTEGRATION_FOLDER_NAME>-v1.0.0
5+
# * integrations/<INTEGRATION_FOLDER_NAME>-v1.0.0.post0 (for post-releases)
56
#
67
# For example, if we want to release version 1.0.99
78
# of the google-vertex-haystack integration we'd have to push the tag:
89
#
910
# integrations/google_vertex-v1.0.99
11+
#
12+
# For a final post-release (e.g., for archiving):
13+
#
14+
# integrations/google_vertex-v1.0.99.post0
1015

1116
on:
1217
push:
1318
tags:
14-
- "**-v[0-9].[0-9]+.[0-9]+"
19+
- "**-v[0-9].[0-9]+.[0-9]+*"
1520

1621
jobs:
1722
release-on-pypi:

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ Please check out our [Contribution Guidelines](CONTRIBUTING.md) for all the deta
3838
| [elasticsearch-haystack](integrations/elasticsearch/) | Document Store | [![PyPI - Version](https://img.shields.io/pypi/v/elasticsearch-haystack.svg)](https://pypi.org/project/elasticsearch-haystack) | [![Test / elasticsearch](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/elasticsearch.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/elasticsearch.yml) |
3939
| [fastembed-haystack](integrations/fastembed/) | Embedder, Ranker | [![PyPI - Version](https://img.shields.io/pypi/v/fastembed-haystack.svg)](https://pypi.org/project/fastembed-haystack/) | [![Test / fastembed](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/fastembed.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/fastembed.yml) |
4040
| [github-haystack](integrations/github/) | Connector | [![PyPI - Version](https://img.shields.io/pypi/v/github-haystack.svg)](https://pypi.org/project/github-haystack) | [![Test / github](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/github.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/github.yml) |
41-
| [google-ai-haystack](integrations/google_ai/) | Generator | [![PyPI - Version](https://img.shields.io/pypi/v/google-ai-haystack.svg)](https://pypi.org/project/google-ai-haystack) | [![Test / google-ai](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_ai.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_ai.yml) |
41+
| [google-ai-haystack](integrations/google_ai/) | Generator | [![PyPI - Version](https://img.shields.io/pypi/v/google-ai-haystack.svg)](https://pypi.org/project/google-ai-haystack) | **Archived** - use [google-genai-haystack](https://pypi.org/project/google-genai-haystack) instead |
4242
| [google-genai-haystack](integrations/google_genai/) | Embedder, Generator | [![PyPI - Version](https://img.shields.io/pypi/v/google-genai-haystack.svg)](https://pypi.org/project/google-genai-haystack) | [![Test / google-genai](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_genai.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_genai.yml) |
43-
| [google-vertex-haystack](integrations/google_vertex/) | Embedder, Generator | [![PyPI - Version](https://img.shields.io/pypi/v/google-vertex-haystack.svg)](https://pypi.org/project/google-vertex-haystack) | [![Test / google-vertex](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_vertex.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/google_vertex.yml) |
43+
| [google-vertex-haystack](integrations/google_vertex/) | Embedder, Generator | [![PyPI - Version](https://img.shields.io/pypi/v/google-vertex-haystack.svg)](https://pypi.org/project/google-vertex-haystack) | **Archived** - use [google-genai-haystack](https://pypi.org/project/google-genai-haystack) instead |
4444
| [hanlp-haystack](integrations/hanlp/) | Preprocessor | [![PyPI - Version](https://img.shields.io/pypi/v/hanlp-haystack.svg)](https://pypi.org/project/hanlp-haystack) | [![Test / hanlp](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/hanlp.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/hanlp.yml) |
4545
| [jina-haystack](integrations/jina/) | Connector, Embedder, Ranker | [![PyPI - Version](https://img.shields.io/pypi/v/jina-haystack.svg)](https://pypi.org/project/jina-haystack) | [![Test / jina](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/jina.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/jina.yml) |
4646
| [langfuse-haystack](integrations/langfuse/) | Tracer | [![PyPI - Version](https://img.shields.io/pypi/v/langfuse-haystack.svg?color=orange)](https://pypi.org/project/langfuse-haystack) | [![Test / langfuse](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/langfuse.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/langfuse.yml) |

‎integrations/google_ai/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# google-ai-haystack
22

3+
> [!WARNING]
4+
> This integration is **archived** and no longer maintained.
5+
>
6+
> Please use **[google-genai-haystack](https://pypi.org/project/google-genai-haystack)** instead.
7+
>
8+
> [Installation and documentation](https://haystack.deepset.ai/integrations/google-genai)
9+
10+
---
11+
312
[![PyPI - Version](https://img.shields.io/pypi/v/google-ai-haystack.svg)](https://pypi.org/project/google-ai-haystack)
413
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/google-ai-haystack.svg)](https://pypi.org/project/google-ai-haystack)
514

‎integrations/google_vertex/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# google-vertex-haystack
22

3+
> [!WARNING]
4+
> This integration is **archived** and no longer maintained.
5+
>
6+
> Please use **[google-genai-haystack](https://pypi.org/project/google-genai-haystack)** instead.
7+
>
8+
> [Installation and documentation](https://haystack.deepset.ai/integrations/google-genai)
9+
10+
---
11+
312
[![PyPI - Version](https://img.shields.io/pypi/v/google-vertex-haystack.svg)](https://pypi.org/project/google-vertex-haystack)
413
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/google-vertex-haystack.svg)](https://pypi.org/project/google-vertex-haystack)
514

0 commit comments

Comments
 (0)