tencent-wedata-feature-engineering-dev 0.1.47__tar.gz → 0.1.48__tar.gz

{tencent-wedata-feature-engineering-dev-0.1.47 → tencent-wedata-feature-engineering-dev-0.1.48}/PKG-INFO

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

{tencent-wedata-feature-engineering-dev-0.1.47 → tencent-wedata-feature-engineering-dev-0.1.48}/tencent_wedata_feature_engineering_dev.egg-info/PKG-INFO

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

{tencent-wedata-feature-engineering-dev-0.1.47 → tencent-wedata-feature-engineering-dev-0.1.48}/tencent_wedata_feature_engineering_dev.egg-info/SOURCES.txt

@@ -14,6 +14,8 @@ wedata/feature_store/cloud_sdk_client/client.py
 wedata/feature_store/cloud_sdk_client/models.py
 wedata/feature_store/cloud_sdk_client/utils.py
 wedata/feature_store/common/__init__.py
+wedata/feature_store/common/log/__init__.py
+wedata/feature_store/common/log/logger.py
 wedata/feature_store/common/protos/__init__.py
 wedata/feature_store/common/protos/feature_store_pb2.py
 wedata/feature_store/common/store_config/__init__.py

{tencent-wedata-feature-engineering-dev-0.1.47 → tencent-wedata-feature-engineering-dev-0.1.48}/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,

{tencent-wedata-feature-engineering-dev-0.1.47 → tencent-wedata-feature-engineering-dev-0.1.48}/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))

{tencent-wedata-feature-engineering-dev-0.1.47 → tencent-wedata-feature-engineering-dev-0.1.48}/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"
+

tencent-wedata-feature-engineering-dev-0.1.48/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()

{tencent-wedata-feature-engineering-dev-0.1.47 → tencent-wedata-feature-engineering-dev-0.1.48}/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.47"
+FEATURE_LOOKUP_CLIENT_MAJOR_VERSION = "0.1.48"
 
 # 特征存储内部数据目录
 FEATURE_STORE_INTERNAL_DATA_DIR = "_wedata_internal/"

{tencent-wedata-feature-engineering-dev-0.1.47 → tencent-wedata-feature-engineering-dev-0.1.48}/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