spectre-core 0.0.20__py3-none-any.whl → 0.0.21__py3-none-any.whl

spectre_core/batches/__init__.py

@@ -10,12 +10,12 @@ from .plugins._batch_keys import BatchKey
 from .plugins._iq_stream import IQStreamBatch, IQMetadata
 from .plugins._callisto import CallistoBatch
 
-from ._base import BaseBatch, BatchFile
+from ._base import BaseBatch, BatchFile, parse_batch_base_file_name
 from ._batches import Batches
 from ._factory import get_batch_cls, get_batch_cls_from_tag
 
 __all__ = [
     "IQStreamBatch", "IQMetadata", "CallistoBatch", "BaseBatch", "BatchFile", 
-    "Batches", "get_batch_cls", "BatchKey", "get_batch_cls_from_tag"
+    "Batches", "get_batch_cls", "BatchKey", "get_batch_cls_from_tag", "parse_batch_base_file_name"
 ]
 

spectre_core/batches/_base.py

@@ -3,19 +3,33 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import datetime
-from typing import TypeVar
+from typing import TypeVar, Tuple
 from base64 import b64encode
 from functools import cached_property
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
+from os.path import splitext
 
 from spectre_core._file_io import BaseFileHandler
 from spectre_core.config import get_batches_dir_path, TimeFormat
 from spectre_core.spectrograms import Spectrogram
 
 
+def parse_batch_base_file_name(
+    base_file_name: str
+) -> Tuple[str, str, str]:
+    """Parse the base file name of a batch file into a start time, tag and extension.
+    """
+    batch_name, extension = splitext(base_file_name)
+    # strip the dot from the extension
+    extension = extension.lstrip('.')
+    start_time, tag = batch_name.split("_", 1)
+    return start_time, tag, extension
+
+
 T = TypeVar('T')
 
+
 class BatchFile(BaseFileHandler[T]):
     """Abstract base class for files belonging to a batch, identified by their file extension.
 
@@ -283,4 +297,12 @@ class BaseBatch(ABC):
         :return: The spectrogram stored by the batch `spectrogram_file`.
         """
         return self.spectrogram_file.read()
-    
+    
+
+
+
+
+
+
+
+

spectre_core/batches/_batches.py

@@ -13,7 +13,7 @@ from spectre_core.config import get_batches_dir_path
 from spectre_core.exceptions import (
     BatchNotFoundError
 )
-from ._base import BaseBatch
+from ._base import BaseBatch, parse_batch_base_file_name
 
 T = TypeVar('T', bound=BaseBatch)
 class Batches(Generic[T]):
@@ -144,9 +144,7 @@ class Batches(Generic[T]):
         # get a list of all batch file names in the batches directory path
         batch_file_names = [f for (_, _, files) in os.walk(self.batches_dir_path) for f in files]
         for batch_file_name in batch_file_names:
-            # strip the extension
-            batch_name, _ = os.path.splitext(batch_file_name)
-            start_time, tag = batch_name.split("_", 1)
+            start_time, tag, _ = parse_batch_base_file_name(batch_file_name) 
             if tag == self._tag:
                 self._batch_map[start_time] = self.batch_cls(start_time, tag)
         
@@ -207,7 +205,7 @@ class Batches(Generic[T]):
             return self._get_from_start_time(subscript)
         elif isinstance(subscript, int):
             return self._get_from_index(subscript)
-
+   
 
     def get_spectrogram(
         self,

spectre_core/logs/__init__.py

@@ -8,10 +8,10 @@
 from ._process_types import ProcessType
 from ._decorators import log_call
 from ._configure import configure_root_logger, get_root_logger_state
-from ._logs import Log, Logs
+from ._logs import Log, Logs, parse_log_base_file_name
 
 
 __all__ = [
     "log_call", "configure_root_logger", "Log", "Logs", "ProcessType",
-    "get_root_logger_state"
-]
+    "get_root_logger_state", "parse_log_base_file_name"
+]

spectre_core/logs/_logs.py

@@ -6,7 +6,7 @@ from logging import getLogger
 _LOGGER = getLogger(__name__)
 
 import os
-from typing import Optional, Iterator
+from typing import Optional, Iterator, Tuple
 from collections import OrderedDict
 from datetime import datetime
 
@@ -14,6 +14,17 @@ from spectre_core._file_io import TextHandler
 from spectre_core.config import get_logs_dir_path, TimeFormat
 from ._process_types import ProcessType
 
