Browse Source

Fix version comparison with imported_version (#23326)

Signed-off-by: Yongtao Huang <yongtaoh2022@gmail.com>
tags/1.7.2
Yongtao Huang 2 months ago
parent
commit
406c1952b8
No account linked to committer's email address

+ 2
- 1
api/core/rag/datasource/vdb/elasticsearch/elasticsearch_vector.py View File

import requests import requests
from elasticsearch import Elasticsearch from elasticsearch import Elasticsearch
from flask import current_app from flask import current_app
from packaging.version import parse as parse_version
from pydantic import BaseModel, model_validator from pydantic import BaseModel, model_validator


from core.rag.datasource.vdb.field import Field from core.rag.datasource.vdb.field import Field
return cast(str, info["version"]["number"]) return cast(str, info["version"]["number"])


def _check_version(self): def _check_version(self):
if self._version < "8.0.0":
if parse_version(self._version) < parse_version("8.0.0"):
raise ValueError("Elasticsearch vector database version must be greater than 8.0.0") raise ValueError("Elasticsearch vector database version must be greater than 8.0.0")


def get_type(self) -> str: def get_type(self) -> str:

+ 2
- 1
api/services/app_dsl_service.py View File

from Crypto.Cipher import AES from Crypto.Cipher import AES
from Crypto.Util.Padding import pad, unpad from Crypto.Util.Padding import pad, unpad
from packaging import version from packaging import version
from packaging.version import parse as parse_version
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from sqlalchemy import select from sqlalchemy import select
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
check_dependencies_pending_data = None check_dependencies_pending_data = None
if dependencies: if dependencies:
check_dependencies_pending_data = [PluginDependency.model_validate(d) for d in dependencies] check_dependencies_pending_data = [PluginDependency.model_validate(d) for d in dependencies]
elif imported_version <= "0.1.5":
elif parse_version(imported_version) <= parse_version("0.1.5"):
if "workflow" in data: if "workflow" in data:
graph = data.get("workflow", {}).get("graph", {}) graph = data.get("workflow", {}).get("graph", {})
dependencies_list = self._extract_dependencies_from_workflow_graph(graph) dependencies_list = self._extract_dependencies_from_workflow_graph(graph)

Loading…
Cancel
Save