kaqing 1.98.137__py3-none-any.whl → 1.98.139__py3-none-any.whl

adam/batch.py

@@ -22,7 +22,6 @@ from adam.commands.report import Report
 from adam.commands.restart import Restart
 from adam.commands.rollout import RollOut
 from adam.commands.show.show import Show, ShowCommandHelper
-from adam.commands.user_entry import UserEntry
 from adam.commands.watch import Watch
 from adam.k8s_utils.kube_context import KubeContext
 from adam.repl import enter_repl
@@ -261,16 +260,6 @@ def undeploy(kubeconfig: str, config: str, param: list[str], namespace: str, ext
     run_command(Undeploy(), kubeconfig, config, param, None, namespace, None, extra_args)
 
 
-@cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=PodCommandHelper, help='Get cassandra log.')
-@click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
-@click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
-@click.option('--param', '-v', multiple=True, metavar='<key>=<value>', help='parameter override')
-@click.option('--namespace', '-n', required=False, metavar='namespace', help='Kubernetes namespace')
-@click.argument('extra_args', nargs=-1, metavar='<pod>', type=click.UNPROCESSED)
-def entry(kubeconfig: str, config: str, param: list[str], namespace: str, extra_args):
-    run_command(UserEntry(), kubeconfig, config, param, None, namespace, None, extra_args)
-
-
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterOrPodCommandHelper, help='Watch pods in cluster.')
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
 @click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
