ctm-python-client 2.4.0__py3-none-any.whl → 2.4.2__py3-none-any.whl

aapi/bases.py

@@ -66,9 +66,9 @@ class AAPIObject:
                       file_path: str = None, delete_afterwards: bool = True, open_in_browser: str = None) -> RunMonitor:        
         # Import circular dependency
         from ctm_python_client.core.workflow import Workflow, WorkflowDefaults
-        from aapi import Job, Folder
+        from aapi import Folder
         
-        if isinstance(self, Job) or (hasattr(self, 'job_list') and self.job_list is not None and len(self.job_list) > 0):
+        if (hasattr(self, '_type') and 'Job' in self._type) or (hasattr(self, 'job_list') and self.job_list is not None and len(self.job_list) > 0):
             try:
                 on_demand_workflow = Workflow(
                     environment,
@@ -85,16 +85,19 @@ class AAPIObject:
                 else:
                     on_demand_workflow.add(self, inpath=inpath)
                 
-                on_demand_workflow.run_on_demand(
+                return on_demand_workflow.run_on_demand(
                     skip_login=skip_login, 
                     file_path=file_path, 
                     delete_afterwards=delete_afterwards,
                     open_in_browser=open_in_browser
                     )
             except Exception as e:
-                errors = [err.get('message', '') + ' ' + err.get('item', '')
-                    for err in json.loads(e.body)['errors']]
-                raise RuntimeError(f"AAPI request failed: {', '.join(errors)}")
+                if e.body:
+                    errors = [err.get('message', '') + ' ' + err.get('item', '')
+                        for err in json.loads(e.body)['errors']]
+                    raise RuntimeError(f"AAPI request failed: {', '.join(errors)}")
+                else:
+                    raise e
             finally:
                 on_demand_workflow.clear_all()
         else:

ctm_python_client/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '2.4.0'
+__version__ = '2.4.2'
 __author__ = 'BMC Software'

ctm_python_client/core/workflow.py

@@ -438,9 +438,12 @@ class Workflow(BaseWorkflow):
                 run_.open_in_browser()
             return run_
         except Exception as e:
-            errors = [err.get('message', '') + ' ' + err.get('item', '')
-                for err in json.loads(e.body)['errors']]
-            raise RuntimeError(f"AAPI request failed: {', '.join(errors)}")
+            if e.body:
+                errors = [err.get('message', '') + ' ' + err.get('item', '')
+                    for err in json.loads(e.body)['errors']]
+                raise RuntimeError(f"AAPI request failed: {', '.join(errors)}")
+            else:
+                raise e
         finally:
             if delete_afterwards:
                 fpath.unlink()

{ctm_python_client-2.4.0.dist-info → ctm_python_client-2.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ctm-python-client
-Version: 2.4.0
+Version: 2.4.2
 Summary: Python Workflows for Control-M
 Author: BMC Software
 License: BSD 3-Clause

{ctm_python_client-2.4.0.dist-info → ctm_python_client-2.4.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ aapi/action.py,sha256=te1lr64tU7854Oy4lUjQgh1EIlZzO82ulA-NnfiK9ko,1622
 aapi/addevents.py,sha256=maZH3TpP1C1usvM2qee4DNl1PUA6IpnAWUKki1WGUlg,793
 aapi/ai.py,sha256=3mZu6I8PSbnr0v6AKxZ3-OA8RbdHlI55qCeaqlF3iXA,2094
 aapi/basefolder.py,sha256=l6wHCwCr-RkJIaDQGzV22bbHk6DQWiNpKHKmOe0x-I4,14191
-aapi/bases.py,sha256=D-U9pJgOSSe_w2gy2rusNwYhUY4PyBwdY7qk94ry23s,4053
+aapi/bases.py,sha256=VIEQmrGuaPecvsijOzDiINQstzbif8AmlBv14PCFmQc,4171
 aapi/businessfield.py,sha256=T11iWMIp8BtQCCrkR3glp0E7dKOLI00qO3lKT6_Ngdw,373
 aapi/businessparameter.py,sha256=Ee8NBDM4TDA2wx7T2lsj1yaNRJ-Pt5FADPCwx8qa4JU,3372
 aapi/calendar.py,sha256=C6mAQhypnSs2IG1CKRbjTekLdo87AHJ5GM_a3HofF3c,9322
@@ -728,18 +728,18 @@ clients/ctm_saas_client/models/workspace_folder.py,sha256=Uxn61e8LzGzceVV6TBofuy
 clients/ctm_saas_client/models/workspace_folders.py,sha256=rpVIXVw8Fh_9W-mfuDEDClC0vYTStKQo_8zgGcGaZu8,3455
 clients/ctm_saas_client/models/zoo_keeper.py,sha256=qYqn4P4CaKqLAKSxBoJvwxm1OGUcS8cmy9BW8Ul7maI,8790
 clients/ctm_saas_client/models/zos_template_data.py,sha256=RF7S-oR4rmbwc_WJDebk2SLvkAku4uxd_a59Cq_DzVM,18096
-ctm_python_client/__init__.py,sha256=_V6aCUYLW1K7XSSg3wcOLFlB_QjeIMUpBFyaXzpdYYI,49
+ctm_python_client/__init__.py,sha256=R1R4gwFGgCD4mpdrAbl_7FXBJXDw96LY7uKTrKJIcaA,49
 ctm_python_client/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ctm_python_client/core/comm.py,sha256=33NSUm-dI9jo7jwQft76KSxridmQsjuX-0eNbQSH5Fo,6726
 ctm_python_client/core/credential.py,sha256=UDN1Q8IYf-ufiXUr-aHm1MDu9bVX8J0Hk8BhvlmYfKk,1009
 ctm_python_client/core/monitoring.py,sha256=62fbSTEGFpHcBrXK8R8cWejq6DlrmdaNumXbOaDa3HY,12043
-ctm_python_client/core/workflow.py,sha256=eA4gqbPEF9PqoYr3FXrcsbYuXRd8PbFkBzjNA0VOXes,16283
+ctm_python_client/core/workflow.py,sha256=4R-porwbqK40taJGQ33G3Id-VV2MI747NiTnsrRvr2k,16360
 ctm_python_client/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ctm_python_client/ext/autogen.py,sha256=Oo5UZ2HKIuMh98e2FDb9GN9dChVe1mt3kcaaOaqBNPk,6671
 ctm_python_client/ext/credential.py,sha256=2AdNAPtquq9ApH41pWi8Zt8mhlh9VNWVFXeLCNrxOfA,469
 ctm_python_client/ext/viz.py,sha256=oVY7DYP0H-nCGRQIb1nZgspc8DQdsS8yWUCAl5x_dwg,1672
-ctm_python_client-2.4.0.dist-info/LICENSE,sha256=L9eFhIgJK0TNYFm9I7tDUR1CDI8muWkBJvzpbkGCVh8,1525
-ctm_python_client-2.4.0.dist-info/METADATA,sha256=RQdSpI7wkf_Jrz0YRZyLpzRZB559yeHOGCtkr2HP8g0,2921
-ctm_python_client-2.4.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ctm_python_client-2.4.0.dist-info/top_level.txt,sha256=Dz3aBWbGmLA3lZcNMUAWX_Yhdw0FdplhI52YBid8Oe0,31
-ctm_python_client-2.4.0.dist-info/RECORD,,
+ctm_python_client-2.4.2.dist-info/LICENSE,sha256=L9eFhIgJK0TNYFm9I7tDUR1CDI8muWkBJvzpbkGCVh8,1525
+ctm_python_client-2.4.2.dist-info/METADATA,sha256=fe89_q6yXyxJQ9_g8HvwA9rj16wPyPb4OIlf53HlUmo,2921
+ctm_python_client-2.4.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ctm_python_client-2.4.2.dist-info/top_level.txt,sha256=Dz3aBWbGmLA3lZcNMUAWX_Yhdw0FdplhI52YBid8Oe0,31
+ctm_python_client-2.4.2.dist-info/RECORD,,