spectre-core 0.0.3__py3-none-any.whl → 0.0.4__py3-none-any.whl

spectre_core/file_handlers/base.py

@@ -56,39 +56,13 @@ class BaseFileHandler(ABC):
         os.makedirs(self.parent_path, exist_ok=True) 
     
 
-    def delete(self, 
-               doublecheck_delete = True) -> None:
+    def delete(self) -> None:
         if not self.exists:
             warn(f"{self.file_path} does not exist. No deletion taking place")
             return
         else:
-            if doublecheck_delete:
-                self.doublecheck_delete()
             os.remove(self.file_path)
     
 
     def cat(self) -> None:
-        print(self.read())
-
-
-    def _doublecheck_action(self, 
-                            action_message: str) -> None:
-        proceed_with_action = False
-        while not proceed_with_action:
-            user_input = input(f"{action_message} [y/n]: ").strip().lower()
-            if user_input == "y":
-                proceed_with_action = True
-            elif user_input == "n":
-                print("Operation cancelled by the user")
-                raise exit(1)
-            else:
-                print(f"Please enter one of [y/n], received {user_input}")
-                proceed_with_action = False
-
-
-    def doublecheck_overwrite(self) -> None:
-        self._doublecheck_action(action_message=f"The file '{self.file_path}' already exists. Overwrite?")
-
-
-    def doublecheck_delete(self) -> None:
-        self._doublecheck_action(action_message=f"Are you sure you would like to delete '{self.file_path}'?")
+        print(self.read())

spectre_core/file_handlers/configs.py

@@ -239,12 +239,14 @@ class FitsConfig(SPECTREConfig):
 
     def save_params(self, 
                     params: list[str], 
-                    doublecheck_overwrite: bool = True
+                    force: bool = False
                     ) -> None:
         d = type_cast_params(params, 
                              self.type_template)
+        validate_against_type_template(d, 
+                                       self.type_template)
         self.save(d, 
-                  doublecheck_overwrite = doublecheck_overwrite)
+                  force = force)
         
     
 class CaptureConfig(SPECTREConfig):

spectre_core/file_handlers/json.py

@@ -26,11 +26,15 @@ class JsonHandler(BaseFileHandler):
 
     def save(self, 
              d: dict, 
-             doublecheck_overwrite: bool = True) -> None:
+             force: bool = False) -> None:
         self.make_parent_path()
 
-        if self.exists and doublecheck_overwrite:
-            self.doublecheck_overwrite()
-        
+        if self.exists:
+            if force:
+                pass
+            else:
+                raise RuntimeError((f"{self.file_name} already exists, write has been abandoned. "
+                                    f"You can override this functionality with `force`"))
+
         with open(self.file_path, 'w') as file:
-            json.dump(d, file, indent=4)
+                json.dump(d, file, indent=4)

spectre_core/receivers/base.py

@@ -155,7 +155,7 @@ class BaseReceiver(ABC):
     def save_params(self, 
                     params: list[str],  
                     tag: str, 
-                    doublecheck_overwrite: bool = True) -> None:
+                    force: bool = False) -> None:
         d = type_cast_params(params, 
                              self.type_template)
         
@@ -164,13 +164,13 @@ class BaseReceiver(ABC):
         
         self.save_capture_config(d, 
                                  tag, 
-                                 doublecheck_overwrite=doublecheck_overwrite)
+                                 force = force)
 
 
     def save_capture_config(self, 
                             d: dict[str, Any],
                             tag: str, 
-                            doublecheck_overwrite: bool = True) -> None:
+                            force: bool = False) -> None:
         
         self.validate_capture_config(d)
 
