Spaces:

1yahoo
/

Test

Sleeping

App Files Files Community

1yahoo commited on Jan 27

Commit

ec00cab

verified ·

1 Parent(s): aee06c0

Update app.py

Browse files

Files changed (1) hide show

app.py +62 -84

app.py CHANGED Viewed

@@ -5,19 +5,19 @@ import chromadb
 import gradio as gr
 from fastapi import FastAPI, Request, File, UploadFile, BackgroundTasks
 from fastapi.responses import StreamingResponse, HTMLResponse
-from fastapi.middleware.cors import CORSMiddleware
 from openai import OpenAI
 from chromadb.utils import embedding_functions
-# --- المحرك الخلفي (FastAPI) ---
 app = FastAPI()
-# إعداد الذاكرة الدائمة
 STORAGE_PATH = "/data/neural_memory" if os.path.exists("/data") else "./neural_memory"
 chroma_client = chromadb.PersistentClient(path=STORAGE_PATH)
 default_ef = embedding_functions.DefaultEmbeddingFunction()
-collection = chroma_client.get_or_create_collection(name="user_vault_v1", embedding_function=default_ef)
 @app.get("/", response_class=HTMLResponse)
 async def get_ui():
     return """
@@ -25,105 +25,88 @@ async def get_ui():
     <html lang="ar" dir="rtl">
     <head>
         <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
         <title>Deep Neural Vault</title>
         <script src="https://cdn.tailwindcss.com"></script>
         <script src="https://unpkg.com/react@18/umd/react.production.min.js"></script>
         <script src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"></script>
         <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
         <style>
-            body { background: #020617; color: #f8fafc; margin: 0; height: 100dvh; display: flex; flex-direction: column; overflow: hidden; }
-            .mobile-safe-area { height: 100%; display: flex; flex-direction: column; position: relative; }
-            .chat-stream { flex: 1; overflow-y: auto; padding-bottom: 80px; -webkit-overflow-scrolling: touch; }
-            .input-area { position: absolute; bottom: 0; left: 0; right: 0; padding: 12px; background: linear-gradient(transparent, #020617 20%); }
-            .sidebar-drawer { position: fixed; top: 0; right: 0; bottom: 0; w: 80%; background: #0f172a; z-index: 1000; transition: transform 0.3s ease; shadow: -10px 0 30px rgba(0,0,0,0.5); }
         </style>
     </head>
     <body>
-        <div id="root" class="mobile-safe-area"></div>
         <script type="text/babel">
             const { useState, useEffect, useRef } = React;
             function App() {
                 const [messages, setMessages] = useState([]);
                 const [input, setInput] = useState("");
-                const [isSideOpen, setSideOpen] = useState(false);
-                const [status, setStatus] = useState("idle");
                 const send = async () => {
                     if(!input.trim()) return;
-                    const newMsgs = [...messages, {role: 'user', content: input}];
-                    setMessages(newMsgs);
                     setInput("");
-                    setStatus("thinking");
-                    try {
-                        const res = await fetch('/v1/chat/completions', {
-                            method: 'POST',
-                            headers: {'Content-Type': 'application/json'},
-                            body: JSON.stringify({ messages: newMsgs })
-                        });
-                        const reader = res.body.getReader();
-                        let currentBotMsg = { role: 'assistant', content: "" };
-                        setMessages(prev => [...prev, currentBotMsg]);
-                        while(true) {
-                            const {done, value} = await reader.read();
-                            if(done) break;
-                            const text = new TextDecoder().decode(value).replace(/data: /g, '');
-                            if(text.includes("[DONE]")) break;
-                            currentBotMsg.content += text;
-                            setMessages(prev => [...prev.slice(0, -1), {...currentBotMsg}]);
-                        }
-                    } catch(e) { console.error(e); }
-                    setStatus("idle");
                 };
                 return (
-                    <div className="h-full flex flex-col">
-                        <header className="p-4 border-b border-white/10 flex justify-between items-center bg-slate-900/50">
-                            <button onClick={() => setSideOpen(true)} className="text-indigo-400">☰</button>
-                            <span className="text-xs font-bold tracking-widest">NEURAL VAULT</span>
-                            <div className={`w-2 h-2 rounded-full ${status === 'idle' ? 'bg-emerald-500' : 'bg-indigo-500 animate-pulse'}`}></div>
                         </header>
                         <div className="chat-stream p-4 space-y-4">
                             {messages.map((m, i) => (
                                 <div key={i} className={`flex ${m.role === 'user' ? 'justify-start' : 'justify-end'}`}>
-                                    <div className={`max-w-[85%] p-3 rounded-2xl text-sm ${m.role === 'user' ? 'bg-slate-800' : 'bg-indigo-600/20 border border-indigo-500/30'}`}>
                                         {m.content}
                                     </div>
                                 </div>
                             ))}
                         </div>
-                        <div className="input-area">
-                            <div className="max-w-xl mx-auto flex gap-2 bg-slate-900 border border-white/10 rounded-xl p-1 shadow-xl">
-                                <input
-                                    className="flex-1 bg-transparent px-3 py-2 outline-none text-sm"
-                                    placeholder="اسأل..."
-                                    value={input}
-                                    onChange={e => setInput(e.target.value)}
-                                    onKeyDown={e => e.key === 'Enter' && send()}
-                                />
-                                <button onClick={send} className="bg-indigo-600 p-2 rounded-lg">
-                                    <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path d="M5 12h14M12 5l7 7-7 7" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/></svg>
-                                </button>
                             </div>
                         </div>
-                        {/* Sidebar Drawer */}
-                        <aside className={`sidebar-drawer p-6 ${isSideOpen ? 'translate-x-0' : 'translate-x-full'}`}>
-                            <div className="flex justify-between mb-8">
-                                <h2 className="font-bold">الحساب والذاكرة</h2>
-                                <button onClick={() => setSideOpen(false)}>✕</button>
                             </div>
-                            <div className="space-y-6">
-                                <div className="p-4 bg-indigo-600/10 rounded-xl border border-indigo-500/20 text-xs">
-                                    <p>نظام الاستهلاك: <b>Featherless API</b></p>
-                                    <p className="mt-2 text-slate-400">سيتم الخصم من رصيدك في HF عند تسجيل الدخول.</p>
-                                </div>
-                                <input type="file" className="block w-full text-xs text-slate-500 file:bg-slate-800 file:text-white file:border-0 file:py-2 file:px-4 file:rounded-lg" />
                             </div>
                         </aside>
                     </div>
@@ -136,23 +119,18 @@ async def get_ui():
     </html>
     """
