mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-01-23 03:26:53 +08:00
b40d639fdb
### What problem does this PR solve? 1) Create dataset using table parser for infinity 2) Answer questions in chat using SQL ### Type of change - [x] New Feature (non-breaking change which adds functionality)
662 lines
26 KiB
Python
662 lines
26 KiB
Python
#
|
|
# Copyright 2025 The InfiniFlow Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
import logging
|
|
import os
|
|
import re
|
|
import json
|
|
import time
|
|
from abc import abstractmethod
|
|
|
|
import infinity
|
|
from infinity.common import ConflictType
|
|
from infinity.index import IndexInfo, IndexType
|
|
from infinity.errors import ErrorCode
|
|
import pandas as pd
|
|
from common.file_utils import get_project_base_directory
|
|
from rag.nlp import is_english
|
|
from common import settings
|
|
from common.doc_store.doc_store_base import DocStoreConnection, MatchExpr, OrderByExpr
|
|
|
|
|
|
class InfinityConnectionBase(DocStoreConnection):
|
|
def __init__(self, mapping_file_name: str="infinity_mapping.json", logger_name: str="ragflow.infinity_conn"):
|
|
from common.doc_store.infinity_conn_pool import INFINITY_CONN
|
|
|
|
self.dbName = settings.INFINITY.get("db_name", "default_db")
|
|
self.mapping_file_name = mapping_file_name
|
|
self.logger = logging.getLogger(logger_name)
|
|
infinity_uri = settings.INFINITY["uri"]
|
|
if ":" in infinity_uri:
|
|
host, port = infinity_uri.split(":")
|
|
infinity_uri = infinity.common.NetworkAddress(host, int(port))
|
|
self.connPool = None
|
|
self.logger.info(f"Use Infinity {infinity_uri} as the doc engine.")
|
|
conn_pool = INFINITY_CONN.get_conn_pool()
|
|
for _ in range(24):
|
|
try:
|
|
inf_conn = conn_pool.get_conn()
|
|
res = inf_conn.show_current_node()
|
|
if res.error_code == ErrorCode.OK and res.server_status in ["started", "alive"]:
|
|
self._migrate_db(inf_conn)
|
|
self.connPool = conn_pool
|
|
conn_pool.release_conn(inf_conn)
|
|
break
|
|
conn_pool.release_conn(inf_conn)
|
|
self.logger.warning(f"Infinity status: {res.server_status}. Waiting Infinity {infinity_uri} to be healthy.")
|
|
time.sleep(5)
|
|
except Exception as e:
|
|
conn_pool = INFINITY_CONN.refresh_conn_pool()
|
|
self.logger.warning(f"{str(e)}. Waiting Infinity {infinity_uri} to be healthy.")
|
|
time.sleep(5)
|
|
if self.connPool is None:
|
|
msg = f"Infinity {infinity_uri} is unhealthy in 120s."
|
|
self.logger.error(msg)
|
|
raise Exception(msg)
|
|
self.logger.info(f"Infinity {infinity_uri} is healthy.")
|
|
|
|
def _migrate_db(self, inf_conn):
|
|
inf_db = inf_conn.create_database(self.dbName, ConflictType.Ignore)
|
|
fp_mapping = os.path.join(get_project_base_directory(), "conf", self.mapping_file_name)
|
|
if not os.path.exists(fp_mapping):
|
|
raise Exception(f"Mapping file not found at {fp_mapping}")
|
|
schema = json.load(open(fp_mapping))
|
|
table_names = inf_db.list_tables().table_names
|
|
for table_name in table_names:
|
|
inf_table = inf_db.get_table(table_name)
|
|
index_names = inf_table.list_indexes().index_names
|
|
if "q_vec_idx" not in index_names:
|
|
# Skip tables not created by me
|
|
continue
|
|
column_names = inf_table.show_columns()["name"]
|
|
column_names = set(column_names)
|
|
for field_name, field_info in schema.items():
|
|
if field_name in column_names:
|
|
continue
|
|
res = inf_table.add_columns({field_name: field_info})
|
|
assert res.error_code == infinity.ErrorCode.OK
|
|
self.logger.info(f"INFINITY added following column to table {table_name}: {field_name} {field_info}")
|
|
if field_info["type"] != "varchar" or "analyzer" not in field_info:
|
|
continue
|
|
analyzers = field_info["analyzer"]
|
|
if isinstance(analyzers, str):
|
|
analyzers = [analyzers]
|
|
for analyzer in analyzers:
|
|
inf_table.create_index(
|
|
f"ft_{re.sub(r'[^a-zA-Z0-9]', '_', field_name)}_{re.sub(r'[^a-zA-Z0-9]', '_', analyzer)}",
|
|
IndexInfo(field_name, IndexType.FullText, {"ANALYZER": analyzer}),
|
|
ConflictType.Ignore,
|
|
)
|
|
|
|
"""
|
|
Dataframe and fields convert
|
|
"""
|
|
|
|
@staticmethod
|
|
@abstractmethod
|
|
def field_keyword(field_name: str):
|
|
# judge keyword or not, such as "*_kwd" tag-like columns.
|
|
raise NotImplementedError("Not implemented")
|
|
|
|
@abstractmethod
|
|
def convert_select_fields(self, output_fields: list[str]) -> list[str]:
|
|
# rm _kwd, _tks, _sm_tks, _with_weight suffix in field name.
|
|
raise NotImplementedError("Not implemented")
|
|
|
|
@staticmethod
|
|
@abstractmethod
|
|
def convert_matching_field(field_weight_str: str) -> str:
|
|
# convert matching field to
|
|
raise NotImplementedError("Not implemented")
|
|
|
|
@staticmethod
|
|
def list2str(lst: str | list, sep: str = " ") -> str:
|
|
if isinstance(lst, str):
|
|
return lst
|
|
return sep.join(lst)
|
|
|
|
def equivalent_condition_to_str(self, condition: dict, table_instance=None) -> str | None:
|
|
assert "_id" not in condition
|
|
columns = {}
|
|
if table_instance:
|
|
for n, ty, de, _ in table_instance.show_columns().rows():
|
|
columns[n] = (ty, de)
|
|
|
|
def exists(cln):
|
|
nonlocal columns
|
|
assert cln in columns, f"'{cln}' should be in '{columns}'."
|
|
ty, de = columns[cln]
|
|
if ty.lower().find("cha"):
|
|
if not de:
|
|
de = ""
|
|
return f" {cln}!='{de}' "
|
|
return f"{cln}!={de}"
|
|
|
|
cond = list()
|
|
for k, v in condition.items():
|
|
if not isinstance(k, str) or not v:
|
|
continue
|
|
if self.field_keyword(k):
|
|
if isinstance(v, list):
|
|
inCond = list()
|
|
for item in v:
|
|
if isinstance(item, str):
|
|
item = item.replace("'", "''")
|
|
inCond.append(f"filter_fulltext('{self.convert_matching_field(k)}', '{item}')")
|
|
if inCond:
|
|
strInCond = " or ".join(inCond)
|
|
strInCond = f"({strInCond})"
|
|
cond.append(strInCond)
|
|
else:
|
|
cond.append(f"filter_fulltext('{self.convert_matching_field(k)}', '{v}')")
|
|
elif isinstance(v, list):
|
|
inCond = list()
|
|
for item in v:
|
|
if isinstance(item, str):
|
|
item = item.replace("'", "''")
|
|
inCond.append(f"'{item}'")
|
|
else:
|
|
inCond.append(str(item))
|
|
if inCond:
|
|
strInCond = ", ".join(inCond)
|
|
strInCond = f"{k} IN ({strInCond})"
|
|
cond.append(strInCond)
|
|
elif k == "must_not":
|
|
if isinstance(v, dict):
|
|
for kk, vv in v.items():
|
|
if kk == "exists":
|
|
cond.append("NOT (%s)" % exists(vv))
|
|
elif isinstance(v, str):
|
|
cond.append(f"{k}='{v}'")
|
|
elif k == "exists":
|
|
cond.append(exists(v))
|
|
else:
|
|
cond.append(f"{k}={str(v)}")
|
|
return " AND ".join(cond) if cond else "1=1"
|
|
|
|
@staticmethod
|
|
def concat_dataframes(df_list: list[pd.DataFrame], select_fields: list[str]) -> pd.DataFrame:
|
|
df_list2 = [df for df in df_list if not df.empty]
|
|
if df_list2:
|
|
return pd.concat(df_list2, axis=0).reset_index(drop=True)
|
|
|
|
schema = []
|
|
for field_name in select_fields:
|
|
if field_name == "score()": # Workaround: fix schema is changed to score()
|
|
schema.append("SCORE")
|
|
elif field_name == "similarity()": # Workaround: fix schema is changed to similarity()
|
|
schema.append("SIMILARITY")
|
|
else:
|
|
schema.append(field_name)
|
|
return pd.DataFrame(columns=schema)
|
|
|
|
"""
|
|
Database operations
|
|
"""
|
|
|
|
def db_type(self) -> str:
|
|
return "infinity"
|
|
|
|
def health(self) -> dict:
|
|
"""
|
|
Return the health status of the database.
|
|
"""
|
|
inf_conn = self.connPool.get_conn()
|
|
res = inf_conn.show_current_node()
|
|
self.connPool.release_conn(inf_conn)
|
|
res2 = {
|
|
"type": "infinity",
|
|
"status": "green" if res.error_code == 0 and res.server_status in ["started", "alive"] else "red",
|
|
"error": res.error_msg,
|
|
}
|
|
return res2
|
|
|
|
"""
|
|
Table operations
|
|
"""
|
|
|
|
def create_idx(self, index_name: str, dataset_id: str, vector_size: int, parser_id: str = None):
|
|
table_name = f"{index_name}_{dataset_id}"
|
|
self.logger.debug(f"CREATE_IDX: Creating table {table_name}, parser_id: {parser_id}")
|
|
|
|
inf_conn = self.connPool.get_conn()
|
|
inf_db = inf_conn.create_database(self.dbName, ConflictType.Ignore)
|
|
|
|
# Use configured schema
|
|
fp_mapping = os.path.join(get_project_base_directory(), "conf", self.mapping_file_name)
|
|
if not os.path.exists(fp_mapping):
|
|
raise Exception(f"Mapping file not found at {fp_mapping}")
|
|
schema = json.load(open(fp_mapping))
|
|
|
|
if parser_id is not None:
|
|
from common.constants import ParserType
|
|
if parser_id == ParserType.TABLE.value:
|
|
# Table parser: add chunk_data JSON column to store table-specific fields
|
|
schema["chunk_data"] = {"type": "json", "default": "{}"}
|
|
self.logger.info("Added chunk_data column for TABLE parser")
|
|
|
|
vector_name = f"q_{vector_size}_vec"
|
|
schema[vector_name] = {"type": f"vector,{vector_size},float"}
|
|
inf_table = inf_db.create_table(
|
|
table_name,
|
|
schema,
|
|
ConflictType.Ignore,
|
|
)
|
|
inf_table.create_index(
|
|
"q_vec_idx",
|
|
IndexInfo(
|
|
vector_name,
|
|
IndexType.Hnsw,
|
|
{
|
|
"M": "16",
|
|
"ef_construction": "50",
|
|
"metric": "cosine",
|
|
"encode": "lvq",
|
|
},
|
|
),
|
|
ConflictType.Ignore,
|
|
)
|
|
for field_name, field_info in schema.items():
|
|
if field_info["type"] != "varchar" or "analyzer" not in field_info:
|
|
continue
|
|
analyzers = field_info["analyzer"]
|
|
if isinstance(analyzers, str):
|
|
analyzers = [analyzers]
|
|
for analyzer in analyzers:
|
|
inf_table.create_index(
|
|
f"ft_{re.sub(r'[^a-zA-Z0-9]', '_', field_name)}_{re.sub(r'[^a-zA-Z0-9]', '_', analyzer)}",
|
|
IndexInfo(field_name, IndexType.FullText, {"ANALYZER": analyzer}),
|
|
ConflictType.Ignore,
|
|
)
|
|
self.connPool.release_conn(inf_conn)
|
|
self.logger.info(f"INFINITY created table {table_name}, vector size {vector_size}")
|
|
return True
|
|
|
|
def delete_idx(self, index_name: str, dataset_id: str):
|
|
table_name = f"{index_name}_{dataset_id}"
|
|
inf_conn = self.connPool.get_conn()
|
|
db_instance = inf_conn.get_database(self.dbName)
|
|
db_instance.drop_table(table_name, ConflictType.Ignore)
|
|
self.connPool.release_conn(inf_conn)
|
|
self.logger.info(f"INFINITY dropped table {table_name}")
|
|
|
|
def index_exist(self, index_name: str, dataset_id: str) -> bool:
|
|
table_name = f"{index_name}_{dataset_id}"
|
|
try:
|
|
inf_conn = self.connPool.get_conn()
|
|
db_instance = inf_conn.get_database(self.dbName)
|
|
_ = db_instance.get_table(table_name)
|
|
self.connPool.release_conn(inf_conn)
|
|
return True
|
|
except Exception as e:
|
|
self.logger.warning(f"INFINITY indexExist {str(e)}")
|
|
return False
|
|
|
|
"""
|
|
CRUD operations
|
|
"""
|
|
|
|
@abstractmethod
|
|
def search(
|
|
self,
|
|
select_fields: list[str],
|
|
highlight_fields: list[str],
|
|
condition: dict,
|
|
match_expressions: list[MatchExpr],
|
|
order_by: OrderByExpr,
|
|
offset: int,
|
|
limit: int,
|
|
index_names: str | list[str],
|
|
dataset_ids: list[str],
|
|
agg_fields: list[str] | None = None,
|
|
rank_feature: dict | None = None,
|
|
) -> tuple[pd.DataFrame, int]:
|
|
raise NotImplementedError("Not implemented")
|
|
|
|
@abstractmethod
|
|
def get(self, doc_id: str, index_name: str, knowledgebase_ids: list[str]) -> dict | None:
|
|
raise NotImplementedError("Not implemented")
|
|
|
|
@abstractmethod
|
|
def insert(self, documents: list[dict], index_name: str, dataset_ids: str = None) -> list[str]:
|
|
raise NotImplementedError("Not implemented")
|
|
|
|
@abstractmethod
|
|
def update(self, condition: dict, new_value: dict, index_name: str, dataset_id: str) -> bool:
|
|
raise NotImplementedError("Not implemented")
|
|
|
|
def delete(self, condition: dict, index_name: str, dataset_id: str) -> int:
|
|
inf_conn = self.connPool.get_conn()
|
|
db_instance = inf_conn.get_database(self.dbName)
|
|
table_name = f"{index_name}_{dataset_id}"
|
|
try:
|
|
table_instance = db_instance.get_table(table_name)
|
|
except Exception:
|
|
self.logger.warning(f"Skipped deleting from table {table_name} since the table doesn't exist.")
|
|
return 0
|
|
filter = self.equivalent_condition_to_str(condition, table_instance)
|
|
self.logger.debug(f"INFINITY delete table {table_name}, filter {filter}.")
|
|
res = table_instance.delete(filter)
|
|
self.connPool.release_conn(inf_conn)
|
|
return res.deleted_rows
|
|
|
|
"""
|
|
Helper functions for search result
|
|
"""
|
|
|
|
def get_total(self, res: tuple[pd.DataFrame, int] | pd.DataFrame) -> int:
|
|
if isinstance(res, tuple):
|
|
return res[1]
|
|
return len(res)
|
|
|
|
def get_doc_ids(self, res: tuple[pd.DataFrame, int] | pd.DataFrame) -> list[str]:
|
|
if isinstance(res, tuple):
|
|
res = res[0]
|
|
return list(res["id"])
|
|
|
|
@abstractmethod
|
|
def get_fields(self, res: tuple[pd.DataFrame, int] | pd.DataFrame, fields: list[str]) -> dict[str, dict]:
|
|
raise NotImplementedError("Not implemented")
|
|
|
|
def get_highlight(self, res: tuple[pd.DataFrame, int] | pd.DataFrame, keywords: list[str], field_name: str):
|
|
if isinstance(res, tuple):
|
|
res = res[0]
|
|
ans = {}
|
|
num_rows = len(res)
|
|
column_id = res["id"]
|
|
if field_name not in res:
|
|
if field_name == "content_with_weight" and "content" in res:
|
|
field_name = "content"
|
|
else:
|
|
return {}
|
|
for i in range(num_rows):
|
|
id = column_id[i]
|
|
txt = res[field_name][i]
|
|
if re.search(r"<em>[^<>]+</em>", txt, flags=re.IGNORECASE | re.MULTILINE):
|
|
ans[id] = txt
|
|
continue
|
|
txt = re.sub(r"[\r\n]", " ", txt, flags=re.IGNORECASE | re.MULTILINE)
|
|
txt_list = []
|
|
for t in re.split(r"[.?!;\n]", txt):
|
|
if is_english([t]):
|
|
for w in keywords:
|
|
t = re.sub(
|
|
r"(^|[ .?/'\"\(\)!,:;-])(%s)([ .?/'\"\(\)!,:;-])" % re.escape(w),
|
|
r"\1<em>\2</em>\3",
|
|
t,
|
|
flags=re.IGNORECASE | re.MULTILINE,
|
|
)
|
|
else:
|
|
for w in sorted(keywords, key=len, reverse=True):
|
|
t = re.sub(
|
|
re.escape(w),
|
|
f"<em>{w}</em>",
|
|
t,
|
|
flags=re.IGNORECASE | re.MULTILINE,
|
|
)
|
|
if not re.search(r"<em>[^<>]+</em>", t, flags=re.IGNORECASE | re.MULTILINE):
|
|
continue
|
|
txt_list.append(t)
|
|
if txt_list:
|
|
ans[id] = "...".join(txt_list)
|
|
else:
|
|
ans[id] = txt
|
|
return ans
|
|
|
|
def get_aggregation(self, res: tuple[pd.DataFrame, int] | pd.DataFrame, field_name: str):
|
|
"""
|
|
Manual aggregation for tag fields since Infinity doesn't provide native aggregation
|
|
"""
|
|
from collections import Counter
|
|
|
|
# Extract DataFrame from result
|
|
if isinstance(res, tuple):
|
|
df, _ = res
|
|
else:
|
|
df = res
|
|
|
|
if df.empty or field_name not in df.columns:
|
|
return []
|
|
|
|
# Aggregate tag counts
|
|
tag_counter = Counter()
|
|
|
|
for value in df[field_name]:
|
|
if pd.isna(value) or not value:
|
|
continue
|
|
|
|
# Handle different tag formats
|
|
if isinstance(value, str):
|
|
# Split by ### for tag_kwd field or comma for other formats
|
|
if field_name == "tag_kwd" and "###" in value:
|
|
tags = [tag.strip() for tag in value.split("###") if tag.strip()]
|
|
else:
|
|
# Try comma separation as fallback
|
|
tags = [tag.strip() for tag in value.split(",") if tag.strip()]
|
|
|
|
for tag in tags:
|
|
if tag: # Only count non-empty tags
|
|
tag_counter[tag] += 1
|
|
elif isinstance(value, list):
|
|
# Handle list format
|
|
for tag in value:
|
|
if tag and isinstance(tag, str):
|
|
tag_counter[tag.strip()] += 1
|
|
|
|
# Return as list of [tag, count] pairs, sorted by count descending
|
|
return [[tag, count] for tag, count in tag_counter.most_common()]
|
|
|
|
"""
|
|
SQL
|
|
"""
|
|
|
|
def sql(self, sql: str, fetch_size: int, format: str):
|
|
"""
|
|
Execute SQL query on Infinity database via psql command.
|
|
Transform text-to-sql for Infinity's SQL syntax.
|
|
"""
|
|
import subprocess
|
|
|
|
try:
|
|
self.logger.debug(f"InfinityConnection.sql get sql: {sql}")
|
|
|
|
# Clean up SQL
|
|
sql = re.sub(r"[ `]+", " ", sql)
|
|
sql = sql.replace("%", "")
|
|
|
|
# Transform SELECT field aliases to actual stored field names
|
|
# Build field mapping from infinity_mapping.json comment field
|
|
field_mapping = {}
|
|
# Also build reverse mapping for column names in result
|
|
reverse_mapping = {}
|
|
fp_mapping = os.path.join(get_project_base_directory(), "conf", self.mapping_file_name)
|
|
if os.path.exists(fp_mapping):
|
|
schema = json.load(open(fp_mapping))
|
|
for field_name, field_info in schema.items():
|
|
if "comment" in field_info:
|
|
# Parse comma-separated aliases from comment
|
|
# e.g., "docnm_kwd, title_tks, title_sm_tks"
|
|
aliases = [a.strip() for a in field_info["comment"].split(",")]
|
|
for alias in aliases:
|
|
field_mapping[alias] = field_name
|
|
reverse_mapping[field_name] = alias # Store first alias for reverse mapping
|
|
|
|
# Replace field names in SELECT clause
|
|
select_match = re.search(r"(select\s+.*?)(from\s+)", sql, re.IGNORECASE)
|
|
if select_match:
|
|
select_clause = select_match.group(1)
|
|
from_clause = select_match.group(2)
|
|
|
|
# Apply field transformations
|
|
for alias, actual in field_mapping.items():
|
|
select_clause = re.sub(
|
|
rf'(^|[, ]){alias}([, ]|$)',
|
|
rf'\1{actual}\2',
|
|
select_clause
|
|
)
|
|
|
|
sql = select_clause + from_clause + sql[select_match.end():]
|
|
|
|
# Also replace field names in WHERE, ORDER BY, GROUP BY, and HAVING clauses
|
|
for alias, actual in field_mapping.items():
|
|
# Transform in WHERE clause
|
|
sql = re.sub(
|
|
rf'(\bwhere\s+[^;]*?)(\b){re.escape(alias)}\b',
|
|
rf'\1{actual}',
|
|
sql,
|
|
flags=re.IGNORECASE
|
|
)
|
|
# Transform in ORDER BY clause
|
|
sql = re.sub(
|
|
rf'(\border by\s+[^;]*?)(\b){re.escape(alias)}\b',
|
|
rf'\1{actual}',
|
|
sql,
|
|
flags=re.IGNORECASE
|
|
)
|
|
# Transform in GROUP BY clause
|
|
sql = re.sub(
|
|
rf'(\bgroup by\s+[^;]*?)(\b){re.escape(alias)}\b',
|
|
rf'\1{actual}',
|
|
sql,
|
|
flags=re.IGNORECASE
|
|
)
|
|
# Transform in HAVING clause
|
|
sql = re.sub(
|
|
rf'(\bhaving\s+[^;]*?)(\b){re.escape(alias)}\b',
|
|
rf'\1{actual}',
|
|
sql,
|
|
flags=re.IGNORECASE
|
|
)
|
|
|
|
self.logger.debug(f"InfinityConnection.sql to execute: {sql}")
|
|
|
|
# Get connection parameters from the Infinity connection pool wrapper
|
|
# We need to use INFINITY_CONN singleton, not the raw ConnectionPool
|
|
from common.doc_store.infinity_conn_pool import INFINITY_CONN
|
|
conn_info = INFINITY_CONN.get_conn_uri()
|
|
|
|
# Parse host and port from conn_info
|
|
if conn_info and "host=" in conn_info:
|
|
host_match = re.search(r"host=(\S+)", conn_info)
|
|
if host_match:
|
|
host = host_match.group(1)
|
|
else:
|
|
host = "infinity"
|
|
else:
|
|
host = "infinity"
|
|
|
|
# Parse port from conn_info, default to 5432 if not found
|
|
if conn_info and "port=" in conn_info:
|
|
port_match = re.search(r"port=(\d+)", conn_info)
|
|
if port_match:
|
|
port = port_match.group(1)
|
|
else:
|
|
port = "5432"
|
|
else:
|
|
port = "5432"
|
|
|
|
# Use psql command to execute SQL
|
|
# Use full path to psql to avoid PATH issues
|
|
psql_path = "/usr/bin/psql"
|
|
# Check if psql exists at expected location, otherwise try to find it
|
|
import shutil
|
|
psql_from_path = shutil.which("psql")
|
|
if psql_from_path:
|
|
psql_path = psql_from_path
|
|
|
|
# Execute SQL with psql to get both column names and data in one call
|
|
psql_cmd = [
|
|
psql_path,
|
|
"-h", host,
|
|
"-p", port,
|
|
"-c", sql,
|
|
]
|
|
|
|
self.logger.debug(f"Executing psql command: {' '.join(psql_cmd)}")
|
|
|
|
result = subprocess.run(
|
|
psql_cmd,
|
|
capture_output=True,
|
|
text=True,
|
|
timeout=10 # 10 second timeout
|
|
)
|
|
|
|
if result.returncode != 0:
|
|
error_msg = result.stderr.strip()
|
|
raise Exception(f"psql command failed: {error_msg}\nSQL: {sql}")
|
|
|
|
# Parse the output
|
|
output = result.stdout.strip()
|
|
if not output:
|
|
# No results
|
|
return {
|
|
"columns": [],
|
|
"rows": []
|
|
} if format == "json" else []
|
|
|
|
# Parse psql table output which has format:
|
|
# col1 | col2 | col3
|
|
# -----+-----+-----
|
|
# val1 | val2 | val3
|
|
lines = output.split("\n")
|
|
|
|
# Extract column names from first line
|
|
columns = []
|
|
rows = []
|
|
|
|
if len(lines) >= 1:
|
|
header_line = lines[0]
|
|
for col_name in header_line.split("|"):
|
|
col_name = col_name.strip()
|
|
if col_name:
|
|
columns.append({"name": col_name})
|
|
|
|
# Data starts after the separator line (line with dashes)
|
|
data_start = 2 if len(lines) >= 2 and "-" in lines[1] else 1
|
|
for i in range(data_start, len(lines)):
|
|
line = lines[i].strip()
|
|
# Skip empty lines and footer lines like "(1 row)"
|
|
if not line or re.match(r"^\(\d+ row", line):
|
|
continue
|
|
# Split by | and strip each cell
|
|
row = [cell.strip() for cell in line.split("|")]
|
|
# Ensure row matches column count
|
|
if len(row) == len(columns):
|
|
rows.append(row)
|
|
elif len(row) > len(columns):
|
|
# Row has more cells than columns - truncate
|
|
rows.append(row[:len(columns)])
|
|
elif len(row) < len(columns):
|
|
# Row has fewer cells - pad with empty strings
|
|
rows.append(row + [""] * (len(columns) - len(row)))
|
|
|
|
if format == "json":
|
|
result = {
|
|
"columns": columns,
|
|
"rows": rows[:fetch_size] if fetch_size > 0 else rows
|
|
}
|
|
else:
|
|
result = rows[:fetch_size] if fetch_size > 0 else rows
|
|
|
|
return result
|
|
|
|
except subprocess.TimeoutExpired:
|
|
self.logger.exception(f"InfinityConnection.sql timeout. SQL:\n{sql}")
|
|
raise Exception(f"SQL timeout\n\nSQL: {sql}")
|
|
except Exception as e:
|
|
self.logger.exception(f"InfinityConnection.sql got exception. SQL:\n{sql}")
|
|
raise Exception(f"SQL error: {e}\n\nSQL: {sql}")
|