@@ -283,7 +272,7 @@ def watch(kubeconfig: str, config: str, param: list[str], cluster: str, namespac
 
 
 def run_command(cmd: Command, kubeconfig: str, config: str, params: list[str], cluster:str, namespace: str, pod: str, extra_args):
-    is_user_entry = cmd.command() == UserEntry().command()
+    is_user_entry = False
 
     KubeContext.init_config(kubeconfig, is_user_entry=is_user_entry)
     if not KubeContext.init_params(config, params, is_user_entry=is_user_entry):

adam/version.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = "1.98.137"  #: the working version
+__version__ = "1.98.139"  #: the working version
 __release__ = "1.0.0"  #: the release version

{kaqing-1.98.137.dist-info → kaqing-1.98.139.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 1.98.137
+Version: 1.98.139
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-1.98.137.dist-info → kaqing-1.98.139.dist-info}/RECORD

@@ -1,7 +1,7 @@
 adam/__init__.py,sha256=oVw1FNd9HZPJ7wm6BNn5ybyNGJLjJ8kopMeBiwgMaOI,59
 adam/app_session.py,sha256=Klypm4JYHOlovaRCHAZ2P_Mj_nheMlcQgX403R0TJGk,6969
 adam/apps.py,sha256=UTpUJBAMRFvR8kJZwileGC0UmPvsOjJ_AgvWoGmnIFI,6701
-adam/batch.py,sha256=Bf5Q07_DW8FEUwuXCq70qjkKs2Sarv1ujNYpBFBQfQM,24102
+adam/batch.py,sha256=o82yYDgyoJw1t87QyAfn9jGqIcWX23ehRI21U4JUTv8,23221
 adam/cli.py,sha256=03pIZdomAu7IL-GSP6Eun_PKwwISShRAmfx6eVRPGC0,458
 adam/cli_group.py,sha256=W3zy1BghCtVcEXizq8fBH-93ZRVVwgAyGPzy0sHno1Y,593
 adam/config.py,sha256=38UcmYRxf-Kq4iPbKS7tNPQqN64fam1bWNy6jhWREd0,2552
@@ -14,7 +14,7 @@ adam/repl_commands.py,sha256=ionPWjPhzrzm59zbhO1WsGGcLVba3bnPl6uPjvQ4C34,4093
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=QarrUAwYWOz3YTemtaf2opbHLa5a3LEsyuonNwhvOhk,7131
 adam/utils.py,sha256=j7p7iruLuV11swa0z9ZLBgoJHu_nkTSVKtQe0q71gmk,7025
-adam/version.py,sha256=hkdSB7jQd7sx68C4limTG--1XsA1tCsUDYlYQsBH1jQ,141
+adam/version.py,sha256=rQTb_obJrUOP5N1EJzEqcCJkxbkdKobYc_9ZyhKgA7A,141
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -76,7 +76,6 @@ adam/commands/report.py,sha256=Ky45LIzSlB_X4V12JZWjU3SA2u4_FKRencRTq7psOWU,1944
 adam/commands/restart.py,sha256=Hik1t5rjH2ATZv4tzwrGB3e44b3dNuATgY327_Nb8Bs,2044
 adam/commands/rollout.py,sha256=52_4ijna3v-8Oug12et43DRHFDNhiN34p6xLTQmhdbQ,2959
 adam/commands/shell.py,sha256=wY_PIx7Lt6vuxhFArlfxdEnBbrouCJ3yNHhFn17DEqw,848
-adam/commands/user_entry.py,sha256=TJBffUJTVAuJw-UJWv2JOoeEy1iQBXAOLahQJsmX1RY,4719
 adam/commands/watch.py,sha256=mmBFpB8T1V7zrNs5b2YNyDDztMym_ILPDdkrbdAXTas,2438
 adam/commands/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/deploy/code_start.py,sha256=-iH8HThTNM83IfBxT_LqTByuHVatV9d-Il4OYOfrwLI,1370
@@ -157,8 +156,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-1.98.137.dist-info/METADATA,sha256=_FcNlCuY04Z-UEQu0IULyiTZN-XgLfpJh9F2JSsvC8k,134
-kaqing-1.98.137.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-1.98.137.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-1.98.137.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-1.98.137.dist-info/RECORD,,
+kaqing-1.98.139.dist-info/METADATA,sha256=piyMN5GQFcQcua01ZJ4CDsD7yi_qlSINzeMBOaJaiDs,134
+kaqing-1.98.139.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-1.98.139.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-1.98.139.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-1.98.139.dist-info/RECORD,,

adam/commands/user_entry.py

@@ -1,133 +0,0 @@
-from functools import partial
-from http.server import BaseHTTPRequestHandler, HTTPServer
-import os
-import re
-import subprocess
-import signal
-import threading
-import traceback
-
-from adam.commands.deploy.code_utils import get_available_port
-from adam.config import Config
-from adam.sso.idp import Idp
-from adam.app_session import AppSession, IdpLogin
-from adam.apps import Apps
-from adam.commands.command import Command
-from adam.repl_state import ReplState
-from adam.utils import log2
-
-class TokenHandler(BaseHTTPRequestHandler):
-    def __init__(self, port: int, user: str, idp_token: str, *args, **kwargs):
-        self.port = port
-        self.user = user
-        self.idp_token = idp_token
-        super().__init__(*args, **kwargs)
-
-    def log_request(self, code='-', size='-'):
-        pass
-
-    def do_GET(self):
-        Config().debug(f'Token request from cient: {self.client_address}\r')
-        ports = self.get_user_ports()
-        Config().debug(f'ports: {ports}\r')
-        if os.getenv('CHECK_CLIENT_PORT', 'true').lower() != 'true' or self.client_address[1] in ports:
-            self.send_response(200)
-            self.send_header('Content-type', 'text/plain')
-            self.end_headers()
-            self.wfile.write(self.idp_token.encode('utf8'))
-        else:
-            self.send_response(403)
-            self.send_header('Content-type', 'text/plain')
-            self.end_headers()
-            self.wfile.write(f'Port: {self.port} has not been opened by you.\n'.encode('utf8'))
-
-    def get_user_ports(self):
-        # this needs SYS_PTRACE capability with the container
-        ports = []
-
-        # curl 627299 sahn 5u IPv4 542049941 0t0 TCP localhost:39524->localhost:8001 (ESTABLISHED)
-        command = ['bash', '-c', f"lsof -i -P 2> /dev/null | grep {self.user} | grep localhost" + " | awk '{print $9}'"]
-        result = subprocess.run(command, capture_output=True, text=True, check=True)
-        for line in result.stdout.split('\n'):
-            groups = re.match(r'localhost:(.*?)->localhost:(.*)$', line)
-            if groups:
-                ports.append(int(groups[1]))
-
-        return ports
-
-class UserEntry(Command):
-    COMMAND = 'entry'
-
-    # the singleton pattern
-    def __new__(cls, *args, **kwargs):
-        if not hasattr(cls, 'instance'): cls.instance = super(UserEntry, cls).__new__(cls)
-
-        return cls.instance
-
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
-    def command(self):
-        return UserEntry.COMMAND
-
-    def run_token_server(port: int, user: str, idp_token: str):
-        server_address = ('localhost', port)
-        handler = partial(TokenHandler, port, user, idp_token)
-        httpd = HTTPServer(server_address, handler)
-        Config().debug(f"Serving on port {port}")
-        httpd.serve_forever()
-
-    def run(self, cmd: str, state: ReplState):
-        def custom_handler(signum, frame):
-            AppSession.ctrl_c_entered = True
-
-        signal.signal(signal.SIGINT, custom_handler)
-
-        if not(args := self.args(cmd)):
-            return super().run(cmd, state)
-
-        state, args = self.apply_state(args, state)
-        args, debug = Command.extract_options(args, 'd')
-        if debug:
-            Config().set('debug.show-out', True)
-
-        username: str = None
-        if len(args) > 0:
-            username = args[0]
-
-        login: IdpLogin = None
-        while not login:
-            try:
-                if not(host := Apps.app_host('c3', 'c3', state.namespace)):
-                    log2('Cannot locate ingress for app.')
-                    username = None
-                    continue
-
-                if not (login := Idp.login(host, username=username, use_token_from_env=False, use_cached_creds=False)):
-                    log2('Invalid username/password. Please try again.')
-                    username = None
-            except Exception as e:
-                log2(e)
-
-                Config().debug(traceback.format_exc())
-
-        server_port = get_available_port()
-        server_thread = threading.Thread(target=UserEntry.run_token_server, args=(server_port, login.shell_user(), login.ser()), daemon=True)
-        server_thread.start()
-
-        sh = f'{os.getcwd()}/login.sh'
-        if not os.path.exists(sh):
-            sh = f'{os.getcwd()}/docker/login.sh'
-
-        if os.getenv('PASS_DOWN_IDP_TOKEN', "false").lower() == "true":
-            os.system(f'{sh} {login.shell_user()} {server_port} {login.ser()}')
-        else:
-            os.system(f'{sh} {login.shell_user()} {server_port}')
-
-        return state
-
-    def completion(self, _: ReplState):
-        return {}
-
-    def help(self, _: ReplState):
-        return f'{UserEntry.COMMAND}\t ttyd user entry'