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

atomicshop/etws/traces/trace_dns.py

@@ -53,7 +53,11 @@ class DnsRequestResponseTrace:
         """
 
         self.attrs = attrs
-        self.skip_record_list = skip_record_list
+
+        if skip_record_list:
+            self.skip_record_list: list = skip_record_list
+        else:
+            self.skip_record_list: list = list()
 
         if not session_name:
             session_name = ETW_DEFAULT_SESSION_NAME

atomicshop/mitm/statistic_analyzer.py

@@ -1,13 +1,12 @@
-import os
 import datetime
 import statistics
 import json
-from typing import Literal
+from typing import Literal, Union
 
 from .. import filesystem, domains, datetimes, urls
 from ..basics import dicts
 from ..file_io import tomls, xlsxs, csvs, jsons
-from ..wrappers.loggingw import reading
+from ..wrappers.loggingw import reading, consts
 from ..print_api import print_api
 
 
@@ -479,7 +478,7 @@ def calculate_moving_average(
         moving_average_window_days,
         top_bottom_deviation_percentage: float,
         print_kwargs: dict = None
-):
+) -> list:
     """
     This function calculates the moving average of the daily statistics.
 
@@ -490,7 +489,7 @@ def calculate_moving_average(
     :param print_kwargs: dict, the print_api arguments.
     """
 
-    date_pattern: str = '%Y_%m_%d'
+    date_pattern: str = consts.DEFAULT_ROTATING_SUFFIXES_FROM_WHEN['midnight']
 
     # Get all the file paths and their midnight rotations.
     logs_paths: list = reading.get_logs_paths(
@@ -782,19 +781,19 @@ def find_deviation_from_moving_average(
 
 def moving_average_calculator_main(
         statistics_file_path: str,
-        output_directory: str,
         moving_average_window_days: int,
-        top_bottom_deviation_percentage: float
-) -> int:
+        top_bottom_deviation_percentage: float,
+        output_json_file_path: str = None
+) -> Union[list, None]:
     """
     This function is the main function for the moving average calculator.
 
     :param statistics_file_path: string, the statistics file path.
-    :param output_directory: string, the output directory.
     :param moving_average_window_days: integer, the moving average window days.
     :param top_bottom_deviation_percentage: float, the top bottom deviation percentage. Example: 0.1 for 10%.
-    :return: integer, the return code.
+    :param output_json_file_path: string, if None, no json file will be written.
     -----------------------------
+    :return: the deviation list of dicts.
 
     Example:
     import sys
@@ -804,9 +803,9 @@ def moving_average_calculator_main(
     def main():
         return statistic_analyzer.moving_average_calculator_main(
             statistics_file_path='statistics.csv',
-            output_directory='output',
             moving_average_window_days=7,
-            top_bottom_deviation_percentage=0.1
+            top_bottom_deviation_percentage=0.1,
+            output_json_file='C:\\output\\deviation_list.json'
         )
 
 
@@ -828,13 +827,15 @@ def moving_average_calculator_main(
     )
 
     if deviation_list:
-        for deviation_list_index, deviation in enumerate(deviation_list):
-            convert_data_value_to_string('request_sizes', deviation_list_index)
-            convert_data_value_to_string('response_sizes', deviation_list_index)
-            convert_value_to_string('ma_data', deviation_list_index)
+        if output_json_file_path:
+            for deviation_list_index, deviation in enumerate(deviation_list):
+                convert_data_value_to_string('request_sizes', deviation_list_index)
+                convert_data_value_to_string('response_sizes', deviation_list_index)
+                convert_value_to_string('ma_data', deviation_list_index)
+
+            print_api(f'Deviation Found, saving to file: {output_json_file_path}', color='blue')
+            jsons.write_json_file(deviation_list, output_json_file_path, use_default_indent=True)
 
-        file_path = output_directory + os.sep + 'deviation.json'
-        print_api(f'Deviation Found, saving to file: {file_path}', color='blue')
-        jsons.write_json_file(deviation_list, file_path, use_default_indent=True)
+        return deviation_list
 
-    return 0
+    return None

{atomicshop-2.14.11.dist-info → atomicshop-2.14.12.dist-info}/METADATA

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

{atomicshop-2.14.11.dist-info → atomicshop-2.14.12.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=j4I9LL6R2TZPz5HJCn6_tLwz-NnCBoG0zgr315IRFG8,124
+atomicshop/__init__.py,sha256=X3k111NJA7eZtjRpWoDPX-8UI7APCHhTzJOfr58o7vQ,124
 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
@@ -108,7 +108,7 @@ atomicshop/etws/providers.py,sha256=CXNx8pYdjtpLIpA66IwrnE64XhY4U5ExnFBMLEb8Uzk,
 atomicshop/etws/sessions.py,sha256=b_KeiOvgOBJezJokN81TRlrvJiQNJlIWN4Z6UVjuxP0,1335
 atomicshop/etws/trace.py,sha256=WMOjdazK97UcIdhVgcnjh98OCbuEJcnm1Z_yPp_nE2c,7258
 atomicshop/etws/traces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/etws/traces/trace_dns.py,sha256=rWQ8bv8eMHBRRkA8oxO9caYqj0h4Emw4aZXmoI3Q6fg,6292
+atomicshop/etws/traces/trace_dns.py,sha256=WvOZm7KNdP4r6ofkZhUGi9WjtYlkV3mUp_yxita3Qg4,6399
 atomicshop/etws/traces/trace_sysmon_process_creation.py,sha256=OM-bkK38uYMwWLZKNOTDa0Xdk3sO6sqsxoMUIiPvm5g,4656
 atomicshop/file_io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/file_io/csvs.py,sha256=eS2SSGwcC1MlRPPgoqyFyE-qqH2esUWQvv3wWLMiOuA,5876
@@ -127,7 +127,7 @@ atomicshop/mitm/initialize_engines.py,sha256=YnXPK1UKrmULnfL4zLo2LOpKWq-aGKzc9p3
 atomicshop/mitm/initialize_mitm_server.py,sha256=j1yMUbHsnFh9l5rFiUgBQA0mRZqREOKviP0frRzYikM,14611
 atomicshop/mitm/message.py,sha256=u2U2f2SOHdBNU-6r1Ik2W14ai2EOwxUV4wVfGZA098k,1732
 atomicshop/mitm/shared_functions.py,sha256=PaK_sbnEA5zo9k2ktEOKLmvo-6wRUunxzSNRr41uXIQ,1924
-atomicshop/mitm/statistic_analyzer.py,sha256=ctsf-MBIUvG4-R0K4gFQyi_b42-VCq-5s7hgO9jMOes,38415
+atomicshop/mitm/statistic_analyzer.py,sha256=uUf6b6uLXxUMetEj5l225B1Id69acEmVRRX4zHsUs4M,38600
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/create_module_template.py,sha256=tRjVSm1sD6FzML71Qbuwvita0qsusdFGm8NZLsZ-XMs,4853
 atomicshop/mitm/engines/create_module_template_example.py,sha256=X5xhvbV6-g9jU_bQVhf_crZmaH50LRWz3bS-faQ18ds,489
@@ -285,8 +285,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=AhpurHJmP2kgzHaUbq5ey
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=aXBwlEIJhFT0-c4i8iNlFx2It9VpCEpsv--5Oqcpxao,11624
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=t3dtDEfN47CfYVi0CW6Kc2QHTEeZVyYhc57IYYh5nmA,826
-atomicshop-2.14.11.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.14.11.dist-info/METADATA,sha256=GQTzZr5oR0sbtuoNqgw0kIIB80QY36y2sYn1I9qG1i4,10479
-atomicshop-2.14.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.14.11.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.14.11.dist-info/RECORD,,
+atomicshop-2.14.12.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.14.12.dist-info/METADATA,sha256=ml2p_-2MUkPlV2TOi-uFOF0ecFg7-1bf1mDSr16JxxE,10479
+atomicshop-2.14.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.14.12.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.14.12.dist-info/RECORD,,