update

.gitattributes

@@ -1,35 +1,35 @@
-*.7z filter=lfs diff=lfs merge=lfs -text
-*.arrow filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.bz2 filter=lfs diff=lfs merge=lfs -text
-*.ckpt filter=lfs diff=lfs merge=lfs -text
-*.ftz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
-*.h5 filter=lfs diff=lfs merge=lfs -text
-*.joblib filter=lfs diff=lfs merge=lfs -text
-*.lfs.* filter=lfs diff=lfs merge=lfs -text
-*.mlmodel filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text
-*.msgpack filter=lfs diff=lfs merge=lfs -text
-*.npy filter=lfs diff=lfs merge=lfs -text
-*.npz filter=lfs diff=lfs merge=lfs -text
-*.onnx filter=lfs diff=lfs merge=lfs -text
-*.ot filter=lfs diff=lfs merge=lfs -text
-*.parquet filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.pickle filter=lfs diff=lfs merge=lfs -text
-*.pkl filter=lfs diff=lfs merge=lfs -text
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.pth filter=lfs diff=lfs merge=lfs -text
-*.rar filter=lfs diff=lfs merge=lfs -text
-*.safetensors filter=lfs diff=lfs merge=lfs -text
-saved_model/**/* filter=lfs diff=lfs merge=lfs -text
-*.tar.* filter=lfs diff=lfs merge=lfs -text
-*.tar filter=lfs diff=lfs merge=lfs -text
-*.tflite filter=lfs diff=lfs merge=lfs -text
-*.tgz filter=lfs diff=lfs merge=lfs -text
-*.wasm filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.arrow filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+*.ftz filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.h5 filter=lfs diff=lfs merge=lfs -text
+*.joblib filter=lfs diff=lfs merge=lfs -text
+*.lfs.* filter=lfs diff=lfs merge=lfs -text
+*.mlmodel filter=lfs diff=lfs merge=lfs -text
+*.model filter=lfs diff=lfs merge=lfs -text
+*.msgpack filter=lfs diff=lfs merge=lfs -text
+*.npy filter=lfs diff=lfs merge=lfs -text
+*.npz filter=lfs diff=lfs merge=lfs -text
+*.onnx filter=lfs diff=lfs merge=lfs -text
+*.ot filter=lfs diff=lfs merge=lfs -text
+*.parquet filter=lfs diff=lfs merge=lfs -text
+*.pb filter=lfs diff=lfs merge=lfs -text
+*.pickle filter=lfs diff=lfs merge=lfs -text
+*.pkl filter=lfs diff=lfs merge=lfs -text
+*.pt filter=lfs diff=lfs merge=lfs -text
+*.pth filter=lfs diff=lfs merge=lfs -text
+*.rar filter=lfs diff=lfs merge=lfs -text
+*.safetensors filter=lfs diff=lfs merge=lfs -text
+saved_model/**/* filter=lfs diff=lfs merge=lfs -text
+*.tar.* filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
+*.tflite filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.wasm filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
+*tfevents* filter=lfs diff=lfs merge=lfs -text

.vscode/settings.json

@@ -1,5 +1,5 @@
-{
-    "python-envs.defaultEnvManager": "ms-python.python:conda",
-    "python-envs.defaultPackageManager": "ms-python.python:conda",
-    "python-envs.pythonProjects": []
-}
+{
+    "python-envs.defaultEnvManager": "ms-python.python:conda",
+    "python-envs.defaultPackageManager": "ms-python.python:conda",
+    "python-envs.pythonProjects": []
+}

Dockerfile

