atomicshop 3.3.14__py3-none-any.whl → 3.3.15__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '3.3.14'
+__version__ = '3.3.15'

atomicshop/process.py

@@ -316,14 +316,21 @@ def kill_process_by_filename_pattern(pattern: str):
         processes.kill_process_by_pid(running_processes[0]['pid'])
 
 
-def run_powershell_command(command):
+def run_powershell_command(
+        command: str
+):
     try:
         result = subprocess.run(["powershell", "-Command", command], capture_output=True, text=True, check=True)
-        print_api(result.stdout)
+        if result.stdout:
+            print_api(result.stdout)
+        if result.stderr:  # PS can write warnings to stderr even on success
+            print_api(result.stderr, color='yellow')
         return result.stdout
     except subprocess.CalledProcessError as e:
-        print_api(f"An error occurred: {e}", color='red', error_type=True)
-        return e
+        # e.stderr and e.stdout are populated because capture_output=True
+        msg = (e.stderr or e.stdout or f"PowerShell exited with code {e.returncode}")
+        print_api(msg, color='red', error_type=True)
+        return msg
 
 
 """

atomicshop/web.py

@@ -4,6 +4,11 @@ import ssl
 # noinspection PyPackageRequirements
 import certifi
 
+try:
+    from importlib.metadata import version, PackageNotFoundError  # Python 3.8+
+except ImportError:  # Python <3.8
+    from importlib_metadata import version, PackageNotFoundError  # backport
+
 from .archiver import zips
 from .urls import url_parser
 from .file_io import file_io
@@ -14,8 +19,6 @@ from . import filesystem, print_api
 # https://www.useragents.me/
 # https://user-agents.net/
 USER_AGENTS = {
-    'Windows_Chrome_Latest':
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36',
     'Chrome_111.0.0_Windows_10-11_x64':
         'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36',
     'Chrome 132.0.0, Windows 10/11':
@@ -184,6 +187,19 @@ def download(
         else:
             print_api.print_api(f'Downloaded bytes: {aggregated_bytes_int}', print_end=print_end, **kwargs)
 
+    def has_pip_system_certs() -> bool:
+        try:
+            version("pip-system-certs")  # distribution/project name on PyPI
+            return True
+        except PackageNotFoundError:
+            return False
+
+    if not has_pip_system_certs():
+        print_api.print_api(
+            'Warning: "pip-system-certs" package is not installed. '
+            'If "certifi" package is installed, the system\'s CA store will not be used for SSL context. '
+            'Install "pip-system-certs" package if you want to use the system\'s CA store.', color='yellow', **kwargs)
+
     # Size of the buffer to read each time from url.
     buffer_size: int = 4096
 

atomicshop/wrappers/loggingw/reading.py

@@ -2,12 +2,26 @@ import os
 from typing import Literal, Union
 from pathlib import Path
 import datetime
+import re
 
 from ... import filesystem, datetimes
 from ...basics import booleans, list_of_classes
 from ...file_io import csvs
 
 
+def is_string_ends_with_ymd(s: str) -> bool:
+    date_tail_re = re.compile(r'(\d{4}-\d{2}-\d{2})$')
+
+    m = date_tail_re.search(s)
+    if not m:
+        return False
+    try:
+        datetime.datetime.strptime(m.group(1), "%Y-%m-%d")
+        return True
+    except ValueError:
+        return False
+
+
 def get_logs_paths(
         log_file_path: str,
         date_format: str = None,
@@ -65,6 +79,10 @@ def get_logs_paths(
     log_file_name: str = Path(log_file_path).stem
     log_file_extension: str = Path(log_file_path).suffix
 
+    if is_string_ends_with_ymd(log_file_name):
+        raise ValueError(
+            f'The log file name cannot end with a date in the format YYYY-MM-DD: {log_file_name}')
+
     if not log_file_extension and '.' in log_file_name:
         log_file_name, log_file_extension = log_file_name.rsplit('.')
         log_file_extension = f'.{log_file_extension}'

atomicshop/wrappers/socketw/creator.py

@@ -245,7 +245,7 @@ def wrap_socket_with_ssl_context_client___default_certs___ignore_verification(
         custom_pem_client_certificate_file_path: str = None,
         enable_sslkeylogfile_env_to_client_ssl_context: bool = False,
         sslkeylog_file_path: str = None
-):
+) -> ssl.SSLSocket:
     """
     This function is a preset for wrapping the socket with SSL context for the client.
     It sets the CA default certificates, and ignores the server's certificate verification.
