spectre-core 0.0.2__tar.gz → 0.0.4__tar.gz

{spectre_core-0.0.2 → spectre_core-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spectre-core
-Version: 0.0.2
+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.2 → spectre_core-0.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spectre-core"
-version = "0.0.2"
+version = "0.0.4"
 maintainers = [
   { name="Jimmy Fitzpatrick", email="jcfitzpatrick12@gmail.com" },
 ]

{spectre_core-0.0.2 → spectre_core-0.0.4}/src/spectre_core/chunks/factory.py

@@ -6,7 +6,7 @@
 from spectre_core.chunks.base import BaseChunk
 from spectre_core.file_handlers.configs import CaptureConfig
 from spectre_core.exceptions import ChunkNotFoundError
-
+from spectre_core.chunks.chunk_register import chunk_map
 
 def get_chunk(chunk_key: str) -> BaseChunk:
     Chunk = chunk_map.get(chunk_key)

{spectre_core-0.0.2 → spectre_core-0.0.4}/src/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-0.0.2 → spectre_core-0.0.4}/src/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-0.0.2 → spectre_core-0.0.4}/src/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-0.0.2 → spectre_core-0.0.4}/src/spectre_core/logging.py

@@ -12,6 +12,7 @@ from typing import Callable, Optional
 import warnings
 from collections import OrderedDict
 from datetime import datetime
+from functools import wraps
 
 from spectre_core.file_handlers.text import TextHandler
 from spectre_core.cfg import (
@@ -206,17 +207,15 @@ def configure_root_logger(process_type: str,
 
     return log_handler
 
-# Logger must be passed in to preserve context of the service function
-def log_call(logger: logging.Logger
-) -> Callable:
-    def decorator(func: Callable) -> Callable:
-        def wrapper(*args, **kwargs):
-            try:
-                logger.info(f"Calling the function: {func.__name__}")
-                return func(*args, **kwargs)
-            except Exception as e:
-                logger.error(f"An error occurred while calling the function: {func.__name__}",
-                              exc_info=True)
-                raise
-        return wrapper
-    return decorator
+
+def log_call(func: Callable) -> Callable:
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        logger = logging.getLogger(func.__module__)  # Automatically get module-level logger
+        try:
+            logger.info(f"Calling the function: {func.__name__}")
+            return func(*args, **kwargs)
+        except Exception as e:
+            logger.error(f"Error in function: {func.__name__}", exc_info=True)
+            raise
+    return wrapper

{spectre_core-0.0.2 → spectre_core-0.0.4}/src/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-0.0.2 → spectre_core-0.0.4}/src/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-0.0.2 → spectre_core-0.0.4}/src/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-0.0.2 → spectre_core-0.0.4}/src/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.2 → spectre_core-0.0.4}/src/spectre_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spectre-core
-Version: 0.0.2
+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