From f66012214bd3b91a958800013ffa53190a0194b9 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Wed, 30 Apr 2025 14:36:22 +0800
Subject: [PATCH] update

---
 cryptoai/__pycache__/main.cpython-313.pyc     | Bin 1789 -> 1499 bytes
 .../__pycache__/crypto_agent.cpython-313.pyc  | Bin 19639 -> 19712 bytes
 cryptoai/agents/crypto_agent.py               |  12 +++++++++---
 cryptoai/config/config.yaml                   |   4 ----
 cryptoai/main.py                              |  11 +++++++----
 docker-compose.yml                            |   2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/cryptoai/__pycache__/main.cpython-313.pyc b/cryptoai/__pycache__/main.cpython-313.pyc
index d1b2a004ed0bb2632748c1c85843df6d40835526..77ff243c3b1004e5a35c1849ee28fab4b9d923e7 100644
GIT binary patch
delta 389
zcmey%dz+i@GcPX}0}!0rCYW)RbtB(NMwu%>?o<XjhG<5R1PGWyD25>B$=1v=66p+z
z4AEjxF$Q*qL_P)v1%_zW$qyMt?Bp5J8KNbSBy|`V@_>>skzl4!20jL3CR3>C3Jk%_
z!3^HKd5ocqL9#&e&6!yICQoHHvEVNPX}ZN-T#{H+5}%l!npbj*wV)^yNO2S=XQZZ-
z=A_<YO)X0;s=URVl300*DY4`hQ%e5i|I8tbqLV{dT(u;D1_%RjaXgS{VEDi!%_{eW
zje%37oA)}0;zbU{D;&x<IQV{iQJVap#aRZVyh%cuVYaBFI`bw@AhBD?QHlAW604*7
z<YZQ3Hg2GTBEiXXSl6k6)ZXHVkIzfYO^uIV$?zG-XD9-B{1%5zZa&Cyc11dq3)l)}
gWEkZ>*fFs1bW~ktmb}Tr(dzbrnSn*BNE@ga0Q&7&YXATM

delta 744
zcmcc3{g;>TGcPX}0}%Lo3uG9uY~(x1SU-)Cfnh3x978mahJav3Qz%=3A({y$8pHx)
zA!sFrU?!N_AU1?Jj1|NQV<G5hZW!AX#Ha`2ARd?yf`%EZ0CF0_5qt<0FqRSn*dQPm
z=v)DqXpj($g`k1XWk#6mtINQk$dDE-0#m@wkO(v$Xb2)CSP;tP8PXY|#gNqMFfimH
zt7Q#k;A1d`hlc_~Fk3K#H%}g8C}WWH<Vq%UWp=+(kgJ}qoAqq^w&yFlpYG~^I${0O
zt`#pqVfzwf?c_~NCT4uMSPP0W^Ga@U6enk-rj+KS-eOHHOD(Fr#hQ^{T2y?CDJ8#%
z6{z|acX3H#QAvDadTL(DWI5&#MzP7o%&zrPKsjL`E}jh}8W=t>iLlDu;o!Z%r*wrw
z`3Z+WKVKK$gu=@llGi!pFLKCV=TN%Hp|r$$vF&wbn~TaeS2%1xurcrp-{BFt&ZBUN
zN8t*O(j6Xwey=XC357krA6bENKfVYs@W_5<U}RMWo2+<^L+J^($Y%y-R=LT)nY9$<
zfL1p-S~=P<9JCR2=3qV~%n2f8l$@EF4>Pkmb4+$*F=hkBe38)PDwcI>AV=Tgh>y=p
z%uS7tU&-(p$Y&^$1dH0_=7WO4u1I&XA8VnED5Km50|pkJj;hPdk~dj6THQV{Gq6Y%
I0i%Qg07;IA`Tzg`

diff --git a/cryptoai/agents/__pycache__/crypto_agent.cpython-313.pyc b/cryptoai/agents/__pycache__/crypto_agent.cpython-313.pyc
index 91ce613ead2879d09698a94238dafce660d1f355..907eab45a224d38d2aa4c71337a0909cd9f3f604 100644
GIT binary patch
delta 2200
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

delta 2127
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

diff --git a/cryptoai/agents/crypto_agent.py b/cryptoai/agents/crypto_agent.py
index f77c4ca..46c19d9 100644
--- a/cryptoai/agents/crypto_agent.py
+++ b/cryptoai/agents/crypto_agent.py
@@ -356,14 +356,20 @@ class CryptoAgent:
         把分析的JSON结果调用大模型转化成交易建议
         """
         prompt = f"""
-        请对以下加密货币市场分析的JSON结果进行深入分析， 转化成包含：分析时间，分析时间级别，技术分析，支撑位，压力位， 建议买点，卖点，止损位，止盈位，仓位建议， 增加适当的emoji便于阅读， 简单明了。
+        请对以下加密货币市场分析的JSON结果进行归纳总结：
+        
+        需要输出的内容包括：
+        1. 技术分析：用技术指标，交易量等进行分析
+        2. 交易策略：操作建议（买入、卖出、等待）、买卖点、止损止盈、操作打分、原因（以表格的方式汇总呈现）
 
-        分析 JSON 结果:
+        以下是每个交易对的分析结果:
         {results}
+
+        请以优美的Markdown格式输出，通过 emoji 标签来增加可读性。
         """
 
         system_prompt = """
-        你是一个专业的加密货币分析助手，你擅长分析市场趋势、预测价格走向和提供交易建议，请始终使用中文回复，并确保输出格式规范的Markdown。
+        你是一个专业的加密货币分析高手，你擅长分析市场趋势、预测价格走向和提供交易建议，请始终使用中文回复，并确保输出格式规范的Markdown。
         """
         response, usage = self.deepseek_api.call_model(prompt, system_prompt=system_prompt, task_type="交易建议")
 
diff --git a/cryptoai/config/config.yaml b/cryptoai/config/config.yaml
index 000be85..31206e2 100644
--- a/cryptoai/config/config.yaml
+++ b/cryptoai/config/config.yaml
@@ -29,10 +29,6 @@ crypto:
     - "ETH"
     - "SOL"
     - "SUI"
-    - "DOGE"
-    - "XRP"
-    - "ADA"
-    # - "CETUS"
   quote_currency: "USDT"
   time_interval: "4h"  # 可选: 1m, 5m, 15m, 30m, 1h, 4h, 1d
   historical_days: 30
diff --git a/cryptoai/main.py b/cryptoai/main.py
index f363aaf..c7372f1 100644
--- a/cryptoai/main.py
+++ b/cryptoai/main.py
@@ -18,6 +18,11 @@ from cryptoai.utils.config_loader import ConfigLoader
 
 def main():
     try:
+
+        # GoldAgent().start_agent()
+        # CryptoAgent().start_agent()
+        # return
+
         print("定时程序启动")
         CryptoAgent().start_agent()
         # 设置 00:00, 04:00, 08:00, 12:00, 16:00, 20:00 运行一次
@@ -28,14 +33,12 @@ def main():
         schedule.every().day.at("16:00").do(CryptoAgent().start_agent)
         schedule.every().day.at("20:00").do(CryptoAgent().start_agent)
 
+        schedule.every().day.at("08:00").do(GoldAgent().start_agent)
+        
         # 启动定时任务
         while True:
             schedule.run_pending()
             time.sleep(1)
-
-            
-        # GoldAgent().start_agent()
-        # CryptoAgent().start_agent('BTCUSDT')
     
     except KeyboardInterrupt:
         print("\n程序已退出")
diff --git a/docker-compose.yml b/docker-compose.yml
index bb49c44..96111ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   cryptoai:
     build: .
     container_name: cryptoai
-    image: cryptoai:0.0.7
+    image: cryptoai:0.0.8
     restart: always
     volumes:
       - ./cryptoai/data:/app/cryptoai/data