@@ -180,7 +180,7 @@ class BaseReceiver(ABC):
         
         capture_config = CaptureConfig(tag)
         capture_config.save(d, 
-                            doublecheck_overwrite = doublecheck_overwrite)
+                            force = force)
 
 
     def load_capture_config(self, 

spectre_core/spectrograms/analytical.py

@@ -2,7 +2,7 @@
 # This file is part of SPECTRE
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Callable
+from typing import Callable, Any
 from dataclasses import dataclass
 
 import numpy as np
@@ -23,15 +23,25 @@ class TestResults:
     # Maps each time to whether the corresponding spectrum matched analytically
     spectrum_validated: dict[float, bool] = None
 
+
     @property
     def num_validated_spectrums(self) -> int:
         """Counts the number of validated spectrums."""
         return sum(is_validated for is_validated in self.spectrum_validated.values())
 
+
     @property
     def num_invalid_spectrums(self) -> int:
         """Counts the number of spectrums that are not validated."""
         return len(self.spectrum_validated) - self.num_validated_spectrums
+    
+
+    def jsonify(self) -> dict[str, Any]:
+        return {
+            "time_validated": self.times_validated,
+            "frequencies_validated": self.frequencies_validated,
+            "spectrum_validated": self.spectrum_validated
+        }
 
 
 class _AnalyticalFactory:

spectre_core/watchdog/library/fixed/event_handler.py

@@ -34,8 +34,8 @@ class EventHandler(BaseEventHandler):
 
         bin_chunk = chunk.get_file('bin')
         _LOGGER.info(f"Deleting {bin_chunk.file_path}")
-        bin_chunk.delete(doublecheck_delete = False)
+        bin_chunk.delete()
 
         hdr_chunk = chunk.get_file('hdr')
         _LOGGER.info(f"Deleting {hdr_chunk.file_path}")
-        hdr_chunk.delete(doublecheck_delete = False)
+        hdr_chunk.delete()

spectre_core/watchdog/library/sweep/event_handler.py

@@ -45,11 +45,11 @@ class EventHandler(BaseEventHandler):
         else:
             bin_chunk = self.previous_chunk.get_file('bin')
             _LOGGER.info(f"Deleting {bin_chunk.file_path}")
-            bin_chunk.delete(doublecheck_delete = False)
+            bin_chunk.delete()
 
             hdr_chunk = self.previous_chunk.get_file('hdr')
             _LOGGER.info(f"Deleting {hdr_chunk.file_path}")
-            hdr_chunk.delete(doublecheck_delete = False)
+            hdr_chunk.delete()
 
             # and reassign the current chunk to be used as the previous chunk at the next call of this method
             self.previous_chunk = chunk

{spectre_core-0.0.3.dist-info → spectre_core-0.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spectre-core
-Version: 0.0.3
+Version: 0.0.4
 Summary: The core Python package used by the spectre program. 
 Maintainer-email: Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{spectre_core-0.0.3.dist-info → spectre_core-0.0.4.dist-info}/RECORD

@@ -14,9 +14,9 @@ spectre_core/chunks/library/fixed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 spectre_core/chunks/library/fixed/chunk.py,sha256=ckBiEtSa6_S06d_H9LQ0ske5JT2ycF-LstWbDX1oo1c,6941
 spectre_core/chunks/library/sweep/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spectre_core/chunks/library/sweep/chunk.py,sha256=bXpC43kylsaAc88VEc0lnLy8AFXZivejqXUyovDz51U,21219
-spectre_core/file_handlers/base.py,sha256=cuMdq4ThX3RDQHzSLWeRdO6d7kGiIiDf_y0ujwbjCak,2664
-spectre_core/file_handlers/configs.py,sha256=GCEqMKWEHpTlTkt_RXQSPB5u7z563aDVxnkAB1uy6l4,8445
-spectre_core/file_handlers/json.py,sha256=1z0wCjpWIw_wJcst8lhay4jGjWjHW8jZodTuAusOgqo,1066
+spectre_core/file_handlers/base.py,sha256=V1R6Vbp3mjA29TI_y4bpslhVvCQT7nzmGY4lDLlN2iI,1653
+spectre_core/file_handlers/configs.py,sha256=CiNHfy5lGrXDAcxCrKS9VE5Z1Aonp0CP9-SxlyP-ZHI,8500
+spectre_core/file_handlers/json.py,sha256=PBwjtM29jqfa9ozeRIuarkCJBD8uYIKyDCbM1V2GmtE,1230
 spectre_core/file_handlers/text.py,sha256=K84BIab_qmbR5igCVJZu3uE47ykpM_bnsasd3WGNEuo,677
 spectre_core/plotting/__init__.py,sha256=ZRQmBzZ0HWcVDaM5a8AneGbyHwx7dhtBs2z5H8VVspc,192
 spectre_core/plotting/base.py,sha256=4HhPPP7BNe5_SUAl1Ee52_QP62Zzh3kmNJwLzCHKG3c,4808
@@ -30,7 +30,7 @@ spectre_core/plotting/library/integral_over_frequency/panel.py,sha256=tvro2MCtY4
 spectre_core/plotting/library/spectrogram/panel.py,sha256=CAaPz7sDYoWZ3-4Jb1kVRu9bvJYaBRiXvoMkV7QXWqk,3556
 spectre_core/plotting/library/time_cuts/panel.py,sha256=u9Sbnwy6ex61y5Jl-D77HlYvuuXdK8_YB-o2gCovCTY,2947
 spectre_core/receivers/__init__.py,sha256=kKfhqrGs9sSPGLbrpTqScv816iPZOvT3ry3zSMcqLkM,227
-spectre_core/receivers/base.py,sha256=sckMC0fnpcflMomj_pVRbZZi6GlXYyRD7CHj3wgiUzM,16241
+spectre_core/receivers/base.py,sha256=Hx-jH7pnFyeSjaajujmzAYjODUNRgCBo3maHw9rIsyM,16149
 spectre_core/receivers/factory.py,sha256=aE-Yw_cnlkhRe5HxK0JqhDzd2AwZcKmB2QkAKwaq27Y,873
 spectre_core/receivers/receiver_register.py,sha256=xHcRnT-3NQxyIWL3nyT3P9qT14Wl5liM9HbflOvOUAM,617
 spectre_core/receivers/validators.py,sha256=udwOw92oCFR84JMaaOmWn_Ve9G4RKfzdqhpSpGDPqnY,8974
@@ -51,7 +51,7 @@ spectre_core/receivers/library/test/gr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 spectre_core/receivers/library/test/gr/cosine_signal_1.py,sha256=6XgYjYMh-QNPs_UUGUQcU_VQFr6BG4OLdsW-M-RU5Ww,2943
 spectre_core/receivers/library/test/gr/tagged_staircase.py,sha256=5rJHbB-3vdXjqT8DrcAGUSebaAqZ5RQtYHBWgH9iU2E,3465
 spectre_core/spectrograms/__init__.py,sha256=OFW82_itCktN8dFm_UO5gbgmzFs51v9KEHrSZWLuIUY,155
-spectre_core/spectrograms/analytical.py,sha256=BqbTZDaINdjxHyqI4gvgvlWf1JMVqYvTrEMAvJTZ9WQ,8279
+spectre_core/spectrograms/analytical.py,sha256=36XWstSNP4n_8EOi8BFNHl_h2k5JrrtWTXN0CRGVZcI,8535
 spectre_core/spectrograms/array_operations.py,sha256=6qKd3y2z6Pmu_U8yxTR4FN4eMhS10KgZ8rH60B_IXqw,2577
 spectre_core/spectrograms/spectrogram.py,sha256=EqeQyvjzjoKaXou4vJbPbRx85BeMPB9iiJtFZcCyimI,19488
 spectre_core/spectrograms/transform.py,sha256=xo7ch2lrRkJ54cfIqbkaTHNo_AptBuK0zRELPf7SfIE,13860
@@ -62,11 +62,11 @@ spectre_core/watchdog/factory.py,sha256=Uqx4nIZPVRxx7hRgm1M-1p2Sc7m3ObkIKWIC_ru9
 spectre_core/watchdog/watcher.py,sha256=eRAuWAw-0JvfcH3b7qn6lRZVLhmPwubCduRCrV2gLhk,1660
 spectre_core/watchdog/library/__init__.py,sha256=vEwAnAV-sv7WcNYOdnjr1JVqZYr29Wr2cv01eoxwdmg,282
 spectre_core/watchdog/library/fixed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-spectre_core/watchdog/library/fixed/event_handler.py,sha256=-G8-bdwSk7ggX9m98kt8Hw4tqIdGQnDCVMflgUzuwaM,1439
-spectre_core/watchdog/library/sweep/event_handler.py,sha256=0PojO-C4xWoJGuuDbp3dI6Xzjc01_rz-H9s1MwDLjB4,2240
+spectre_core/watchdog/library/fixed/event_handler.py,sha256=yWWS80LukB-cTrKBsF4-pRvw2obkX2MzQ5ZGytOtmAg,1387
+spectre_core/watchdog/library/sweep/event_handler.py,sha256=wDISZiQXBeqLDPxgEMo0a2QAXqQVOO7fng3yhZWSR74,2188
 spectre_core/web_fetch/callisto.py,sha256=qiww6IURqNI0Dg5nc4uT8f4GFagWcapSgYkrBoRVmlg,3627
-spectre_core-0.0.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-spectre_core-0.0.3.dist-info/METADATA,sha256=UK6D1klqtxaesSYGEECLm2Rcrt0ZWf9YX9Fq-7v3XwA,42149
-spectre_core-0.0.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-spectre_core-0.0.3.dist-info/top_level.txt,sha256=-UsyjpFohXgZpgcZ9QbVeXhsIyF3Am8RxNFNDV_Ta2Y,13
-spectre_core-0.0.3.dist-info/RECORD,,
+spectre_core-0.0.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+spectre_core-0.0.4.dist-info/METADATA,sha256=KMnQMpsW1dD3TvZtn0wC-xKLjY-WyfnIgm4QHo7is94,42149
+spectre_core-0.0.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+spectre_core-0.0.4.dist-info/top_level.txt,sha256=-UsyjpFohXgZpgcZ9QbVeXhsIyF3Am8RxNFNDV_Ta2Y,13
+spectre_core-0.0.4.dist-info/RECORD,,