Merge branch 'main' into fix/settings-storage

Resolve merge conflict in enterprise/storage/saas_settings_store.py:
- Keep the fix that sets default llm_base_url if not set
- Use is_openhands_model from openhands.utils.llm (already imported)

Co-authored-by: openhands <openhands@all-hands.dev>

enterprise/storage/saas_settings_store.py

@@ -162,6 +162,8 @@ class SaasSettingsStore(SettingsStore):
                 return None
 
             # Check if we need to generate an LLM key.
+            if not item.llm_base_url:
+                item.llm_base_url = LITE_LLM_API_URL
             if item.llm_base_url == LITE_LLM_API_URL:
                 await self._ensure_api_key(
                     item, str(org_id), openhands_type=is_openhands_model(item.llm_model)