kaqing 2.0.145__py3-none-any.whl → 2.0.172__py3-none-any.whl

adam/commands/reaper/reaper_run_abort.py

@@ -1,13 +1,10 @@
-import requests
-
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import reaper
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 
 class ReaperRunAbort(Command):
     COMMAND = 'reaper abort run'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -28,38 +25,22 @@ class ReaperRunAbort(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            if not args:
+                if state.in_repl:
+                    log2('Specify run id to abort.')
+                else:
+                    Command.display_help()
 
-        if not args:
-            if state.in_repl:
-                log2('Specify run id to abort.')
-            else:
-                Command.display_help()
+                return state
 
-            return state
+            with reaper(state) as http:
+                http.put(f'repair_run/{args[0]}/state/ABORTED')
 
-        if not(reaper := ReaperSession.create(state)):
             return state
 
-        self.stop_run(state, reaper, args[0])
-
-        return state
-
-    def stop_run(self, state: ReplState, reaper: ReaperSession, run_id: str):
-        def body(uri: str, headers: dict[str, str]):
-            return requests.put(uri, headers=headers)
-
-        # PAUSED, RUNNING, ABORTED
-        # PUT /repair_run/{id}/state/{state}
-        reaper.port_forwarded(state, f'repair_run/{run_id}/state/ABORTED', body, method='PUT')
-
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ReaperRunAbort.COMMAND} <run-id>\t abort reaper run'

adam/commands/reaper/reaper_runs.py