-# --- منطق تسجيل الدخول واستهلاك الرصيد (مستوحى من ملفك) ---
-def get_client(token: str = None):
-    # نستخدم التوكن الخاص بالمستخدم إذا سجل دخوله، وإلا نستخدم توكن النظام
-    api_key = token if token else os.getenv("HF_TOKEN")
-    return OpenAI(
-        base_url="https://router.huggingface.co/hf-inference/v1",
-        api_key=api_key
-    )
 @app.post("/v1/chat/completions")
 async def chat_endpoint(request: Request):
     body = await request.json()
-    # [span_2](start_span)هنا يتم ربط الطلب بـ featherless-ai كما في ملف app(2).py[span_2](end_span)
-    local_client = get_client()
     def stream_gen():
-        response = local_client.chat.completions.create(
             model="huihui-ai/Qwen2.5-72B-Instruct-abliterated",
             messages=body.get("messages", []),
             stream=True
@@ -164,14 +142,14 @@ async def chat_endpoint(request: Request):
     return StreamingResponse(stream_gen(), media_type="text/event-stream")
-# إطلاق واجهة Gradio كطبقة دخول اختيارية لتأكيد الهوية
 with gr.Blocks() as auth_layer:
-    gr.Markdown("# تسجيل الدخول")
-    login_btn = gr.LoginButton("تسجيل الدخول باستخدام Hugging Face")
-    gr.Markdown("بعد تسجيل الدخول، سيتم استخدام رصيدك الشخصي للعمليات.")
 # تشغيل النظام
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)

 import gradio as gr
 from fastapi import FastAPI, Request, File, UploadFile, BackgroundTasks
 from fastapi.responses import StreamingResponse, HTMLResponse
 from openai import OpenAI
 from chromadb.utils import embedding_functions
+# --- المحرك الخلفي ---
 app = FastAPI()
+# إعداد الذاكرة
 STORAGE_PATH = "/data/neural_memory" if os.path.exists("/data") else "./neural_memory"
 chroma_client = chromadb.PersistentClient(path=STORAGE_PATH)
 default_ef = embedding_functions.DefaultEmbeddingFunction()
