tencent-wedata-feature-engineering-dev 0.1.48__py3-none-any.whl → 0.2.5__py3-none-any.whl

wedata/feature_engineering/table_client/table_client.py

@@ -0,0 +1,548 @@
+"""
+特征表操作相关工具方法
+"""
+import json
+from typing import Union, List, Dict, Optional, Any
+
+from pyspark.sql import DataFrame, SparkSession
+from pyspark.sql.streaming import StreamingQuery
+from pyspark.sql.types import StructType
+import os
+from wedata.common.constants.constants import (
+    APPEND, DEFAULT_WRITE_STREAM_TRIGGER,
+    FEATURE_ENGINEERING_TABLE_PRIMARY_KEY_WEDATA)
+from wedata.common.log import get_logger
+from wedata.common.entities.feature_table import FeatureTable
+from wedata.common.constants.engine_types import EngineTypes
+from wedata.common.spark_client import SparkClient
+from wedata.common.utils import common_utils, env_utils
+from wedata.common.feast_client.feast_client import FeastClient
+from wedata.common.base_table_client import AbstractBaseTableClient
+
+
+class FeatureEngineeringTableClient(AbstractBaseTableClient):
+    """特征表操作类"""
+    def __init__(
+            self,
+            spark: SparkSession,
+            cloud_secret_id: str = None,
+            cloud_secret_key: str = None,
+    ):
+        self._spark = spark
+        self._feast_client = FeastClient(spark)
+        if cloud_secret_id and cloud_secret_key:
+            self.__cloud_secret_id = cloud_secret_id
+            self.__cloud_secret_key = cloud_secret_key
+        else:
+            self.__cloud_secret_id, self.__cloud_secret_key = env_utils.get_cloud_secret()
+        self.__project = env_utils.get_project_id()
+        self.__region = env_utils.get_region()
+        self.__logger = get_logger()
+
+    @property
+    def cloud_secret_id(self) -> str:
+        if not self.__cloud_secret_id:
+            raise ValueError("cloud_secret_id is empty. please set it first.")
+        return self.__cloud_secret_id
+
+    @cloud_secret_id.setter
+    def cloud_secret_id(self, cloud_secret_id: str):
+        if not cloud_secret_id:
+            raise ValueError("cloud_secret_id cannot be None")
+        self.__cloud_secret_id = cloud_secret_id
+
+    @property
+    def cloud_secret_key(self) -> str:
+        if not self.__cloud_secret_key:
+            raise ValueError("cloud_secret_key is empty. please set it first.")
+        return self.__cloud_secret_key
+
+    @cloud_secret_key.setter
+    def cloud_secret_key(self, cloud_secret_key: str):
+        if not cloud_secret_key:
+            raise ValueError("cloud_secret_key cannot be None")
+        self.__cloud_secret_key = cloud_secret_key
+
+    @property
+    def project(self) -> str:
+        return self.__project
+
+    @property
+    def region(self) -> str:
+        return self.__region
+
+    def create_table(
+            self,
+            name: str,
+            primary_keys: Union[str, List[str]],
+            timestamp_key: str,
+            engine_type: EngineTypes,
+            data_source_name: str,
+            database_name: Optional[str] = None,
+            df: Optional[DataFrame] = None,
+            *,
+            partition_columns: Union[str, List[str], None] = None,
+            schema: Optional[StructType] = None,
+            description: Optional[str] = None,
+            tags: Optional[Dict[str, str]] = None
+    ) -> FeatureTable:
+
+        """
+        创建特征表（支持批流数据写入）
+
+        Args:
+            name: 特征表全称（格式：<table>）
+            primary_keys: 主键列名（支持复合主键）
+            database_name: Optional[str] = None,
+            data_source_name: 数据源名称,
+            df: 初始数据（可选，用于推断schema）
+            timestamp_key: 时间戳键（用于时态特征）
+            partition_columns: 分区列（优化存储查询）
+            schema: 表结构定义（可选，当不提供df时必需）
+            description: 业务描述
+            tags: 业务标签
+        Returns:
+            FeatureTable实例
+
+        Raises:
+            ValueError: 当schema与数据不匹配时
+        """
+
+        # 参数标准化
+        primary_keys = self._normalize_params(primary_keys)
+        partition_columns = self._normalize_params(partition_columns)
+
+        assert self._check_sequence_element_type(primary_keys, str), "primary_keys must be a list of strings"
+        assert self._check_sequence_element_type(partition_columns, str), "partition_columns must be a list of strings"
+        assert isinstance(timestamp_key, str), "timestamp key must be string"
+
+        # 元数据校验
+        self._validate_schema(df, schema)
+        self._validate_key_exists(primary_keys, timestamp_key)
+        self._validate_key_conflicts(primary_keys, timestamp_key)
+
+        # 表名校验
+        common_utils.validate_table_name(name)
+
+        common_utils.validate_database(database_name)
+
+        # 校验PrimaryKey是否有重复
+        dup_list = common_utils.get_duplicates(primary_keys)
+        if dup_list:
+            raise ValueError(f"Primary keys have duplicates: {dup_list}")
+
+        # 构建完整表名
+        table_name = common_utils.build_full_table_name(name, database_name)
+
+        # 检查表是否存在
+        try:
+            if self._check_table_exists(table_name):
+                raise ValueError(
+                    f"Table '{name}' already exists\n"
+                    "Solutions:\n"
+                    "1. Use a different table name\n"
+                    "2. Drop the existing table: spark.sql(f'DROP TABLE {name}')\n"
+                )
+        except Exception as e:
+            raise ValueError(f"Error checking table existence: {str(e)}") from e
+
+        # 推断表schema
+        table_schema = schema or df.schema
+
+        # 构建时间戳键属性
+
+        # 从环境变量获取额外标签
+        env_tags = {
+            "project_id": os.getenv("WEDATA_PROJECT_ID", ""),  # wedata项目ID
+            "engine_name": os.getenv("WEDATA_NOTEBOOK_ENGINE", ""),  # wedata引擎名称
+            "user_uin": os.getenv("KERNEL_LOGIN_UIN", "")  # wedata用户UIN
+        }
+        projectId = os.getenv("WEDATA_PROJECT_ID", "")
+        # 构建表属性（通过TBLPROPERTIES）
+        tbl_properties = {
+            FEATURE_ENGINEERING_TABLE_PRIMARY_KEY_WEDATA: ",".join(primary_keys),
+            "wedata.feature_project_id": f"{json.dumps([projectId])}",
+            "comment": description or "",
+            **{f"{k}": v for k, v in (tags or {}).items()},
+            **{f"feature_{k}": v for k, v in (env_tags or {}).items()}
+        }
+        if engine_type == EngineTypes.ICEBERG_ENGINE:
+            if partition_columns:
+                tbl_properties.update({
+                    'format-version': '2',
+                    'write.upsert.enabled': 'true',
+                    'write.update.mode': 'merge-on-read',
+                    'write.merge.mode': 'merge-on-read',
+                    'write.parquet.bloom-filter-enabled.column.id': 'true',
+                    'dlc.ao.data.govern.sorted.keys': ",".join(primary_keys),
+                    'write.distribution-mode': 'hash',
+                    'write.metadata.delete-after-commit.enabled': 'true',
+                    'write.metadata.previous-versions-max': '100',
+                    'write.metadata.metrics.default': 'full',
+                    'smart-optimizer.inherit': 'default',
+                })
+            else:
+                tbl_properties.update({
+                    'format-version': '2',
+                    'write.upsert.enabled': 'true',
+                    'write.update.mode': 'merge-on-read',
+                    'write.merge.mode': 'merge-on-read',
+                    'write.parquet.bloom-filter-enabled.column.id': 'true',
+                    'dlc.ao.data.govern.sorted.keys': ",".join(primary_keys),
+                    'write.distribution-mode': 'hash',
+                    'write.metadata.delete-after-commit.enabled': 'true',
+                    'write.metadata.previous-versions-max': '100',
+                    'write.metadata.metrics.default': 'full',
+                    'smart-optimizer.inherit': 'default',
+                })
+
+        # 构建列定义
+        columns_ddl = []
+        for field in table_schema.fields:
+            data_type = field.dataType.simpleString().upper()
+            col_def = f"`{field.name}` {data_type}"
+            if not field.nullable:
+                col_def += " NOT NULL"
+            # 添加字段注释(如果metadata中有comment)
+            if field.metadata and "comment" in field.metadata:
+                comment = self._escape_sql_value(field.metadata["comment"])
+                col_def += f" COMMENT '{comment}'"
+            columns_ddl.append(col_def)
+
+        # 构建分区表达式
+        partition_expr = (
+            f"PARTITIONED BY ({', '.join([f'`{c}`' for c in partition_columns])})"
+            if partition_columns else ""
+        )
+        # 本地调试 iceberg --》PARQUET
+        # 核心建表语句
+        if engine_type == EngineTypes.ICEBERG_ENGINE:
+            ddl = f"""
+        CREATE TABLE {table_name} (
+            {', '.join(columns_ddl)}
+        )
+        USING iceberg
+        {partition_expr}
+        TBLPROPERTIES (
+            {', '.join(f"'{k}'='{self._escape_sql_value(v)}'" for k, v in tbl_properties.items())}
+        )
+            """
+        elif engine_type == EngineTypes.HIVE_ENGINE:
+            ddl = f"""
+            CREATE TABLE {table_name} (
+        {', '.join(columns_ddl)}
+    )
+    {partition_expr}
+    TBLPROPERTIES (
+        {', '.join(f"'{k}'='{self._escape_sql_value(v)}'" for k, v in tbl_properties.items())}
+    )
+            """
+        else:
+            raise ValueError(f"Engine type {engine_type} is not supported")
+
+        # 打印sql
+        self.__logger.info(f"create table ddl: {ddl}\n")
+
+        # 执行DDL
+        try:
+            self._spark.sql(ddl)
+            if df is not None:
+                df.write.insertInto(table_name)
+        except Exception as e:
+            raise ValueError(f"Failed to create table: {str(e)}") from e
+
+        self._feast_client.create_table(
+            table_name=table_name,
+            primary_keys=primary_keys,
+            timestamp_key=timestamp_key,
+            df=df,
+            schema=table_schema,
+            tags=tags,
+            description=description
+        )
+
+        self.__logger.info(f"Table '{name}' created successfully. Starting web synchronization.")
+
+        # 构建并返回FeatureTable对象
+        return FeatureTable(
+            name=name,
+            table_id=table_name,
+            description=description or "",
+            primary_keys=primary_keys,
+            partition_columns=partition_columns or [],
+            features=[field.name for field in table_schema.fields],
+            timestamp_keys=timestamp_key or [],
+            tags=dict(**tags or {}, **env_tags)
+        )
+
+    def write_table(
+            self,
+            name: str,
+            df: DataFrame,
+            database_name: Optional[str] = None,
+            mode: Optional[str] = APPEND,
+            checkpoint_location: Optional[str] = None,
+            trigger: Optional[Dict[str, Any]] = DEFAULT_WRITE_STREAM_TRIGGER
+    ) -> Optional[StreamingQuery]:
+
+        """
+        写入特征表数据（支持批处理和流式写入）
+
+        Args:
+            name: 特征表名称（格式：<table>）
+            df: 要写入的数据（DataFrame）
+            database_name: 数据库名
+            mode: 写入模式（append/overwrite）
+            checkpoint_location: 流式写入的检查点位置（仅流式写入需要）
+            trigger: 流式写入触发条件（仅流式写入需要）
+
+        Returns:
+            如果是流式写入返回StreamingQuery对象，否则返回None
+
+        Raises:
+            ValueError: 当参数不合法时抛出
+        """
+
+        # 验证写入模式
+        valid_modes = ["append", "overwrite"]
+        if mode not in valid_modes:
+            raise ValueError(f"Invalid write mode '{mode}', valid options: {valid_modes}")
+
+        # 表名校验
+        common_utils.validate_table_name(name)
+
+        common_utils.validate_database(database_name)
+
+        # 构建完整表名
+        table_name = common_utils.build_full_table_name(name, database_name)
+
+        # 检查表是否存在
+        if not self._check_table_exists(table_name):
+            raise ValueError(f"table '{name}' not exists")
+
+        # 判断是否是流式DataFrame
+        is_streaming = df.isStreaming
+
+        try:
+            if is_streaming:
+                # 流式写入
+                if not checkpoint_location:
+                    raise ValueError("Streaming write requires checkpoint_location parameter")
+
+                writer = df.writeStream \
+                    .format("parquet") \
+                    .outputMode(mode) \
+                    .option("checkpointLocation", checkpoint_location) \
+                    # .foreachBatch(process_batch)
+
+                if trigger:
+                    writer = writer.trigger(**trigger)
+
+                return writer.toTable(table_name)
+            else:
+                # 批处理写入
+                df.write \
+                    .mode(mode) \
+                    .insertInto(table_name)
+                # self._feast_client.client.write_to_offline_store(feature_view_name=table_name, df=df.toPandas(), allow_registry_cache=False,)
+                return None
+
+        except Exception:
+            raise
+            # raise ValueError(f"Failed to write to table '{table_name}': {str(e)}") from e
+
+    def read_table(
+            self,
+            name: str,
+            database_name: Optional[str] = None,
+    ) -> DataFrame:
+
+        """
+        从特征表中读取数据
+        Args:
+            name: 特征表名称（格式：<table>）
+            database_name: 特征库名称
+        Returns:
+            包含表数据的DataFrame
+
+        Raises:
+            ValueError: 当表不存在或读取失败时抛出
+        """
+
+        # 表名校验
+        common_utils.validate_table_name(name)
+
+        common_utils.validate_database(database_name)
+
+        # 构建完整表名
+        table_name = common_utils.build_full_table_name(name, database_name)
+
+        try:
+            # 检查表是否存在
+            if not self._check_table_exists(table_name):
+                raise ValueError(f"Table '{name}' does not exist")
+
+            # 读取表数据
+            return self._spark.read.table(table_name)
+
+        except Exception as e:
+            raise
+
+    def drop_table(self, name: str, database_name: Optional[str] = None) -> None:
+
+        """
+        删除特征表（表不存在时抛出异常）
+
+        Args:
+            name: 特征表名称（格式：<table>）
+            database_name: 特征库名称
+        Raises:
+            ValueError: 当表不存在时抛出
+            RuntimeError: 当删除操作失败时抛出
+
+        示例:
+            # 基本删除
+            drop_table("user_features")
+        """
+
+        # 表名校验
+        common_utils.validate_table_name(name)
+
+        # 构建完整表名
+        table_name = common_utils.build_full_table_name(name, database_name)
+        try:
+            # 检查表是否存在
+            if not self._check_table_exists(table_name):
+                self.__logger.error(f"Table '{name}' does not exist")
+                return
+
+            try:
+                feature_view = self._feast_client.get_feature_view(table_name)
+            except Exception:
+                pass
+                # self.__logger.warning(f"Table '{name}' is not a feature table, skip delete. {str(e)}")
+            else:
+                if feature_view.online:
+                    raise ValueError(f"Table '{name}' has a online table, please call drop_online_table first")
+
+            # 执行删除
+            self._spark.sql(f"DROP TABLE {table_name}")
+            self.__logger.info(f"Table '{name}' dropped")
+            try:
+                self._feast_client.remove_offline_table(table_name=table_name)
+            except Exception:
+                raise
+            else:
+                self.__logger.info(f"Table '{name}' removed from feast")
+        except ValueError:
+            raise  # 直接抛出已知的ValueError
+        except Exception as e:
+            raise RuntimeError(f"Failed to delete table '{name}': {str(e)}") from e
+
+    def get_table(
+            self,
+            name: str,
+            spark_client: SparkClient,
+            database_name: Optional[str] = None,
+    ) -> FeatureTable:
+
+        """
+        获取特征表元数据信息
+
+        参数:
+            name: 特征表名称
+            spark_client: Spark客户端
+
+        返回:
+            FeatureTable对象
+
+        异常:
+            ValueError: 当表不存在或获取失败时抛出
+        """
+
+        # 表名校验
+        common_utils.validate_table_name(name)
+        common_utils.validate_database(database_name)
+
+        # 构建完整表名
+        table_name = common_utils.build_full_table_name(name, database_name)
+        if not self._check_table_exists(full_table_name=table_name):
+            raise ValueError(f"Table '{name}' does not exist")
+        try:
+            return spark_client.get_feature_table(table_name)
+        except Exception as e:
+            raise
+            # raise ValueError(f"Failed to get metadata for table '{name}': {str(e)}") from e
+
+    def alter_table_tag(
+            self,
+            name: str,
+            properties: Dict[str, str],
+            database_name: Optional[str] = None,
+            mode: str = "add"
+    ):
+        """
+        修改表的TBLPROPERTIES属性（有则修改，无则新增）
+
+        Args:
+            name: 表名（格式：<table>）
+            properties: 要修改/新增的属性字典
+            database_name: 特征库名称
+            mode: 模式  add / delete
+
+        Raises:
+            ValueError: 当表不存在或参数无效时抛出
+            RuntimeError: 当修改操作失败时抛出
+
+        示例:
+            # 修改表属性
+            client.alter_tables_tag("user_features", {
+                "comment": "更新后的描述",
+                "owner": "data_team"
+            })
+        """
+        # 参数校验
+        if not properties:
+            raise ValueError("properties must be a non-empty dictionary")
+
+        # 表名校验
+        common_utils.validate_table_name(name)
+        common_utils.validate_database(database_name)
+
+        # 构建完整表名
+        table_name = common_utils.build_full_table_name(name, database_name)
+
+        try:
+            # 检查表是否存在
+            if not self._check_table_exists(table_name):
+                raise ValueError(f"table '{name}' not exists")
+
+            if mode == "add":
+                # 构建属性设置语句
+                props_str = ", ".join(
+                    f"'{k}'='{self._escape_sql_value(v)}'"
+                    for k, v in properties.items()
+                )
+
+                alter_sql = f"ALTER TABLE {table_name} SET TBLPROPERTIES ({props_str})"
+            elif mode == "delete":
+                props_str = ", ".join(f"'{k}'" for k in properties.keys())
+                alter_sql = f"ALTER TABLE {table_name} UNSET TBLPROPERTIES ({props_str})"
+            else:
+                raise ValueError(f"Invalid mode '{mode}', valid options: {['add', 'delete']}")
+
+            # 执行修改
+            self._spark.sql(alter_sql)
+            # 执行结果回写feast
+            tbl_pro = self._spark.sql(f"SHOW TBLPROPERTIES {table_name}").collect()
+            props = {row['key']: row['value'] for row in tbl_pro}
+            self._feast_client.modify_tags(table_name=table_name, tags=props)
+            print(f"Successfully updated properties for table '{name}': {list(properties.keys())}")
+
+        except ValueError as e:
+            raise  # 直接抛出已知的ValueError
+        except Exception as e:
+            raise RuntimeError(f"Failed to modify properties for table '{name}': {str(e)}") from e
+
+    def _check_table_exists(self, full_table_name: str) -> bool:
+        return common_utils.check_spark_table_exists(self._spark, full_table_name)

