File size: 22,566 Bytes
480cde2 42bad9f a01528e 480cde2 a01528e 9b1ce6e a01528e fe36bed e6dc409 a01528e e6dc409 a01528e e6dc409 a01528e e6dc409 a01528e e6dc409 a01528e e6dc409 a01528e e6dc409 a01528e e6dc409 a01528e 480cde2 a01528e 129f2aa 9b1ce6e a01528e fe36bed |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 |
# r2.py (ู
ุญุฏุซ V10.3 - Typing Fix)
import os, traceback, json, time
from datetime import datetime, timedelta
import asyncio
import boto3
from botocore.exceptions import NoCredentialsError, ClientError
from typing import List, Dict, Any, Optional # <-- ๐ด ุงูุณุทุฑ ุงูู
ุถุงู ูุฅุตูุงุญ ุงูุฎุทุฃ
R2_ACCOUNT_ID = os.getenv("R2_ACCOUNT_ID")
R2_ACCESS_KEY_ID = os.getenv("R2_ACCESS_KEY_ID")
R2_SECRET_ACCESS_KEY = os.getenv("R2_SECRET_ACCESS_KEY")
BUCKET_NAME = "trading"
INITIAL_CAPITAL = 10.0
# ๐ด --- (ุฌุฏูุฏ V10.2) ุฃุณู
ุงุก ู
ููุงุช ุงูุชุนูู
--- ๐ด
WHALE_LEARNING_PENDING_KEY = "learning_whale_pending_records.json"
WHALE_LEARNING_COMPLETED_KEY = "learning_whale_completed_records.json"
WHALE_LEARNING_CONFIG_KEY = "learning_whale_optimal_config.json"
class R2Service:
def __init__(self):
try:
endpoint_url = f"https://{R2_ACCOUNT_ID}.r2.cloudflarestorage.com"
self.s3_client = boto3.client(
's3',
endpoint_url=endpoint_url,
aws_access_key_id=R2_ACCESS_KEY_ID,
aws_secret_access_key=R2_SECRET_ACCESS_KEY,
)
self.lock_acquired = False
self.BUCKET_NAME = BUCKET_NAME
self._open_trades_warning_printed = False
self._portfolio_warning_printed = False
self._contracts_warning_printed = False
except Exception as e:
raise RuntimeError(f"Failed to initialize S3 client: {e}")
def acquire_lock(self, max_retries=3):
lock_path = "lock.txt"
for attempt in range(max_retries):
try:
try:
self.s3_client.head_object(Bucket=BUCKET_NAME, Key=lock_path)
print(f"๐ Lock file exists. Attempt {attempt + 1}/{max_retries}. Waiting...")
time.sleep(1)
except ClientError as e:
if e.response['Error']['Code'] == '404':
self.s3_client.put_object(Bucket=BUCKET_NAME, Key=lock_path, Body=b'')
self.lock_acquired = True
print("โ
Lock acquired.")
return True
else:
raise
except Exception as e:
print(f"โ Failed to acquire lock: {e}")
time.sleep(1)
print(f"โ Failed to acquire lock after {max_retries} attempts.")
return False
def release_lock(self):
lock_path = "lock.txt"
if self.lock_acquired:
try:
self.s3_client.delete_object(Bucket=BUCKET_NAME, Key=lock_path)
print("โ
Lock released.")
self.lock_acquired = False
except Exception as e:
print(f"โ Failed to release lock: {e}")
async def save_candidates_async(self, candidates):
"""ุญูุธ ุจูุงูุงุช ุงูู
ุฑุดุญูู ุงูุนุดุฑุฉ ูู ู
ูู ู
ููุตู ูู R2"""
try:
key = "Candidates.json"
data = {
"timestamp": datetime.now().isoformat(),
"total_candidates": len(candidates),
"candidates": candidates
}
data_json = json.dumps(data, indent=2, ensure_ascii=False).encode('utf-8')
self.s3_client.put_object(
Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
)
print(f"โ
ุชู
ุญูุธ {len(candidates)} ู
ุฑุดุญ ูู ู
ูู Candidates ูู R2")
# ุนุฑุถ ู
ุนููู
ุงุช ุงูู
ุฑุดุญูู ุงูู
ุญููุธูู
print("๐ ุงูู
ุฑุดุญูู ุงูู
ุญููุธูู:")
for i, candidate in enumerate(candidates):
symbol = candidate.get('symbol', 'Unknown')
score = candidate.get('enhanced_final_score', 0)
strategy = candidate.get('target_strategy', 'GENERIC')
print(f" {i+1}. {symbol}: {score:.3f} - {strategy}")
except Exception as e:
print(f"โ ูุดู ุญูุธ ุงูู
ุฑุดุญูู ูู R2: {e}")
async def load_candidates_async(self):
"""ุชุญู
ูู ุจูุงูุงุช ุงูู
ุฑุดุญูู ู
ู R2"""
try:
key = "Candidates.json"
response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
data = json.loads(response['Body'].read())
candidates = data.get('candidates', [])
print(f"โ
ุชู
ุชุญู
ูู {len(candidates)} ู
ุฑุดุญ ู
ู R2")
return candidates
except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchKey':
print("โ ๏ธ ูุง ููุฌุฏ ู
ูู ู
ุฑุดุญูู ุณุงุจู")
return []
else:
raise
async def save_llm_prompts_async(self, symbol, prompt_type, prompt_content, analysis_data=None):
"""ุญูุธ ุงูู Prompts ุงูู
ุฑุณูุฉ ุฅูู ุงููู
ูุฐุฌ ุงูุถุฎู
"""
try:
key = "llm_prompts.json"
try:
response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
existing_data = json.loads(response['Body'].read())
except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchKey':
existing_data = {"prompts": []}
else:
raise
new_prompt = {
"timestamp": datetime.now().isoformat(),
"symbol": symbol,
"prompt_type": prompt_type, # 'trading_decision' or 'trade_reanalysis'
"prompt_content": prompt_content,
"analysis_data": analysis_data
}
existing_data["prompts"].append(new_prompt)
if len(existing_data["prompts"]) > 2000:
existing_data["prompts"] = existing_data["prompts"][-2000:]
data_json = json.dumps(existing_data, indent=2, ensure_ascii=False).encode('utf-8')
self.s3_client.put_object(
Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
)
print(f"โ
ุชู
ุญูุธ prompt ูู {symbol} ({prompt_type}) ูู R2")
except Exception as e:
print(f"โ ูุดู ุญูุธ prompt ูู {symbol}: {e}")
async def save_system_logs_async(self, log_data):
try:
key = "system_logs.json"
try:
response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
existing_logs = json.loads(response['Body'].read())
except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchKey':
existing_logs = {"logs": []}
else:
raise
log_entry = {
"timestamp": datetime.now().isoformat(),
**log_data
}
existing_logs["logs"].append(log_entry)
if len(existing_logs["logs"]) > 2000:
existing_logs["logs"] = existing_logs["logs"][-2000:]
data_json = json.dumps(existing_logs, indent=2, ensure_ascii=False).encode('utf-8')
self.s3_client.put_object(
Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
)
print(f"โ
System log saved: {log_data.get('cycle_started', log_data.get('cycle_completed', 'event'))}")
except Exception as e:
print(f"โ Failed to save system logs: {e}")
async def save_learning_data_async(self, learning_data):
try:
key = "learning_data.json"
data = {
"timestamp": datetime.now().isoformat(),
"learning_data": learning_data
}
data_json = json.dumps(data, indent=2, ensure_ascii=False).encode('utf-8')
self.s3_client.put_object(
Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
)
print("โ
Learning data saved to R2")
except Exception as e:
print(f"โ Failed to save learning data: {e}")
async def load_learning_data_async(self):
try:
key = "learning_data.json"
response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
data = json.loads(response['Body'].read())
print("โ
Learning data loaded from R2")
return data
except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchKey':
print("โ ๏ธ No learning data found. Starting fresh.")
return {}
else:
raise
async def get_portfolio_state_async(self):
key = "portfolio_state.json"
try:
response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
state = json.loads(response['Body'].read())
if hasattr(self, '_portfolio_warning_printed'):
delattr(self, '_portfolio_warning_printed')
print(f"๐ฐ Portfolio state loaded: Current Capital ${state.get('current_capital_usd', 0):.2f}")
return state
except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchKey':
if not hasattr(self, '_portfolio_warning_printed'):
print(f"โ ๏ธ No portfolio state file found. Initializing with ${INITIAL_CAPITAL:.2f}")
self._portfolio_warning_printed = True
initial_state = {
"current_capital_usd": INITIAL_CAPITAL,
"invested_capital_usd": 0.0,
"initial_capital_usd": INITIAL_CAPITAL,
"total_trades": 0,
"winning_trades": 0,
"total_profit_usd": 0.0,
"total_loss_usd": 0.0
}
await self.save_portfolio_state_async(initial_state)
return initial_state
else:
raise
async def save_portfolio_state_async(self, state):
key = "portfolio_state.json"
try:
data_json = json.dumps(state, indent=2).encode('utf-8')
self.s3_client.put_object(
Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
)
print(f"๐พ Portfolio state saved: Current Capital ${state.get('current_capital_usd', 0):.2f}")
except Exception as e:
print(f"โ Failed to save portfolio state: {e}")
raise
async def get_open_trades_async(self):
try:
response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key="open_trades.json")
trades = json.loads(response['Body'].read())
if hasattr(self, '_open_trades_warning_printed'):
delattr(self, '_open_trades_warning_printed')
return trades
except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchKey':
if not hasattr(self, '_open_trades_warning_printed'):
print("โ ๏ธ No open trades file found. Starting with an empty list.")
print("๐ก This is normal for first-time runs or when all trades are closed.")
self._open_trades_warning_printed = True
return []
else:
raise
async def save_open_trades_async(self, trades):
try:
data_json = json.dumps(trades, indent=2).encode('utf-8')
self.s3_client.put_object(
Bucket=BUCKET_NAME, Key="open_trades.json", Body=data_json, ContentType="application/json"
)
print(f"โ
Open trades saved to R2. Total open trades: {len(trades)}")
except Exception as e:
print(f"โ Failed to save open trades: {e}")
raise
async def load_contracts_db_async(self):
key = "contracts.json"
try:
response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
contracts_db = json.loads(response['Body'].read())
if hasattr(self, '_contracts_warning_printed'):
delattr(self, '_contracts_warning_printed')
print(f"๐พ Contracts database loaded from R2. Total entries: {len(contracts_db)}")
return contracts_db
except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchKey':
if not hasattr(self, '_contracts_warning_printed'):
print("โ ๏ธ No existing contracts database found. Initializing new one.")
self._contracts_warning_printed = True
return {}
else:
raise
async def save_contracts_db_async(self, data):
key = "contracts.json"
try:
data_json = json.dumps(data, indent=2).encode('utf-8')
self.s3_client.put_object(
Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
)
print(f"โ
Contracts database saved to R2 successfully. Total entries: {len(data)}")
except Exception as e:
print(f"โ Failed to save contracts database to R2: {e}")
raise
async def get_trade_by_symbol_async(self, symbol):
try:
open_trades = await self.get_open_trades_async()
for trade in open_trades:
if trade['symbol'] == symbol and trade['status'] == 'OPEN':
return trade
return None
except Exception as e:
print(f"โ Failed to get trade by symbol {symbol}: {e}")
return None
async def update_trade_monitoring_status_async(self, symbol, is_monitored):
try:
open_trades = await self.get_open_trades_async()
updated = False
for trade in open_trades:
if trade['symbol'] == symbol:
trade['is_monitored'] = is_monitored
updated = True
break
if updated:
await self.save_open_trades_async(open_trades)
status = "ENABLED" if is_monitored else "DISABLED"
print(f"โ
Real-time monitoring {status} for {symbol}")
else:
print(f"โ ๏ธ Trade {symbol} not found for monitoring status update")
return updated
except Exception as e:
print(f"โ Failed to update monitoring status for {symbol}: {e}")
return False
async def get_monitored_trades_async(self):
try:
open_trades = await self.get_open_trades_async()
monitored_trades = [trade for trade in open_trades if trade.get('is_monitored', False)]
return monitored_trades
except Exception as e:
print(f"โ Failed to get monitored trades: {e}")
return []
#
# ๐ด ุฏุงูุฉ ุฌุฏูุฏุฉ: ูุญูุธ ุณุฌู ุชุฏููู ุงูุชุญููู
#
async def save_analysis_audit_log_async(self, audit_data):
"""ุญูุธ ุณุฌู ุชุฏููู ุฏูุฑุฉ ุงูุชุญููู (ูุญุชูุธ ุจุขุฎุฑ 50 ุฏูุฑุฉ)"""
try:
key = "analysis_audit_log.json"
# 1. ุฌูุจ ุงูุณุฌู ุงูุญุงูู (ุฅู ูุฌุฏ)
try:
response = self.s3_client.get_object(Bucket=BUCKET_NAME, Key=key)
existing_log_data = json.loads(response['Body'].read())
if isinstance(existing_log_data, list):
history = existing_log_data
else:
history = [] # ุจุฏุก ุณุฌู ุฌุฏูุฏ ุฅุฐุง ูุงู ุงูุชูุณูู ุบูุฑ ุตุงูุญ
except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchKey':
history = [] # ู
ูู ุฌุฏูุฏ
else:
raise
# 2. ุฅุถุงูุฉ ุงูุฏูุฑุฉ ุงูุญุงููุฉ
history.append(audit_data)
# 3. ุงูุญูุงุธ ุนูู ุขุฎุฑ 50 ุณุฌู ููุท
if len(history) > 50:
history = history[-50:]
# 4. ุญูุธ ุงูู
ูู ุงูู
ุญุฏุซ
data_json = json.dumps(history, indent=2, ensure_ascii=False).encode('utf-8')
self.s3_client.put_object(
Bucket=BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
)
print(f"๐ ุชู
ุญูุธ ุณุฌู ุชุฏููู ุงูุชุญููู ุจูุฌุงุญ ูู R2 (ุฅุฌู
ุงูู {len(history)} ุณุฌูุงุช)")
except Exception as e:
print(f"โ ูุดู ุญูุธ ุณุฌู ุชุฏููู ุงูุชุญููู ูู R2: {e}")
# ๐ด --- START OF CHANGE (V10.2 - Whale Learning Storage) --- ๐ด
async def _load_json_file_from_r2(self, key: str, default: Any = []) -> Any:
"""ุฏุงูุฉ ู
ุณุงุนุฏุฉ ูุชุญู
ูู ู
ูู JSON ุจุฃู
ุงู."""
try:
response = self.s3_client.get_object(Bucket=self.BUCKET_NAME, Key=key)
return json.loads(response['Body'].read())
except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchKey':
print(f"โน๏ธ [R2Service] ูู
ูุชู
ุงูุนุซูุฑ ุนูู ู
ูู '{key}'. ุณูุชู
ุงุณุชุฎุฏุงู
ุงูููู
ุฉ ุงูุงูุชุฑุงุถูุฉ.")
return default
else:
print(f"โ [R2Service] ุฎุทุฃ ClientError ุฃุซูุงุก ุชุญู
ูู '{key}': {e}")
raise
except Exception as e:
print(f"โ [R2Service] ุฎุทุฃ ุนุงู
ุฃุซูุงุก ุชุญู
ูู '{key}': {e}")
return default
async def _save_json_file_to_r2(self, key: str, data: Any):
"""ุฏุงูุฉ ู
ุณุงุนุฏุฉ ูุญูุธ ู
ูู JSON ุจุฃู
ุงู."""
try:
data_json = json.dumps(data, indent=2, ensure_ascii=False).encode('utf-8')
self.s3_client.put_object(
Bucket=self.BUCKET_NAME, Key=key, Body=data_json, ContentType="application/json"
)
except Exception as e:
print(f"โ [R2Service] ูุดู ุญูุธ ุงูู
ูู '{key}' ุฅูู R2: {e}")
traceback.print_exc()
async def save_whale_learning_record_async(self, record: Dict[str, Any]):
"""
(ุฌุฏูุฏ V10.2)
ูุญูุธ ุณุฌูุงู "ู
ุนููุงู" ุฌุฏูุฏุงู ูู ู
ูู PENDING.
"""
try:
pending_records = await self._load_json_file_from_r2(WHALE_LEARNING_PENDING_KEY, default=[])
pending_records.append(record)
await self._save_json_file_to_r2(WHALE_LEARNING_PENDING_KEY, pending_records)
print(f"โ
[R2Service] ุชู
ุญูุธ ุณุฌู ุชุนูู
ุงูุญูุชุงู (PENDING) ูู {record['symbol']}.")
except Exception as e:
print(f"โ [R2Service] ูุดู ูู save_whale_learning_record_async: {e}")
async def get_pending_whale_learning_records_async(self) -> List[Dict[str, Any]]:
"""
(ุฌุฏูุฏ V10.2)
ูุฌูุจ ุฌู
ูุน ุงูุณุฌูุงุช "ุงูู
ุนููุฉ" ู
ู ู
ูู PENDING.
"""
try:
return await self._load_json_file_from_r2(WHALE_LEARNING_PENDING_KEY, default=[])
except Exception as e:
print(f"โ [R2Service] ูุดู ูู get_pending_whale_learning_records_async: {e}")
return []
async def update_completed_whale_learning_record_async(self, completed_record: Dict[str, Any]):
"""
(ุฌุฏูุฏ V10.2)
1. ูุญูุธ ุงูุณุฌู "ุงูู
ูุชู
ู" ูู ู
ูู COMPLETED.
2. ูุฒูู ุงูุณุฌู ู
ู ู
ูู PENDING.
"""
try:
record_id = completed_record.get("record_id")
if not record_id:
print("โ [R2Service] ูุง ูู
ูู ุชุญุฏูุซ ุณุฌู ู
ูุชู
ู ุจุฏูู record_id.")
return
# 1. ุงูุญูุธ ูู ู
ูู ุงูู
ูุชู
ู (ูุญุชูุธ ุจุขุฎุฑ 5000 ุณุฌู ู
ูุชู
ู)
completed_records = await self._load_json_file_from_r2(WHALE_LEARNING_COMPLETED_KEY, default=[])
completed_records.append(completed_record)
if len(completed_records) > 5000:
completed_records = completed_records[-5000:]
await self._save_json_file_to_r2(WHALE_LEARNING_COMPLETED_KEY, completed_records)
# 2. ุงูุฅุฒุงูุฉ ู
ู ู
ูู ุงูู
ุนูู
pending_records = await self._load_json_file_from_r2(WHALE_LEARNING_PENDING_KEY, default=[])
updated_pending_records = [
rec for rec in pending_records if rec.get("record_id") != record_id
]
await self._save_json_file_to_r2(WHALE_LEARNING_PENDING_KEY, updated_pending_records)
print(f"โ
[R2Service] ุชู
ููู ุณุฌู ุชุนูู
ุงูุญูุชุงู (COMPLETED) ูู {completed_record['symbol']} (ID: {record_id}).")
except Exception as e:
print(f"โ [R2Service] ูุดู ูู update_completed_whale_learning_record_async: {e}")
async def get_all_completed_whale_records_async(self) -> List[Dict[str, Any]]:
"""
(ุฌุฏูุฏ V10.2)
ูุฌูุจ *ุฌู
ูุน* ุงูุณุฌูุงุช ุงูู
ูุชู
ูุฉ (ูุชุญููู ุงูุงุฑุชุจุงุท).
"""
try:
return await self._load_json_file_from_r2(WHALE_LEARNING_COMPLETED_KEY, default=[])
except Exception as e:
print(f"โ [R2Service] ูุดู ูู get_all_completed_whale_records_async: {e}")
return []
async def save_whale_learning_config_async(self, config: Dict[str, Any]):
"""
(ุฌุฏูุฏ V10.2)
ูุญูุธ ู
ูู ุงูุฅุนุฏุงุฏุงุช (ุงูุฃูุฒุงู) ุงูุฐู ูุชุฌ ุนู ุงูุชุนูู
.
"""
await self._save_json_file_to_r2(WHALE_LEARNING_CONFIG_KEY, config)
print(f"โ
[R2Service] ุชู
ุญูุธ ุฅุนุฏุงุฏุงุช ุชุนูู
ุงูุญูุชุงู ุงูู
ุซูู.")
async def load_whale_learning_config_async(self) -> Dict[str, Any]:
"""
(ุฌุฏูุฏ V10.2)
ูุฌูุจ ู
ูู ุงูุฅุนุฏุงุฏุงุช (ุงูุฃูุฒุงู) ุงูุฐู ูุชุฌ ุนู ุงูุชุนูู
.
"""
return await self._load_json_file_from_r2(WHALE_LEARNING_CONFIG_KEY, default={})
# ๐ด --- END OF CHANGE --- ๐ด
print("โ
Enhanced R2 Service Loaded - Comprehensive Logging System with Candidates Support") |