kaqing 1.98.81__tar.gz → 1.98.83__tar.gz

{kaqing-1.98.81 → kaqing-1.98.83}/PKG-INFO

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

{kaqing-1.98.81 → kaqing-1.98.83}/adam/commands/frontend/setup_frontend.py

@@ -51,8 +51,8 @@ class SetupFrontend(Command):
 
         return state
 
-    def completion(self, _: ReplState):
-        return {}
+    def completion(self, state: ReplState):
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{SetupFrontend.COMMAND}\t sets up frontend'

{kaqing-1.98.81 → kaqing-1.98.83}/adam/commands/frontend/teardown_frontend.py

@@ -35,8 +35,8 @@ class TearDownFrontend(Command):
 
         return state
 
-    def completion(self, _: ReplState):
-        return {}
+    def completion(self, state: ReplState):
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{TearDownFrontend.COMMAND}\t tear down frontend'

{kaqing-1.98.81 → kaqing-1.98.83}/adam/commands/medusa/medusa_show_backupjobs.py

@@ -49,4 +49,4 @@ class MedusaShowBackupJobs(Command):
         return {}
 
     def help(self, _: ReplState):
-        return f'{MedusaShowBackupJobs.COMMAND}\t start a restore job'
+        return f'{MedusaShowBackupJobs.COMMAND}\t show backups'

{kaqing-1.98.81 → kaqing-1.98.83}/adam/commands/medusa/medusa_show_restorejobs.py

@@ -49,4 +49,4 @@ class MedusaShowRestoreJobs(Command):
         return {}
 
     def help(self, _: ReplState):
-        return f'{MedusaShowRestoreJobs.COMMAND}\t start a restore job'
+        return f'{MedusaShowRestoreJobs.COMMAND}\t show restores'

{kaqing-1.98.81 → kaqing-1.98.83}/adam/embedded_params.py

@@ -1,2 +1,2 @@
 def config():
-    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'image': 'seanahnsf/kaqing', 'name': 'kaqing-agent', 'timeout': 86400}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.13', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': True}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': {'timings': False, 'exit-on-error': False, 'show-parallelism': False, 'show-out': False}}
+    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'image': 'seanahnsf/kaqing', 'name': 'kaqing-agent', 'timeout': 86400}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.13', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': True}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': {'timings': False, 'exit-on-error': False, 'show-parallelism': False, 'show-out': False}}

{kaqing-1.98.81 → kaqing-1.98.83}/adam/repl_commands.py

@@ -2,6 +2,10 @@ from adam.commands.app import App
 from adam.commands.app_ping import AppPing
 from adam.commands.frontend.code_start import CodeStart
 from adam.commands.frontend.code_stop import CodeStop
+from adam.commands.frontend.setup import Setup
+from adam.commands.frontend.setup_frontend import SetupFrontend
+from adam.commands.frontend.teardown import TearDown
+from adam.commands.frontend.teardown_frontend import TearDownFrontend
 from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.cp import ClipboardCopy
 from adam.commands.bash import Bash
@@ -44,7 +48,7 @@ class ReplCommands:
         cmds: list[Command] = ReplCommands.navigation() + ReplCommands.cassandra_check() + ReplCommands.cassandra_ops() + \
             ReplCommands.tools() + ReplCommands.app() + ReplCommands.exit()
 
-        intermediate_cmds: list[Command] = [Show(), App(), Reaper(), Repair()]
+        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Setup(), Show(), TearDown()]
         ic = [c.command() for c in intermediate_cmds]
         # 1. dedup commands
         deduped = []
@@ -71,7 +75,7 @@ class ReplCommands:
         return Medusa.cmd_list() + [Restart(), RollOut(), Watch()] + Reaper.cmd_list() + Repair.cmd_list()
 
     def tools() -> list[Command]:
-        return [Cqlsh(), Postgres(), Bash(), CodeStart(), CodeStop()]
+        return [Cqlsh(), Postgres(), Bash(), CodeStart(), CodeStop(), SetupFrontend(), TearDownFrontend()]
 
     def app() -> list[Command]:
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), AppPing(), App()]