@@ -1,24 +1,24 @@
-FROM ollama/ollama
-
-# 🔴 IMPORTANT: remove ollama entrypoint
-ENTRYPOINT []
-
-WORKDIR /app
-
-RUN apt-get update && \
-    apt-get install -y python3-venv python3-pip build-essential libffi-dev libssl-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN python3 -m venv /opt/venv
-ENV PATH="/opt/venv/bin:$PATH"
-
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-EXPOSE 8000
-
-CMD sh -c "ollama serve & sleep 5 && ollama pull qwen2.5:1.5b && uvicorn app:app --host 0.0.0.0 --port $PORT"
-# CMD sh -c "ollama serve & sleep 5 && ollama pull qwen2.5:3b && uvicorn app:app --host 0.0.0.0 --port $PORT"
-# CMD sh -c "ollama serve & sleep 5 && ollama pull qwen2.5:7b && uvicorn app:app --host 0.0.0.0 --port $PORT"
+FROM ollama/ollama
+
+# 🔴 IMPORTANT: remove ollama entrypoint
+ENTRYPOINT []
+
+WORKDIR /app
+
+RUN apt-get update && \
+    apt-get install -y python3-venv python3-pip build-essential libffi-dev libssl-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN python3 -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+EXPOSE 8000
+
+CMD sh -c "ollama serve & sleep 5 && ollama pull qwen2.5:1.5b && uvicorn app:app --host 0.0.0.0 --port $PORT"
+# CMD sh -c "ollama serve & sleep 5 && ollama pull qwen2.5:3b && uvicorn app:app --host 0.0.0.0 --port $PORT"
+# CMD sh -c "ollama serve & sleep 5 && ollama pull qwen2.5:7b && uvicorn app:app --host 0.0.0.0 --port $PORT"

README.md

@@ -1,10 +1,10 @@
----
-title: Arabic Analysis Server
-emoji: 📈
-colorFrom: red
-colorTo: purple
-sdk: docker
-pinned: false
----
-
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+---
+title: Arabic Analysis Server
+emoji: 📈
+colorFrom: red
+colorTo: purple
+sdk: docker
+pinned: false
+---
+
+Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference

app.py

