malwareDetector 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

malwareDetector/config.py

@@ -25,6 +25,7 @@ class PathConfig(BaseModel, extra=Extra.allow):
     '''
     input: str = DEFAULT_INPUT_PATH
     output: str = DEFAULT_OUT_PATH
+    config: str = DEFAULT_CONFIG_PATH
 
     def set_param(self, __name: str, __value: Any):
         if hasattr(self, __name):
@@ -85,10 +86,9 @@ class FolderConfig(BaseModel, extra=Extra.allow):
     vectorize: str = VECTORIZE_DIR
     model: str = MODEL_DIR
     predict: str = PREDICT_DIR
-    folder_list: List[str] = [dataset, feature, vectorize, model, predict]
 
     def update_folder_list(self):
-        self.folder_list = [self.dataset, self.feature, self.vectorize, self.model, self.predict]
+        self.folder_list = [getattr(self, folder) for folder in self.__dict__.keys()]
 
     def __iter__(self):
         return FolderClassIter(self.folder_list)
@@ -186,6 +186,12 @@ def parameter_parser(config: Config) -> Config:
                         help="Embeddings path."
                         )
 
+    parser.add_argument("--config-path","-c",
+                        dest="config_path",
+                        nargs="?",
+                        default=DEFAULT_CONFIG_PATH,
+                        help="Configuration file path.")
+
     parser.add_argument("--dimensions",
                         dest="dimensions",
                         type=int,
@@ -242,7 +248,7 @@ def parameter_parser(config: Config) -> Config:
                         help='Select the model(KNN, LR, MLP, RF, SVM).'
                         )
 
-    parser.add_argument('--classify', '-c',
+    parser.add_argument('--classify', '-f',
                         dest="classify",
                         action='store_true',
                         default=DEFAULT_CLASSIFY,
@@ -252,6 +258,7 @@ def parameter_parser(config: Config) -> Config:
     args = parser.parse_args()
     config.path.input = args.input_path
     config.path.output = args.output_path
+    config.path.config = args.config_path
     config.model.dimensions = args.dimensions
     config.model.workers = args.workers
     config.model.epochs = args.epochs
@@ -264,17 +271,18 @@ def parameter_parser(config: Config) -> Config:
 
     return config
 
-def write_config_to_file(config: Config):
+def write_config_to_file(config: Config, config_file_path=DEFAULT_CONFIG_PATH):
     '''
     Writes the parameter settings of
     the config object to a JSON file in
     the execution folder with the
     default name `config.json`.
     '''
-    with open(CONFIG_FILE_NAME, "w", encoding="utf8") as file:
-        file.write(config.json())
 
-def detect_config_file() -> None:
+    with open(config_file_path, "w", encoding="utf8") as file:
+        file.write(config.json(exclude={"folder": {"folder_list"}}))
+
+def detect_config_file(config_file_path=DEFAULT_CONFIG_PATH) -> None:
     '''
     If you run Python using the IPython approach,
     the command line parsing functionality will not be enabled.
@@ -286,18 +294,21 @@ def detect_config_file() -> None:
         logging.info(
             "Creating local config file by argparse."
         )
-        write_config_to_file(parameter_parser(Config()))
-        logging.info(f"{CONFIG_FILE_NAME} created!")
-    elif CONFIG_FILE_NAME in os.listdir():
-        logging.info(f"{CONFIG_FILE_NAME} detected!")
+        config = parameter_parser(Config())
+        config_file_path = config.path.config
+        write_config_to_file(config, config.path.config)
+        logging.info(f"{config_file_path} created!")
+    elif config_file_path in os.listdir():
+        logging.info(f"{config_file_path} detected!")
     else:
         logging.info(
             "config file not found. creating local config file by default config."
         )
-        write_config_to_file(Config())
-        logging.info(f"{CONFIG_FILE_NAME} created!")
+        write_config_to_file(Config(), config_file_path)
+        logging.info(f"{config_file_path} created!")
+    return config_file_path
 
-def read_config(count=1) -> Config:
+def read_config(config_file_path=DEFAULT_CONFIG_PATH, count=1) -> Config:
     '''
     Reads the settings from the `config.json` file.
     '''
@@ -307,14 +318,13 @@ def read_config(count=1) -> Config:
     if count != 1:
         logging.info(f"Trying to read config time:{count}")
     try:
