atomicshop 3.1.6__py3-none-any.whl → 3.1.8__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.1.6'
+__version__ = '3.1.8'

atomicshop/networks.py

@@ -273,6 +273,9 @@ def generate_unused_ipv4_addresses_from_ip(
     if not skip_ips:
         skip_ips = []
 
+    # Remove duplicate IPs from the skip_ips list, loses order.
+    skip_ips = list(set(skip_ips))
+
     # Add the IP address to the list of IPs to skip.
     if ip_address not in skip_ips:
         skip_ips = [ip_address] + skip_ips
@@ -356,6 +359,9 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
     will be generated from it. Unused addresses decided by pinging them.
     Same for the subnet mask.
 
+    While generating the IPs, the function will skip the already existing IPs in the adapter, like default gateway
+    and DNS servers.
+
     :param number_of_ips: int, number of IPs to generate in addition to the IPv4s that already exist in the adapter.
         Or you add the IPs and masks to the adapter with the parameters virtual_ipv4s_to_add and virtual_ipv4_masks_to_add.
 
@@ -409,7 +415,7 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
             ip_address=current_ipv4s[0],
             mask=current_ipv4_masks[0],
             number_of_ips=number_of_ips,
-            skip_ips=current_ipv4s
+            skip_ips=current_ipv4s + default_adapter_info['default_gateways'] + default_adapter_info['dns_gateways']
         )
     elif virtual_ipv4s_to_add and virtual_ipv4_masks_to_add:
         ips_to_assign = virtual_ipv4s_to_add

atomicshop/wrappers/pywin32w/wmis/win32_networkadapterconfiguration.py

@@ -3,6 +3,7 @@ import socket
 import time
 
 from win32com.client import CDispatch
+import pywintypes
 
 from . import wmi_helpers, win32networkadapter
 from ...psutilw import psutil_networks
