Merge pull request #106 from controlm/_Support-run-ondemand

Support run ondemand Automation-API Control-M

Author: RefaelBeker7

setup.py

@@ -8,7 +8,7 @@
     name="ctm-python-client",
     packages=find_packages(where="src"),
     package_dir={"": "src"},
-    version="2.4.2",
+    version="2.4.3",
     description="Python Workflows for Control-M",
     long_description=long_description,
     long_description_content_type='text/markdown',

src/aapi/bases.py

@@ -92,7 +92,7 @@ def run_on_demand(self, environment: Environment, inpath: str = f'run_on_demand{
                     open_in_browser=open_in_browser
                     )
             except Exception as e:
-                if e.body:
+                if hasattr(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)}")

src/ctm_python_client/__init__.py

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

src/ctm_python_client/core/workflow.py

@@ -412,9 +412,12 @@ def run(self, skip_login: bool = False, file_path: str = None, delete_afterwards
                 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 hasattr(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()
@@ -438,7 +441,7 @@ def run_on_demand(self, skip_login: bool = False, file_path: str = None, delete_
                 run_.open_in_browser()
             return run_
         except Exception as e:
-            if e.body:
+            if hasattr(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)}")

tests/test_sanity.py

@@ -2,6 +2,6 @@ def test_version_author():
     import ctm_python_client
 
     assert ctm_python_client.__author__ == 'BMC Software'
-    assert ctm_python_client.__version__ == '2.4.2'
+    assert ctm_python_client.__version__ == '2.4.3'