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

{tencent_wedata_feature_engineering_dev-0.1.46.dist-info → tencent_wedata_feature_engineering_dev-0.1.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tencent-wedata-feature-engineering-dev
-Version: 0.1.46
+Version: 0.1.48
 Summary: Wedata Feature Engineering Library Development
 Home-page: 
 Author: meahqian

{tencent_wedata_feature_engineering_dev-0.1.46.dist-info → tencent_wedata_feature_engineering_dev-0.1.48.dist-info}/RECORD

@@ -1,18 +1,20 @@
 wedata/__init__.py,sha256=GYxqkkgH0oH4QtNiOCZHuGkc0sSH1LgEqmhSX6sB4So,200
 wedata/feature_store/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wedata/feature_store/client.py,sha256=rXQfSC14vvxPed9P0PoboDTwhD47aPwmGndY825Sl6k,19484
+wedata/feature_store/client.py,sha256=B6fy-PGJZsEHGPE8tDmrTolyioJ_-Po2DK3p_HCW7Sw,19552
 wedata/feature_store/mlflow_model.py,sha256=OCUuccOoO0NXWSzIPoGeL03Ha1Q3aQTJW2RlJrTCmzc,554
 wedata/feature_store/cloud_sdk_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wedata/feature_store/cloud_sdk_client/client.py,sha256=NtzV0EmLTzMLYqWhnUyOx3bmxoIIgxw8REid-Gy96Pc,4234
+wedata/feature_store/cloud_sdk_client/client.py,sha256=B7nCQ_MvbLP4ieT7rsa32FHws2fOG4VQZT5lmQ3Cvzk,4914
 wedata/feature_store/cloud_sdk_client/models.py,sha256=7_QUq0kZcrcclRMsIYFoqBrlzVwaHoVY-yU5SHIrJWM,19789
-wedata/feature_store/cloud_sdk_client/utils.py,sha256=6ESwVhlrftnp0h9ojTzbB-m-0hktLI1PLcyk6zpNgrs,857
+wedata/feature_store/cloud_sdk_client/utils.py,sha256=xwvXJpk2RXbJtgOaXCZQbGRrlzcTRzv27yQFxKp_X84,970
 wedata/feature_store/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wedata/feature_store/common/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wedata/feature_store/common/log/logger.py,sha256=c45DlIbIuwRP2na3ZXsncpHV5KUltqfyKzIgG9GG3g4,1151
 wedata/feature_store/common/protos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wedata/feature_store/common/protos/feature_store_pb2.py,sha256=oMIUGGeGNP84g_nFqOQwTXjV1GiU2ehSOy7CyFu2__g,4207
 wedata/feature_store/common/store_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wedata/feature_store/common/store_config/redis.py,sha256=9R5npM2s1u0o9IakmpbRsFdJC0vNar_uvA62OLWuXBs,1145
 wedata/feature_store/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wedata/feature_store/constants/constants.py,sha256=KxDS2NKE_Y3pEm4WmZuROiX7OUHvz6xFKwVKTePQW9Q,1959
+wedata/feature_store/constants/constants.py,sha256=M0UKZSnpM7x5RYDvfesyF422zg82JJe4JsHUuUDiUF4,1959
 wedata/feature_store/constants/engine_types.py,sha256=42mI-kNDDtoA4_I3iqDe4FkF2M2l_Bt4Q1V6WUB-_k0,921
 wedata/feature_store/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wedata/feature_store/entities/column_info.py,sha256=-AR6EKHwgoqIkRHFyguxVEtnYt6fvusWHkEjF4kvS0A,5141
@@ -32,11 +34,11 @@ wedata/feature_store/entities/training_set.py,sha256=ylt1h6Z_xU8hKYvnvd80CeewTGS
 wedata/feature_store/feast_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wedata/feature_store/feast_client/feast_client.py,sha256=mCv-OiKehfgcOJhJV0wXMRs5d7e2zEBYmVmDguk0rxU,20728
 wedata/feature_store/feature_table_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wedata/feature_store/feature_table_client/feature_table_client.py,sha256=qKkzQVIa9_rPpkTaLWh6VQ2DPBlyb7UzM-JFTsAHbZ8,42559
+wedata/feature_store/feature_table_client/feature_table_client.py,sha256=qyr-jS-nIyphFVZXcUXV_HSfAu-8c19f0b8iG5rYsl8,42669
 wedata/feature_store/spark_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wedata/feature_store/spark_client/spark_client.py,sha256=aTenEqfZoJYMrph98qjNHZ-H4dgNKnMaH14st8bCVRQ,11797
 wedata/feature_store/training_set_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wedata/feature_store/training_set_client/training_set_client.py,sha256=wwxTMGPm9QZXjGFv9XI2hA5N1pHntxhAJ6Grcfg6C2g,23572
+wedata/feature_store/training_set_client/training_set_client.py,sha256=Ja_W1SKWKueW6wmwDx-623mfpwKQICm6A-ec_jgOFt4,23707
 wedata/feature_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wedata/feature_store/utils/common_utils.py,sha256=vkpoXxZTd6S-2MgdyTQZ6P_ckdqNSK50ECuVBG2BwfI,12314
 wedata/feature_store/utils/env_utils.py,sha256=kMCl6gyqDxjN5IZ7-wZMR0R4YY-Evh_7NHxugSYPWQc,2736
@@ -58,7 +60,7 @@ wedata/tempo/ml.py,sha256=WtGa2szn6PditvZsTZoxo7wFDe4k1SRoMZ-jgNGIjvE,4323
 wedata/tempo/resample.py,sha256=h81RVVmCl4ect-YKE-KZZHPDi1rGI3sh-YIb-Btz0ck,9698
 wedata/tempo/tsdf.py,sha256=S4lZfxhSRFiezYoYS6gvGsl1mZA3zp-MWEKFHYZpDg0,70968
 wedata/tempo/utils.py,sha256=I9I6l2DMwUoY213L04Yc1UR_zTWgSkj1BVo4ZwzQd4Y,7977
-tencent_wedata_feature_engineering_dev-0.1.46.dist-info/METADATA,sha256=s5EcvoA3Dz40G15pMbjaFZ_gvPEulSYjDzPiB6bRYlg,582
-tencent_wedata_feature_engineering_dev-0.1.46.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-tencent_wedata_feature_engineering_dev-0.1.46.dist-info/top_level.txt,sha256=Xa0v1rh__RvfVTVDirW5r5UBKg7ZO_iuTeXfp8MNo2A,7
-tencent_wedata_feature_engineering_dev-0.1.46.dist-info/RECORD,,
+tencent_wedata_feature_engineering_dev-0.1.48.dist-info/METADATA,sha256=-A-1H2urk9u4M9sEoQYri1xCeVtH3lFhUrsajCGb9tU,582
+tencent_wedata_feature_engineering_dev-0.1.48.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+tencent_wedata_feature_engineering_dev-0.1.48.dist-info/top_level.txt,sha256=Xa0v1rh__RvfVTVDirW5r5UBKg7ZO_iuTeXfp8MNo2A,7
+tencent_wedata_feature_engineering_dev-0.1.48.dist-info/RECORD,,

wedata/feature_store/client.py

@@ -288,7 +288,7 @@ class FeatureStoreClient:
         )
 
     def score_batch(
-            self, model_uri: str, df: DataFrame, result_type: str = "double"
+            self, model_uri: str, df: DataFrame, result_type: str = "double", timestamp_key: str = None
     ) -> DataFrame:
         """
         Evaluate the model on the provided :class:`DataFrame <pyspark.sql.DataFrame>`.
@@ -399,6 +399,7 @@ class FeatureStoreClient:
             df=df,
             result_type=result_type,
             client_name=FEATURE_STORE_CLIENT,
+            timestamp_key=timestamp_key,
         )
 
     def publish_table(self, table_name: str, data_source_name: str, cloud_secret_id: str, cloud_secret_key: str,

wedata/feature_store/cloud_sdk_client/client.py

@@ -4,8 +4,9 @@ from tencentcloud.wedata.v20210820.wedata_client import WedataClient
 from tencentcloud.wedata.v20250806.wedata_client import WedataClient as WedataClientV2
 from tencentcloud.common import credential
 from tencentcloud.common.exception.tencent_cloud_sdk_exception import TencentCloudSDKException
-from wedata.feature_store.cloud_sdk_client.utils import get_client_profile, set_request_header
+from wedata.feature_store.cloud_sdk_client.utils import get_client_profile, set_request_header, is_mock
 import wedata.feature_store.cloud_sdk_client.models as models
+from wedata.feature_store.common.log.logger import get_logger
 
 
 class FeatureCloudSDK:
@@ -22,17 +23,21 @@ class FeatureCloudSDK:
         Returns:
             创建结果响应
         """