{kaqing-1.98.81 → kaqing-1.98.83}/adam/sso/authn_ad.py

@@ -163,58 +163,4 @@ class AdAuthenticator(Authenticator):
         except:
             Config().debug(traceback.format_exc())
 
-        return None
-
-        #     def decode_jwt_part(encoded_part):
-        #         missing_padding = len(encoded_part) % 4
-        #         if missing_padding:
-        #             encoded_part += '=' * (4 - missing_padding)
-        #         decoded_bytes = base64.urlsafe_b64decode(encoded_part)
-        #         return json.loads(decoded_bytes.decode('utf-8'))
-
-        # parts = id_token.split('.')
-        # # header = decode_jwt_part(parts[0])
-        # data = decode_jwt_part(parts[1])
-        # print('SEAN', payload)
-        # {
-        #     'aud': '00ff94a8-6b0a-4715-98e0-95490012d818',
-        #     'iss': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/v2.0',
-        #     'iat': 1756138348,
-        #     'nbf': 1756138348,
-        #     'exp': 1756142248,
-        #     'cc': 'CmCuOndNgXFbP/Vor0kv9fqd32LOv7kSHKStVrGPTXXnlPlSET3g4z23XjVZJW37F2Yy8d45MzZ6xA/XNbYGE3BHYAZFhfDKOp0ZbWZysqa2zqD3lpyXxnlEpzWkFY1SlDgSBWMzLmFpGhIKEFbS9ukejKFBi0QKCcPHh6MiEgoQb7gHorgqqEOuuPDIcSgHATICTkE4AUIJCQDvjjtx391I',
-        #     'email': 'sean.ahn@c3.ai',
-        #     'groups': [
-        #         'e58ef97f-8622-47cc-93cd-0ec8e3df2b4e',
-        #         '290214ec-2eaa-47bb-802c-70c2535bb7e7',
-        #         '55cd2e92-c40d-4646-b837-c6fb6406013b',
-        #         '9b715aa3-ec6c-44ad-be0c-a1d95045526d',
-        #         '19a38c19-e4c3-4d7b-8bb0-4afe7f502a51',
-        #         '5d891ce3-02d8-4d34-9748-9e711a3d54c5',
-        #         '0626cb36-106c-4ab3-adcf-7ee8e3f05584',
-        #         '6dfdfa3e-b225-4a74-a534-1cc963f78e08',
-        #         'bfdcca4e-7212-4e73-9b8a-eecfd3a7797d',
-        #         '6d050845-61c4-4072-acb1-9662d0c9faa0',
-        #         'c4fbb32c-9892-4eb3-a829-b4eaaf71b4ef'
-        #     ],
-        #     'name': 'Sean Ahn',
-        #     'nonce': 'V7DzmHtmhu3X3tzZmC55vMQ2WJtqXnW6wJpYb3Kfud8',
-        #     'oid': '380029a1-0643-4764-b3b8-9bc02630af41',
-        #     'preferred_username': 'sean.ahn@c3.ai',
-        #     'rh': '1.ATcAmnetU-eTXEi6IKyCkNclK6iU_wAKaxVHmOCVSQAS2Bj1AJU3AA.',
-        #     'sid': '007dea79-a65c-7911-5142-8ea1b9faa41a',
-        #     'sub': 'd-iCznXBDo3HEV7UCGalCVFIG47dQl_SFCaQtN2yVQI',
-        #     'tid': '53ad779a-93e7-485c-ba20-ac8290d7252b',
-        #     'uti': 'b7gHorgqqEOuuPDIcSgHAQ',
-        #     'ver': '2.0'
-        # }
-
-        # return IdToken(
-        #     data,
-        #     data['email'],
-        #     data['name'],
-        #     groups=data['groups'] if 'groups' in data else [],
-        #     iat=data['iat'] if 'iat' in data else 0,
-        #     nbf=data['nbf'] if 'nbf' in data else 0,
-        #     exp=data['exp'] if 'exp' in data else 0
-        # )
+        return None