@@ -137,7 +138,18 @@ def set_static_ips(
     if not masks or len(ips) != len(masks):
         raise ValueError("ipv4 and masks must be lists of equal length")
 
-    in_params = network_config.Methods_("EnableStatic").InParameters.SpawnInstance_()
+    # # refresh the instance – state may have changed after the previous call
+    # network_config = network_config.Path_.GetObject_()
+
+    try:
+        in_params = network_config.Methods_("EnableStatic").InParameters.SpawnInstance_()
+    except pywintypes.com_error as e:
+        if e.excepinfo[1] == 'SWbemMethodSet' and 'Not found' in e.excepinfo[2]:
+            raise RuntimeError(f"Probably the adapter is already set to static non-DHCP.\n"
+                               f"Failed to get [EnableStatic] method parameters: {e}\n")
+        else:
+            raise
+
     in_params.IPAddress  = ips
     in_params.SubnetMask = masks
 

atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py

@@ -142,7 +142,8 @@ def call_method(
     :return: WMI method object.
     """
 
-    if not (isinstance(value, EmptyValue) and isinstance(value, tuple) and isinstance(value, dict)):
+    # Assign the single value to a tuple if it is not already a tuple or dict and not an EmptyValue.
+    if not isinstance(value, EmptyValue) and not (isinstance(value, tuple) and isinstance(value, dict)):
         value = (value,)
 
     # Get the method instance out of the WMI object.

{atomicshop-3.1.6.dist-info → atomicshop-3.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 3.1.6
+Version: 3.1.8
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License
@@ -52,7 +52,7 @@ Requires-Dist: playwright
 Requires-Dist: playwright-stealth
 Requires-Dist: protobuf
 Requires-Dist: psutil
-Requires-Dist: py7zr
+Requires-Dist: py7zr ==0.22.0
 Requires-Dist: pyautogui
 Requires-Dist: pymongo
 Requires-Dist: pyopenssl

{atomicshop-3.1.6.dist-info → atomicshop-3.1.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=lgJ4Y2cZjapTRcmtqh6h2LaQj-h7MwBqzq-fHO09skc,122
+atomicshop/__init__.py,sha256=EsaT4vSXGAXzBfTEAtjwOzP6zvlGXekljCTQOrMqSTA,122
 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
@@ -23,7 +23,7 @@ atomicshop/http_parse.py,sha256=1Tna9YbOM0rE3t6i_M-klBlwd1KNSA9skA_BqKGXDFc,1186
 atomicshop/inspect_wrapper.py,sha256=sGRVQhrJovNygHTydqJj0hxES-aB2Eg9KbIk3G31apw,11429
 atomicshop/ip_addresses.py,sha256=penRFeJ1-LDVTko4Q0EwK4JiN5cU-KzCBR2VXg9qbUY,1238
 atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,452
-atomicshop/networks.py,sha256=OSFaEUu8otxCkNq9oMbYQpj5SLzHie2r5uJDiyLR19U,18685
+atomicshop/networks.py,sha256=xOU_lDf6Rct178W7EB80-AFMgu9Nnh6l7GgjA9z9Jtg,19010
 atomicshop/on_exit.py,sha256=9XlOnzoAG8zlI8wBF4AB8hyrC6Q1b84gkhqpAhhdN9g,6977
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
 atomicshop/print_api.py,sha256=SJNQIMqSLlYaPtjHnALySAI-jQYuYHOCGgfP7oe96fU,10957
@@ -313,10 +313,10 @@ atomicshop/wrappers/pywin32w/win_event_log/subscribes/process_terminate.py,sha25
 atomicshop/wrappers/pywin32w/win_event_log/subscribes/schannel_logging.py,sha256=8nxIcNcbeEuvoBwhujgh7-oIpL9A6J-gg1NM8hOGAVA,3442
 atomicshop/wrappers/pywin32w/wmis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/pywin32w/wmis/msft_netipaddress.py,sha256=Kn2gQsyEquM5QQkdF2Vtr1MqK5D7uo6EFi-cxt52Q0g,4800
-atomicshop/wrappers/pywin32w/wmis/win32_networkadapterconfiguration.py,sha256=Iz-p--cE2iP6wyD9ceSF3scMMvdXC5fF-VKP1v-iIDo,10813
+atomicshop/wrappers/pywin32w/wmis/win32_networkadapterconfiguration.py,sha256=CnHFac1FT6cnH1VwHUyD6vZr6FKPxY8fpbj-1s2_Mzg,11327
 atomicshop/wrappers/pywin32w/wmis/win32networkadapter.py,sha256=iao4OK6u097uRacw6vQuya1kOtJzLA1IM4cgo6UCWLM,3941
 atomicshop/wrappers/pywin32w/wmis/win32process.py,sha256=qMzXtJ5hBZ5ydAyqpDbSx0nO2RJQL95HdmV5SzNKMhk,6826
-atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py,sha256=H8QIiHlm9ei8GSudKECFpEc1qny_1PNnVxZuIDK9xfU,8604
+atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py,sha256=3SA6hNgw-iBWYl3l1t3RBxRYB4BH-FbTs9gzmcg_Q8w,8710
 atomicshop/wrappers/socketw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/socketw/accepter.py,sha256=4I9ORugRDvwaqSzm_gWSjZnRwQGY8hDTlCdsYHwH_ZE,2377
 atomicshop/wrappers/socketw/base.py,sha256=EcosGkD8VzgBY3GeIHDSG29ThQfXwg3-GQPmBTAqTdw,3048
@@ -336,8 +336,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=WcNyaqEZ82S5-f3kzqi1nllNT2N
 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=3Ts1sVqSUiCDsHRHwJCbiZ9EYvv2ELGxF0Y_pibGU4k,9596
-atomicshop-3.1.6.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.1.6.dist-info/METADATA,sha256=nOFaTyw74lY191rFSACO5nChQHK6jRcTq4yPfbvOj2A,10653
-atomicshop-3.1.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.1.6.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.1.6.dist-info/RECORD,,
+atomicshop-3.1.8.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.1.8.dist-info/METADATA,sha256=evAROFKYJtONn4b-_ij9PzDB6jKZW3hMlXGRHP_j4Gk,10662
+atomicshop-3.1.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.1.8.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.1.8.dist-info/RECORD,,