+        logger = get_logger()
+        if is_mock():
+            logger.debug("Mock CreateOnlineFeatureTable API")
+            return models.CreateOnlineFeatureTableResponse()
         try:
             params = request._serialize()
             headers = set_request_header(request.headers)
-            print(f"CreateOnlineFeatureTable params: {params}")
-            print(f"CreateOnlineFeatureTable headers: {headers}")
+            logger.debug(f"CreateOnlineFeatureTable params: {params}")
+            logger.debug(f"CreateOnlineFeatureTable headers: {headers}")
             self._client._apiVersion = "2021-08-20"
             body = self._client.call("CreateOnlineFeatureTable", params, headers=headers)
             response = json.loads(body)
             model = models.CreateOnlineFeatureTableResponse()
             model._deserialize(response["Response"])
-            print("CreateOnlineFeatureTable Response: ", response)
+            logger.debug(f"CreateOnlineFeatureTable Response: {response}")
             return model
         except Exception as e:
             if isinstance(e, TencentCloudSDKException):
@@ -49,17 +54,22 @@ class FeatureCloudSDK:
         Returns:
             查询结果响应
         """
+        logger = get_logger()
+        if is_mock():
+            logger.debug("Mock DescribeNormalSchedulerExecutorGroups API")
+            return models.DescribeNormalSchedulerExecutorGroupsResponse()
+
         try:
             params = request._serialize()
             headers = set_request_header(request.headers)
-            print(f"DescribeNormalSchedulerExecutorGroups params: {params}")
-            print(f"DescribeNormalSchedulerExecutorGroups headers: {headers}")
+            logger.debug(f"DescribeNormalSchedulerExecutorGroups params: {params}")
+            logger.debug(f"DescribeNormalSchedulerExecutorGroups headers: {headers}")
             self._client._apiVersion = "2021-08-20"
             body = self._client.call("DescribeNormalSchedulerExecutorGroups", params, headers=headers)
             response = json.loads(body)
             model = models.DescribeNormalSchedulerExecutorGroupsResponse()
             model._deserialize(response["Response"])
-            print("DescribeNormalSchedulerExecutorGroups Response: ", response)
+            logger.debug(f"DescribeNormalSchedulerExecutorGroups Response: {response}")
             return model
         except Exception as e:
             if isinstance(e, TencentCloudSDKException):
@@ -75,20 +85,24 @@ class FeatureCloudSDK:
         Returns:
             刷新结果响应
         """