@@ -1,14 +1,11 @@
-import requests
-
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import reaper
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import convert_seconds, epoch, lines_to_tabular, log, log2
 
 class ReaperRuns(Command):
     COMMAND = 'reaper show runs'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -29,63 +26,51 @@ class ReaperRuns(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if not(reaper := ReaperSession.create(state)):
-            return state
-
-        self.show_runs(state, reaper)
-
-        return state
-
-    def show_runs(self, state: ReplState, reaper: ReaperSession):
-        def body(uri: str, headers: dict[str, str]):
-            return requests.get(uri, headers=headers, params={
-                'cluster_name': 'all',
-                'limit': Config().get('reaper.show-runs-batch', 10)
-            })
-
-        def line(run):
-            state = run['state']
-            start_time = run['start_time']
-            end_time = run['end_time']
-            duration = '-'
-            if state == 'DONE' and end_time:
-                hours, minutes, seconds = convert_seconds(epoch(end_time) - epoch(start_time))
-                if hours:
-                    duration = f"{hours:2d}h {minutes:2d}m {seconds:2d}s"
-                elif minutes:
-                    duration = f"{minutes:2d}m {seconds:2d}s"
+        with self.validate(args, state) as (args, state):
+            header = 'ID,START,DURATION,STATE,CLUSTER,KEYSPACE,TABLES,REPAIRED'
+
+            def line(run):
+                id = run['id']
+                state = run['state']
+                start_time = run['start_time']
+                end_time = run['end_time']
+                duration = '-'
+                if state == 'DONE' and end_time:
+                    hours, minutes, seconds = convert_seconds(epoch(end_time) - epoch(start_time))
+                    if hours:
+                        duration = f"{hours:2d}h {minutes:2d}m {seconds:2d}s"
+                    elif minutes:
+                        duration = f"{minutes:2d}m {seconds:2d}s"
+                    else:
+                        duration = f"{seconds:2d}s"
+
+                return f"{id},{start_time},{duration},{state},{run['cluster_name']},{run['keyspace_name']},{len(run['column_families'])},{run['segments_repaired']}/{run['total_segments']}"
+
+            with reaper(state) as http:
+                response = http.get('repair_run?state=RUNNING', params={
+                    'cluster_name': 'all',
+                    'limit': Config().get('reaper.show-runs-batch', 10)
+                })
+
+                runs = response.json()
+                if runs:
+                    log(lines_to_tabular(sorted([line(run) for run in runs], reverse=True), header, separator=","))
                 else:
-                    duration = f"{seconds:2d}s"
+                    log2('No running runs found.')
+                    log2()
 
-            return f"{start_time},{duration},{state},{run['cluster_name']},{run['keyspace_name']},{len(run['column_families'])},{run['segments_repaired']}/{run['total_segments']}"
+                response = http.get('repair_run?state=PAUSED,ABORTED,DONE', params={
+                    'cluster_name': 'all',
+                    'limit': Config().get('reaper.show-runs-batch', 10)
+                })
 
-        # PAUSED, RUNNING, ABORTED
-        response = reaper.port_forwarded(state, 'repair_run?state=RUNNING', body, method='GET')
-        if not response:
-            return
-
-        header = 'Start,Duration,State,Cluster,Keyspace,Tables,Repaired'
-
-        runs = response.json()
-        if runs:
-            log(lines_to_tabular(sorted([line(run) for run in runs], reverse=True), header, separator=","))
-        else:
-            log2('No running runs found.')
-            log2()
-
-        response = reaper.port_forwarded(state, 'repair_run?state=PAUSED,ABORTED,DONE', body, method='GET')
-        if not response:
-            return
+                runs = response.json()
+                if runs:
+                    log(lines_to_tabular(sorted([line(run) for run in runs], reverse=True), header, separator=","))
+                else:
+                    log2('No runs found.')
 
-        runs = response.json()
-        if runs:
-            log(lines_to_tabular(sorted([line(run) for run in runs], reverse=True), header, separator=","))
-        else:
-            log2('No runs found.')
+            return state
 
     def completion(self, state: ReplState):
         if state.sts:

adam/commands/reaper/reaper_runs_abort.py

@@ -1,14 +1,11 @@
-import requests
-
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import reaper
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 
 class ReaperRunsAbort(Command):
     COMMAND = 'reaper abort runs'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -29,55 +26,38 @@ class ReaperRunsAbort(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            with reaper(state) as http:
+                # PAUSED, RUNNING, ABORTED
+                aborted = 0
+
+                while True == True:
+                    response = http.get('repair_run?state=RUNNING', params={
+                        'cluster_name': 'all',
+                        'limit': Config().get('reaper.abort-runs-batch', 10)
+                    })
+                    if not response:
+                        break
+
+                    runs = response.json()
+                    if not runs:
+                        break
+
+                    for run in runs:
+                        run_id = run['id']
+                        # PUT /repair_run/{id}/state/{state}
+                        http.put(f'repair_run/{run_id}/state/ABORTED')
+                        aborted += 1
+
+                if aborted:
+                    log2(f'Aborted {aborted} runs in total.')
+                else:
+                    log2('No running repair runs found.')
 
-        if not(reaper := ReaperSession.create(state)):
             return state
 
-        self.stop_runs(state, reaper)
-
-        return state
-
-    def stop_runs(self, state: ReplState, reaper: ReaperSession):
-        def body_list(uri: str, headers: dict[str, str]):
-            return requests.get(uri, headers=headers, params={
-                'cluster_name': 'all',
-                'limit': Config().get('reaper.abort-runs-batch', 10)
-            })
-
-        def body_abort(uri: str, headers: dict[str, str]):
-            return requests.put(uri, headers=headers)
-
-        # PAUSED, RUNNING, ABORTED
-        aborted = 0
-        while True == True:
-            response = reaper.port_forwarded(state, 'repair_run?state=RUNNING', body_list, method='GET')
-            if not response:
-                break
-
-            runs = response.json()
-            if not runs:
-                break
-
-            for run in runs:
-                run_id = run['id']
-                # PUT /repair_run/{id}/state/{state}
-                reaper.port_forwarded(state, f'repair_run/{run_id}/state/ABORTED', body_abort, method='PUT')
-                log2(f'Aborted {len(runs)} runs.')
-                aborted += 1
-
-        if aborted:
-            log2(f'Aborted {aborted} runs in total.')
-        else:
-            log2('No running repair runs found.')
-
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ReaperRunsAbort.COMMAND}\t abort all running reaper runs'

adam/commands/reaper/reaper_schedule_activate.py

@@ -1,13 +1,10 @@
-import requests
-
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import Reapers, reaper
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 
 class ReaperScheduleActivate(Command):
     COMMAND = 'reaper activate schedule'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -28,37 +25,21 @@ class ReaperScheduleActivate(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if not args:
-            log2('Specify schedule to activate.')
-
-            return state
-
-        schedule_id = args[0]
-        if not(reaper := ReaperSession.create(state)):
-            return state
+        with self.validate(args, state) as (args, state):
+            if not args:
+                log2('Specify schedule to activate.')
 
-        self.activate_schedule(state, reaper, schedule_id)
+                return state
 
-        return schedule_id
+            schedule_id = args[0]
+            with reaper(state) as http:
+                http.put(f'repair_schedule/{schedule_id}?state=ACTIVE')
+                Reapers.show_schedule(state, schedule_id)
 
-    def activate_schedule(self, state: ReplState, reaper: ReaperSession, schedule_id: str):
-        def body(uri: str, headers: dict[str, str]):
-            return requests.put(uri, headers=headers)
-
-        reaper.port_forwarded(state, f'repair_schedule/{schedule_id}?state=ACTIVE', body, method='PUT')
-        reaper.show_schedule(state, schedule_id)
+            return schedule_id
 
     def completion(self, state: ReplState):
-        if state.sts:
-            leaf = {id: None for id in ReaperSession.cached_schedule_ids(state)}
-
-            return super().completion(state, leaf)
-
-        return {}
+        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)})
 
     def help(self, _: ReplState):
         return f'{ReaperScheduleActivate.COMMAND} <schedule-id>\t resume reaper schedule'

adam/commands/reaper/reaper_schedule_start.py

