Update app.py

app.py

@@ -122,3 +122,49 @@ def predict(request: ConflictDetectionRequest):
 
     except Exception as e:
         return JSONResponse({"error": str(e)}, status_code=500)
+
+
+def run_fanar_to_resolve(req1, req2):
+    client = OpenAI(base_url="https://api.fanar.qa/v1", api_key=os.getenv("FANAR_API"))
+    prompt = f"""
+You are a requirements engineer. You are given two potentially conflicting requirements.
+
+
+Requirement 1: "{req1}"
+Requirement 2: "{req2}"
+
+
+Your task is to resolve the conflict in Arabic using a hybrid strategy:
+1. If possible, combine both requirements into **a single non-conflicting and concise requirement** that preserves the intent of both.
+2. If they cannot be merged clearly, rewrite them as **two separate non-conflicting requirements**, possibly by adding conditions, default cases, or clarifying their scope.
+
+
+Avoid using vague expressions such as 'as needed', 'if possible', or 'may'. Only merge requirements if they can be resolved clearly and deterministically. Otherwise, indicate that clarification is needed.
+
+
+The resolved output must follow proper software requirement language and be easy to test.
+
+
+Format your answer like this:
+[Resolution Type]: Single / Split
+Resolved Requirement(s):
+- ...
+"""
+    
+    response = client.chat.completions.create(
+        model="Fanar",
+        messages=[{"role": "user", "content": prompt}]
+    )
+    return response.choices[0].message.content.strip()
+
+
+class ConflictResoluionRequest(BaseModel):
+    Req1: str
+    Req2: str
+
+
+@app.post("/resolve")
+def resolve(request: ConflictResoluionRequest):
+    answer = run_fanar_to_resolve(request.Req1, request.Req2)
+    return JSONResponse({"resp": answer, "statusText": "OK", "statusCode": 0}, status_code=200)
+