+        logger = get_logger()
+        if is_mock():
+            logger.debug("Mock RefreshFeatureTable API")
+            return models.RefreshFeatureTableResponse()
         try:
             params = request._serialize()
             headers = set_request_header(request.headers)
-            print(f"RefreshFeatureTable params: {params}")
-            print(f"RefreshFeatureTable headers: {headers}")
+            logger.debug(f"RefreshFeatureTable params: {params}")
+            logger.debug(f"RefreshFeatureTable headers: {headers}")
             self._client_v2._apiVersion = "2025-08-06"
             body = self._client_v2.call("RefreshFeatureTable", params, headers=headers)
             response = json.loads(body)
             model = models.RefreshFeatureTableResponse()
             model._deserialize(response["Response"])
-            print("RefreshFeatureTable Response: ", response)
+            logger.debug(f"RefreshFeatureTable Response: {response}")
             return model
         except Exception as e:
             if isinstance(e, TencentCloudSDKException):
                 raise
             else:
-                raise TencentCloudSDKException(type(e).__name__, str(e))
+                raise TencentCloudSDKException(type(e).__name__, str(e))

wedata/feature_store/cloud_sdk_client/utils.py

@@ -30,3 +30,10 @@ def set_request_header(headers):
         headers["X-Qcloud-User-Id"] = os.environ.get("TEST_USER_ID")
     return headers
 