wedata/feature_store/client.py

@@ -10,21 +10,21 @@ from pyspark.sql import DataFrame, SparkSession
 from pyspark.sql.streaming import StreamingQuery
 from pyspark.sql.types import StructType
 import mlflow
-from wedata.feature_store.constants.constants import FEATURE_STORE_CLIENT
+from wedata.common.constants.constants import FEATURE_STORE_CLIENT
 
-from wedata.feature_store.constants.constants import APPEND, DEFAULT_WRITE_STREAM_TRIGGER
+from wedata.common.constants.constants import APPEND, DEFAULT_WRITE_STREAM_TRIGGER
 from wedata.feature_store.constants.engine_types import EngineTypes
 from wedata.feature_store.common.store_config.redis import RedisStoreConfig
-from wedata.feature_store.cloud_sdk_client.models import TaskSchedulerConfiguration
-from wedata.feature_store.entities.feature_function import FeatureFunction
-from wedata.feature_store.entities.feature_lookup import FeatureLookup
-from wedata.feature_store.entities.feature_table import FeatureTable
-from wedata.feature_store.entities.training_set import TrainingSet
+from wedata.common.cloud_sdk_client.models import TaskSchedulerConfiguration
+from wedata.common.entities.feature_function import FeatureFunction
+from wedata.common.entities.feature_lookup import FeatureLookup
+from wedata.common.entities.feature_table import FeatureTable
+from wedata.common.entities.training_set import TrainingSet
 from wedata.feature_store.feature_table_client.feature_table_client import FeatureTableClient
