hpc-beeflow 0.1.10.dev1__tar.gz → 0.1.11.dev0__tar.gz

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: hpc-beeflow
-Version: 0.1.10.dev1
+Version: 0.1.11.dev0
 Summary: A software package for containerizing HPC applications and managing job workflows
-Home-page: https://github.com/lanl/BEE
 Keywords: bee,hpc,workflow,cluster,computing
 Author: BEE-LANL Dev Team
 Author-email: bee-dev@lanl.gov
@@ -35,7 +34,7 @@ Requires-Dist: celery[redis,sqlalchemy] (>=5.3.4,<6.0.0)
 Requires-Dist: cffi (>=1.15.1,<2.0.0)
 Requires-Dist: cwl-utils (>=0.16,<0.17)
 Requires-Dist: docutils (==0.18.1)
-Requires-Dist: fastapi (==0.109.2)
+Requires-Dist: fastapi (==0.115.8)
 Requires-Dist: flask_restful (==0.3.9)
 Requires-Dist: google-api-python-client (>=2.66.0,<3.0.0) ; extra == "cloud-extras"
 Requires-Dist: graphviz (>=0.20.3,<0.21.0)
@@ -43,6 +42,8 @@ Requires-Dist: gunicorn (>=20.1,<23.0)
 Requires-Dist: jsonpickle (>=2.2.0,<3.0.0)
 Requires-Dist: neo4j (>=5,<6)
 Requires-Dist: networkx (==3.1)
+Requires-Dist: pre-commit (==3.5.0)
+Requires-Dist: pylint (==3.2.7)
 Requires-Dist: python-daemon (>=2.3.1,<3.0.0)
 Requires-Dist: python-heatclient (>=3.1.0,<4.0.0) ; extra == "cloud-extras"
 Requires-Dist: python-openstackclient (>=6.0.0,<7.0.0) ; extra == "cloud-extras"

hpc_beeflow-0.1.11.dev0/beeflow/__init__.py

@@ -0,0 +1 @@
+"""beeflow module."""

hpc_beeflow-0.1.11.dev0/beeflow/client/__init__.py

@@ -0,0 +1 @@
+"""beeflow client module."""

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/client/bee_client.py