@@ -1,13 +1,10 @@
-import requests
-
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import Reapers, reaper
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 
 class ReaperScheduleStart(Command):
     COMMAND = 'reaper start schedule'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -28,37 +25,21 @@ class ReaperScheduleStart(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            if not args:
+                log2('Specify schedule to activate.')
 
-        if not args:
-            log2('Specify schedule to activate.')
+                return state
 
-            return state
+            schedule_id = args[0]
+            with reaper(state) as http:
+                http.post(f'repair_schedule/start/{schedule_id}')
+                Reapers.show_schedule(state, schedule_id)
 
-        schedule_id = args[0]
-        if not(reaper := ReaperSession.create(state)):
             return schedule_id
 
-        self.start_schedule(state, reaper, schedule_id)
-
-        return schedule_id
-
-    def start_schedule(self, state: ReplState, reaper: ReaperSession, schedule_id: str):
-        def body(uri: str, headers: dict[str, str]):
-            return requests.post(uri, headers=headers)
-
-        reaper.port_forwarded(state, f'repair_schedule/start/{schedule_id}', body, method='POST')
-        reaper.show_schedule(state, schedule_id)
-
     def completion(self, state: ReplState):
-        if state.sts:
-            leaf = {id: None for id in ReaperSession.cached_schedule_ids(state)}
-
-            return super().completion(state, leaf)
-
-        return {}
+        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)})
 
     def help(self, _: ReplState):
         return f'{ReaperScheduleStart.COMMAND} <schedule-id>\t start reaper runs for schedule'

adam/commands/reaper/reaper_schedule_stop.py

@@ -1,13 +1,10 @@
-import requests
-
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import Reapers, reaper
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 
 class ReaperScheduleStop(Command):
     COMMAND = 'reaper stop schedule'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -28,37 +25,21 @@ class ReaperScheduleStop(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            if not args:
+                log2('Specify run schedule to stop.')
 
-        if not args:
-            log2('Specify run schedule to stop.')
+                return state
 
-            return state
+            with reaper(state) as http:
+                schedule_id = args[0]
+                http.put(f'repair_schedule/{schedule_id}?state=PAUSED')
+                Reapers.show_schedule(state, schedule_id)
 
-        schedule_id = args[0]
-        if not(reaper := ReaperSession.create(state)):
             return schedule_id
 
-        self.stop_schedule(state, reaper, schedule_id)
-
-        return schedule_id
-
-    def stop_schedule(self, state: ReplState, reaper: ReaperSession, schedule_id: str):
-        def body(uri: str, headers: dict[str, str]):
-            return requests.put(uri, headers=headers)
-
-        reaper.port_forwarded(state, f'repair_schedule/{schedule_id}?state=PAUSED', body, method='PUT')
-        reaper.show_schedule(state, schedule_id)
-
     def completion(self, state: ReplState):
-        if state.sts:
-            leaf = {id: None for id in ReaperSession.cached_schedule_ids(state)}
-
-            return super().completion(state, leaf)
-
-        return {}
+        return super().completion(state, lambda: {id: None for id in Reapers.cached_schedule_ids(state)})
 
     def help(self, _: ReplState):
         return f'{ReaperScheduleStop.COMMAND} <schedule-id>\t pause reaper schedule'

adam/commands/reaper/reaper_schedules.py

@@ -1,10 +1,9 @@
 from adam.commands.command import Command
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import Reapers
 from adam.repl_state import ReplState, RequiredState
 
 class ReaperSchedules(Command):
     COMMAND = 'reaper show schedules'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -25,22 +24,13 @@ class ReaperSchedules(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
+        with self.validate(args, state) as (args, state):
+            Reapers.show_schedules(state)
 
-        if not(reaper := ReaperSession.create(state)):
             return state
 
-        reaper.show_schedules(state)
-
-        return state
-
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ReaperSchedules.COMMAND}\t show reaper schedules'

adam/commands/reaper/reaper_status.py

@@ -4,13 +4,11 @@ from kubernetes import client
 
 from adam.commands.command import Command
 from adam.commands.commands_utils import show_pods
-from .reaper_session import ReaperSession
+from adam.commands.reaper.utils_reaper import Reapers
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log, log2
 
 class ReaperStatus(Command):
     COMMAND = 'reaper status'
-    reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
@@ -31,18 +29,15 @@ class ReaperStatus(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if not(reaper := ReaperSession.create(state)):
-            return state
+        with self.validate(args, state) as (args, state):
+            if not Reapers.pod_name(state):
+                return state
 
-        pods = self.list_pods(state.sts, state.namespace)
+            pods = self.list_pods(state.sts, state.namespace)
 
-        show_pods(pods, state.namespace, show_host_id=False)
+            show_pods(pods, state.namespace, show_host_id=False)
 
-        return state
+            return state
 
     def list_pods(self, sts_name: str, namespace: str) -> List[client.V1Pod]:
         v1 = client.CoreV1Api()
@@ -55,10 +50,7 @@ class ReaperStatus(Command):
         return cast(List[client.V1Pod], v1.list_namespaced_pod(namespace, label_selector=label_selector).items)
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ReaperStatus.COMMAND}\t show reaper status'