Merge branch 'main' into heet-designSupport

Author: heetrojivadiya

RFEM/initModel.py

@@ -241,7 +241,7 @@ def __delete__(self, index_or_name):
         Args:
             index_or_name (str or int): Name of the index of model
         '''
-        if isinstance(index_or_name, str):
+        if isinstance(index_or_name, str) and index_or_name in self.clientModelDct:
             assert index_or_name in list(self.clientModelDct)
             self.clientModelDct.pop(index_or_name)
             if len(self.clientModelDct) > 0:
@@ -252,8 +252,7 @@ def __delete__(self, index_or_name):
         if isinstance(index_or_name, int):
             assert index_or_name <= len(self.clientModelDct)
             modelLs = connectionGlobals.client.service.get_model_list()
-
-            if modelLs:
+            if modelLs and (modelLs.name[index_or_name] in self.clientModelDct):
                 self.clientModelDct.pop(modelLs.name[index_or_name])
                 if len(self.clientModelDct) > 0:
                     model_key = list(self.clientModelDct)[-1]
@@ -327,6 +326,7 @@ def openFile(model_path):
     assert os.path.exists(model_path)
 
     file_name = os.path.basename(model_path)
+    connectToServer()
     connectionGlobals.client.service.open_model(model_path)
 
     return Model(False, file_name)
@@ -341,6 +341,8 @@ def closeModel(index_or_name, save_changes = False):
         index_or_name : Model Index or Name to be Close
         save_changes (bool): Enable/Disable Save Changes Option
     '''
+
+    connectToServer()
     if isinstance(index_or_name, int):
         Model.__delete__(Model, index_or_name)
         connectionGlobals.client.service.close_model(index_or_name, save_changes)
@@ -357,7 +359,7 @@ def closeModel(index_or_name, save_changes = False):
             except:
                 print('Model did NOT close properly.')
         else:
-            print('\nINFO: Model "'+modelLs+'" is not opened.')
+            print('\nINFO: Model "'+index_or_name+'" is not opened.')
     else:
         assert False, 'Parameter index_or_name must be int or string.'