aspect-stable 0.7.dev1__tar.gz → 0.7.dev2__tar.gz

{aspect_stable-0.7.dev1 → aspect_stable-0.7.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aspect-stable
-Version: 0.7.dev1
+Version: 0.7.dev2
 Summary: Automatic SPEctra Components Tagging
 Author-email: Vital Fernández <vgf@stsci.edu>
 License-Expression: GPL-3.0-or-later

{aspect_stable-0.7.dev1 → aspect_stable-0.7.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aspect-stable"
-version = "0.7.dev1"
+version = "0.7.dev2"
 readme = "README.rst"
 requires-python = ">=3.11"
 license = "GPL-3.0-or-later"

{aspect_stable-0.7.dev1 → aspect_stable-0.7.dev2}/src/aspect/__init__.py

@@ -1,9 +1,7 @@
 import logging
 from pathlib import Path
 from aspect.io import cfg, load_cfg, load_model
-from aspect.workflow import ComponentsDetector, model_mgr, CHOICE_DM, TIME_DM
-from aspect.plots import decision_matrix_plot
-from aspect.trainer import components_trainer
+
 
 try:
     import tomllib
@@ -23,4 +21,8 @@ with open(_conf_path, mode="rb") as fp:
 __version__ = _setup_cfg['metadata']['version']
 
 # Invert the dictionary of categories number
-cfg['number_shape'] =  {v: k for k, v in cfg['shape_number'].items()}
+cfg['number_shape'] =  {v: k for k, v in cfg['shape_number'].items()}
+
+from aspect.workflow import ComponentsDetector, model_mgr, CHOICE_DM, TIME_DM
+from aspect.plots import decision_matrix_plot
+from aspect.trainer import components_trainer

{aspect_stable-0.7.dev1 → aspect_stable-0.7.dev2}/src/aspect/aspect.toml

@@ -3,6 +3,12 @@ name = 'aspect-stable'
 version = '0.7.dev1'
 category_order = ['undefined', 'white-noise', 'continuum', 'emission', 'cosmic-ray', 'broad', 'doublet-em', 'peak',
                   'absorption', 'dead-pixel', 'doublet-abs', 'trough']
+default_model = 'classifier_v10_RF'
+
+[models]
+classifier_v10_RF = 'classifier-v10-RF_min-max-log_12-pixels.joblib'
+classifier_v12_RF = 'classifier-v12-RF_min-max-log_12-pixels.joblib'
+classifier_v12_MLP ='classifier-v12-MLP_min-max-log_12-pixels.joblib'
 
 [shape_number]
 undefined = 0
@@ -32,6 +38,8 @@ dead-pixel = '#8788EE'          # Purple
 trough = "#33937F"              # Dark Emerald
 doublet-abs = '#A330C9'         # Dark magenta
 
+
+
 [decision_matrices]
 
 #                   Orange      Blue

{aspect_stable-0.7.dev1 → aspect_stable-0.7.dev2}/src/aspect/io.py

@@ -23,7 +23,7 @@ with open(_CONF_FILE, mode="rb") as fp:
     cfg = tomllib.load(fp)
 
 # Default feature detection model
-DEFAULT_MODEL_ADDRESS = Path(_MODEL_FOLDER/'aspect_min-max-log_12_pixels_v10_model.joblib')
+# DEFAULT_MODEL_ADDRESS = Path(_MODEL_FOLDER/'classifier-v10-RF_min-max-log_12-pixels.joblib')
 
 def read_trained_model(file_address):
 

aspect_stable-0.7.dev2/src/aspect/models/classifier-v12-MLP_min-max-log_12-pixels.toml

@@ -0,0 +1,30 @@
+[resuts]
+f1 = 0.984128204164804
+precision = 0.9842391985355154
+Recall = 0.984132699154136
+confusion_matrix = [ [ "0.12191329812026794", "0.0030832019843171745", "0.0", "0.0", "3.2940192140140753e-06", "0.0", "0.0", "0.0",], [ "0.0025874520926080563", "0.12195776737965712", "0.00030799079651031605", "2.799916331911964e-05", "3.2940192140140753e-06", "9.717356681341523e-05", "9.882057642042226e-06", "8.235048035035188e-06",], [ "0.0", "0.00028328565240521046", "0.12127919942157023", "0.0034373090498236876", "0.0", "0.0", "0.0", "0.0",], [ "0.0", "9.882057642042226e-06", "0.0007889176017563711", "0.12420099446440071", "0.0", "0.0", "0.0", "0.0",], [ "0.0", "0.0", "0.0", "0.0", "0.12499979412379912", "0.0", "0.0", "0.0",], [ "0.0", "5.2704307424225205e-05", "0.0", "0.0", "0.0", "0.12098438470191597", "0.003962705114458932", "0.0",], [ "0.0", "1.6470096070070377e-06", "0.0", "0.0", "0.0", "0.0012006700035081305", "0.123799124120291", "0.0",], [ "0.0", "1.6470096070070377e-06", "0.0", "0.0", "0.0", "0.0", "0.0", "0.12499814711419212",],]
+fit_time = "46.44"
+
+[properties]
+box_size = 12
+sample_size = 650000
+test_sample_size_fraction = 0.1
+categories = [ "white-noise", "continuum", "cosmic-ray", "emission", "doublet-em", "dead-pixel", "absorption", "doublet-abs",]
+scale = "min-max-log"
+
+[properties.estimator]
+module = "sklearn.neural_network"
+class = "MLPClassifier"
+
+[properties.estimator_params]
+hidden_layer_sizes = [ 256, 128, 64,]
+activation = "relu"
+solver = "adam"
+learning_rate_init = 0.001
+max_iter = 200
+early_stopping = true
+validation_fraction = 0.1
+n_iter_no_change = 15
+batch_size = 1024
+random_state = 42
+verbose = true

{aspect_stable-0.7.dev1 → aspect_stable-0.7.dev2}/src/aspect/workflow.py

@@ -1,5 +1,5 @@
 import numpy as np
-from aspect.io import read_trained_model, DEFAULT_MODEL_ADDRESS, cfg, Aspect_Error
+from aspect.io import read_trained_model, cfg, Aspect_Error, _MODEL_FOLDER
 from aspect.tools import monte_carlo_expansion, white_noise_scale, scale_min_max
 from aspect.plots import plot_comps_detect
 # from matplotlib import pyplot as plt
@@ -8,7 +8,7 @@ from pathlib import Path
 
 CHOICE_DM = np.array(cfg['decision_matrices']['choice'])
 TIME_DM = np.array(cfg['decision_matrices']['time'])
-
+DEFAULT_MODEL_ADDRESS = _MODEL_FOLDER/cfg['models'][cfg['metadata']['default_model']]
 
 def flux_to_image(flux_array, approximation, model_2D):
 
@@ -164,7 +164,12 @@ class ModelManager:
 
         return
 
-    def reload_model(self, model_address=None, n_jobs=None):
+    def reload_model(self, model_address=None, model_key=None, n_jobs=None):
+
+        # Use model address or model reference otherwise reload the model
+        if (model_address is None) and (model_key is not None):
+            assert model_key in cfg['models'], 'Input reference not found in aspect configuration'
+            model_address = _MODEL_FOLDER / cfg['models'][model_key]
 
         # Call the constructor again
         self.__init__(model_address, n_jobs)

{aspect_stable-0.7.dev1 → aspect_stable-0.7.dev2}/src/aspect_stable.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aspect-stable
-Version: 0.7.dev1
+Version: 0.7.dev2
 Summary: Automatic SPEctra Components Tagging
 Author-email: Vital Fernández <vgf@stsci.edu>
 License-Expression: GPL-3.0-or-later

aspect_stable-0.7.dev2/src/aspect_stable.egg-info/SOURCES.txt

@@ -0,0 +1,22 @@
+README.rst
+pyproject.toml
+src/aspect/__init__.py
+src/aspect/aspect.toml
+src/aspect/changelog.txt
+src/aspect/io.py
+src/aspect/plots.py
+src/aspect/tools.py
+src/aspect/trainer.py
+src/aspect/workflow.py
+src/aspect/models/classifier-v10-RF_min-max-log_12-pixels.joblib
+src/aspect/models/classifier-v10-RF_min-max-log_12-pixels.toml
+src/aspect/models/classifier-v12-MLP_min-max-log_12-pixels.joblib
+src/aspect/models/classifier-v12-MLP_min-max-log_12-pixels.toml
+src/aspect/models/classifier-v12-RF_min-max-log_12-pixels.joblib
+src/aspect/models/classifier-v12-RF_min-max-log_12-pixels.toml
+src/aspect_stable.egg-info/PKG-INFO
+src/aspect_stable.egg-info/SOURCES.txt
+src/aspect_stable.egg-info/dependency_links.txt
+src/aspect_stable.egg-info/requires.txt
+src/aspect_stable.egg-info/top_level.txt
+tests/test_tools.py

aspect_stable-0.7.dev1/src/aspect_stable.egg-info/SOURCES.txt

@@ -1,20 +0,0 @@
-README.rst
-pyproject.toml
-src/aspect/__init__.py
-src/aspect/aspect.toml
-src/aspect/changelog.txt
-src/aspect/io.py
-src/aspect/plots.py
-src/aspect/tools.py
-src/aspect/trainer.py
-src/aspect/workflow.py
-src/aspect/models/aspect_min-max-log_12_pixels_v10_model.joblib
-src/aspect/models/aspect_min-max-log_12_pixels_v10_model.toml
-src/aspect/models/aspect_min-max-log_12_pixels_v12_randomforest_model.joblib
-src/aspect/models/aspect_min-max-log_12_pixels_v12_randomforest_model.toml
-src/aspect_stable.egg-info/PKG-INFO
-src/aspect_stable.egg-info/SOURCES.txt
-src/aspect_stable.egg-info/dependency_links.txt
-src/aspect_stable.egg-info/requires.txt
-src/aspect_stable.egg-info/top_level.txt
-tests/test_tools.py