@@ -4,6 +4,11 @@
 This script provides a client interface to the user to manage workflows.
 Capablities include submitting, starting, listing, pausing and cancelling workflows.
 """
+
+# Disable W0511: This allows us to have TODOs in the code
+# Disable R1732: Significant code restructuring required to fix
+# pylint:disable=W0511,R1732
+
 import os
 import sys
 import logging
@@ -28,13 +33,14 @@ from beeflow.common.connection import Connection
 from beeflow.common import paths
 from beeflow.common.parser import CwlParser
 from beeflow.common.wf_data import generate_workflow_id
-from beeflow.client import core
+from beeflow.client import core # pylint: disable=R0401 #WIP
+from beeflow.client import remote_client
 from beeflow.wf_manager.resources import wf_utils
 from beeflow.common.db import client_db
 from beeflow.common.db import bdb
 
 # Length of a shortened workflow ID
-short_id_len = 6 #noqa: Not a constant
+short_id_len = 6 # pylint: disable=C0103 # not a constant
 
 # Maximum length of a workflow ID
 MAX_ID_LEN = 32
@@ -167,7 +173,7 @@ def error_exit(msg, include_caller=True):
         raise ClientError(msg) from None
 
 
-def error_handler(resp):  # noqa (this is an error handler, it doesn't need to return an expression)
+def error_handler(resp):  # pylint: disable=R1710 # error handler doesn't need to return an expression
     """Handle a 500 error in a response."""
     if resp.status_code != 500:
         return resp
@@ -231,7 +237,7 @@ def get_wf_list():
 
 def check_short_id_collision():
     """Check short workflow IDs for colliions; increase short ID length if detected."""
-    global short_id_len  #noqa: Not a constant
+    global short_id_len
     workflow_list = get_wf_list()
     if workflow_list:
         while short_id_len < MAX_ID_LEN:
@@ -291,6 +297,7 @@ def get_wf_status(wf_id):
 
 app = typer.Typer(no_args_is_help=True, add_completion=False, cls=NaturalOrderGroup)
 app.add_typer(core.app, name='core')
+app.add_typer(remote_client.app, name='remote')
 app.add_typer(config_driver.app, name='config')
 
 
@@ -318,6 +325,8 @@ def submit(wf_name: str = typer.Argument(..., help='the workflow name'),  # pyli
     workdir = workdir.resolve()
 
     tarball_path = ""
+    workflow = None
+    wf_tarball = None
     if os.path.exists(wf_path):
         # Check to see if the wf_path is a tarball or a directory. Package if directory
         if os.path.isdir(wf_path):
@@ -470,13 +479,13 @@ def package(wf_path: pathlib.Path = typer.Argument(...,
     # Just use tar with subprocess. Python's tar library is not performant.
     return_code = subprocess.run(['tar', '-C', parent_dir, '-czf', tarball, wf_dir],
                                  check=True).returncode
-    package_path = package_dest.resolve()/tarball  # noqa: Not an arithmetic operation
+    package_path = package_dest.resolve()/tarball
 
     # Get the curent working directory
     cwd = pathlib.Path().absolute()
     if package_dest != cwd:
         # Move the tarball if the directory it's wanted in is not in the current working directory
-        tarball_path = cwd/tarball  # noqa: Not an arithmetic operation
+        tarball_path = cwd/tarball
         shutil.move(tarball_path, package_path)
 
     if return_code != 0:
@@ -657,6 +666,7 @@ def reexecute(wf_name: str = typer.Argument(..., help='The workflow name'),
                   help='working directory for workflow containing input + output files')
               ):
     """Reexecute an archived workflow."""
+    wf_tarball = None
     if os.path.exists(wf_path):
         wf_tarball = open(wf_path, 'rb')
     else:
@@ -700,7 +710,7 @@ def reexecute(wf_name: str = typer.Argument(..., help='The workflow name'),
     except requests.exceptions.ConnectionError:
         error_exit('Could not reach WF Manager.')
 
-    if resp.status_code != requests.codes.created: #noqa: member does exist
+    if resp.status_code != requests.codes.created: # pylint: disable=E1101
         error_exit(f"Reexecute for {wf_name} failed. Please check the WF Manager.")
 
     wf_id = resp.json()['wf_id']
@@ -729,19 +739,18 @@ def dag(wf_id: str = typer.Argument(..., callback=match_short_id),
     # Check if the workflow is archived
     wf_status = get_wf_status(wf_id)
     if wf_status == 'Archived':
-        copy_dag_in_archive = False
         bee_workdir = wf_utils.get_bee_workdir()
         mount_dir = os.path.join(bee_workdir, 'gdb_mount')
         graphmls_dir = mount_dir + '/graphmls'
         typer.secho("Workflow has been archived. All new DAGs will look the same as the one "
                     "in the archive directory.",
                     fg=typer.colors.MAGENTA)
+        wf_utils.export_dag(wf_id, output_dir, graphmls_dir, no_dag_dir)
     else:
-        copy_dag_in_archive = True
         wf_dir = wf_utils.get_workflow_dir(wf_id)
         graphmls_dir = wf_dir + '/graphmls'
         os.makedirs(graphmls_dir, exist_ok=True)
-    wf_utils.export_dag(wf_id, output_dir, graphmls_dir, no_dag_dir, copy_dag_in_archive)
+        wf_utils.export_dag(wf_id, output_dir, graphmls_dir, no_dag_dir, wf_dir)
     typer.secho(f"DAG for workflow {_short_id(wf_id)} has been exported successfully.",
                 fg=typer.colors.GREEN)
 
@@ -765,7 +774,3 @@ def main():
 
 if __name__ == "__main__":
     app()
-
-# Ignore W0511: This allows us to have TODOs in the code
-# Ignore R1732: Significant code restructuring required to fix
-# pylama:ignore=W0511,R1732

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/client/core.py

@@ -23,7 +23,7 @@ import daemon
 import typer
 
 
-from beeflow.client import bee_client
+from beeflow.client import bee_client # pylint: disable=R0401 #WIP
 from beeflow.common.config_driver import BeeConfig as bc
 from beeflow.common.config_driver import AlterConfig
 from beeflow.common import cli_connection
@@ -51,11 +51,7 @@ class ComponentManager:
         """Return a decorator function to be called."""
 
         def wrap(fn):
-            """Check to see if any components are disabled."""
-            if bc.get('DEFAULT', 'remote_api') is False and 'remote_api' in name:
-                return
-
-            # Add the component to the list.
+            """Add the component to the list."""
             self.components[name] = {
                 'fn': fn,
                 'deps': deps,
@@ -111,7 +107,7 @@ class ComponentManager:
         """Poll each process to check for errors, restart failed processes."""
         # Max number of times a component can be restarted
         max_restarts = bc.get('DEFAULT', 'max_restarts')
-        for name in self.procs:  # noqa no need to iterate with items() since self.procs may be set
+        for name in self.procs:  # pylint: disable=C0206 # no need to iterate with items() since self.procs may be set
             component = self.components[name]
             if component['failed']:
                 continue
@@ -167,7 +163,7 @@ def need_slurmrestd():
             and not bc.get('slurm', 'use_commands'))
 
 
-def init_components():
+def init_components(remote=False):
     """Initialize the components and component manager."""
     mgr = ComponentManager()
 
@@ -200,12 +196,13 @@ def init_components():
         return launch_with_gunicorn('beeflow.scheduler.scheduler:create_app()',
                                     paths.sched_socket(), stdout=fp, stderr=fp)
 
-    @mgr.component('remote_api', ('wf_manager', 'task_manager'))
-    def start_remote_api():
-        """Start the remote API."""
-        fp = open_log('remote_api')
-        return launch_with_gunicorn('beeflow.remote.remote:create_app()',
-                                    paths.remote_socket(), stdout=fp, stderr=fp)
+    if remote:
+        @mgr.component('remote_api', ('wf_manager', 'task_manager'))
+        def start_remote_api():
+            """Start the remote API."""
+            fp = open_log('remote_api')
+            return launch_with_gunicorn('beeflow.remote.remote:create_app()',
+                                        paths.remote_socket(), stdout=fp, stderr=fp)
 
     @mgr.component('celery', ('redis',))
     def celery():
@@ -255,7 +252,7 @@ def init_components():
             # slurm_args = f'-s openapi/{openapi_version},openapi/db{openapi_version}'
             slurm_socket = paths.slurm_socket()
             subprocess.run(['rm', '-f', slurm_socket], check=True)
-            fp = open(slurmrestd_log, 'w', encoding='utf-8') # noqa
+            fp = open(slurmrestd_log, 'w', encoding='utf-8') # pylint: disable=R1732
             cmd = ['slurmrestd']
             cmd.extend(slurm_args.split())
             cmd.append(f'unix:{slurm_socket}')
@@ -277,7 +274,7 @@ def load_check_charliecloud():
     if not shutil.which('ch-run'):
         lmod = os.environ.get('MODULESHOME')
         sys.path.insert(0, lmod + '/init')
-        from env_modules_python import module #noqa No need to import at top
+        from env_modules_python import module # pylint: disable=C0415 # No need to import at top
         module("load", "charliecloud")
         # Try loading the Charliecloud module then test again
         if not shutil.which('ch-run'):
@@ -328,7 +325,7 @@ def check_dependencies(backend=False):
     # Check for the flux API
     if bc.get('DEFAULT', 'workload_scheduler') == 'Flux':
         try:
-            import flux  # noqa needed to check whether flux api is actually installed
+            import flux  # pylint: disable=W0611,C0415 # don't need to check whether flux api is actually installed
         except ModuleNotFoundError:
             warn('Failed to import flux Python API. Please make sure you can '
                  'use flux in your environment.')
@@ -382,7 +379,7 @@ class Beeflow:
 
 def daemonize(mgr, base_components):
     """Start beeflow as a daemon, monitoring all processes."""
-    def handle_terminate(signum, stack): # noqa
+    def handle_terminate(signum, stack): # pylint: disable=W0613
         """Handle a terminate signal."""
         # Kill all subprocesses
         mgr.kill()
@@ -405,7 +402,8 @@ app = typer.Typer(no_args_is_help=True)
 @app.command()
 def start(foreground: bool = typer.Option(False, '--foreground', '-F',
           help='run in the foreground'), backend: bool = typer.Option(False, '--backend',
-          '-B', help='allow to run on a backend node')):
+          '-B', help='allow to run on a backend node'), remote: bool = typer.Option(False, 
+          '--remote', '-R', help='allow remote connection')):
     """Start all BEE components."""
     start_hn = socket.gethostname()  # hostname when beeflow starts
     if bee_client.get_hostname() == "" and bee_client.check_backend_status() == "":
@@ -419,7 +417,12 @@ def start(foreground: bool = typer.Option(False, '--foreground', '-F',
         bee_client.set_backend_status("true")  # add flag to db
     else:
         check_dependencies()
-    mgr = init_components()
+
+    if remote:  # turn on REST API for remote connection
+        mgr = init_components(remote=True)
+    else:
+        mgr = init_components()
+
     beeflow_log = paths.log_fname('beeflow')
     sock_path = paths.beeflow_socket()
     if bc.get('DEFAULT', 'workload_scheduler') == 'Slurm' and not need_slurmrestd():

hpc_beeflow-0.1.11.dev0/beeflow/client/remote_client.py

@@ -0,0 +1,178 @@
+#!/usr/bin/env python3
+
+"""remote-client.
+
+This script provides a client interface to the user to manage workflows remotely.
+Capabilities include checking the connection to the client, getting the droppoint location,
+copying files to the droppoint, and submitting the workflow to the client.
+"""
+import subprocess
+import pathlib
+import sys
+import json
+
+import typer
+
+from beeflow.common.config_driver import BeeConfig as bc
+
+
+def warn(*pargs):
+    """Print a red warning message."""
+    typer.secho(' '.join(pargs), fg=typer.colors.RED, file=sys.stderr)
+
+
+def remote_port_val():
+    """Return the value of the remote port."""
+    return bc.get('DEFAULT', 'remote_api_port')
+
+
+app = typer.Typer(no_args_is_help=True)
+
+
+@app.command()
+def connection(ssh_target: str = typer.Argument(..., help='the target to ssh to')):
+    """Check the connection to Beeflow client via REST API."""
+    port = remote_port_val()
+    try:
+        result = subprocess.run(
+            ["curl", f"{ssh_target}:{port}/"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=True
+        )
+        print(result.stdout)
+    except subprocess.CalledProcessError:
+        warn(f'Connection to {ssh_target}:{port} failed.')
+
+        # check if the remote API was started
+        check_command = 'ssh {ssh_target} "ps aux | grep $USER | grep \'gunicorn\'"'
+        result = subprocess.run(
+                check_command,
+                shell=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                check=False
+        )
+        lines = result.stdout.strip().splitlines()
+        if not any("beeflow.remote.remote:create_app" in element for element in lines):
+            warn(f'Remote API has not been started on {ssh_target}. '
+                  'Use remote flag when starting beeflow.')
+        sys.exit(1)
+
+
+@app.command()
+def droppoint(ssh_target: str = typer.Argument(..., help='the target to ssh to')):
+    """Request drop point location on remote machine via Beeflow client REST API."""
+    port = remote_port_val()
+    try:
+        result = subprocess.run(
+            ["curl", f"{ssh_target}:{port}/droppoint"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=True
+        )
+
+        with open('droppoint.env', 'w', encoding='utf-8') as output_file:
+            output_file.write(result.stdout)
+        print("Droppoint information saved to droppoint.env")
+
+    except subprocess.CalledProcessError:
+        warn(f'Failed to retrieve droppoint from {ssh_target}:{port}.'
+             ' Check connection to beeflow.')
+        sys.exit(1)
+
+
+@app.command()
+def copy(user: str = typer.Argument(..., help='the username on the remote system'),
+         ssh_target: str = typer.Argument(..., help="the target to ssh to"),
+         file_path: pathlib.Path = typer.Argument(..., help="path to copy to droppoint")):
+    """Copy path to droppoint."""
+    if not file_path.exists():
+        warn(f'Error: File or directory {file_path} does not exist.')
+        sys.exit(1)
+
+    try:
+        with open("droppoint.env", "r", encoding="utf-8") as f:
+            config = json.load(f)
+        droppoint_path = config.get("droppoint", "")
+
+        if not droppoint_path:
+            warn('Error: Could not retrieve droppoint location.')
+            sys.exit(1)
+
+        print(f"Copying {str(file_path)} to {droppoint_path}")
+
+        subprocess.run(["rsync", "-a", str(file_path), f"{user}@{ssh_target}:{droppoint_path}"],
+                        check=True)
+
+        print("Copy successful.")
+    except FileNotFoundError:
+        warn("Error: File droppoint.env not found. Did you run"
+             " 'beeflow remote droppoint $ssh_target' to create this file?")
+        sys.exit(1)
+    except json.JSONDecodeError as jde:
+        warn(f'Error reading JSON configuration: {jde}')
+        sys.exit(1)
+    except subprocess.CalledProcessError as err:
+        warn(f'Error copying file: {err.stderr}')
+        sys.exit(1)
+
+
+@app.command()
+def submit(ssh_target: str = typer.Argument(..., help='the target to ssh to'),
+           wf_name: str = typer.Argument(..., help='the workflow name'),
+           tarball_name: str = typer.Argument(..., help='the tarball name'),
+           main_cwl: str = typer.Argument(..., help='filename of main CWL'),
+           job_file: str = typer.Argument(..., help='filename of yaml file')):
+    """Submit the workflow to Beeflow client."""
+    port = remote_port_val()
+    try:
+        result = subprocess.run(
+            [
+                "curl",
+                f"{ssh_target}:{port}/submit_long/{wf_name}/{tarball_name}/{main_cwl}/{job_file}"
+            ],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=True
+        )
+        response = result.stdout.strip()
+
+        try:
+            response_json = json.loads(response)
+        except json.JSONDecodeError:
+            warn(f'Unexpected response from API: {response}')
+            sys.exit(1)
+
+        # Check if API response contains an error
+        if "error" in response_json:
+            warn(f"Error submitting workflow: {response_json['error']}")
+            sys.exit(1)
+
+        print(response_json.get('result'))
+
+    except subprocess.CalledProcessError as err:
+        warn(f'Failed to submit workflow. Error: {err.stderr}')
+        sys.exit(1)
+
+
+@app.command("core-status")
+def core_status(ssh_target: str = typer.Argument(..., help='the target to ssh to')):
+    """Check the status of BEEflow and the components."""
+    port = remote_port_val()
+    try:
+        result = subprocess.run(
+            ["curl", f"{ssh_target}:{port}/core/status/"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=True
+        )
+        print(result.stdout)
+    except subprocess.CalledProcessError:
+        warn(f'Failed to check status on {ssh_target}:{port}. Check connection to beeflow.')
+        sys.exit(1)

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/cloud_launcher.py

@@ -1,4 +1,9 @@
 """BEE Cloud Installer Script."""
+
+# Disable R1732: Significant code restructuring required to fix
+# Disable W0511: This allows us to have TODOs in the code
+# pylint:disable=W0511,R1732
+
 import argparse
 import subprocess
 import sys
@@ -205,6 +210,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-# Ignore R1732: Significant code restructuring required to fix
-# Ignore W0511: This allows us to have TODOs in the code
-# pylama:ignore=W0511,R1732

hpc_beeflow-0.1.11.dev0/beeflow/common/__init__.py

@@ -0,0 +1 @@
+"""beeflow common module."""

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/common/api.py

@@ -7,6 +7,6 @@ from flask_restful import Api
 class BeeApi(Api):
     """Wrapper around Flask-Restful's API to catch exceptions."""
 
