From d2faebd760c1b68d07c3639896e4a9b76aedf535 Mon Sep 17 00:00:00 2001
From: arun3688 <rain100falls@gmail.com>
Date: Wed, 25 Oct 2023 12:55:54 +0200
Subject: [PATCH] report proper error messages to users

---
 OMPython/__init__.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/OMPython/__init__.py b/OMPython/__init__.py
index 6b9521e4d..f8ba88710 100755
--- a/OMPython/__init__.py
+++ b/OMPython/__init__.py
@@ -1592,7 +1592,7 @@ def convertMo2Fmu(self, version="2.0", fmuType="me_cs", fileNamePrefix="<default
         >>> convertMo2Fmu()
         >>> convertMo2Fmu(version="2.0", fmuType="me|cs|me_cs", fileNamePrefix="<default>", includeResources=true)
         """
-        convertMo2FmuError = ''
+
         if fileNamePrefix == "<default>":
           fileNamePrefix = self.modelName
         if includeResources:
@@ -1600,11 +1600,13 @@ def convertMo2Fmu(self, version="2.0", fmuType="me_cs", fileNamePrefix="<default
         else:
           includeResourcesStr = "false"
         properties = 'version="{}", fmuType="{}", fileNamePrefix="{}", includeResources={}'.format(version, fmuType, fileNamePrefix,includeResourcesStr)
-        translateModelFMUResult = self.requestApi('translateModelFMU', self.modelName, properties)
-        if convertMo2FmuError:
-            print(convertMo2FmuError)
+        fmu = self.requestApi('buildModelFMU', self.modelName, properties)
+
+        ## report proper error message
+        if not os.path.exists(fmu):
+            return print(self.getconn.sendExpression("getErrorString()"))
 
-        return translateModelFMUResult
+        return fmu
 
     # to convert FMU to Modelica model
     def convertFmu2Mo(self, fmuName):  # 20
@@ -1614,13 +1616,14 @@ def convertFmu2Mo(self, fmuName):  # 20
         usage
         >>> convertFmu2Mo("c:/BouncingBall.Fmu")
         """
-        convertFmu2MoError = ''
-        importResult = self.requestApi('importFMU', fmuName)
-        convertFmu2MoError = self.requestApi('getErrorString')
-        if convertFmu2MoError:
-            print(convertFmu2MoError)
 
-        return importResult
+        fileName = self.requestApi('importFMU', fmuName)
+
+        ## report proper error message
+        if not os.path.exists(fileName):
+            return print(self.getconn.sendExpression("getErrorString()"))
+
+        return fileName
 
     # to optimize model
     def optimize(self):  # 21