+
+def parse_log_base_file_name(
+    base_file_name: str
+) -> Tuple[str, str, str]:
+    """Parse the base file name of a log into a start time, process ID and process type.
+    """
+    file_name, _ = os.path.splitext(base_file_name)
+    log_start_time, pid, process_type = file_name.split("_")
+    return log_start_time, pid, process_type
+
+
 class Log(TextHandler):
     """Interface to read log files generated by `spectre`."""
     def __init__(
@@ -177,13 +188,13 @@ class Logs:
         log_files = [f for (_, _, files) in os.walk(self.logs_dir_path) for f in files]
 
         for log_file in log_files:
-            file_name, _ = os.path.splitext(log_file)
-            log_start_time, pid, process_type = file_name.split("_")
+            
+            log_start_time, pid, process_type = parse_log_base_file_name(log_file)
 
             if self.process_type and process_type != self.process_type:
                 continue
 
-            self._log_map[file_name] = Log(log_start_time, pid, ProcessType(process_type))
+            self._log_map[log_file] = Log(log_start_time, pid, ProcessType(process_type))
 
         self._log_map = OrderedDict(sorted(self._log_map.items()))
 
@@ -225,4 +236,4 @@ class Logs:
         for log in self.log_list:
             if log.pid == pid:
                 return log
-        raise FileNotFoundError(f"Log handler for PID '{pid}' not found in log map")
+        raise FileNotFoundError(f"Log handler for PID '{pid}' could not be identified")

spectre_core/wgetting/_callisto.py

@@ -6,7 +6,8 @@ import os
 import subprocess
 import shutil
 import gzip
-from datetime import datetime
+from datetime import datetime, date
+from typing import Tuple
 
 from spectre_core.config import (
     get_spectre_data_dir_path, get_batches_dir_path, TimeFormat
@@ -195,7 +196,7 @@ def download_callisto_data(
     year: int, 
     month: int, 
     day: int
-) -> list[str]:
+) -> Tuple[list[str], date]:
     """
     Download and decompress e-Callisto FITS files, saving them as `spectre` batch files.
 
@@ -203,7 +204,7 @@ def download_callisto_data(
     :param year: Year of the observation.
     :param month: Month of the observation.
     :param day: Day of the observation.
-    :return: A list of file names of all newly created batch files, as absolute paths within the container's file system.
+    :return: A list of file names of all newly created batch files, as absolute paths within the container's file system. Additionally, return the start date shared by all batch files. 
     """
     tmp_dir = os.path.join(get_spectre_data_dir_path(), "tmp")
     # if there are any residual files in the temporary directory, remove them.
@@ -212,4 +213,4 @@ def download_callisto_data(
     os.makedirs(tmp_dir, exist_ok=True)
     
     _wget_callisto_data(instrument_code.value, year, month, day, tmp_dir)
-    return sorted( _unzip_to_batches(tmp_dir) )
+    return sorted( _unzip_to_batches(tmp_dir) ), date(year, month, day)

{spectre_core-0.0.20.dist-info → spectre_core-0.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spectre-core
-Version: 0.0.20
+Version: 0.0.21
 Summary: The core Python package used by the spectre program. 
 Maintainer-email: Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -691,7 +691,6 @@ Requires-Dist: scipy==1.12.0
 Requires-Dist: astropy==6.0.1
 Requires-Dist: matplotlib==3.5.0
 Requires-Dist: watchdog==4.0.0
-Requires-Dist: mypy==1.14.1
 Dynamic: license-file
 
 # spectre-core

{spectre_core-0.0.20.dist-info → spectre_core-0.0.21.dist-info}/RECORD

@@ -3,9 +3,9 @@ spectre_core/exceptions.py,sha256=ccr-n88W0c_DKcsKMAe09QHX1iG2LUEqOMYHcGB-_do,45
 spectre_core/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spectre_core/_file_io/__init__.py,sha256=RZAtX8pFtdtTlxoxxttxJf1Wcg8lDFXgKMe1rcgaFP8,351
 spectre_core/_file_io/file_handlers.py,sha256=dJ3rMcTGbNnEXbYZgVoaos4p6qKGs-rWNeY8nmluQCQ,6402
-spectre_core/batches/__init__.py,sha256=nEEGLB9TnCKrP1VHQxYlU6U5MBt_4CHBcrRDnB-9GIU,685
-spectre_core/batches/_base.py,sha256=5N9I6F_ixfu3ZRtcoDE480j2LbnpRGTET7DVgHpOZ-c,8639
-spectre_core/batches/_batches.py,sha256=uFlRfkTndepkAwbMwDzmfSPIuZ69Yt_-i_Nidrb_mPk,7712
+spectre_core/batches/__init__.py,sha256=AIE3S3D3z__Ox557W95EILiv-BYoxjyRODMo2vu7My0,743
+spectre_core/batches/_base.py,sha256=0-eYk7AINGMMUyecAqBEQ97tWi765MUHysGi2gvdVTI,9079
+spectre_core/batches/_batches.py,sha256=2tgP2Mfwlay2bkblruS2mAfgfmdP3Doq841tKb8rq1U,7670
 spectre_core/batches/_factory.py,sha256=ApshWhbhZ-CSoQBrlcYaC5W5p_w_v4pxOdOdlrF7YIA,2277
 spectre_core/batches/_register.py,sha256=dSQC8KXj_jG8EiPwmKPdV0HSSalIZLaWt-8E29sczJM,1085
 spectre_core/batches/plugins/_batch_keys.py,sha256=8v0KE1n0NAQX0i9SwwB4Lgkct7Q_jna-H5S0Gs6p1qg,544
@@ -26,10 +26,10 @@ spectre_core/config/_time_formats.py,sha256=gS0j5zIvBhnV7KMYvTloloIbVwmCYn8MMKn3
 spectre_core/jobs/__init__.py,sha256=WKTvxvpciedm6tsKjU02iXJhIdNsMDt-BnMVwVme2Bo,412
 spectre_core/jobs/_jobs.py,sha256=gGpxsLZZ7EdXBYGH-r_pKnRGWSapr78E5SK_VnulaGg,3844
 spectre_core/jobs/_workers.py,sha256=9GPEJVqIFuOAXpY9gfJxX-0_UPJ6RBtUe5qC5JLiYNw,5023
-spectre_core/logs/__init__.py,sha256=BHZTru9KyOUDPBnanM1EJK5E1BN6YAGrjhdKFZ1ysUM,484
+spectre_core/logs/__init__.py,sha256=cUIjKXzxT9pzITVOsv5zkX97WnMZNHEUt9_orKuaHMw,539
 spectre_core/logs/_configure.py,sha256=NlR3BEwhj5k0qlTooOLb6OFRbYcDT05eWN-9Sl9Hkbk,2208
 spectre_core/logs/_decorators.py,sha256=u_Ixpr6aeKiSjM0mtqHuGXVGawNjgJPRvIpAj0zPSdQ,1169
-spectre_core/logs/_logs.py,sha256=M6sIsb2xxos9Ytj509qqp2jXZtvFU5uon9jIwEHLEI8,6578
+spectre_core/logs/_logs.py,sha256=ZNYtJN_A_StRfJJFkv5rTmQ2z2427YIxXGkd_6NQY1Y,6900
 spectre_core/logs/_process_types.py,sha256=qnKfeXPk-6NOlNf4XtD8D3tYbA_ZVhHSZAKSd2MiVmY,488
 spectre_core/plotting/__init__.py,sha256=9zhmCphR4DSHlWfJhHeWPbvIrh8Kycov5Ta6woSrUZg,517
 spectre_core/plotting/_base.py,sha256=yRZ6pf_d1mm35yn4AU8Hu2X50rCeB0KX1yEygDbpYo4,8547
@@ -70,9 +70,9 @@ spectre_core/spectrograms/_array_operations.py,sha256=79vddwWqR5i6OkeD5L_84t8svs
 spectre_core/spectrograms/_spectrogram.py,sha256=WhHEt_QpmzspDqYlzdZcJ8CAXxRfs8-JfP0T3NHpjLQ,28205
 spectre_core/spectrograms/_transform.py,sha256=_Kw9XfGNuhBqHfwPxNL4d-KIZJgzEX449ew1e17_k00,11698
 spectre_core/wgetting/__init__.py,sha256=UkS0Z0wuuqpoZ1EL35wJcDpjBiAaZgdZ7064yGESxNE,341
-spectre_core/wgetting/_callisto.py,sha256=tRUqYA4qRbJW8W0LoRAhg4Dk_rcR1OOfho661FWe8nY,7464
-spectre_core-0.0.20.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-spectre_core-0.0.20.dist-info/METADATA,sha256=WgMJ2MZnPLHqaMPCLilyBQmTRvWoSTA5EkDSySuZF94,42122
-spectre_core-0.0.20.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
-spectre_core-0.0.20.dist-info/top_level.txt,sha256=-UsyjpFohXgZpgcZ9QbVeXhsIyF3Am8RxNFNDV_Ta2Y,13
-spectre_core-0.0.20.dist-info/RECORD,,
+spectre_core/wgetting/_callisto.py,sha256=jMvv75d6152KmasZlydc4nXxuX0nAl4snSXzXOVwVGU,7597
+spectre_core-0.0.21.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+spectre_core-0.0.21.dist-info/METADATA,sha256=HcteVzzTLeZCUSUnCfqHNud70AutsvI6tgztzBPokzE,42094
+spectre_core-0.0.21.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+spectre_core-0.0.21.dist-info/top_level.txt,sha256=-UsyjpFohXgZpgcZ9QbVeXhsIyF3Am8RxNFNDV_Ta2Y,13
+spectre_core-0.0.21.dist-info/RECORD,,

{spectre_core-0.0.20.dist-info → spectre_core-0.0.21.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.0.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any