之前多个任务，配置分散，进行集中管理，全部统一到offline_tasks/config/offline_config.py

因为在线服务跟搜索项目融合到一起，这里删除 config.py

之前多个任务，配置分散，进行集中管理，全部统一到offline_tasks/config/offline_config.py
因为在线服务跟搜索项目融合到一起，这里删除 config.py
tangwang
1 parent 8cf2517e
Showing 7 changed files with 25 additions and 46 deletions Show diff stats
config.py
offline_tasks/config/offline_config.py
offline_tasks/example_query_redis.py
offline_tasks/run.sh
offline_tasks/scripts/fix_redis_keys.py
offline_tasks/scripts/load_index_to_redis.py
offline_tasks/test_connection.py
@@ -1,26 +0,0 @@
-import os
-
-
-ES_CONFIG = {
-    'host': 'http://localhost:9200',
-    # default index name will be overwritten below based on APP_ENV
-    'index_name': 'spu',
-    'username': 'essa',
-    'password': '4hOaLaf41y2VuI8y'
-}
-
-
-# Redis Cache Configuration
-REDIS_CONFIG = {
-    # 'host': '120.76.41.98',
-    'host': 'localhost',
-    'port': 6479,
-    'snapshot_db': 0,
-    'password': 'BMfv5aI31kgHWtlx',
-    'socket_timeout': 1,
-    'socket_connect_timeout': 1,
-    'retry_on_timeout': False,
-    'cache_expire_days': 180,  # 6 months
-    'translation_cache_expire_days': 360,
-    'translation_cache_prefix': 'trans'
-}
@@ -105,9 +105,9 @@ INTEREST_AGGREGATION_CONFIG = {
 # Redis配置（用于存储索引）
 REDIS_CONFIG = {
     'host': 'localhost',
-    'port': 6379,
+    'port': 6479,  # 统一使用6479端口
     'db': 0,
-    'password': None,
+    'password': 'BMfv5aI31kgHWtlx',  # 6479端口需要认证
     'decode_responses': False
 }
@@ -69,11 +69,11 @@ def query_interest_items(redis_client, dimension_key, list_type=&#39;hot&#39;, top_n=20)
 def main():
     parser = argparse.ArgumentParser(description='Query recommendation results from Redis')
-    parser.add_argument('--redis-host', type=str, default=REDIS_CONFIG.get('host', 'localhost'),
+    parser.add_argument('--redis-host', type=str, default=REDIS_CONFIG['host'],
                        help='Redis host')
-    parser.add_argument('--redis-port', type=int, default=REDIS_CONFIG.get('port', 6379),
+    parser.add_argument('--redis-port', type=int, default=REDIS_CONFIG['port'],
                        help='Redis port')
-    parser.add_argument('--redis-db', type=int, default=REDIS_CONFIG.get('db', 0),
+    parser.add_argument('--redis-db', type=int, default=REDIS_CONFIG['db'],
                        help='Redis database')
     args = parser.parse_args()
@@ -30,8 +30,6 @@ TOP_N=50
 DEBUG_MODE="--debug"  # 留空则不开启debug
 # Redis配置
-REDIS_HOST="localhost"
-REDIS_PORT=6379
 # 内存监控阈值
 MEM_WARN_THRESHOLD=25  # GB
@@ -216,7 +214,7 @@ echo &quot;======================================================================&quot;
 echo "[加载到Redis] 开始 - $(date '+%Y-%m-%d %H:%M:%S')"
 echo "======================================================================"
-python3 scripts/load_index_to_redis.py --redis-host $REDIS_HOST --redis-port $REDIS_PORT
+python3 scripts/load_index_to_redis.py
 LOAD_EXIT=$?
 if [ $LOAD_EXIT -eq 0 ]; then
@@ -5,15 +5,19 @@
 """
 import redis
 import sys
+import os
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from config.offline_config import REDIS_CONFIG
 def fix_redis_keys():
     """修复Redis key格式"""
-    
+
     # 连接Redis
     redis_client = redis.Redis(
-        host='localhost',
-        port=6379,
-        db=0,
+        host=REDIS_CONFIG['host'],
+        port=REDIS_CONFIG['port'],
+        db=REDIS_CONFIG['db'],
+        password=REDIS_CONFIG['password'],
         decode_responses=True
     )
@@ -8,6 +8,9 @@ import logging
 import os
 import sys
 from datetime import datetime
+
+# 添加父目录到Python路径
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from config.offline_config import REDIS_CONFIG, OUTPUT_DIR
 def setup_logger():
@@ -209,13 +212,13 @@ def load_interest_indices(redis_client, date_str=None, expire_days=7):
 def main():
     parser = argparse.ArgumentParser(description='Load recommendation indices to Redis')
-    parser.add_argument('--redis-host', type=str, default=REDIS_CONFIG.get('host', 'localhost'),
+    parser.add_argument('--redis-host', type=str, default=REDIS_CONFIG['host'],
                        help='Redis host')
-    parser.add_argument('--redis-port', type=int, default=REDIS_CONFIG.get('port', 6379),
+    parser.add_argument('--redis-port', type=int, default=REDIS_CONFIG['port'],
                        help='Redis port')
-    parser.add_argument('--redis-db', type=int, default=REDIS_CONFIG.get('db', 0),
+    parser.add_argument('--redis-db', type=int, default=REDIS_CONFIG['db'],
                        help='Redis database')
-    parser.add_argument('--redis-password', type=str, default=REDIS_CONFIG.get('password'),
+    parser.add_argument('--redis-password', type=str, default=REDIS_CONFIG['password'],
                        help='Redis password')
     parser.add_argument('--date', type=str, default=None,
                        help='Date string (YYYYMMDD), default is today')
@@ -51,10 +51,10 @@ def test_redis_connection():
     try:
         redis_client = redis.Redis(
-            host=REDIS_CONFIG.get('host', 'localhost'),
-            port=REDIS_CONFIG.get('port', 6379),
-            db=REDIS_CONFIG.get('db', 0),
-            password=REDIS_CONFIG.get('password'),
+            host=REDIS_CONFIG['host'],
+            port=REDIS_CONFIG['port'],
+            db=REDIS_CONFIG['db'],
+            password=REDIS_CONFIG['password'],
             decode_responses=True
         )