-from wedata.feature_store.spark_client.spark_client import SparkClient
+from wedata.common.spark_client import SparkClient
 from wedata.feature_store.training_set_client.training_set_client import TrainingSetClient
-from wedata.feature_store.utils import common_utils
-from wedata.feature_store.utils.feature_utils import format_feature_lookups_and_functions
+from wedata.common.utils import common_utils
+from wedata.common.utils.feature_utils import format_feature_lookups_and_functions
 
 
 class FeatureStoreClient:
@@ -402,7 +402,7 @@ class FeatureStoreClient:
             timestamp_key=timestamp_key,
         )
 
-    def publish_table(self, table_name: str, data_source_name: str, cloud_secret_id: str, cloud_secret_key: str,
+    def publish_table(self, table_name: str, data_source_name: str,
                       database_name: Optional[str] = None,
                       is_cycle: bool = False, cycle_obj: TaskSchedulerConfiguration = None,
                       is_use_default_online: bool = True, online_config: RedisStoreConfig = None):
@@ -415,8 +415,6 @@ class FeatureStoreClient:
         Args:
             table_name: Name of the offline feature table
             data_source_name: Name of the data source
-            cloud_secret_id: Cloud secret ID for authentication
-            cloud_secret_key: Cloud secret key for authentication
             database_name: Database name (optional)
             is_cycle: Whether to enable periodic publishing (default: False)
             cycle_obj: Periodic task configuration object (required if is_cycle is True)
@@ -429,8 +427,6 @@ class FeatureStoreClient:
         """
         return self._feature_table_client.publish_table(table_name=table_name, database_name=database_name,
                                                         data_source_name=data_source_name,
-                                                        cloud_secret_key=cloud_secret_key,
-                                                        cloud_secret_id=cloud_secret_id,
                                                         is_cycle=is_cycle, cycle_obj=cycle_obj,
                                                         is_use_default_online=is_use_default_online,
                                                         online_config=online_config)

wedata/feature_store/constants/engine_types.py

@@ -1,34 +1,12 @@
-from enum import Enum
-import os
+import warnings
+from wedata.common.constants.engine_types import (EngineTypes as _EngineTypes,
+                                                  CalculateEngineTypes as _CalculateEngineTypes,
+                                                  judge_engine_type as _judge_engine_type)
 
+warnings.warn("engine_types.py is deprecated, please use wedata.common.constants.engine_types.py")
 
-class EngineTypes(Enum):
-    HIVE_ENGINE = "hive"
-    ICEBERG_ENGINE = "iceberg"
+EngineTypes = _EngineTypes
 
-    @classmethod
-    def get_engine(cls, engine_name: str) -> 'EngineTypes':
-        try:
-            return cls(engine_name.lower())
-        except ValueError:
-            raise ValueError(f"Invalid engine type: {engine_name}. Supported engine types: {list(cls)}")
-
-
-class CalculateEngineTypes(Enum):
-    DLC = "dlc"
-    EMR = "emr"
-
-    @classmethod
-    def get_calculate_engine(cls, engine_name: str) -> 'CalculateEngineTypes':
-        try:
-            return cls(engine_name.lower())
-        except ValueError:
-            raise ValueError(f"Invalid engine type: {engine_name}. Supported engine types: {list(cls)}")
-
-
-def judge_engine_type() -> 'CalculateEngineTypes':
-    if os.environ.get("DLC_REGION", ""):
-        return CalculateEngineTypes.DLC
-    else:
-        return CalculateEngineTypes.EMR
+CalculateEngineTypes = _CalculateEngineTypes
 
+judge_engine_type = _judge_engine_type