-    def handle_error(self, e):  # noqa (conflict on naming in base class vs. following convention)
+    def handle_error(self, e):  # pylint: disable=W0613 # conflict on naming in base class vs. following convention
         """Handle an error or exception."""
         return make_response(jsonify(error=traceback.format_exc()), 500)

hpc_beeflow-0.1.11.dev0/beeflow/common/build/__init__.py

@@ -0,0 +1 @@
+"""beeflow common build module."""

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/common/build/container_drivers.py

@@ -3,6 +3,10 @@
 All container-based build systems belong here.
 """
 
+# Disable W0231: linter doesn't know about abstract classes,
+# it's ok to now call the parent __init__
+# pylint:disable=W0231
+
 import os
 import shutil
 import subprocess
@@ -65,14 +69,14 @@ class CharliecloudBuildDriver(ContainerBuildDriver):
         try:
             requirement_docker_requirements = self.task.requirements['DockerRequirement'].keys()
             docker_requirements = docker_requirements.union(requirement_docker_requirements)
-            req_string = (f'{set(requirement_docker_requirements)}')
+            req_string = f'{set(requirement_docker_requirements)}'
             log.info(f'task {self.task.id} requirement DockerRequirements: {req_string}')
         except (TypeError, KeyError):
             log.info(f'task {self.task.name} {self.task.id} no DockerRequirements in requirement')
         try:
             hint_docker_requirements = self.task.hints['DockerRequirement'].keys()
             docker_requirements = docker_requirements.union(hint_docker_requirements)
-            hint_str = (f'{set(hint_docker_requirements)}')
+            hint_str = f'{set(hint_docker_requirements)}'
             log.info(f'task {self.task.name} {self.task.id} hint DockerRequirements: {hint_str}')
         except (TypeError, KeyError):
             log.info(f'task {self.task.name} {self.task.id} hints has no DockerRequirements')
@@ -252,7 +256,7 @@ class CharliecloudBuildDriver(ContainerBuildDriver):
 
         # Pull the image.
         file_name = crt_driver.get_ccname(import_input_path)
-        cmd = (f'ch-convert {import_input_path} {self.deployed_image_root}/{file_name}')
+        cmd = f'ch-convert {import_input_path} {self.deployed_image_root}/{file_name}'
         log.info(f'Docker import: Assuming container name is {import_input_path}. Correct?')
         return subprocess.run(cmd, check=True, shell=True)
 
@@ -423,5 +427,3 @@ class SingularityBuildDriver(ContainerBuildDriver):
         param_output_directory may be used to override DockerRequirement
         specs.
         """