@@ -256,6 +256,9 @@ def wrap_socket_with_ssl_context_client___default_certs___ignore_verification(
         Default is None.
     :param enable_sslkeylogfile_env_to_client_ssl_context: boolean, enables the SSLKEYLOGFILE environment variable
         to the SSL context. Default is False.
+    :param sslkeylog_file_path: string, full file path for the SSL key log file. Default is None.
+
+    :return: ssl.SSLSocket object
     """
     ssl_context: ssl.SSLContext = create_ssl_context_for_client(
         enable_sslkeylogfile_env_to_client_ssl_context=enable_sslkeylogfile_env_to_client_ssl_context

{atomicshop-3.3.14.dist-info → atomicshop-3.3.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atomicshop
-Version: 3.3.14
+Version: 3.3.15
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License-Expression: MIT

{atomicshop-3.3.14.dist-info → atomicshop-3.3.15.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=debK84uDGgKHJ_4iS_NawX5O0cgsZh-k1lWv7rnptCA,123
+atomicshop/__init__.py,sha256=6WgqHKNGGFHXE26Xw2aXZupzRTfmkTbM2lmvzAjmQcc,123
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -28,7 +28,7 @@ atomicshop/networks.py,sha256=IfhEgI0rJHPgkbIDEC6lsPVZm-fyylpacKSo5HrIEic,26403
 atomicshop/on_exit.py,sha256=9XlOnzoAG8zlI8wBF4AB8hyrC6Q1b84gkhqpAhhdN9g,6977
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
 atomicshop/print_api.py,sha256=SJNQIMqSLlYaPtjHnALySAI-jQYuYHOCGgfP7oe96fU,10957
-atomicshop/process.py,sha256=dmje2YIDPVM8zS38ylAqyOhDBXk6ay_N1xeewKdEIX4,16966
+atomicshop/process.py,sha256=e8u7jvq5HDKqna7xmeqNTKFY4BQNKX6NtAUGPwur6zE,17288
 atomicshop/python_file_patcher.py,sha256=-uhbUX-um5k-If_XXuOfCr8wMzZ3QE6h9N8xGWw6W_o,5486
 atomicshop/python_functions.py,sha256=BPZ3sv5DgQs6Xrl3nIMdPABRpgrau3XSrsnDIz-LEwY,6175
 atomicshop/question_answer_engine.py,sha256=7nM6kGDSFjQNi87b87-kP9lYM0vTjBHn1rEQGNAfdGA,825
@@ -48,12 +48,11 @@ atomicshop/uuids.py,sha256=JSQdm3ZTJiwPQ1gYe6kU0TKS_7suwVrHc8JZDGYlydM,2214
 atomicshop/venvs.py,sha256=D9lwOoObkYoRx-weuoAmbvN-RdSHhVm4DE9TVl-utAs,903
 atomicshop/versioning.py,sha256=e5W6m9AF3__M5nntqI9CqNAeHqkwY9JhlnpYeZ1CEus,970
 atomicshop/virtualization.py,sha256=LPP4vjE0Vr10R6DA4lqhfX_WaNdDGRAZUW0Am6VeGco,494
-atomicshop/web.py,sha256=syPmJLkV8j7zdn8cb_VPOB-zD0wJMr3metnrJHm3Hm0,13189
+atomicshop/web.py,sha256=dqnOX2Y4kQktAaU2xzfT-U-emPcqN4z50rQ0UoOgiBc,13828
 atomicshop/websocket_parse.py,sha256=aLHWyKqaYqEn_MRBWm2L6rIl6QPmqbVrjEXE_rBzwCw,16711
 atomicshop/a_installs/ubuntu/docker_rootless.py,sha256=9IPNtGZYjfy1_n6ZRt7gWz9KZgR6XCgevjqq02xk-o0,281
 atomicshop/a_installs/ubuntu/docker_sudo.py,sha256=JzayxeyKDtiuT4Icp2L2LyFRbx4wvpyN_bHLfZ-yX5E,281
 atomicshop/a_installs/ubuntu/elastic_search_and_kibana.py,sha256=yRB-l1zBxdiN6av-FwNkhcBlaeu4zrDPjQ0uPGgpK2I,244
-atomicshop/a_installs/win/wsl_ubuntu_lts.py,sha256=dZbPRLNKFeMd6MotjkE6UDY9cOiIaaclIdR1kGYWI50,139
 atomicshop/a_mains/dns_gateway_setting.py,sha256=ncc2rFQCChxlNP59UshwmTonLqC6MWblrVAzbbz-13M,149
 atomicshop/a_mains/github_wrapper.py,sha256=F-PoZknVCxWPN0PTO6l7ZNiaYvo7OVFKFI_zlPt56ps,169
 atomicshop/a_mains/msi_unpacker.py,sha256=5hrkqETYt9HIqR_3PMf32_q06kCrIcsdm_RJV9oY438,188
@@ -198,7 +197,6 @@ atomicshop/wrappers/process_wrapper_pbtk.py,sha256=ycPmBRnv627RWks6N8OhxJQe8Gu3h
 atomicshop/wrappers/pyopensslw.py,sha256=pklvXEbi0fHu5n1eRKKHEDLN_nsIqCTXv5Lv0bzReTo,7071
 atomicshop/wrappers/sysmonw.py,sha256=CdawuWuy_uUi3ALCm6lKP7pSyKeTk1MXyzOaTMbBSO8,5346
 atomicshop/wrappers/ubuntu_terminal.py,sha256=hHXsr_jEHU4frCwgo1XWS5Gb5nmg-Q06tiem4N8RYeE,12316
-atomicshop/wrappers/wslw.py,sha256=2Z7X0j5M2hoRZjbHfm_vqwNXZeptsdkNCdhdcM_S9vo,6998
 atomicshop/wrappers/certauthw/certauth.py,sha256=qLo593_MLU8VfbhYoNQ3J5BvtZuE71aFQROysEt6_dk,12225
 atomicshop/wrappers/certauthw/certauthw.py,sha256=4WvhjANI7Kzqrr_nKmtA8Kf7B6rute_5wfP65gwQrjw,8082
 atomicshop/wrappers/ctyping/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -260,7 +258,7 @@ atomicshop/wrappers/loggingw/formatters.py,sha256=ZY12IokVY1G_Wzn2Zlv9qjK-e8CtIK
 atomicshop/wrappers/loggingw/handlers.py,sha256=9JoleL96N85e6lEtD92YmKMwupHHON_YbV2ajeOBJ-8,21965
 atomicshop/wrappers/loggingw/loggers.py,sha256=mmM__XR3W4QC82wbsDRG_M4_0JYGGEP0Qn0WCOSp-go,2910
 atomicshop/wrappers/loggingw/loggingw.py,sha256=Cp_9IsiloPYpp9uzEQtUX-jCfcgGe4B2nFBle8x4wqQ,43582
-atomicshop/wrappers/loggingw/reading.py,sha256=sCNlgqLNH5XdKqOOjjEox7CvViMHzs6h7-hwCnx4NKk,17566
+atomicshop/wrappers/loggingw/reading.py,sha256=3uM7xc4Q_CBDkWgu6YGv_n5-9cCGrYXEd7qhc_Zk2EI,18068
 atomicshop/wrappers/mongodbw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/mongodbw/mongo_infra.py,sha256=vEXKy1Mi6LZ7QNEtRb8d-5xT5PYFhXbeEfFsXfsgpYo,918
 atomicshop/wrappers/mongodbw/mongodbw.py,sha256=CHbDfW9CXzXUs3V97DYQpt-dYlt_gB60JhwqG2tVFQY,56049
@@ -303,7 +301,7 @@ atomicshop/wrappers/socketw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 atomicshop/wrappers/socketw/accepter.py,sha256=4I9ORugRDvwaqSzm_gWSjZnRwQGY8hDTlCdsYHwH_ZE,2377
 atomicshop/wrappers/socketw/base.py,sha256=EcosGkD8VzgBY3GeIHDSG29ThQfXwg3-GQPmBTAqTdw,3048
 atomicshop/wrappers/socketw/certificator.py,sha256=mtWPJ_ew3OSwt0-1W4jaoco1VIY4NRCrMv3mDUxb_Cc,12418
-atomicshop/wrappers/socketw/creator.py,sha256=V_M-xGoOsPWh0ndScdHG3zHrX-5nIjQjYhJHnt_P8vg,13816
+atomicshop/wrappers/socketw/creator.py,sha256=LLqPEI00pDN1HxHo_QVVuNmrmjmjhIBNMsgpZd3wS_4,13969
 atomicshop/wrappers/socketw/dns_server.py,sha256=GOYMvHvS6Fx7s-DRygGqO7_o8_Qt9on3HmKxgOSznRE,55956
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=qW_1CKyPgGlsIt7_jusKkMV4A4hih4bX324u0PLnoO8,7382
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
@@ -318,8 +316,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=_gA8bMX6Sw_UCXKi2y9wNAwlqif
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
-atomicshop-3.3.14.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.3.14.dist-info/METADATA,sha256=fJyUo62FOFuh2wMAlAnxRwsXJSWpggmeXAuwJpKdljU,9345
-atomicshop-3.3.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atomicshop-3.3.14.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.3.14.dist-info/RECORD,,
+atomicshop-3.3.15.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.3.15.dist-info/METADATA,sha256=Mcn63amszsRHA31Jh2PiUb2TH3jwolN_trPIqZUGwr8,9345
+atomicshop-3.3.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atomicshop-3.3.15.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.3.15.dist-info/RECORD,,

atomicshop/a_installs/win/wsl_ubuntu_lts.py

@@ -1,10 +0,0 @@
-from atomicshop.wrappers import wslw
-
-
-# Run as admin
-def main():
-    wslw.install_wsl()
-
-
-if __name__ == '__main__':
-    main()

atomicshop/wrappers/wslw.py

@@ -1,192 +0,0 @@
-import sys
-from pathlib import Path
-
-from ..import process, permissions, virtualization
-from ..permissions import permissions
-from ..print_api import print_api
-
-
-def is_installed():
-    # Command to check the status of the WSL feature
-    command = "Get-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux"
-
-    # Check if WSL is enabled
-    if "Enabled" in process.run_powershell_command(command):
-        return True
-    else:
-        return False
-
-
-def get_installed_distros() -> list:
-    """
-    Get a list of installed WSL distros.
-    :return: list, list of installed WSL distros.
-    """
-    return process.execute_with_live_output("wsl --list --quiet")
-
-
-def get_available_distros_to_install() -> list:
-    """
-    Get a list of available WSL distros to install.
-    :return: list, list of available WSL distros to install.
-    """
-    return process.execute_with_live_output("wsl --list --online")
-
-
-def is_ubuntu_installed(version: str = "22.04") -> bool:
-    """
-    Check if specific version of Ubuntu is installed on WSL.
-    :param version: string, Ubuntu version to check for. Default is 22.04.
-    :return: bool, True if Ubuntu is installed, False otherwise.
-    """
-
-    if not version:
-        version = str()
-
-    installed_distros_list = get_installed_distros()
-
-    if f'Ubuntu-{version}' in installed_distros_list:
-        return True
-    elif 'Ubuntu' in installed_distros_list:
-        # Command to get Ubuntu version
-        command = f"wsl -d Ubuntu lsb_release -a"
-
-        # Execute the command
-        result = process.execute_with_live_output(command)
-
-        is_version_installed: bool = False
-        # Parse the output for the version number
-        for line in result:
-            if "Release" in line and version in line:
-                is_version_installed = True
-                break
-
-        return is_version_installed
-    else:
-        return False
-
-
-def install_wsl_manual(
-        directory_path: str, enable_virtual_machine_platform: bool = True, set_default_version_2: bool = True):
-    # noinspection GrazieInspection
-    """
-        Install WSL on Windows 10.
-        :param directory_path: string, directory path to save Ubuntu package.
-        :param enable_virtual_machine_platform: bool, True to enable Virtual Machine Platform feature.
-        :param set_default_version_2: bool, True to set WSL version 2 as default.
-
-        Main.py example:
-            import sys
-            from atomicshop.wrappers import wslw
-
-
-            def main():
-                if len(sys.argv) < 2:
-                    print("Usage: python main.py <directory_path_to_save_Ubuntu_package>")
-                    sys.exit(1)
-
-                wslw.install_wsl(directory_path=sys.argv[1])
-
-
-            if __name__ == '__main__':
-                main()
-        """
-
-    # Check for admin privileges
-    if not permissions.is_admin():
-        sys.exit("Script must be run as administrator")
-
-    # Check if WSL is already installed
-    if is_installed():
-        print_api("WSL is already installed", color='green')
-    else:
-        # Enable WSL
-        print_api("Enabling Windows Subsystem for Linux...")
-        process.run_powershell_command(
-            "Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux -NoRestart")
-
-        # # Check if the system needs a reboot
-        # if "RestartNeeded : True" in process.run_powershell_command(
-        #         "Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux"):
-        #     print_api("Please restart your computer to complete the installation of WSL and rerun the script.")
-        #     sys.exit(0)
-
-    # Enable Virtual Machine Platform is needed for WSL 2.
-    if enable_virtual_machine_platform:
-        # Check if Hyper-V is enabled
-        if "Enabled" in process.run_powershell_command(
-                "Get-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V"):
-            print_api("Hyper-V is enabled")
-        else:
-            # Command to enable Virtual Machine Platform
-            command = "Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All -NoRestart"
-
-            print_api("Enabling Virtual Machine Platform...")
-            process.run_powershell_command(command)
-
-    # Set WSL version 2 as default.
-    if set_default_version_2:
-        print_api("Setting WSL version 2 as default...")
-        process.execute_with_live_output("wsl --set-default-version 2")
-
-    # Check if Ubuntu is already installed. If so, exit with a message.
-    if is_ubuntu_installed():
-        print_api("Ubuntu is already installed", color='green')
-        sys.exit(0)
-
-    # Before you install Ubuntu, you need to set the WSL to version 2.
-    # You can do it after you install, but if so, you will need to set the Ubuntu to version 2 either.
-    # Download and Install Ubuntu.
-    print_api("Installing Ubuntu for WSL...")
-    package_file_path: str = str(Path(directory_path, "Ubuntu.appx"))
-    process.run_powershell_command(
-        f"Invoke-WebRequest -Uri https://aka.ms/wslubuntu2204 -OutFile {package_file_path} -UseBasicParsing")
-    process.run_powershell_command(f"Add-AppxPackage {package_file_path}")
-
-    print_api("Ubuntu installation is complete. You can now launch Ubuntu from the Start Menu.")
-    print_api("Please restart your computer to complete the installation.")
-
-
-def install_wsl(distro: str = "Ubuntu-22.04"):
-    # noinspection GrazieInspection
-    """
-        Install WSL and Ubuntu.
-        :param distro: string, distro to install. Default is Ubuntu-22.04.
-        :return:
-
-        Main.py example:
-            from atomicshop.wrappers import wslw
-
-
-            def main():
-                wslw.install_wsl()
-
-
-            if __name__ == '__main__':
-                main()
-        """
-
-    # Check for admin privileges
-    if not permissions.is_admin():
-        print_api("Script must be run as administrator", color='red')
-        sys.exit(1)
-
-    # Check if virtualization is enabled.
-    if not virtualization.is_enabled():
-        print_api("Virtualization is not enabled in the bios. Please enable it and rerun the script.", color='red')
-        sys.exit(1)
-
-    # Check if WSL and Ubuntu is already installed
-    wsl_installed: bool = is_installed()
-    ubuntu_installed: bool = is_ubuntu_installed()
-
-    if wsl_installed and ubuntu_installed:
-        print_api("WSL and Ubuntu is already installed", color='green')
-        sys.exit(0)
-    elif wsl_installed and not ubuntu_installed:
-        print_api("WSL is already installed, installing Ubuntu")
-    elif not wsl_installed:
-        print_api("WSL is not installed, installing WSL and Ubuntu")
-
-    command = f"wsl --install -d {distro}"
-    process.execute_with_live_output(command, verbose=True)