{kaqing-1.98.81 → kaqing-1.98.83}/adam/sso/authn_okta.py

@@ -79,34 +79,6 @@ class OktaAuthenticator(Authenticator):
                 log2(f'{username} is not a member of {group}.')
 
                 raise OktaException("You are not part of admin group.")
-            # print(parsed)
-            # {
-            #   'sub': '00u1fii2azgmh46dE1d8',
-            #   'name': 'Sean Ahn',
-            #   'locale': 'US',
-            #   'email': 'sean.ahn@c3iot.com',
-            #   'ver': 1,
-            #   'iss': 'https://c3energy.okta.com',
-            #   'aud': 'azops88.c3.ai',
-            #   'iat': 1756136559,
-            #   'exp': 1756140159,
-            #   'jti': 'ID.fIjNa_A-uYo-mKMqpN_CLPqgQUnDIHeBV4WGa-Q_Qx8',
-            #   'amr': [
-            #     'pwd'
-            #   ],
-            #   'idp': '00onsxj5mmBGYLRURHTH',
-            #   'nonce': 'kRpFTGiyUGg6uWfdCUkS3tGI4wrroCz3MTaeI_wTILE',
-            #   'preferred_username': 'sean.ahn@c3iot.com',
-            #   'given_name': 'Seung',
-            #   'family_name': 'Ahn',
-            #   'zoneinfo': 'America/Los_Angeles',
-            #   'updated_at': 1755201182,
-            #   'email_verified': False,
-            #   'auth_time': 1756136558,
-            #   'groups': [
-            #     'azops88.c3.ai/C3.ClusterAdmin'
-            #   ]
-            # }
 
         return IdpLogin(redirect_url, id_token, state_token, username, idp_uri=idp_uri, id_token_obj=parsed, session=session)
 
@@ -118,8 +90,7 @@ class OktaAuthenticator(Authenticator):
 
             return None
 
-        okta_auth_server = f"https://{idp_host}/oauth2"
-        jwks_url = f"{okta_auth_server}/v1/keys"
+        jwks_url = Config().get('idps.okta.jwks-uri', 'https://c3energy.okta.com/oauth2/v1/keys')
         try:
             jwks_client = jwt.PyJWKClient(jwks_url, cache_jwk_set=True, lifespan=360)
             signing_key = jwks_client.get_signing_key_from_jwt(id_token)

{kaqing-1.98.81 → kaqing-1.98.83}/adam/sso/idp.py

@@ -34,15 +34,16 @@ class Idp:
         if use_token_from_env:
             if l0 := session.login_from_env_var():
                 return l0
-        if port := os.getenv("SERVER_PORT"):
-            token_server = Config().get('app.login.token-server-url', 'http://localhost:{port}').replace('{port}', port)
-            res: requests.Response = requests.get(token_server)
-            if res.status_code == 200 and res.text:
-                try:
-                    # may fail if the idp token is not complete
-                    return session.login_from_token(res.text)
-                except:
-                    pass
+
+            if port := os.getenv("SERVER_PORT"):
+                token_server = Config().get('app.login.token-server-url', 'http://localhost:{port}').replace('{port}', port)
+                res: requests.Response = requests.get(token_server)
+                if res.status_code == 200 and res.text:
+                    try:
+                        # may fail if the idp token is not complete
+                        return session.login_from_token(res.text)
+                    except:
+                        pass
 
         r: IdpLogin = None
         try:

kaqing-1.98.83/adam/version.py

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

{kaqing-1.98.81 → kaqing-1.98.83}/kaqing.egg-info/PKG-INFO

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

{kaqing-1.98.81 → kaqing-1.98.83}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='kaqing',
-    version='1.98.81',
+    version='1.98.83',
     packages=find_packages(),
     entry_points={
         'console_scripts': [

kaqing-1.98.81/adam/version.py

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