pyntcli 0.1.105__py3-none-any.whl → 0.1.107__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.105"
+__version__ = "0.1.107"

pyntcli/analytics/send.py

@@ -95,7 +95,11 @@ class AnalyticsSender():
             if self.disable_analytics:
                 logger.info(f"Analytics disabled, not sending: {base_event}")
             else:
-                pynt_requests.post(MIXPANEL_URL, json=[base_event])
+                try:
+                    pynt_requests.post(MIXPANEL_URL, json=[base_event])
+                except Exception as e:
+                    logger.error(f"Failed to send analytics event: {base_event}, error: {e}")
+                    pass
         else:
             self.events.append(base_event)
 
@@ -116,6 +120,10 @@ class AnalyticsSender():
 
     def done(self):
         if self.events and not self.disable_analytics:
-            pynt_requests.post(MIXPANEL_URL, json=self.events)
+            try:
+                pynt_requests.post(MIXPANEL_URL, json=self.events)
+            except Exception as e:
+                logger.error(f"Failed to send analytics events. error: {e}")
+                pass
 
         self.events = []

pyntcli/commands/util.py

@@ -1,12 +1,12 @@
 import time
 import socket
 import os
-import tempfile
 from contextlib import contextmanager
 from pathlib import Path
 import webbrowser
 import json
 import pyntcli.log.log as log
+import pyntcli.store.store as store
 
 from pyntcli.commands.static_file_extensions import STATIC_FILE_EXTENSIONS
 from pyntcli.pynt_docker import pynt_container
@@ -74,8 +74,8 @@ class SeverityException(Exception):
 
 @contextmanager
 def create_default_file_mounts(args):
-    html_report_path = os.path.join(tempfile.gettempdir(), "results.html")
-    json_report_path = os.path.join(tempfile.gettempdir(), "results.json")
+    html_report_path = os.path.join(store.get_default_store_dir(), "results.html")
+    json_report_path = os.path.join(store.get_default_store_dir(), "results.json")
 
     if "reporters" in args and args.reporters:
         html_report_path = os.path.join(os.getcwd(), "pynt_results.html")

pyntcli/pynt_docker/pynt_container.py

@@ -288,15 +288,17 @@ class PyntContainerNative:
         ui_thread.print_verbose("Killing other pynt containers if such exist")
         try:
             for _ in IMAGE_TAGS:
-                command = ["docker", "ps", "-q", "-f", f"name={self.container_name}"]
+                command = ["docker", "ps", "-a", "-q", "-f", f"name={self.container_name}"]
                 containers_output = subprocess.check_output(command, text=True)
                 if not containers_output:
                     continue
 
                 container_ids = containers_output.splitlines()
                 for container_id in container_ids:
