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

atomicshop/mitm/connection_thread_worker.py

@@ -294,6 +294,7 @@ def thread_worker_main(
         client_message: ClientMessage = ClientMessage()
         client_message.client_name = client_name
         client_message.client_ip = client_ip
+        client_message.server_ip = server_ip
         client_message.source_port = source_port
         client_message.destination_port = destination_port
         client_message.server_name = server_name
@@ -542,6 +543,13 @@ def thread_worker_main(
         client_name = socket.gethostbyaddr(client_ip)[0]
         destination_port = client_socket.getsockname()[1]
 
+        if config_static.TCPServer.server_response_mode:
+            # If in response mode, then we'll get the TCP server's input address.
+            server_ip = client_socket.getsockname()[0]
+        else:
+            # If not in response mode, we will get the ip from the socket that will connect later to the service.
+            server_ip = ""
+
         network_logger.info(f"Thread Created - Client [{client_ip}:{source_port}] | "
                             f"Destination service: [{server_name}:{destination_port}]")
 
@@ -569,6 +577,9 @@ def thread_worker_main(
             if not service_client:
                 service_client = create_client_socket(client_message_connection)
                 service_socket_instance, connection_error = service_client.service_connection()
+                # Now we'll update the server IP with the IP of the service.
+                server_ip = service_socket_instance.getpeername()[0]
+                client_message_connection.server_ip = server_ip
         else:
             client_message_connection.timestamp = datetime.now()
             client_message_connection.action = 'service_connect'

atomicshop/web_apis/google_llm.py

@@ -128,17 +128,27 @@ class GoogleLLM:
     def ask_gemini(
             question: str,
             temperature: float,
-            max_output_tokens: int,
-            model_name: str = 'gemini-pro'
+            # max_output_tokens: int,
+            model_name: str = 'gemini-2.0-flash-thinking-exp-01-21'
     ) -> str:
         """
         Function to ask the Gemini API a question and get the response.
         :param question: str, the question to ask the Gemini API.
         :param temperature: float, the temperature parameter for the LLM.
             While 0 is deterministic, higher values can lead to more creative responses.
-        :param max_output_tokens: int, the maximum number of tokens to generate in the LLM response.
         :param model_name: str, the name of the model to use for the LLM.
 
+        max_output_tokens: int, the maximum number of tokens to generate in the LLM response.
+            UPDATE: Disabled this feature since it gave exceptions in some situations.
+            Example:
+                  File ".\Lib\site-packages\google\generativeai\types\generation_types.py", line 464, in text
+                    parts = self.parts
+                            ^^^^^^^^^^
+                  File ".\Lib\site-packages\google\generativeai\types\generation_types.py", line 447, in parts
+                    raise ValueError(msg)
+                ValueError: Invalid operation: The `response.parts` quick accessor requires a single candidate, but but `response.candidates` is empty.
+
+
         :return: str, the response from the Gemini API.
         """
         # Model Configuration
@@ -146,7 +156,7 @@ class GoogleLLM:
             "temperature": temperature,
             "top_p": 0.99,
             "top_k": 0,
-            "max_output_tokens": max_output_tokens,
+            # "max_output_tokens": max_output_tokens,
         }
 
         # model = genai.GenerativeModel('gemini-1.5-pro-latest',

{atomicshop-2.20.2.dist-info → atomicshop-2.20.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.20.2
+Version: 2.20.4
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.20.2.dist-info → atomicshop-2.20.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=YT_T5JzFRTIksmE_0awk2rKq2ttCQS7jQZk6RPF_DjQ,123
+atomicshop/__init__.py,sha256=db6JGtlhqdS5AI8AP9hTGCkD-0rCHHR2UqDNerpAIQE,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
@@ -135,7 +135,7 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=DjSnDtMU8srdqca8s6Q-oFCWgjjiCjXRhyk-nafRAUk,7788
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=6xfQ5MmWR2pqgDfjjelSgHfiTzhprRXNpfhgpoNbsGI,28688
+atomicshop/mitm/connection_thread_worker.py,sha256=tn71RotrQOTo6dyAakuLlY4HrM5ia_0FbNKLCY6Xahg,29304
 atomicshop/mitm/import_config.py,sha256=0Ij14aISTllTOiWYJpIUMOWobQqGofD6uafui5uWllE,9272
 atomicshop/mitm/initialize_engines.py,sha256=rijND1jxt3Zs8P0jhcQZc0tgcWD4-nq8ARODiWzhurU,8278
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
@@ -186,7 +186,7 @@ atomicshop/startup/win/startup_folder.py,sha256=2RZEyF-Mf8eWPlt_-OaoGKKnMs6YhELE
 atomicshop/startup/win/task_scheduler.py,sha256=qALe-8sfthYxsdCViH2r8OsH3x-WauDqteg5RzElPdk,4348
 atomicshop/web_apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/web_apis/google_custom_search.py,sha256=R1BnUmBFWZIWkfizSRWoSYoZTdPEjLJ28F_sS2g1jGQ,1558
-atomicshop/web_apis/google_llm.py,sha256=JcWkorK0Fu5C3SkZLSzI0TO4CwDscjFsWu1bDhfGYww,7056
+atomicshop/web_apis/google_llm.py,sha256=bOE91hGSz4I2DJK0LZHMCSDDYSTgP6SF_FWVvpV5LcY,7691
 atomicshop/wrappers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/_process_wrapper_curl.py,sha256=XkZZXYl7D0Q6UfdWqy-18AvpU0yVp9i2BVD2qRcXlkk,841
 atomicshop/wrappers/_process_wrapper_tar.py,sha256=WUMZFKNrlG4nJP9tWZ51W7BR1j_pIjsjgyAStmWjRGs,655
@@ -330,8 +330,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=AENV88H1qDidrcpyM9OwEZxX5svfi-Jb4N6FkS1xtqA,8851
-atomicshop-2.20.2.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.20.2.dist-info/METADATA,sha256=vUaF9sMXezhYJN5zLGjTupSrN9oMANcQhKKqnFmsgGY,10630
-atomicshop-2.20.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.20.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.20.2.dist-info/RECORD,,
+atomicshop-2.20.4.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.20.4.dist-info/METADATA,sha256=vj3fQF5hXmJ1WwdtNNC7fJ1_eIebTpjKfAkROwEZuMM,10630
+atomicshop-2.20.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.20.4.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.20.4.dist-info/RECORD,,