-        with open(CONFIG_FILE_NAME, encoding="utf-8") as file:
+        config_file_path = detect_config_file(config_file_path=config_file_path)
+        with open(config_file_path, encoding="utf-8") as file:
             config = Config.parse_raw(file.read())
             config.folder.update_folder_list()
             return config
     except Exception as err:
         logging.warning(err)
-        detect_config_file(argparse=False)
-        return read_config(count=count+1)
+        return read_config(config_file_path=config_file_path, count=count+1)
 
-detect_config_file()
 logging.info("config.py got executed")

malwareDetector/const.py

@@ -1,8 +1,8 @@
 '''
 Save the variables of the system's default constants.
 '''
-CONFIG_FILE_NAME="config.json"
 
+DEFAULT_CONFIG_PATH="./config.json"
 DEFAULT_INPUT_PATH="./Dataset/malware"
 DEFAULT_OUT_PATH="./Feature/feature.csv"
 DEFAULT_MODEL_NAME="SVM"

{malwareDetector-0.1.8.dist-info → malwareDetector-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: malwareDetector
-Version: 0.1.8
+Version: 0.1.10
 Summary: Malware detector specification for NTUST isLab
 Author: PO-LIN LAI
 Author-email: bolin8017@gmail.com

malwareDetector-0.1.10.dist-info/RECORD

@@ -0,0 +1,10 @@
+malwareDetector/__init__.py,sha256=x9kkfeWTUR0g6RQkE13V2sZhY2DSVD3KqzcxOqlNjtA,768
+malwareDetector/config.py,sha256=_Wk3XAaQIcG0O_fxhsz7TwEloM-w6IeEr0gpJJLc4vY,12195
+malwareDetector/const.py,sha256=9XC5FUofRz6meRdFkzUPe3LK8fp-aBVCFHlsSLFD9b0,533
+malwareDetector/detector.py,sha256=IeLfmOoMp20s-io5w8igMc5bJdXt8ir-EarHKBo3C_U,2207
+malwareDetector/utils.py,sha256=kjEX-A-FuwjGwxZ-2JP489NaaeC7HwvdMrDrfPk4pYE,371
+malwareDetector-0.1.10.dist-info/LICENCE.txt,sha256=2XPCaZqZ-jgHh7e1DKa87JUeuOB6DC0jaZonmjDeILM,1088
+malwareDetector-0.1.10.dist-info/METADATA,sha256=SPO7of7kYU9zIKn-cJsJa9wI4qK6icSZ4aSlVgP1YS0,2287
+malwareDetector-0.1.10.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+malwareDetector-0.1.10.dist-info/top_level.txt,sha256=wRXSanQD5XDXRYp3lPh1SjltOo6rpC5jktmR69tqIQo,16
+malwareDetector-0.1.10.dist-info/RECORD,,

malwareDetector-0.1.8.dist-info/RECORD

@@ -1,10 +0,0 @@
-malwareDetector/__init__.py,sha256=x9kkfeWTUR0g6RQkE13V2sZhY2DSVD3KqzcxOqlNjtA,768
-malwareDetector/config.py,sha256=z24nSzqEQp3M5yldGZeWHosucdTdz4EyQ9F2pk22y_E,11620
-malwareDetector/const.py,sha256=7UtO1bUHKh-_arYMTbjQ-XKdY0-EVBASY2Uy7Lqxu6U,528
-malwareDetector/detector.py,sha256=IeLfmOoMp20s-io5w8igMc5bJdXt8ir-EarHKBo3C_U,2207
-malwareDetector/utils.py,sha256=kjEX-A-FuwjGwxZ-2JP489NaaeC7HwvdMrDrfPk4pYE,371
-malwareDetector-0.1.8.dist-info/LICENCE.txt,sha256=2XPCaZqZ-jgHh7e1DKa87JUeuOB6DC0jaZonmjDeILM,1088
-malwareDetector-0.1.8.dist-info/METADATA,sha256=hX_BOECHz9fHpeNTgUP0AHJTYqgYpXlpPkH5kNadKgM,2286
-malwareDetector-0.1.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-malwareDetector-0.1.8.dist-info/top_level.txt,sha256=wRXSanQD5XDXRYp3lPh1SjltOo6rpC5jktmR69tqIQo,16
-malwareDetector-0.1.8.dist-info/RECORD,,