+collection = chroma_client.get_or_create_collection(name="user_vault_v2", embedding_function=default_ef)
+# الواجهة المتجاوبة للهاتف
 @app.get("/", response_class=HTMLResponse)
 async def get_ui():
     return """
     <html lang="ar" dir="rtl">
     <head>
         <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
         <title>Deep Neural Vault</title>
         <script src="https://cdn.tailwindcss.com"></script>
         <script src="https://unpkg.com/react@18/umd/react.production.min.js"></script>
         <script src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"></script>
         <script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
         <style>
+            body { background: #020617; color: #f8fafc; margin: 0; padding: 0; height: 100dvh; overflow: hidden; width: 100vw; position: fixed; }
+            .chat-stream { height: calc(100dvh - 140px); overflow-y: auto; -webkit-overflow-scrolling: touch; padding-bottom: 20px; }
+            .input-box { position: fixed; bottom: 0; left: 0; right: 0; padding: 15px; background: #020617; border-top: 1px solid rgba(255,255,255,0.05); }
+            @media (max-width: 768px) { .sidebar { width: 85% !important; transform: translateX(100%); position: fixed; top:0; right:0; height:100%; z-index: 1000; transition: transform 0.3s ease; background: #0f172a; } .sidebar.open { transform: translateX(0); } }
         </style>
     </head>
     <body>
+        <div id="root"></div>
         <script type="text/babel">
             const { useState, useEffect, useRef } = React;
             function App() {
                 const [messages, setMessages] = useState([]);
                 const [input, setInput] = useState("");
+                const [isOpen, setIsOpen] = useState(false);
                 const send = async () => {
                     if(!input.trim()) return;
+                    const userMsg = {role: 'user', content: input};
+                    setMessages(p => [...p, userMsg]);
                     setInput("");
+                    const res = await fetch('/v1/chat/completions', {
+                        method: 'POST',
+                        headers: {'Content-Type': 'application/json'},
+                        body: JSON.stringify({ messages: [...messages, userMsg] })
+                    });
+                    const reader = res.body.getReader();
+                    let botMsg = { role: 'assistant', content: "" };
+                    setMessages(p => [...p, botMsg]);
+                    while(true) {
+                        const {done, value} = await reader.read();
+                        if(done) break;
+                        const chunk = new TextDecoder().decode(value).replace(/data: /g, '');
+                        if(chunk.includes("[DONE]")) break;
+                        botMsg.content += chunk;
+                        setMessages(p => [...p.slice(0, -1), {...botMsg}]);
+                    }
                 };
                 return (
+                    <div className="flex flex-col h-full w-full">
+                        <header className="p-4 border-b border-white/10 flex justify-between items-center bg-slate-900/80 backdrop-blur-md">
+                            <button onClick={() => setIsOpen(true)} className="text-indigo-400 text-xl">☰</button>
+                            <h1 className="text-sm font-black">NEURAL VAULT</h1>
+                            <div className="w-2 h-2 rounded-full bg-emerald-500"></div>
                         </header>
                         <div className="chat-stream p-4 space-y-4">
                             {messages.map((m, i) => (
                                 <div key={i} className={`flex ${m.role === 'user' ? 'justify-start' : 'justify-end'}`}>
+                                    <div className={`max-w-[85%] p-3 rounded-2xl text-sm ${m.role === 'user' ? 'bg-slate-800' : 'bg-indigo-600/20 border border-indigo-500/30 text-indigo-100'}`}>
                                         {m.content}
                                     </div>
                                 </div>
                             ))}
                         </div>
+                        <div className="input-box">
+                            <div className="max-w-xl mx-auto flex gap-2">
+                                <input className="flex-1 bg-slate-900 border border-white/10 rounded-xl px-4 py-3 outline-none text-sm" placeholder="تكلم..." value={input} onChange={e => setInput(e.target.value)} onKeyDown={e => e.key === 'Enter' && send()} />
+                                <button onClick={send} className="bg-indigo-600 px-4 rounded-xl">↑</button>
                             </div>
                         </div>
+                        {/* Sidebar */}
+                        <aside className={`sidebar p-6 shadow-2xl ${isOpen ? 'open' : ''}`}>
+                            <div className="flex justify-between items-center mb-10">
+                                <span className="font-bold">الإعدادات</span>
+                                <button onClick={() => setIsOpen(false)}>✕</button>
                             </div>
+                            <div className="bg-indigo-600/10 p-4 rounded-xl text-[10px] text-slate-400 leading-loose">
+                                <p>يتم الآن استهلاك الرصيد عبر: <b>Featherless Provider</b></p>
+                                <p className="mt-2 uppercase">رابط المحرك: Active ✅</p>
                             </div>
                         </aside>
                     </div>
     </html>
     """
+# --- نظام تسجيل الدخول (OAuth) لربط الرصيد ---
 @app.post("/v1/chat/completions")
 async def chat_endpoint(request: Request):
     body = await request.json()
+    # استخدام الرابط الحديث والصحيح لتجنب خطأ 410
+    client = OpenAI(
+        base_url="https://router.huggingface.co/hf-inference/v1",
+        api_key=os.getenv("HF_TOKEN")
+    )
     def stream_gen():
+        response = client.chat.completions.create(
             model="huihui-ai/Qwen2.5-72B-Instruct-abliterated",
             messages=body.get("messages", []),
             stream=True
     return StreamingResponse(stream_gen(), media_type="text/event-stream")
+# طبقة تسجيل الدخول من ملف app(2).py
 with gr.Blocks() as auth_layer:
+    gr.Markdown("# بوابة الدخول")
+    gr.LoginButton()
 # تشغيل النظام
+app = gr.mount_gradio_app(app, auth_layer, path="/auth")
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)