Update app.py

app.py

@@ -62,7 +62,7 @@ SERVER = StdioServerParameters(
 # Tool şemasındaki argüman adları sürümler arası değişebilir; şemaya bakıp eşleştiriyoruz.
 ALIASES = {
     "symbol": ["symbol", "pair"],
-    "timeframe": ["timeframe", "interval", "tf"],
+    "timeframe": ["timeframe", "interval", "tf", "period"],
     "exchange": ["exchange"],
     "limit": ["limit", "count", "n", "bars"],
     "until": ["until", "end", "end_time", "endTime", "to", "before"],
@@ -147,6 +147,113 @@ async def fetch_ohlcv(session, tools, symbol, timeframe, exchange, total):
     return out.to_dict("records")
 
 
+# ----------------------------------------------------------------- 2. MCP: crypto-market-data-mcp (türev verisi)
+# Kurulum:  git clone https://github.com/eliasfire617/crypto-market-data-mcp
+#           (kendi venv'inde) pip install -r requirements.txt
+# Sonra ortam değişkenleri:
+#   CRYPTO_MCP_SERVER=/yol/crypto-market-data-mcp/server.py
+#   CRYPTO_MCP_PYTHON=/yol/crypto-market-data-mcp/.venv/bin/python   (opsiyonel; yoksa bu uygulamanın python'u)
+DERIV_PATH = os.environ.get("CRYPTO_MCP_SERVER", "")
+
+
+def _perp(symbol):
+    s = symbol.strip().upper()
+    if "/" in s and ":" not in s:
+        s = f"{s}:{s.split('/')[1]}"
+    return s
+
+
+def parse_funding(payload):
+    """Funding geçmişi çıktısında (şemadan bağımsız) zaman + oran kolonlarını bulur."""
+    def find_rows(o):
+        if isinstance(o, list) and len(o) >= 5 and all(isinstance(x, dict) for x in o[:3]):
+            return o
+        if isinstance(o, dict):
+            for v in o.values():
+                r = find_rows(v)
+                if r:
+                    return r
+        return None
+
+    rows = find_rows(payload)
+    if not rows:
+        return None
+    d = pd.DataFrame(rows)
+    tcol = next((c for c in ("timestamp", "fundingTime", "time", "ts", "datetime") if c in d), None)
+    rcol = next((c for c in ("fundingRate", "funding_rate", "rate", "value") if c in d), None)
+    if tcol is None or rcol is None:
+        return None
+    ts = d[tcol]
+    if pd.api.types.is_numeric_dtype(ts):
+        ts = pd.to_datetime(ts, unit="ms" if ts.iloc[-1] > 1e11 else "s")
+    else:
+        ts = pd.to_datetime(ts)
+    if getattr(ts.dt, "tz", None) is not None:
+        ts = ts.dt.tz_convert(None)
+    out = pd.DataFrame({"ts": ts.astype("datetime64[ns]"), "r": pd.to_numeric(d[rcol], errors="coerce")})
+    return out.dropna().drop_duplicates("ts").sort_values("ts").reset_index(drop=True)
+
+
+async def fetch_deriv_features(symbol, exchange, timeframe, df):
+    """2. MCP'den funding geçmişi (özellik) + OI / long-short / likidasyon (canlı bağlam) çeker.
+    Dönen: (özellik tablosu | None, df (funding kapsamına kırpılmış olabilir), ham çıktı sözlüğü)."""
+    import sys
+    extra = {}
+    if not DERIV_PATH or not os.path.exists(DERIV_PATH):
+        extra["deriv_note"] = "CRYPTO_MCP_SERVER ayarlı değil / dosya yok; türev verisi atlandı"
+        return None, df, extra
+    params = StdioServerParameters(
+        command=os.environ.get("CRYPTO_MCP_PYTHON", sys.executable),
+        args=[DERIV_PATH],
+        cwd=os.path.dirname(os.path.abspath(DERIV_PATH)),
+        env={**os.environ},
+    )
+    perp = _perp(symbol)
+    try:
+        async with stdio_client(params) as (r, w):
+            async with ClientSession(r, w) as session:
+                await session.initialize()
+                tools = {t.name: t for t in (await session.list_tools()).tools}
+                hist = await call_tool(session, tools, "get_funding_rate_history",
+                                       symbol=perp, exchange=exchange, limit=1000)
+                for name in ("get_funding_rate", "compare_funding", "get_open_interest",
+                             "get_long_short_ratio", "get_liquidations"):
+                    if name in tools:
+                        try:
+                            extra[f"deriv_{name}"] = await call_tool(
+                                session, tools, name, symbol=perp, exchange=exchange, timeframe=timeframe)
+                        except Exception as e:  # noqa: BLE001
+                            extra[f"deriv_{name}"] = {"error": _root(e)}
+    except Exception as e:  # noqa: BLE001
+        extra["deriv_error"] = _root(e)
+        return None, df, extra
+
+    bad = hist is None or (isinstance(hist, dict) and "error" in hist)
+    f = None if bad else parse_funding(hist)
+    if f is None or len(f) < 60:
+        extra["deriv_note"] = "Funding geçmişi okunamadı veya yetersiz; özellik eklenmedi"
+        extra["deriv_funding_raw"] = _strip_series(hist)
+        return None, df, extra
+
+    rr = f["r"]
+    f["fund"] = rr * 1e4                                   # baz puan
+    f["fund_z"] = (rr - rr.rolling(30).mean()) / (rr.rolling(30).std() + 1e-12)
+    f["fund_chg"] = rr.diff() * 1e4
+    f["fund_ma9"] = rr.rolling(9).mean() * 1e4
+    f = f.dropna().reset_index(drop=True)
+    start = f["ts"].iloc[0]
+    d2 = df[df["ts"] >= start].reset_index(drop=True)
+    if len(d2) < 800:
+        extra["deriv_note"] = (f"Funding geçmişi mumların yalnızca {len(d2)} barını kapsıyor (<800); "
+                               "özellik eklenmedi")
+        return None, df, extra
+    d2["ts"] = d2["ts"].astype("datetime64[ns]")
+    m = pd.merge_asof(d2[["ts"]], f.drop(columns=["r"]), on="ts", direction="backward")  # lookahead yok
+    m.index = d2.index
+    extra["deriv_funding_used"] = {"funding_gozlem": len(f), "baslangic": str(start), "bar": len(d2)}
+    return m.drop(columns=["ts"]).add_prefix("dv_"), d2, extra
+
+
 def _numeric_list(o, min_len):
     return (isinstance(o, list) and len(o) >= min_len and
             all(x is None or (isinstance(x, (int, float)) and not isinstance(x, bool)) for x in o[:50]))
@@ -491,11 +598,17 @@ def _root(e):
     return f"{type(e).__name__}: {e}"
 
 
-def run(symbol, timeframe, exchange, horizon, limit):
+def run(symbol, timeframe, exchange, horizon, limit, use_deriv=True):
     try:
         ohlcv, deep, ind, extra = asyncio.run(run_async(symbol, timeframe, exchange, horizon, limit))
         df = to_df(ohlcv)
+        dfeat = None
+        if use_deriv:
+            dfeat, df, dextra = asyncio.run(fetch_deriv_features(symbol, exchange, timeframe, df))
+            extra.update(dextra)
         ext = indicator_features(ind, df)
+        if dfeat is not None:
+            ext = dfeat if ext is None else pd.concat([ext, dfeat], axis=1)
         res = predict(df, int(horizon), ext=ext)
     except BaseException as e:  # noqa: BLE001
         import traceback
@@ -548,12 +661,13 @@ with gr.Blocks(title="Tickscope Tahmin") as demo:
     with gr.Row():
         horizon = gr.Slider(1, 24, value=4, step=1, label="Tahmin ufku (bar)")
         limit = gr.Slider(300, 20000, value=5000, step=100, label="Mum sayısı (1000 üstü sayfalanır)")
+    use_deriv = gr.Checkbox(True, label="Türev verisi (funding; 2. MCP) — mumları funding geçmişinin kapsadığı aralığa kırpabilir")
     btn = gr.Button("Tahmin et", variant="primary")
     out_md = gr.Markdown()
     out_plot = gr.Plot()
     with gr.Accordion("Tickscope ham çıktı (deep_analyze / indicators)", open=False):
         out_raw = gr.Code(language="json")
-    btn.click(run, [symbol, timeframe, exchange, horizon, limit], [out_md, out_plot, out_raw])
+    btn.click(run, [symbol, timeframe, exchange, horizon, limit, use_deriv], [out_md, out_plot, out_raw])
 
 if __name__ == "__main__":
     demo.launch()