pyntcli 0.1.102__py3-none-any.whl → 0.1.104__py3-none-any.whl

pyntcli/__init__.py

@@ -1,20 +1 @@
-__version__ = "0.1.102"
-
-try:
-    from logzio import sender
-    import logging
-
-
-    def get_silent_logger():
-        logger = logging.getLogger("silent_logger")
-        logger.addHandler(logging.NullHandler())
-        return logger
-
-
-    def patched_get_stdout_logger(debug):
-        return get_silent_logger()
-
-
-    sender.get_stdout_logger = patched_get_stdout_logger
-except Exception as e:
-    pass
+__version__ = "0.1.104"

pyntcli/analytics/send.py

@@ -1,4 +1,3 @@
-import requests
 import time
 import platform
 import socket
@@ -7,7 +6,6 @@ import subprocess
 from pyntcli import __version__
 from pyntcli.transport import pynt_requests
 import pyntcli.log.log as log
-from pyntcli.ui import ui_thread
 
 
 PYNT_DEFAULT_USER_ID = "d9e3b82b-2900-43bf-8c8f-7ffe2f0cda36"
@@ -95,7 +93,7 @@ class AnalyticsSender():
 
         if self.user_id != PYNT_DEFAULT_USER_ID:
             if self.disable_analytics:
-                logger.info(f"Analytics disabled, sending to logz: {base_event}")
+                logger.info(f"Analytics disabled, not sending: {base_event}")
             else:
                 pynt_requests.post(MIXPANEL_URL, json=[base_event])
         else:
@@ -117,10 +115,7 @@ class AnalyticsSender():
         self.done()
 
     def done(self):
-        if self.events:
-            if self.disable_analytics:
-                logger.info(f"Analytics disabled, sending to logz: {self.events}")
-            else:
-                pynt_requests.post(MIXPANEL_URL, json=self.events)
+        if self.events and not self.disable_analytics:
+            pynt_requests.post(MIXPANEL_URL, json=self.events)
 
-            self.events = []
+        self.events = []

pyntcli/commands/postman.py

@@ -98,7 +98,7 @@ class PostmanSubCommand(sub_command.PyntSubCommand):
         container_config = pynt_container.DockerContainerConfig(
             args,
             "postman",
-            pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, port=args.port, name="--port"))
+            pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=args.port, name="--port"))
 
         postman_docker = pynt_container.PyntContainerNative(container_config)
         postman_docker.prepare_client()

pyntcli/commands/root.py

@@ -2,7 +2,6 @@ import argparse
 from os import environ
 
 from pyntcli.auth import login
-import pyntcli.log.log as log
 from pyntcli.ui import ui_thread
 from pyntcli.analytics import send as analytics
 
@@ -116,6 +115,5 @@ class BaseCommand:
         user_id = login.user_id()
         if user_id:
             analytics.set_user_id(user_id)
-            log.add_user_details(user_id)
 
         check_cicd_context()

pyntcli/log/log.py

@@ -1,46 +1,7 @@
-import os
 import logging
 import logging.config
-from contextlib import contextmanager
-from logzio.handler import ExtraFieldsLogFilter
 
-loggerType = logging.Logger
-
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        'logzio': {
-            'class': 'logzio.handler.LogzioHandler',
-            'level': 'DEBUG',
-            'token': "KOfjdWTcZXmjAwAOslpFYwhLpDzFTfJl",
-            'logs_drain_timeout': 5,
-            'url': 'https://listener.logz.io:8071',
-            'retries_no': 1,
-        }
-    },
-    'loggers': {
-        'logzioLogger': {
-            'level': 'DEBUG',
-            'handlers': ['logzio'],
-            'propagate': True
-        },
-
-    }
-}
-
-logging.config.dictConfig(LOGGING)
-
-logger = logging.getLogger('logzioLogger')
-
-def set_source(version):
-    logger.addFilter(ExtraFieldsLogFilter({"source":{"pyntcli":version}}))
-
-def add_user_details(id):
-    logger.addFilter(ExtraFieldsLogFilter({"userId":id}))
-
-def flush_logger():
-    [h.flush() for h in logger.handlers]
+logger = logging.getLogger(__name__)
 
 def get_logger():
     return logger

pyntcli/main.py

@@ -1,7 +1,6 @@
 from sys import argv, exit
 import signal
 import os
-import pyntcli.log.log as log
 from pyntcli.commands import pynt_cmd
 from pyntcli.pynt_docker import pynt_container
 from pyntcli.ui import ui_thread
@@ -41,7 +40,6 @@ def print_header():
 def start_analytics(user_id: str):
     if user_id:
         analytics.set_user_id(user_id)
-        log.add_user_details(user_id)
 
 
 def logout():
@@ -71,7 +69,6 @@ def main():
         if "--verbose" in argv:
             ui_thread.VERBOSE = True
 
-        log.set_source(__version__)
         ui_thread.print_verbose("Logging in...")
         user_id = login.user_id()
         start_analytics(user_id)
@@ -126,7 +123,6 @@ def main():
         pynt_errors.unexpected_error(e)
 
     finally:
-        log.flush_logger()
         shutdown_cli()
 
 

pyntcli/pynt_docker/pynt_container.py

