j

app.py

@@ -41,29 +41,48 @@ def _retry_openai_call(func, *args, _retries=1, _delay=0.5, **kwargs):
             last_err = e
             app.logger.warning(f"OpenAI call attempt {attempt + 1} failed: {e}")
             if attempt < _retries:
-                time.sleep(_delay)  # Use time.sleep instead of _time.sleep
+                time.sleep(_delay * (attempt + 1))
             else:
+                app.logger.error(f"All {_retries + 1} OpenAI call attempts failed")
                 raise last_err
 
 # --- Minimal retry helper for Ollama style calls (keeps API parity with older code) ---
 def _retry_ollama_call(func, *args, _retries=1, _delay=0.5, **kwargs):
     """
-    Retry wrapper for calls to ollama.* functions to mirror the behavior of _retry_openai_call.
-    Accepts the target callable as 'func' and forwards args/kwargs; retries on exceptions.
+    Retry wrapper for OpenAI API calls that maintains compatibility with old Ollama calls.
+    Maps Ollama-style parameters to OpenAI format.
     """
     last_err = None
     for attempt in range(_retries + 1):
         try:
+            # Map Ollama chat parameters to OpenAI format
+            if func == openai_client.chat.completions.create:
+                # Extract options if present
+                options = kwargs.pop('options', {})
+                # Merge options into kwargs
+                kwargs.update({
+                    'temperature': options.get('temperature', 0.7),
+                    'top_p': options.get('top_p', 0.9),
+                    'max_tokens': options.get('max_tokens', 1024)
+                })
+                response = func(*args, **kwargs)
+                # Map OpenAI response to Ollama format
+                return {
+                    'message': {
+                        'content': response.choices[0].message.content
+                    }
+                }
             return func(*args, **kwargs)
         except Exception as e:
             last_err = e
             try:
-                app.logger.warning(f"Ollama call attempt {attempt + 1} failed: {e}")
+                app.logger.error(f"API call failed (attempt {attempt + 1}): {str(e)}")
             except Exception:
                 pass
             if attempt < _retries:
-                time.sleep(_delay)  # Use time.sleep instead of _time.sleep
+                time.sleep(_delay * (attempt + 1))
             else:
+                app.logger.error(f"All {_retries + 1} API call attempts failed")
                 raise last_err
 
 # --- Helper Functions ---
@@ -2076,7 +2095,12 @@ CONTEXT:
         
         # Use retry wrapper (now fixed to remove timeout parameter)
         app.logger.info(f"Sending messages to Ollama: {len(messages)} messages")
-        reply = _retry_ollama_call(ollama.chat, model=chat_model, messages=messages, options={"temperature": 0.2, "top_p": 0.9})
+        reply = _retry_ollama_call(
+            openai_client.chat.completions.create,
+            model=chat_model,
+            messages=messages,
+            options={"temperature": 0.2, "top_p": 0.9}
+        )
         answer = reply.get("message", {}).get("content", "") or ""
         app.logger.info(f"Ollama response received: {answer[:100]}...")
         
@@ -2100,31 +2124,7 @@ CONTEXT:
                 elif target_language == 'fr':
                     answer = f"Bonjour! Je suis AIMHSA, votre compagnon de santé mentale pour le Rwanda. Comment puis-je vous aider aujourd'hui? Pour une aide immédiate, contactez la ligne d'assistance en santé mentale au 105."
                 elif target_language == 'rw':
-                    answer = f"Muraho! Nitwa AIMHSA, umufasha wawe w'ubuzima bw'ubwoba mu Rwanda. Nshobora gufasha ute uyu munsi? Niba ukeneye ubufasha buhagije, hamagara 105."
-                elif target_language == 'sw':
-                    answer = f"Hujambo! Mimi ni AIMHSA, msaidizi wako wa afya ya akili wa Rwanda. Ninawezaje kukusaidia leo? Ikiwa unahitaji msaada wa haraka, piga simu 105."
-                else:
-                    answer = f"Hello! I'm AIMHSA, your mental health companion for Rwanda. How can I support you today? If you need immediate help, contact the Mental Health Hotline at 105."
-        
-        # Enforce final-language safety: if model mixed languages or replied in wrong language,
-        # translate to target_language before returning
-        try:
-            detected_answer_lang = translation_service.detect_language(answer)
-            if detected_answer_lang != target_language and answer.strip():
-                app.logger.info(f"Answer language {detected_answer_lang} != target {target_language}; translating")
-                answer = translation_service.translate_text(answer, target_language)
-        except Exception as _e:
-            app.logger.warning(f"Post-translate guard failed: {_e}")
-
-        # If target is Kinyarwanda, apply normalization to clean any leaked phrases
-        try:
-            if target_language == 'rw' and answer.strip():
-                answer = translation_service.normalize_kinyarwanda(answer)
-        except Exception as _e:
-            app.logger.warning(f"Kinyarwanda normalization failed: {_e}")
-        app.logger.info(f"Generated response in {target_language}: {answer[:50]}...")
-        
-        # Ensure we never return an empty answer
+                    answer = f"Muraho! Nitwa AIMHSA, umufasha wawe w'ubuzima bw'ubwoba bw'u Rwanda. Nakora iki ngo ngufashe uyu munsi? Niba ukeneye ubufasha bwihuse, hamagara Ligne d'assistance en santé mentale ku 105."
         if not isinstance(answer, str) or not answer.strip():
             app.logger.warning("Empty answer received, using language-specific fallback")