@@ -1,116 +1,123 @@
-from fastapi import FastAPI, HTTPException
-from pydantic import BaseModel
-import httpx
-import json
-import os
-import uvicorn
-
-app = FastAPI()
-
-OLLAMA_URL = "http://localhost:11434/api/chat"
-
-# تعريف شكل البيانات المستلمة
-class AnalysisRequest(BaseModel):
-    user_text: str  # النص المجمع من حوار المستخدم فقط
-
-@app.post("/analyze/personality")
-async def analyze_personality(data: AnalysisRequest):
-    # الـ Prompt باللغة الإنجليزية فقط
-#     analysis_prompt = f"""
-# Analyze the following user text and return a JSON object with EXACTLY these English keys:
-# 'decision_making', 'energy', 'focus', 'lifestyle', 'compatible_type'.
-
-# Requirements:
-# 1. The 'summary' field inside each key must be written in ARABIC.
-# 2. The 'summary' should be a concise psychological insight (1-2 sentences).
-# 3. 'compatible_type' must be a 4-letter MBTI code in ENGLISH (e.g., 'INFJ').
-
-# User Text:
-# \"\"\"{data.user_text}\"\"\"
-
-# Respond ONLY in valid JSON.
-# """
-    
-#     analysis_prompt = f"""
-# Analyze the following user text based on MBTI personality theory. 
-# Return a JSON object with EXACTLY these keys:
-# 'personality_type', 'decision_making', 'energy', 'focus', 'lifestyle', 'compatible_type'.
-
-# Requirements:
-# 1. 'personality_type': MUST be the 4-letter MBTI code that is the user's identified type.
-# 2. The 'summary' field inside 'decision_making', 'energy', 'focus', and 'lifestyle' must be written in ARABIC.
-# 3. The 'summary' should be a concise psychological insight (1-2 sentences) in ARABIC just in Arabic.
-# 4. 'compatible_type': The 4-letter MBTI code in ENGLISH that best matches the user.
-
-# User Text:
-# \"\"\"{data.user_text}\"\"\"
-# Respond ONLY in ARABIC
-# Respond ONLY in valid JSON.
-
-# """
-#     analysis_prompt = """
-# Analyze the following text based on MBTI theory.
-# Return ONLY a JSON object with this EXACT structure:
-# {{
-#   "personality_type": "MUST be the 4-letter MBTI code that is the user's identified type. (e.g., 'INFJ')",
-#   "decision_making": {{ "summary": "تحليل باللغة العربية هنا" }},
-#   "energy": {{ "summary": "تحليل باللغة العربية هنا" }},
-#   "focus": {{ "summary": "تحليل باللغة العربية هنا" }},
-#   "lifestyle": {{ "summary": "تحليل باللغة العربية هنا" }},
-#   "compatible_type": "MUST be the 4-letter MBTI code that is the user's identified type. (e.g., 'INFJ')"
-# }}
-
-# User Text:"""
-#     analysis_prompt +=f"""
-# \"\"\"{data.user_text}\"\"\"
-# """
-    
-    analysis_prompt = f"""
-    أنت محلل شخصيات متخصص. حلل نص المستخدم واستخرج كود MBTI المكون من 4 أحرف فقط.
-
-المطلوب:
-1. الرد بصيغة JSON فقط.
-2. الكود يجب أن يكون بالإنجليزية (مثل: ENFP).
-
-النص المراد تحليله:
-
-{data.user_text}
-"""
-    analysis_prompt +="""
-قالب الرد:
-{
-    "mbti": "MUST be the 4-letter MBTI code that is the user's identified type. (e.g., 'INFJ')"
-}
-    """
-
-    # print(analysis_prompt)
-
-    payload = {
-        "model": "qwen2.5:1.5b",#"qwen2.5:3b",#qwen2.5:7b
-        "messages": [
-            {"role": "system",   "content": "أنت خبير في تحليل الشخصيات النفسية. يجب أن تكون إجابتك دائماً بصيغة JSON صالحة فقط. استخدم اللغة العربية في كتابة التحليلات."},
-            {"role": "user", "content": analysis_prompt}
-        ],
-        "options":{
-            "temperature":0.3, 
-        },
-        "stream": False,
-        "format": "json"
-    }
-
-    async with httpx.AsyncClient(timeout=400.0) as client:
-        try:
-            url = os.environ.get("OLLAMA_URL", OLLAMA_URL)
-            response = await client.post(url, json=payload)
-            response.raise_for_status()
-            result = response.json()
-            
-            analysis_content = result.get("message", {}).get("content", "")
-            # print(json.loads(analysis_content))
-            return json.loads(analysis_content)
-            
-        except Exception as e:
-            print(e)
-            raise HTTPException(status_code=500, detail=str(e))
-
+from fastapi import FastAPI, HTTPException
+from pydantic import BaseModel
+import httpx
+import json
+import os
+import uvicorn
+
+app = FastAPI()
+
+OLLAMA_URL = "http://localhost:11434/api/chat"
+
+# تعريف شكل البيانات المستلمة
+class AnalysisRequest(BaseModel):
+    user_text: str  # النص المجمع من حوار المستخدم فقط
+
+@app.get("/")
+async def check():
+     return {
+            "status": "success",
+            "state":"ok"
+        }
+
+@app.post("/analyze/personality")
+async def analyze_personality(data: AnalysisRequest):
+    # الـ Prompt باللغة الإنجليزية فقط
+#     analysis_prompt = f"""
+# Analyze the following user text and return a JSON object with EXACTLY these English keys:
+# 'decision_making', 'energy', 'focus', 'lifestyle', 'compatible_type'.
+
+# Requirements:
+# 1. The 'summary' field inside each key must be written in ARABIC.
+# 2. The 'summary' should be a concise psychological insight (1-2 sentences).
+# 3. 'compatible_type' must be a 4-letter MBTI code in ENGLISH (e.g., 'INFJ').
+
+# User Text:
+# \"\"\"{data.user_text}\"\"\"
+
+# Respond ONLY in valid JSON.
+# """
+    
+#     analysis_prompt = f"""
+# Analyze the following user text based on MBTI personality theory. 
+# Return a JSON object with EXACTLY these keys:
+# 'personality_type', 'decision_making', 'energy', 'focus', 'lifestyle', 'compatible_type'.
+
+# Requirements:
+# 1. 'personality_type': MUST be the 4-letter MBTI code that is the user's identified type.
+# 2. The 'summary' field inside 'decision_making', 'energy', 'focus', and 'lifestyle' must be written in ARABIC.
+# 3. The 'summary' should be a concise psychological insight (1-2 sentences) in ARABIC just in Arabic.
+# 4. 'compatible_type': The 4-letter MBTI code in ENGLISH that best matches the user.
+
+# User Text:
+# \"\"\"{data.user_text}\"\"\"
+# Respond ONLY in ARABIC
+# Respond ONLY in valid JSON.
+
+# """
+#     analysis_prompt = """
+# Analyze the following text based on MBTI theory.
+# Return ONLY a JSON object with this EXACT structure:
+# {{
+#   "personality_type": "MUST be the 4-letter MBTI code that is the user's identified type. (e.g., 'INFJ')",
+#   "decision_making": {{ "summary": "تحليل باللغة العربية هنا" }},
+#   "energy": {{ "summary": "تحليل باللغة العربية هنا" }},
+#   "focus": {{ "summary": "تحليل باللغة العربية هنا" }},
+#   "lifestyle": {{ "summary": "تحليل باللغة العربية هنا" }},
+#   "compatible_type": "MUST be the 4-letter MBTI code that is the user's identified type. (e.g., 'INFJ')"
+# }}
+
+# User Text:"""
+#     analysis_prompt +=f"""
+# \"\"\"{data.user_text}\"\"\"
+# """
+    
+    analysis_prompt = f"""
+    أنت محلل شخصيات متخصص. حلل نص المستخدم واستخرج كود MBTI المكون من 4 أحرف فقط.
+
+المطلوب:
+1. الرد بصيغة JSON فقط.
+2. الكود يجب أن يكون بالإنجليزية (مثل: ENFP).
+
+النص المراد تحليله:
+
+{data.user_text}
+"""
+    analysis_prompt +="""
+قالب الرد:
+{
+    "mbti": "MUST be the 4-letter MBTI code that is the user's identified type. (e.g., 'INFJ')"
+}
+    """
+
+    # print(analysis_prompt)
+
+    payload = {
+        "model": "qwen2.5:1.5b",#"qwen2.5:3b",#qwen2.5:7b
+        "messages": [
+            {"role": "system",   "content": "أنت خبير في تحليل الشخصيات النفسية. يجب أن تكون إجابتك دائماً بصيغة JSON صالحة فقط. استخدم اللغة العربية في كتابة التحليلات."},
+            {"role": "user", "content": analysis_prompt}
+        ],
+        "options":{
+            "temperature":0.3, 
+        },
+        "stream": False,
+        "format": "json"
+    }
+
+    async with httpx.AsyncClient(timeout=400.0) as client:
+        try:
+            url = os.environ.get("OLLAMA_URL", OLLAMA_URL)
+            response = await client.post(url, json=payload)
+            response.raise_for_status()
+            result = response.json()
+            
+            analysis_content = result.get("message", {}).get("content", "")
+            # print(json.loads(analysis_content))
+            return json.loads(analysis_content)
+            
+        except Exception as e:
+            print(e)
+            raise HTTPException(status_code=500, detail=str(e))
+
     uvicorn.run(app, host="0.0.0.0", port=os.environ.get("PORT",7860)) # منفذ مختلف عن سيرفر الدردشة

requirements.txt

@@ -1,3 +1,3 @@
-fastapi
-uvicorn
-httpx
+fastapi
+uvicorn
+httpx