+
+def is_mock() -> bool:
+    """
+    是否为模拟环境
+    """
+    return os.getenv("IS_MOCK_API") == "true"
+

wedata/feature_store/common/log/logger.py

@@ -0,0 +1,40 @@
+import logging
+import sys
+
+
+class LoggerSingleton:
+    _instance = None
+    
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            cls._instance._initialize_logger()
+        return cls._instance
+    
+    def _initialize_logger(self):
+        self.logger = logging.getLogger("wedata-feature-engineering")
+        self.logger.setLevel(logging.INFO)
+        
+        # 清除已有的handler，避免重复添加
+        if self.logger.handlers:
+            self.logger.handlers.clear()
+        
+        # 创建formatter，包含时间、文件名和行号
+        formatter = logging.Formatter(
+            fmt='%(asctime)s - %(name)s - %(levelname)s - %(filename)s:%(lineno)d - %(message)s',
+            datefmt='%Y-%m-%d %H:%M:%S'
+        )
+        
+        # 创建handler并输出到stdout
+        handler = logging.StreamHandler(sys.stdout)
+        handler.setFormatter(formatter)
+        
+        self.logger.addHandler(handler)
+    
+    def get_logger(self):
+        return self.logger
+
+
+def get_logger():
+    """获取单例logger实例"""
+    return LoggerSingleton().get_logger()

wedata/feature_store/constants/constants.py

@@ -43,7 +43,7 @@ ML_MODEL = "MLmodel"
 FEATURE_LOOKUP_CLIENT_PIP_PACKAGE = "tencent-wedata-feature-engineering-dev"
 
 # 特征查找版本号
-FEATURE_LOOKUP_CLIENT_MAJOR_VERSION = "0.1.46"
+FEATURE_LOOKUP_CLIENT_MAJOR_VERSION = "0.1.48"
 
 # 特征存储内部数据目录
 FEATURE_STORE_INTERNAL_DATA_DIR = "_wedata_internal/"

wedata/feature_store/feature_table_client/feature_table_client.py

@@ -926,13 +926,15 @@ class FeatureTableClient:
         full_table_name = common_utils.build_full_table_name(table_name, database_name)
         feast_client = FeastClient(self._spark, online_config)
         try:
-            self._sync_table_info(table_name=table_name, database_name=database_name, action_name="delete_online", engine_name=env_utils.get_engine_name(), is_try=True)
+            self._sync_table_info(table_name=table_name, database_name=database_name, action_name="delete_online",
+                                  data_source_name="", engine_name=env_utils.get_engine_name(), is_try=True)
         except Exception as e:
             raise RuntimeError(f"drop online table failed. table_name: {full_table_name}. {str(e)}")
 
         feast_client.remove_online_table(full_table_name)
         try:
-            self._sync_table_info(table_name=table_name, database_name=database_name, action_name="delete_online", engine_name=env_utils.get_engine_name(), is_try=False)
+            self._sync_table_info(table_name=table_name, database_name=database_name, action_name="delete_online",
+                                  data_source_name="", engine_name=env_utils.get_engine_name(), is_try=False)
         except Exception as e:
             raise RuntimeError(f"drop online table failed. table_name: {full_table_name}. {str(e)}")
         print(f"drop online table success. table_name: {full_table_name}")

wedata/feature_store/training_set_client/training_set_client.py

@@ -360,6 +360,7 @@ class TrainingSetClient:
         env_manager: Optional[str] = None,
         local_uri: Optional[str] = None,
         params: Optional[dict[str, Any]] = None,
+        timestamp_key: str = None,
         **kwargs,
     ) -> DataFrame:
         # TODO:ML 待确定是否需要
@@ -423,8 +424,11 @@ class TrainingSetClient:
 
         # Validate that columns needed for joining feature tables exist and are not duplicates.
         feature_input_keys = []
+        print("====>timestamp_key:", timestamp_key)
         for fci in feature_spec.feature_column_infos:
+            print("====>fci:", fci.lookup_key)
             feature_input_keys.extend([k for k in fci.lookup_key])
+
         on_demand_input_names = uc_utils.get_unique_list_order(
             [
                 input_name