-# Ignore W0231: linter doesn't know about abstract classes, it's ok to now call the parent __init__
-# pylama:ignore=W0231

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/common/build_interfaces.py

@@ -6,6 +6,9 @@ The build_interface will access components of the build_driver and
 components of the gdb_interface as required.
 """
 
+# Disable W0703: Catching generic exception isn't a problem if we just want a descriptive report
+# pylint:disable=W0703
+
 # from beeflow.common.gdb.gdb_interface import GraphDatabaseInterface
 # from beeflow.common.build.container_drivers import CharliecloudBuildDriver,
 #                                                    SingularityBuildDriver
@@ -74,7 +77,6 @@ if __name__ == '__main__':
         raise IndexError('build_interface must execute with 2 arguments.') from exc
 
     bee_workdir = bc.get('DEFAULT', 'bee_workdir')
-    handler = bee_logging.save_log(bee_workdir=bee_workdir, log=log, logfile='build_interface.log')
 
     try:
         local_task = arg2task(my_args)
@@ -82,7 +84,3 @@ if __name__ == '__main__':
         log.info(f'{err}')
 
     build_main(local_task)
-
-# Ignore W0703: Catching generic exception isn't a problem if we just want a descriptive report
-# Ignore C901: "'build_main' is too complex" - this function is just around 40 lines
-# pylama:ignore=W0703,C901

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/common/cli.py

@@ -5,6 +5,6 @@ import click
 class NaturalOrderGroup(click.Group):
     """Natural ordering class for using with CLI code."""
 
-    def list_commands(self, ctx):  # noqa
+    def list_commands(self, ctx):
         """List the commands in order."""
         return self.commands.keys()

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/common/cloud/__init__.py

@@ -1,4 +1,8 @@
 """Cloud init module."""
+
+# Disable W0611: These are meant to be used by external code
+# pylint:disable=W0611
+
 from beeflow.common.cloud import chameleoncloud
 from beeflow.common.cloud import openstack
 from beeflow.common.cloud import provider
@@ -21,5 +25,3 @@ def get_provider(name, **kwargs):
         return providers[name](**kwargs)
 
     raise RuntimeError(f'Invalid provider "{name}"')
-# Ignore W0611: These are meant to be used by external code
-# pylama:ignore=W0611

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/common/cloud/chameleoncloud.py

@@ -19,7 +19,7 @@ class ChameleoncloudProvider(provider.Provider):
             'Use the Horizon interface instead'
         )
 
-    def get_ext_ip_addr(self, node_name):  # noqa
+    def get_ext_ip_addr(self, node_name):  # pylint: disable=W0613
         """Get the external IP address of the node, if it has one."""
         if self._stack_name is not None:
             stack = self._api.get_stack(self._stack_name)

{hpc_beeflow-0.1.10.dev1 → hpc_beeflow-0.1.11.dev0}/beeflow/common/cloud/google.py

@@ -19,7 +19,7 @@ class GoogleProvider(provider.Provider):
 
     def get_ext_ip_addr(self, node_name):
         """Get the external IP of this node (or None if no IP)."""
-        res = self._api.instances().get(instance=node_name,  # noqa (can't find instances member)
+        res = self._api.instances().get(instance=node_name,
                                         project=self.project,
                                         zone=self.zone).execute()
         try:
@@ -34,7 +34,7 @@ class GoogleProvider(provider.Provider):
         # This just creates instances one-by-one. There may be a better API call
         # to just create everything at once.
         for instance in config['instances']:
-            call = self._api.instances().insert(project=self.project,  # noqa (can't find instances member)
+            call = self._api.instances().insert(project=self.project,
                                                 zone=self.zone, body=instance)
             res = call.execute()
             print(res)