sdsstools 1.9.3__py3-none-any.whl → 1.9.5__py3-none-any.whl

sdsstools/configuration.py

@@ -15,7 +15,7 @@ import pathlib
 import re
 from copy import deepcopy
 
-from typing import Any, Dict, Optional, Type, TypeVar, Union
+from typing import Any, Dict, Optional, Type, Union
 
 import yaml
 from typing_extensions import Self
@@ -385,16 +385,13 @@ class Configuration(RecursiveDict):
         return self
 
 
-ReturnClass = TypeVar("ReturnClass", bound=dict)
-
-
 def read_yaml_file(
     path: AnyPath,
     use_extends: bool = True,
     loader: Any = yaml.FullLoader,
-    return_class: Type[ReturnClass] = dict,
+    return_class: Type | None = None,
     use_variables: bool = True,
-) -> ReturnClass:
+):
     """Reads a YAML file and returns a dictionary.
 
     Parameters
@@ -403,11 +400,12 @@ def read_yaml_file(
         The path to the YAML file or a file-like object.
     use_extends
         If :obj:`True`, looks for lines starting with ``#!extends <basefile>`` and
-        merges the current file with the base file.
+        merges the current file with the base file. This requires both the current and
+        base files to be formatted as dictionaries.
     loader
         The YAML loader to use.
     return_class
-        The class of the returned object. Typically a subclass of :obj:`dict`.
+        Casts the read YAML data to ``return_class`` if possible.
     use_variables
         If :obj:`True`, looks for a ``variables`` section in the YAML file and
         replaces occurrences of ``$(VARNAME)`` with the value of that variable.
@@ -427,7 +425,12 @@ def read_yaml_file(
     fp.seek(0)
     yaml_data: Union[ConfigType, None] = yaml.load(fp, Loader=loader)
 
-    if yaml_data is not None and use_variables:
+    if yaml_data is None or yaml_data == {}:
+        return (
+            return_class({}) if return_class and issubclass(return_class, dict) else {}
+        )
+
+    if use_variables and isinstance(yaml_data, dict):
         variables = yaml_data.get("variables", {})
 
         fp.seek(0)
@@ -437,10 +440,7 @@ def read_yaml_file(
             file_content = re.sub(rf"\$\(\s*{var}\s*\)", str(value), file_content)
         yaml_data = yaml.load(file_content, Loader=loader)
 
-    if yaml_data is None or yaml_data == {}:
-        return return_class({})
-
-    if use_extends:
+    if use_extends and isinstance(yaml_data, dict):
         fp.seek(0)
         for line in fp.readlines():
             if line.strip().startswith("#!extends"):
@@ -452,9 +452,9 @@ def read_yaml_file(
 
                 base = read_yaml_file(base_file, use_extends=False, return_class=dict)
                 new_config = merge_config(base, yaml_data)
-                return return_class(new_config)
+                return return_class(new_config) if return_class else new_config
 
             elif line.strip().startswith("#") or line.strip() == "":
                 continue
 
-    return return_class(yaml_data)
+    return return_class(yaml_data) if return_class else yaml_data

sdsstools/daemonizer.py

@@ -23,7 +23,19 @@ from click.decorators import pass_context
 from daemonocle import Daemon
 
 
-__all__ = ["cli_coro", "DaemonGroup"]
+__all__ = ["cli_coro", "DaemonGroup", "get_event_loop", "daemonize"]
+
+
+def get_event_loop() -> asyncio.AbstractEventLoop:
+    """Gets the current event loop, or creates a new one if none exists."""
+
+    try:
+        return asyncio.get_event_loop()
+    except RuntimeError:
+        # "There is no current event loop in thread %r"
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        return loop
 
 
 def cli_coro(
@@ -35,7 +47,7 @@ def cli_coro(
     def decorator_cli_coro(f):
         @wraps(f)
         def wrapper(*args, **kwargs):
-            loop = asyncio.get_event_loop()
+            loop = get_event_loop()
             if shutdown_func:
                 for ss in signals:
                     loop.add_signal_handler(ss, shutdown_func, ss, loop)

{sdsstools-1.9.3.dist-info → sdsstools-1.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdsstools
-Version: 1.9.3
+Version: 1.9.5
 Summary: Small tools for SDSS products
 Project-URL: Homepage, https://github.com/sdss/sdsstools
 Project-URL: Repository, https://github.com/sdss/sdsstools

{sdsstools-1.9.3.dist-info → sdsstools-1.9.5.dist-info}/RECORD

@@ -1,8 +1,8 @@
 sdsstools/__init__.py,sha256=G8u94gRu4THFJvptEITykK0Q_3jHqhQY9p01j9QCQH4,744
 sdsstools/_tasks.py,sha256=U7fvxk9IExzE6voNjio2QqRTw-H9Upu1d0zKQlQFs5I,4263
 sdsstools/cli.py,sha256=e4BS4b1cJThCj5tytajr_VMUvmVP1xYq_r90EtEscg8,1348
-sdsstools/configuration.py,sha256=lvutpHf7wYIVOoFXd3NMkbh-zJrTTi2q6HVkWQOH9ns,14496
-sdsstools/daemonizer.py,sha256=TMzq3RgD0KqY6jmeeJASlCsw7CjDpLmF8QrENaxCHBU,7796
+sdsstools/configuration.py,sha256=y_nmF_TN_o68ib2YIpdypHfwggvBpjz_dwKjNd0jzc8,14673
+sdsstools/daemonizer.py,sha256=Yd06BTwcAjQ9hIC3O-pQhqE5daHK-ECPZ17FzZPe3xM,8176
 sdsstools/logger.py,sha256=nGAC_hDK0dWVMAS-a-vBsw0oSCxAwx-ZsJUE5GMzILs,18382
 sdsstools/metadata.py,sha256=LZWO0KI-gVvzdJNIaVlIn4bBBHxbglU8BLW-MdlxOFA,3268
 sdsstools/time.py,sha256=cqLrch0ZUCt3ShagN1v-5GhgLyNjzPXgaQRem4j7vAk,4606
@@ -15,8 +15,8 @@ sdsstools/_vendor/toml/decoder.py,sha256=hWUJ3UQ43MGVER35rSUUj7Hdh85Vat8Od_B4HeF
 sdsstools/_vendor/toml/encoder.py,sha256=OBRwH2tRUhRI8nJgKBwKbkyQnBAuhcUf60r3wykjPco,9989
 sdsstools/_vendor/toml/ordered.py,sha256=aW5woa5xOqR4BjIz9t10_lghxyhF54KQ7FqUNVv7WJ0,334
 sdsstools/_vendor/toml/tz.py,sha256=8TAiXrTqU08sE0ruz2TXH_pFY2rlwNKE47MSE4rDo8Y,618
-sdsstools-1.9.3.dist-info/METADATA,sha256=IwrO_J-v0fUFPfaByUchYYoc_2bmYSni--E4RQnHg34,15701
-sdsstools-1.9.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sdsstools-1.9.3.dist-info/entry_points.txt,sha256=H1UefQFMHyzmGcdNib_qxiOfFSx3351wr4c2ax0PJbQ,87
-sdsstools-1.9.3.dist-info/licenses/LICENSE.md,sha256=_7dAUQQ5Ph_x1hcFXhi9aHBcqq9H11zco12eO4B3Cyg,1504
-sdsstools-1.9.3.dist-info/RECORD,,
+sdsstools-1.9.5.dist-info/METADATA,sha256=3_LXoDmSXoduy2mJteBp4bVbh-uN8bG-I2yu-HhYGi0,15701
+sdsstools-1.9.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sdsstools-1.9.5.dist-info/entry_points.txt,sha256=H1UefQFMHyzmGcdNib_qxiOfFSx3351wr4c2ax0PJbQ,87
+sdsstools-1.9.5.dist-info/licenses/LICENSE.md,sha256=_7dAUQQ5Ph_x1hcFXhi9aHBcqq9H11zco12eO4B3Cyg,1504
+sdsstools-1.9.5.dist-info/RECORD,,