pyntcli 0.1.115__py3-none-any.whl → 0.1.116__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.115"
+__version__ = "0.1.116"

pyntcli/commands/pynt_cmd.py

@@ -7,8 +7,9 @@ from pyntcli.analytics import send as analytics
 from pyntcli.transport import pynt_requests
 from pyntcli.ui import ui_thread
 from pyntcli.ui import prompt
-from pyntcli.store import CredStore, StateStore
+from pyntcli.store import StateStore
 import pyntcli.log.log as log
+from pyntcli.saas_client.saas_client import pynt_client
 
 from requests.exceptions import SSLError, HTTPError
 
@@ -123,27 +124,26 @@ class PyntCommand:
         Returns:
             bool: True if it's a business-plan user
         """
-        saas_url = "https://api.pynt.io/v1/config"
-        headers = {}
-        with CredStore() as store:
-            access_keys = store.get_access_token()
-            token_type = store.get_token_type()
-            headers["Authorization"] = f"{token_type} {access_keys}"
         try:
-            response = requests.get(saas_url, headers=headers, timeout=10)
 
-            if response.status_code == requests.codes.ok:
+            if pynt_client.get_config():
                 return True
-            else:
-                return False
-        except requests.exceptions.RequestException as e:
-            # Catch all other request exceptions
-            logger.debug(f"An error occurred when accessing '{saas_url}': {e}")
+
+            return False
+        except HTTPError as e:
             return False
 
     def _post_login_args_validation(self, args: argparse.Namespace, command: str, is_business_plan_user: bool):
         if getattr(args, "application_name"):
-            if getattr(args, "yes") or self._is_auto_create_app_confirmed(args.application_name):
+            try:
+                pynt_client.get_application_by_name(args.application_name)
+            except HTTPError as e:
+                if e.response.status_code == 404:
+                    if getattr(args, "yes") or self._is_auto_create_app_confirmed(args.application_name):
+                        return
+                    else:
+                        raise UserAbortedException()
+            if getattr(args, "yes") or self._is_missing_app_id_confirmed():
                 return
             else:
                 raise UserAbortedException()
@@ -180,7 +180,7 @@ class PyntCommand:
                     return True
 
             if prompt.confirmation_prompt_with_timeout(confirmation_message, default=default_confirmation, timeout=15):
-                prompts_history["missing_app_id"] = {"last_confirmation": current_time.strftime("%Y-%m-%d %H:%M:%S")}
+                prompts_history[prompt_history_key] = {"last_confirmation": current_time.strftime("%Y-%m-%d %H:%M:%S")}
                 state_store.put_prompts_history(
                     prompts_history)
                 return True
@@ -195,5 +195,5 @@ class PyntCommand:
 
 
     def _is_auto_create_app_confirmed(self, application_name: str) -> bool:
-        return self.is_confirmed("auto_create_application", f"Application {application_name} will be created automatically if it does not exist.\n" +
-                                                       f"Do you want to continue without the application name {application_name}?", "yes")
+        return self.is_confirmed("", f"Application {application_name} will be created automatically if it does not exist.\n" +
+                                                       f"Do you want to continue with the application name {application_name}?", "yes")

pyntcli/pynt_docker/pynt_container.py

@@ -5,6 +5,7 @@ import os
 import json
 import argparse
 import threading
+from datetime import datetime
 from typing import List
 import base64
 
@@ -193,6 +194,35 @@ def get_docker_mounts(args: argparse.Namespace) -> list:
     return mounts
 
 
+class DockerLogFollower(threading.Thread):
+    def __init__(self, docker_exec: str, container_id: str):
+        super().__init__(target=self._run, name="docker logs follower")
+        self.docker_exec = docker_exec
+        self.container_id = container_id
+
+    def _run(self):
+        logs_process = subprocess.Popen(
+            [self.docker_exec, "logs", "-f", self.container_id],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+        )
+
+        while True:
+            line = logs_process.stdout.readline()
+            if not line:
+                break
+
+            now = datetime.now().astimezone().strftime("%Y-%m-%d %H:%M:%S %z")
+            log_line = ui_thread.Text(f"{now} [container]", "default on grey53")
+            log_line.append(f" {line}", "bold yellow on default")
+
+            ui_thread.print(log_line)
+
+
+
+        logs_process.wait()
+
 class PyntContainerNative:
     def __init__(self, container_config: DockerContainerConfig):
         self.config = container_config
@@ -255,37 +285,20 @@ class PyntContainerNative:
         process = subprocess.Popen(docker_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
         stdout, stderr = process.communicate()
 
-        if stderr:
-            print(stderr)
-
         container_id = stdout.strip()
 
         if process.returncode and process.returncode != 0:
-            ui_thread.print_verbose(f"Unable to perform docker run command, return code: {process.returncode}")
-            raise DockerNativeUnavailableException(f"Unable to perform docker run command, return code: {process.returncode}")
+            formatted_response = f"Unable to perform docker run command, return code: {process.returncode}"
+            if ui_thread.VERBOSE:
+                if stderr is not None and len(stderr) > 0:
+                    formatted_response += f"\nstderr\n---\n\n{stderr}"
+                if stdout is not None and len(stdout) > 0:
+                    formatted_response += f"\nstdout\n---\n\n{stdout}"
+            raise DockerNativeUnavailableException(formatted_response)
 
-        # Start log streaming in a separate thread
         if ui_thread.VERBOSE:
-            log_thread = threading.Thread(target=self.stream_docker_logs, args=(container_id,))
-            log_thread.daemon = True
-            log_thread.start()
-
-    def stream_docker_logs(self, container_id):
-        logs_process = subprocess.Popen(
-            ['docker', 'logs', '-f', container_id],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
-        )
-
-        while True:
-            log_output = logs_process.stdout.readline()
-            if log_output == '' and logs_process.poll() is not None:
-                break
-            if log_output:
-                print(log_output.strip())
-
-        logs_process.stdout.close()
+            # Start log streaming in a separate thread
+            DockerLogFollower(docker_exec, container_id).start()
 
     def kill_other_instances(self, report_to_user=True):
         ui_thread.print_verbose("Killing other pynt containers if such exist")

pyntcli/saas_client/__init__.py

@@ -0,0 +1 @@
+from .saas_client import *

pyntcli/saas_client/saas_client.py

@@ -0,0 +1,56 @@
+import os
+import requests
+
+import pyntcli.log.log as log
+from pyntcli.store import CredStore
+
+PYNT_SAAS = os.environ.get("PYNT_SAAS_URL", "https://api.pynt.io/v1")
+logger = log.get_logger()
+
+class PyntClient:
+    def __init__(self, base_url=PYNT_SAAS):
+        self.base_url = base_url
+
+    def _get_headers(self):
+        headers = {}
+        with CredStore() as store:
+            access_token = store.get_access_token()
+            token_type = store.get_token_type()
+            headers["Authorization"] = f"{token_type} {access_token}"
+        return headers
+
+    def get_config(self):
+        url = f"{self.base_url}/config"
+        headers = self._get_headers()
+
+        try:
+            response = requests.get(url, headers=headers, timeout=10)
+            response.raise_for_status()
+            return response.json()  # returning actual data
+
+        except requests.exceptions.HTTPError as e:
+            logger.error(f"HTTP error accessing '{url}': {e}")
+            raise e
+        except requests.exceptions.RequestException as e:
+            logger.error(f"Error accessing '{url}': {e}")
+
+        return None
+
+    def get_application_by_name(self, application_name):
+        url = f"{self.base_url}/application/{application_name}"
+        headers = self._get_headers()
+
+        try:
+            response = requests.get(url, headers=headers)
+            response.raise_for_status()
+            return response.json()  # returning actual data
+
+        except requests.exceptions.HTTPError as e:
+            logger.error(f"HTTP error accessing '{url}': {e}")
+            raise e
+        except requests.exceptions.RequestException as e:
+            logger.error(f"Error accessing '{url}': {e}")
+
+        return None
+
+pynt_client = PyntClient()

pyntcli/ui/pynt_errors.py

@@ -2,14 +2,12 @@ from pyntcli.ui import ui_thread
 
 
 def unexpected_error(original):
-    printer_text = ui_thread.PrinterText("An Unexpected Error Occurred", style=ui_thread.PrinterText.WARNING) \
-        .with_line("")
+    printer_text = ui_thread.PrinterText("An Unexpected Error Occurred: ", style=ui_thread.PrinterText.WARNING)
 
     msg = str(original) or repr(original)
-    if msg:
-        printer_text.with_line(f"e: {msg}")
+    printer_text.text.append(msg if msg else "Unknown error")
 
-    printer_text = printer_text.with_line(
+    printer_text = printer_text.with_line("").with_line(
         "Please tell us about it in our community channel and we will help you figure it out:",
         style=ui_thread.PrinterText.HEADER) \
         .with_line("https://join.slack.com/t/pynt-community/shared_invite/zt-1mvacojz5-WNjbH4HN8iksmKpCLTxOiQ",

{pyntcli-0.1.115.dist-info → pyntcli-0.1.116.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pyntcli
-Version: 0.1.115
+Version: 0.1.116
 Summary: Command line utility to handle all of Pynt's different integrations
 Author-email: Pynt-io <support@pynt.io>
 Project-URL: Homepage, https://pynt.io

{pyntcli-0.1.115.dist-info → pyntcli-0.1.116.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ignoreTests/conftest.py,sha256=gToq5K74GtgeGQXjFvXSzMaE6axBYxAzcFG5XJPOXjI,427
 ignoreTests/auth/login.py,sha256=7GeBirHTD9t6EassLYsegCw1FZHkfjvVW1Z5uybHzgM,3801
 ignoreTests/store/cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli/__init__.py,sha256=w7iUQrCxcREXlc0oJR5V2FHWH8-aYWfF0nTwm9iSFCY,24
+pyntcli/__init__.py,sha256=WH7k6Lp9d5LeVrO9NrIvNHTU68a2Yw4l0K-_6mGJeDk,24
 pyntcli/main.py,sha256=RD0W2_0ogYBCXubo-YewxHYkiIXxNv6NkZOh3n1VujE,5964
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/analytics/send.py,sha256=0hJ0WJNFHLqyohtRr_xOg5WEXzxHrUOlcePPg-k65Hk,3846
@@ -15,7 +15,7 @@ pyntcli/commands/id_command.py,sha256=UBEgMIpm4vauTCsKyixltiGUolNg_OfHEJvJ_i5BpJ
 pyntcli/commands/listen.py,sha256=RTlUt2oq5_BPeBZpG5yQ6GPAG_Cf0JVrUrkzz8uw9ns,9042
 pyntcli/commands/newman.py,sha256=w0d0Pi1swJQ8E3oRs6vsgw_591sl-4bcLpWZwuBXmDI,5282
 pyntcli/commands/postman.py,sha256=kN1PkzPpcUnsbirg17AN9JwJZu6VBt6OeKYrLGrvtFc,4964
-pyntcli/commands/pynt_cmd.py,sha256=Sqb64Ow3qhhBdyAglY6wV-SSL0AK5ADoEeOHO4FniQY,7942
+pyntcli/commands/pynt_cmd.py,sha256=TcsKVl0QZLEDIZjo-977IY6k4MAXVk_hljraW1eJmyg,7790
 pyntcli/commands/root.py,sha256=bTGlFroeK7WG9dAhFkVTVnpEM-Gdp8QKCuTxW_QWNlQ,4441
 pyntcli/commands/static_file_extensions.py,sha256=PZJb02BI-64tbU-j3rdCNsXzTh7gkIDGxGKbKNw3h5k,1995
 pyntcli/commands/sub_command.py,sha256=GF3-rE_qk2L4jGPFqHLm9SdGINmu3EakhjJTFyWjRms,374
@@ -25,7 +25,9 @@ pyntcli/log/__init__.py,sha256=cOGwOYzMoshEbZiiasBGkj6wF0SBu3Jdpl-AuakDesw,19
 pyntcli/log/log.py,sha256=YXCvcCzuhQ5QUT2L02uQEdN_lTCzLEuet4OnLuEnjlM,112
 pyntcli/pynt_docker/__init__.py,sha256=PQIOVxc7XXtMLfEX7ojgwf_Z3mmTllO3ZvzUZTPOxQY,30
 pyntcli/pynt_docker/container_utils.py,sha256=_Onn7loInzyJAG2-Uk6CGpsuRyelmUFHOvtJj4Uzi9A,175
-pyntcli/pynt_docker/pynt_container.py,sha256=YiYEq8_GZ8NpFNkUV4ynSEdKaYEjE764JgjdEknSw4g,13997
+pyntcli/pynt_docker/pynt_container.py,sha256=4vW12inRuKgsUM5K8NHTEjPZE1Qp8F62_J0gy6FjiRU,14506
+pyntcli/saas_client/__init__.py,sha256=HPBzoC5a6F5_WkHubcjq_W4m1OQ9i0TX8QXBtJlKm1M,26
+pyntcli/saas_client/saas_client.py,sha256=7mJNo2x4Oy2N4NKdHyGRxXZUk_VHZvRu1x586rojrp0,1756
 pyntcli/store/__init__.py,sha256=1fP8cEAQCF_myja3gnhHH9FEqtBiOJ-2aBmUXSKBdFA,41
 pyntcli/store/json_connector.py,sha256=UGs3uORw3iyn0YJ8kzab-veEZToA6d-ByXYuqEleWsA,560
 pyntcli/store/store.py,sha256=Kl_HT9FJFdKlAH7SwAt3g4-bW-r-1ve_u13OPggQai0,2529
@@ -35,13 +37,13 @@ pyntcli/transport/pynt_requests.py,sha256=gOPwBpPj6qIymDRFNgcQmwoI5Rqs4GMk4pfBva
 pyntcli/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/ui/progress.py,sha256=RrnO_jJNunoyupylakmWmHOEPw3lh99OHpKBzL6OBiE,1008
 pyntcli/ui/prompt.py,sha256=tK3BFYvgT7ZgSrsN5ASkltcsbhy8tOdNfEjRyCjOk6Q,1570
-pyntcli/ui/pynt_errors.py,sha256=00UprD4tFViREv7kuXGQ99PAKGTpXYixxi3Ndeoeiew,689
+pyntcli/ui/pynt_errors.py,sha256=4CTUnO6D8HD4JFWwKsNqdmhp5XugfFK7wJT5TK3k-Bc,686
 pyntcli/ui/report.py,sha256=W-icPSZrGLOubXgam0LpOvHLl_aZg9Zx9qIkL8Ym5PE,1930
 pyntcli/ui/ui_thread.py,sha256=XUBgLpYQjVhrilU-ofw7VSXgTiwneSdTxm61EvC3x4Q,5091
 tests/test_utils.py,sha256=t5fTQUk1U_Js6iMxcGYGqt4C-crzOJ0CqCKtLkRtUi0,2050
-tests/commands/test_pynt_cmd.py,sha256=c0m7L_kK3iWaHTIEC5H0IlUSL2UUU4NdakduLDbsVyg,8505
-pyntcli-0.1.115.dist-info/METADATA,sha256=sZ2RGy8wdB9ZZ4HgeoY4kJddkqOAsVkOs8Y218MjMtE,427
-pyntcli-0.1.115.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyntcli-0.1.115.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.115.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
-pyntcli-0.1.115.dist-info/RECORD,,
+tests/commands/test_pynt_cmd.py,sha256=J4JrEuD_qSVN76Fu6bKRjrxWSwCTXVEAzVPYdXMa0tI,8826
+pyntcli-0.1.116.dist-info/METADATA,sha256=68McFg0rYxmguHJX3Tc-YVRv9pg-zyyxNuUN1H_283M,427
+pyntcli-0.1.116.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+pyntcli-0.1.116.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.116.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.116.dist-info/RECORD,,

{pyntcli-0.1.115.dist-info → pyntcli-0.1.116.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/commands/test_pynt_cmd.py

@@ -8,18 +8,16 @@ import requests
 
 class TestIsBusinessPlanUser(unittest.TestCase):
 
-    @patch('pyntcli.commands.pynt_cmd.requests.get')
-    @patch('pyntcli.commands.pynt_cmd.CredStore')
-    def test_is_business_plan_user_success(self, mock_cred_store, mock_requests_get):
+    @patch('requests.get')
+    @patch('pyntcli.saas_client.saas_client.CredStore')
+    def test_is_business_plan_user_success(self, mock_requests_get, mock_cred_store):
         # Mock the CredStore context manager
-        mock_store_instance = MagicMock()
+        mock_store_instance = mock_cred_store.return_value.__enter__.return_value
         mock_store_instance.get_access_token.return_value = 'fake_token'
         mock_store_instance.get_token_type.return_value = 'Bearer'
-        mock_cred_store.return_value.__enter__.return_value = mock_store_instance
 
         # Mock the requests.get response
         mock_response = MagicMock()
-        mock_response.status_code = 200
         mock_requests_get.return_value = mock_response
 
         # Instantiate the class and call the method
@@ -29,18 +27,18 @@ class TestIsBusinessPlanUser(unittest.TestCase):
         # Assert the result
         self.assertTrue(result)
 
-    @patch('pyntcli.commands.pynt_cmd.requests.get')
-    @patch('pyntcli.commands.pynt_cmd.CredStore')
-    def test_is_business_plan_user_failure(self, mock_cred_store, mock_requests_get):
+    @patch('requests.get')
+    @patch('pyntcli.saas_client.saas_client.CredStore')
+    def test_is_business_plan_user_failure(self,mock_cred_store, mock_requests_get):
         # Mock the CredStore context manager
-        mock_store_instance = MagicMock()
+        mock_store_instance = mock_cred_store.return_value.__enter__.return_value
         mock_store_instance.get_access_token.return_value = 'fake_token'
         mock_store_instance.get_token_type.return_value = 'Bearer'
-        mock_cred_store.return_value.__enter__.return_value = mock_store_instance
+
 
         # Mock the requests.get response
         mock_response = MagicMock()
-        mock_response.status_code = 403
+        mock_response.raise_for_status.side_effect = requests.exceptions.HTTPError(response=MagicMock(status_code=403))
         mock_requests_get.return_value = mock_response
 
         # Instantiate the class and call the method
@@ -50,14 +48,13 @@ class TestIsBusinessPlanUser(unittest.TestCase):
         # Assert the result
         self.assertFalse(result)
 
-    @patch('pyntcli.commands.pynt_cmd.requests.get')
-    @patch('pyntcli.commands.pynt_cmd.CredStore')
+    @patch('requests.get')
+    @patch('pyntcli.saas_client.saas_client.CredStore')
     def test_is_business_plan_user_exception(self, mock_cred_store, mock_requests_get):
         # Mock the CredStore context manager
-        mock_store_instance = MagicMock()
+        mock_store_instance = mock_cred_store.return_value.__enter__.return_value
         mock_store_instance.get_access_token.return_value = 'fake_token'
         mock_store_instance.get_token_type.return_value = 'Bearer'
-        mock_cred_store.return_value.__enter__.return_value = mock_store_instance
 
         # Mock the requests.get to raise an exception
         mock_requests_get.side_effect = requests.exceptions.RequestException
@@ -137,6 +134,18 @@ class TestIsBusinessPlanUser(unittest.TestCase):
         # Assert the result
         self.assertTrue(result)
 
+    @patch('pyntcli.commands.pynt_cmd.prompt.confirmation_prompt_with_timeout', return_value=True)
+    @patch('requests.get')
+    def test_is_auto_create_app_confirmed_auto_confirms(self, mock_requests_get,  _):
+        mock_response = MagicMock()
+        mock_requests_get.return_value = mock_response
+
+        instance = PyntCommand()
+        result = instance._is_auto_create_app_confirmed("app_name")
+
+        # Assert the result
+        self.assertTrue(result)
+
     @patch('pyntcli.commands.pynt_cmd.prompt.confirmation_prompt_with_timeout', return_value=False)
     @patch('pyntcli.commands.pynt_cmd.StateStore')
     def test_missing_app_id_confirmation_confirmation_expired_user_aborts(self, mock_state_store, _):