-                    command = ["docker", "kill", container_id]
-                    subprocess.run(command,stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    kill_command = ["docker", "kill", container_id]
+                    remove_command = ["docker", "remove", container_id]
+                    subprocess.run(kill_command,stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    subprocess.run(remove_command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
                     if report_to_user:
                         ui_thread.print(
                             ui_thread.PrinterText("Another Pynt container was running, killed it", ui_thread.PrinterText))

pyntcli/store/store.py

@@ -5,6 +5,10 @@ from .json_connector import JsonStoreConnector
 from .store_connector import StoreConnector
 
 
+def get_default_store_dir():
+    return os.path.join(os.path.expanduser("~"), ".pynt")
+
+
 class Store():
     def __init__(self, file_location: str, connector_type: Type[StoreConnector]) -> None:
         self.file_location = file_location
@@ -40,9 +44,6 @@ class Store():
     def get_path(self):
         return self.file_location
 
-    def _get_default_store_dir(self):
-        return os.path.join(os.path.expanduser("~"), ".pynt")
-
     def __enter__(self):
         self._get_file_data()
         return self
@@ -54,7 +55,7 @@ class Store():
 
 class CredStore(Store):
     def __init__(self) -> None:
-        pynt_dir = super()._get_default_store_dir()
+        pynt_dir = get_default_store_dir()
         super().__init__(file_location=os.path.join(pynt_dir, "creds.json"),
                          connector_type=JsonStoreConnector)
 
@@ -73,7 +74,7 @@ class CredStore(Store):
 
 class StateStore(Store):
     def __init__(self) -> None:
-        pynt_dir = super()._get_default_store_dir()
+        pynt_dir = get_default_store_dir()
         super().__init__(file_location=os.path.join(pynt_dir, "state.json"),
                          connector_type=JsonStoreConnector)
 

{pyntcli-0.1.105.dist-info → pyntcli-0.1.107.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyntcli
-Version: 0.1.105
+Version: 0.1.107
 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.105.dist-info → pyntcli-0.1.107.dist-info}/RECORD

@@ -1,10 +1,10 @@
 ignoreTests/conftest.py,sha256=gToq5K74GtgeGQXjFvXSzMaE6axBYxAzcFG5XJPOXjI,427
 ignoreTests/auth/login.py,sha256=KFlzWhXBAuwdi7GXf16gCB3ya94LQG2wjcSChE149rQ,3798
 ignoreTests/store/cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli/__init__.py,sha256=HgBBYnefIIbQJYRCDzUrV1XShKQixe48kLei7iJcsSs,24
+pyntcli/__init__.py,sha256=EOCfjhl8tpnOQpcbCZSBKM0i_FvcprayX3DIVt2CxZY,24
 pyntcli/main.py,sha256=RD0W2_0ogYBCXubo-YewxHYkiIXxNv6NkZOh3n1VujE,5964
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/analytics/send.py,sha256=U8F2qh1CYZCTb-reEvPXWVPrGkb3bnHc1I6fBWnG_2U,3509
+pyntcli/analytics/send.py,sha256=0hJ0WJNFHLqyohtRr_xOg5WEXzxHrUOlcePPg-k65Hk,3846
 pyntcli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/auth/login.py,sha256=TljsRXbEkNI1YUrKm5mlTw4YiecYScYUsit8Z8vstss,5228
 pyntcli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,15 +19,15 @@ pyntcli/commands/pynt_cmd.py,sha256=T7jee0yw67Zth3lTkSDInCLnbu_IhpNqb7GqnTiTceQ,
 pyntcli/commands/root.py,sha256=UtGky7LfbfQ6mELHoNJcdHznFrUVBlhXI47_8QdApfc,4068
 pyntcli/commands/static_file_extensions.py,sha256=PZJb02BI-64tbU-j3rdCNsXzTh7gkIDGxGKbKNw3h5k,1995
 pyntcli/commands/sub_command.py,sha256=GF3-rE_qk2L4jGPFqHLm9SdGINmu3EakhjJTFyWjRms,374
-pyntcli/commands/util.py,sha256=csZHQ2Xbdh-_KX-yIVrnaeNsT0NbuS-ej6kND3CxD_w,4414
+pyntcli/commands/util.py,sha256=FGtuXLxMAL0b9sbsrJaQR_-5sEu-PwZOJonMwuCjO2U,4450
 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=AnfIPwu0NVTBH4_9F1pjJb9oIietebOBTzJ8ssNf-ro,13849
+pyntcli/pynt_docker/pynt_container.py,sha256=oItp-NK4eu08DfpTtyBXrjHOE7jHZjffwe8Ox9ae770,14042
 pyntcli/store/__init__.py,sha256=1fP8cEAQCF_myja3gnhHH9FEqtBiOJ-2aBmUXSKBdFA,41
 pyntcli/store/json_connector.py,sha256=UGs3uORw3iyn0YJ8kzab-veEZToA6d-ByXYuqEleWsA,560
-pyntcli/store/store.py,sha256=ZLSe0WAjHDp8cSt4BBFDkPGRux4cgOo5UfF7V4naM7U,2559
+pyntcli/store/store.py,sha256=Kl_HT9FJFdKlAH7SwAt3g4-bW-r-1ve_u13OPggQai0,2529
 pyntcli/store/store_connector.py,sha256=w4LzcpRZesUZL1f63RmLlWEFRtJ6Y6rcS6PkkGtO4MA,357
 pyntcli/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/transport/pynt_requests.py,sha256=C7OPvcKkRTcxSYuyiWKE59KgA9sRX0d6fm1wnopAmPo,1719
@@ -39,8 +39,8 @@ 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=BjGFCFACcSziLrNA6_27t6TjSmvdu54wx9njwLpRSJY,8379
-pyntcli-0.1.105.dist-info/METADATA,sha256=fY5Wj4fgESMah0UVLqBzixfK_F32VARFLgmodPMsat8,428
-pyntcli-0.1.105.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-pyntcli-0.1.105.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.105.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
-pyntcli-0.1.105.dist-info/RECORD,,
+pyntcli-0.1.107.dist-info/METADATA,sha256=IntbbJxOYoQBlP7_awa0DmVxHubkTuY67D5buGUn5HA,428
+pyntcli-0.1.107.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+pyntcli-0.1.107.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.107.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.107.dist-info/RECORD,,