@@ -3,6 +3,7 @@ import subprocess
 import os
 import json
 import argparse
+import threading
 from typing import List
 import base64
 
@@ -260,16 +261,28 @@ class PyntContainerNative:
         if process.returncode and process.returncode != 0:
             raise DockerNativeUnavailableException(f"Unable to perform docker run command, return code: {process.returncode}")
 
+        # 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', container_id],
+            ['docker', 'logs', '-f', container_id],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True
         )
 
-        logs_stdout, logs_stderr = logs_process.communicate()
+        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())
 
-        self.stdout = logs_stdout
+        logs_process.stdout.close()
 
     def kill_other_instances(self, report_to_user=True):
         ui_thread.print_verbose("Killing other pynt containers if such exist")
@@ -283,7 +296,7 @@ class PyntContainerNative:
                 container_ids = containers_output.splitlines()
                 for container_id in container_ids:
                     command = ["docker", "kill", container_id]
-                    subprocess.run(command)
+                    subprocess.run(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-0.1.102.dist-info → pyntcli-0.1.104.dist-info}/METADATA

@@ -1,15 +1,14 @@
 Metadata-Version: 2.1
 Name: pyntcli
-Version: 0.1.102
+Version: 0.1.104
 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
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Requires-Dist: rich
 Requires-Dist: requests==2.31.0
 Requires-Dist: pem
 Requires-Dist: certifi>=2017.4.17
-Requires-Dist: logzio-python-handler>=4.1.0
 Requires-Dist: websocket-client
 Requires-Dist: xmltodict
 Requires-Dist: timedinput==0.1.1

{pyntcli-0.1.102.dist-info → pyntcli-0.1.104.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=FOqUO2NVzyu71qVPUvSdcSq0R9nb3HWrEn0eMrsEMO8,403
-pyntcli/main.py,sha256=WEbWyqzDjtnZGSWgqru1FCT7wmHdi11uzd1LmwTTCI4,6095
+pyntcli/__init__.py,sha256=Vjjs1BYAO1INJZawED5BdBMAeebPcKzlvATnfl-mpRw,24
+pyntcli/main.py,sha256=RD0W2_0ogYBCXubo-YewxHYkiIXxNv6NkZOh3n1VujE,5964
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/analytics/send.py,sha256=9TRAEoPbv4rWOZfcNaGanrRJAFvNs39P-uKSl49GcQE,3679
+pyntcli/analytics/send.py,sha256=U8F2qh1CYZCTb-reEvPXWVPrGkb3bnHc1I6fBWnG_2U,3509
 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
@@ -14,17 +14,17 @@ pyntcli/commands/har.py,sha256=NzxyXlgS5YtQJqi9528V0FkbonMaZ0wHuvRl0LmR5JA,4329
 pyntcli/commands/id_command.py,sha256=UBEgMIpm4vauTCsKyixltiGUolNg_OfHEJvJ_i5BpJY,943
 pyntcli/commands/listen.py,sha256=oxgMvJYpPEu6h8qRFoueGF3a_nmwzaWMPL8ucfy7yxE,8983
 pyntcli/commands/newman.py,sha256=PRbsbDTxL54FRVYOYEpKJ5icVdGXtG2bfiGsnJgmKT4,5173
-pyntcli/commands/postman.py,sha256=aStkkyx3FTXvnIcQxNf1_OPKDE1RL25OALc2eyAZJCY,4980
+pyntcli/commands/postman.py,sha256=gV7Y_NM6oUQl1b7mLiGKnzityCuCE9RYMLFfeHFD-Gc,4980
 pyntcli/commands/pynt_cmd.py,sha256=T7jee0yw67Zth3lTkSDInCLnbu_IhpNqb7GqnTiTceQ,7012
-pyntcli/commands/root.py,sha256=6dSzKSjUX-ZetE2KYJNkBmfDDrcYJligmHBqIAIc2aQ,4140
+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/log/__init__.py,sha256=cOGwOYzMoshEbZiiasBGkj6wF0SBu3Jdpl-AuakDesw,19
-pyntcli/log/log.py,sha256=cWCdWmUaAwePwdhYDcgNMEG9d9RM34sGahxBCYEdv2Y,1069
+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=Yl_YESabRmWb38roDDUa_r3NKeAiwa0h9TPY7zTIsfY,13303
+pyntcli/pynt_docker/pynt_container.py,sha256=AnfIPwu0NVTBH4_9F1pjJb9oIietebOBTzJ8ssNf-ro,13849
 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
@@ -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.102.dist-info/METADATA,sha256=hC0ph5yb-J8gVgy9CKsVxj6s5UR80btfQdehYhTT_e0,472
-pyntcli-0.1.102.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-pyntcli-0.1.102.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.102.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
-pyntcli-0.1.102.dist-info/RECORD,,
+pyntcli-0.1.104.dist-info/METADATA,sha256=ie6Wx72JdfutnaFdNYOyfYp48n45Y7nFPyREUb1M6SA,428
+pyntcli-0.1.104.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+pyntcli-0.1.104.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.104.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.104.dist-info/RECORD,,

{pyntcli-0.1.102.dist-info → pyntcli-0.1.104.dist-info}/WHEEL

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