splight-lib 5.11.5.dev0__tar.gz → 5.11.7__tar.gz

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-lib
-Version: 5.11.5.dev0
+Version: 5.11.7
 Summary: Splight Library
 Author: Splight Dev
 Author-email: dev@splight-ae.com

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splight-lib"
-version = "5.11.5.dev0"
+version = "5.11.7"
 description = "Splight Library"
 authors = ["Splight Dev <dev@splight-ae.com>"]
 readme = "README.md"

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/auth/__init__.py

@@ -1,7 +1,5 @@
-from splight_lib.auth.mac_auth import HmacSignature
 from splight_lib.auth.token import SplightAuthToken
 
 __all__ = [
-    HmacSignature,
     SplightAuthToken,
 ]

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/client/database/abstract.py

@@ -1,19 +1,18 @@
 from abc import abstractmethod
 from tempfile import NamedTemporaryFile
-from typing import Dict, List, Union
 
 from splight_lib.abstract.client import AbstractClient, QuerySet
 
 
 class AbstractDatabaseClient(AbstractClient):
     @abstractmethod
-    def save(self, resource_name: str, instance: Dict) -> Dict:
+    def save(self, resource_name: str, instance: dict) -> dict:
         pass
 
     @abstractmethod
     def _get(
         self, resource_name: str, first: bool = False, **kwargs
-    ) -> Union[Dict, List[Dict]]:
+    ) -> dict | list[dict]:
         pass
 
     def get(self, resource_name: str, *args, **kwargs) -> QuerySet:
@@ -24,5 +23,5 @@ class AbstractDatabaseClient(AbstractClient):
         pass
 
     @abstractmethod
-    def download(self, instance: Dict) -> NamedTemporaryFile:
+    def download(self, instance: dict) -> NamedTemporaryFile:
         pass

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/client/database/builder.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any
 
 from splight_lib.client.database.abstract import AbstractDatabaseClient
 from splight_lib.client.database.remote_client import RemoteDatabaseClient
@@ -6,6 +6,6 @@ from splight_lib.client.database.remote_client import RemoteDatabaseClient
 
 class DatabaseClientBuilder:
     @staticmethod
-    def build(parameters: Dict[str, Any] = {}) -> AbstractDatabaseClient:
+    def build(parameters: dict[str, Any] = {}) -> AbstractDatabaseClient:
         db_client = RemoteDatabaseClient(**parameters)
         return db_client

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/client/database/remote_client.py

@@ -1,5 +1,5 @@
 from tempfile import NamedTemporaryFile
-from typing import Any, Dict, Generator, List, Optional, Union
+from typing import Any, Generator
 
 import progressbar
 import requests
@@ -31,9 +31,9 @@ logger = get_splight_logger()
 
 class PaginatedResponse(TypedDict):
     count: int
-    next: Optional[str]
-    previous: Optional[str]
-    results: List[Any]
+    next: str | None
+    previous: str | None
+    results: list[Any]
 
 
 class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
@@ -66,9 +66,9 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
     def save(
         self,
         resource_name: str,
-        instance: Dict,
-        files: Optional[Dict[str, str]] = None,
-    ) -> Dict:
+        instance: dict,
+        files: dict[str, str] | None = None,
+    ) -> dict:
         """Creates or updates a resource depending on the name if
         it contains the id or not.
 
@@ -126,7 +126,7 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
         resource_name: str,
         first: bool = False,
         **kwargs,
-    ) -> Union[Dict, List[Dict]]:
+    ) -> dict | list[dict]:
         """Retrieves one or multiple resources. If the parameter id is passed
         as a kwarg, the instance with that id will be retrieved.
 
@@ -149,7 +149,7 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
             )
         return instances
 
-    def operate(self, resource_name: str, instance: Dict) -> Dict:
+    def operate(self, resource_name: str, instance: dict) -> dict:
         model_name = resource_name.lower()
         api_path = CUSTOM_PATHS_MAP.get(model_name)
         if not api_path:
@@ -163,7 +163,7 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
 
     def _retrieve_multiple(
         self, resource_name: str, first: bool = False, **kwargs
-    ) -> List[Dict]:
+    ) -> list[dict]:
         logger.debug(f"Retrieving objects {resource_name}")
         api_path = self._get_api_path(resource_name)
         url = self._base_url / api_path
@@ -176,7 +176,7 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
         return instances
 
     @retry(SPLIGHT_REQUEST_EXCEPTIONS, tries=3, delay=1)
-    def _retrieve_single(self, resource_name: str, id: str) -> Dict:
+    def _retrieve_single(self, resource_name: str, id: str) -> dict:
         logger.debug(f"Retrieving object {resource_name} with id {id}")
         api_path = self._get_api_path(resource_name)
         url = self._base_url / api_path / f"{id}/"
@@ -191,8 +191,8 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
     def download(
         self,
         resource_name: str,
-        instance: Dict,
-        type_: Optional[str] = None,
+        instance: dict,
+        type_: str | None = None,
         **kwargs,
     ) -> NamedTemporaryFile:
         """Returns the number of resources in the database for a given model
@@ -271,9 +271,9 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
     def _create(
         self,
         resource_name: str,
-        instance: Dict,
-        files: Optional[Dict[str, str]] = None,
-    ) -> Dict:
+        instance: dict,
+        files: dict[str, str] | None = None,
+    ) -> dict:
         logger.debug("Saving new instance", tags=LogTags.DATABASE)
         model_name = resource_name.lower()
         api_path = self._get_api_path(resource_name)
@@ -305,9 +305,9 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
         self,
         resource_name: str,
         resource_id: str,
-        instance: Dict,
-        files: Optional[Dict[str, str]] = None,
-    ) -> Dict:
+        instance: dict,
+        files: dict[str, str] | None = None,
+    ) -> dict:
         logger.debug("Saving instance %s", resource_id, tags=LogTags.DATABASE)
         model_name = resource_name.lower()
         api_path = self._get_api_path(resource_name)
@@ -323,7 +323,7 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
             raise RequestError(response.status_code, response.text)
         return response.json()
 
-    def _create_file(self, instance: Dict, url: furl):
+    def _create_file(self, instance: dict, url: furl):
         response = self._restclient.post(url, data=instance)
         if response.is_error:
             raise RequestError(response.status_code, response.text)
@@ -333,7 +333,7 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
         self._upload_file(created_instance, file_path=file_path)
         return created_instance
 
-    def _upload_file(self, instance: Dict, file_path: str):
+    def _upload_file(self, instance: dict, file_path: str):
         api_path = self._get_api_path("file")
         resource_id = instance.get("id")
         url = self._base_url / api_path / f"{resource_id}/upload_url/"
@@ -358,9 +358,9 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
     def upload(
         self,
         resource_name: str,
-        instance: Dict,
+        instance: dict,
         file_path: str,
-        type_: Optional[str] = None,
+        type_: str | None = None,
     ):
         api_path = self._get_api_path(resource_name)
         resource_id = instance.get("id")

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/client/datalake/buffer.py

@@ -1,5 +1,4 @@
 from datetime import datetime, timezone
-from typing import Dict, List
 
 
 class DatalakeDocumentBuffer:
@@ -8,13 +7,13 @@ class DatalakeDocumentBuffer:
     def __init__(self, buffer_size: int, buffer_timeout: float):
         self._size = buffer_size
         self._timeout = buffer_timeout
-        self._buffer: List[Dict] = []
+        self._buffer: list[dict] = []
         self._last_flush = datetime.now(timezone.utc)
 
         self.reset()
 
     @property
-    def data(self) -> List[Dict]:
+    def data(self) -> list[dict]:
         """Retrieves the buffer data
 
         Returns
@@ -45,7 +44,7 @@ class DatalakeDocumentBuffer:
         self._last_flush = datetime.now(timezone.utc)
         self._buffer = []
 
-    def add_documents(self, documents: List[Dict]):
+    def add_documents(self, documents: list[dict]):
         """Adds new documents to the buffer.
 
         Parameters

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/client/datalake/builder.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any
 
 from splight_lib.client.datalake.abstract import AbstractDatalakeClient
 from splight_lib.client.datalake.remote_client import (
@@ -19,6 +19,6 @@ class DatalakeClientBuilder:
     @staticmethod
     def build(
         dl_client_type: DatalakeClientType = DatalakeClientType.BUFFERED_ASYNC,
-        parameters: Dict[str, Any] = {},
+        parameters: dict[str, Any] = {},
     ) -> AbstractDatalakeClient:
         return DL_CLIENT_TYPE_MAP[dl_client_type](**parameters)

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/client/hub/abstract.py

@@ -1,5 +1,4 @@
 from abc import abstractmethod
-from typing import Dict, List, Tuple
 
 from pydantic import BaseModel
 
@@ -17,7 +16,7 @@ class AbstractHubClient(AbstractClient):
         limit_: int = -1,
         skip_: int = 0,
         **kwargs,
-    ) -> List[BaseModel]:
+    ) -> list[BaseModel]:
         pass
 
     @abstractmethod
@@ -25,7 +24,7 @@ class AbstractHubClient(AbstractClient):
         pass
 
     @abstractmethod
-    def download(self, data: Dict) -> Tuple:
+    def download(self, data: dict) -> tuple:
         pass
 
     @abstractmethod
@@ -33,5 +32,5 @@ class AbstractHubClient(AbstractClient):
         pass
 
     @abstractmethod
-    def save(self, instance: Dict) -> Dict:
+    def save(self, instance: dict) -> dict:
         pass

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/client/hub/client.py

@@ -1,5 +1,5 @@
 from tempfile import NamedTemporaryFile
-from typing import Any, Dict, Generator, List, Optional, TypedDict
+from typing import Any, Generator, TypedDict
 
 import progressbar
 import requests
@@ -13,9 +13,9 @@ from splight_lib.client.hub.abstract import AbstractHubClient
 
 class PaginatedResponse(TypedDict):
     count: int
-    next: Optional[str]
-    previous: Optional[str]
-    results: List[Any]
+    next: str | None
+    previous: str | None
+    results: list[Any]
 
 
 class SplightHubClient(AbstractHubClient):
@@ -58,7 +58,7 @@ class SplightHubClient(AbstractHubClient):
         limit_: int = -1,
         skip_: int = 0,
         **kwargs,
-    ) -> List[BaseModel]:
+    ) -> list[BaseModel]:
         url = self._hub_url / "versions/"
         params = self._get_params(limit_, skip_, **kwargs)
         instances = []
@@ -71,14 +71,14 @@ class SplightHubClient(AbstractHubClient):
     def get_org_id(self):
         return self._org_id
 
-    def _create(self, instance: Dict) -> Dict:
+    def _create(self, instance: dict) -> dict:
         url = self._hub_url / "components/"
         response = self._session.post(url, json=instance)
         response.raise_for_status()
         instance = response.json()
         return instance
 
-    def _update(self, instance: Dict) -> Dict:
+    def _update(self, instance: dict) -> dict:
         instance_id = instance.get("id")
         url = self._hub_url / "versions" / f"{instance_id}/"
         response = self._session.put(url, json=instance)
@@ -86,12 +86,12 @@ class SplightHubClient(AbstractHubClient):
         instance = response.json()
         return instance
 
-    def build(self, id: str):
+    def build(self, id: str) -> None:
         url = self._hub_url / f"versions/{id}/build/"
         response = self._session.post(url)
         response.raise_for_status()
 
-    def upload(self, id: str, file_path: str, type_: str):
+    def upload(self, id: str, file_path: str, type_: str) -> None:
         url = self._hub_url / f"versions/{id}/upload_url/"
         params = {"type": type_}
         response = self._session.get(url, params=params)
@@ -135,7 +135,7 @@ class SplightHubClient(AbstractHubClient):
             response.status_code == 204
         ), f"Failed to delete component: {response.json()}"
 
-    def save(self, instance: Dict) -> Dict:
+    def save(self, instance: dict) -> dict:
         if instance.get("id"):
             return self._update(instance)
         else:

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/component/abstract.py

@@ -5,7 +5,7 @@ from collections import namedtuple
 from tempfile import NamedTemporaryFile
 from threading import Thread
 from time import sleep
-from typing import Callable, Dict, Optional, Type
+from typing import Callable, Type
 
 from pydantic import BaseModel
 from pydantic_core import ValidationError
@@ -70,7 +70,7 @@ class HealthCheckProcessor:
 class SplightBaseComponent(ABC):
     def __init__(
         self,
-        component_id: Optional[str] = None,
+        component_id: str | None = None,
     ):
         self._component_id = component_id
         self._execution_engine = ExecutionEngine()
@@ -185,7 +185,7 @@ class SplightBaseComponent(ABC):
         return wrapper
 
     def _get_custom_type_model(
-        self, component_object: Dict[str, Type[ComponentObjectInstance]]
+        self, component_object: dict[str, Type[ComponentObjectInstance]]
     ) -> BaseModel:
         custom_type_model = namedtuple(
             "CustomTypes", [k for k in component_object.keys()]
@@ -193,7 +193,7 @@ class SplightBaseComponent(ABC):
         return custom_type_model(**component_object)
 
     def _get_routine_model(
-        self, routine_objects: Dict[str, Type[RoutineObjectInstance]]
+        self, routine_objects: dict[str, Type[RoutineObjectInstance]]
     ) -> namedtuple:
         routine_model = namedtuple(
             "ComponentRoutine", [k for k in routine_objects.keys()]
@@ -209,9 +209,9 @@ class SplightBaseComponent(ABC):
         return spec
 
     @abstractmethod
-    def start(self):
+    def start(self) -> None:
         raise NotImplementedError()
 
-    def stop(self):
+    def stop(self) -> None:
         self._execution_engine.stop()
         sys.exit(1)

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/component/spec.py

@@ -1,6 +1,6 @@
 import json
 from collections import namedtuple
-from typing import Dict, List, Optional, Set, Type
+from typing import Annotated, Type
 
 from pydantic import AnyUrl, BaseModel, Field, ValidationInfo, field_validator
 
@@ -43,7 +43,7 @@ VALID_DEPENDS_ON = [
 ]
 
 
-def check_unique_values(values: List[str]):
+def check_unique_values(values: list[str]):
     """Checks if there are repeated values in a list of strings.
 
     Raises
@@ -54,14 +54,14 @@ def check_unique_values(values: List[str]):
         raise DuplicatedValuesError("The list contains duplicated values")
 
 
-def check_parameter_dependency(parameters: List[InputParameter]):
+def check_parameter_dependency(parameters: list[InputParameter]):
     """Checks dependency between parameters.
 
     Raises
     ------
     ParameterDependencyError thrown for an error in the dependency.
     """
-    parameter_map: Dict[str, InputParameter] = {p.name: p for p in parameters}
+    parameter_map: dict[str, InputParameter] = {p.name: p for p in parameters}
     for parameter in parameters:
         if not parameter.depends_on:
             continue
@@ -75,35 +75,35 @@ def check_parameter_dependency(parameters: List[InputParameter]):
 
 
 class Spec(BaseModel):
-    name: str = Field(pattern=r"^[a-zA-Z0-9\s]+$")
-    version: str = Field(pattern=r"^(\d+\.)?(\d+\.)?(\*|\d+)$")
-    splight_lib_version: Optional[str] = Field(
-        None, pattern=r"^(\d+)\.(\d+)\.(\d+)(\.dev[0-9]+)?$"
-    )
-    splight_cli_version: Optional[str] = Field(
-        None, pattern=r"^(\d+)\.(\d+)\.(\d+)(\.dev[0-9]+)?$"
-    )
+    name: Annotated[str, Field(pattern=r"^[a-zA-Z0-9\s]+$")]
+    version: Annotated[str, Field(pattern=r"^(\d+\.)?(\d+\.)?(\*|\d+)$")]
+    splight_lib_version: Annotated[
+        str | None, Field(pattern=r"^(\d+)\.(\d+)\.(\d+)(\.dev[0-9]+)?$")
+    ] = None
+    splight_cli_version: Annotated[
+        str | None, Field(pattern=r"^(\d+)\.(\d+)\.(\d+)(\.dev[0-9]+)?$")
+    ] = None
     description: str | None = None
     privacy_policy: PrivacyPolicy = PrivacyPolicy.PUBLIC
-    tags: Set[str] = set()
+    tags: set[str] = set()
     component_type: ComponentType = ComponentType.CONNECTOR
-    custom_types: List[CustomType] = []
-    input: List[InputParameter] = []
-    output: List[Output] = []
-    routines: List[Routine] = []
-    endpoints: List[Endpoint] = []
+    custom_types: list[CustomType] = []
+    input: list[InputParameter] = []
+    output: list[Output] = []
+    routines: list[Routine] = []
+    endpoints: list[Endpoint] = []
 
     @field_validator("custom_types", mode="after")
     def validate_custom_types(
-        cls, custom_types: List[CustomType], info: ValidationInfo
-    ) -> List[CustomType]:
+        cls, custom_types: list[CustomType], info: ValidationInfo
+    ) -> list[CustomType]:
         try:
             check_unique_values([item.name for item in custom_types])
         except DuplicatedValuesError as exc:
             raise ValueError("Repeated Custom Types in spec") from exc
 
-        valid_types: List[str] = VALID_PARAMETER_VALUES.keys()
-        custom_type_names: List[str] = []
+        valid_types: list[str] = VALID_PARAMETER_VALUES.keys()
+        custom_type_names: list[str] = []
 
         for custom_type in custom_types:
             for field in custom_type.fields:
@@ -125,16 +125,16 @@ class Spec(BaseModel):
 
     @field_validator("input", mode="after")
     def validate_parameters(
-        cls, input: List[InputParameter], info: ValidationInfo
-    ) -> List[InputParameter]:
+        cls, input: list[InputParameter], info: ValidationInfo
+    ) -> list[InputParameter]:
         values = info.data
         try:
             check_unique_values([item.name for item in input])
         except DuplicatedValuesError as exc:
             raise ValueError("Repeated Input parameters in spec") from exc
 
-        custom_type_names: List[str] = [c.name for c in values["custom_types"]]
-        valid_types_names: List[str] = (
+        custom_type_names: list[str] = [c.name for c in values["custom_types"]]
+        valid_types_names: list[str] = (
             list(VALID_PARAMETER_VALUES.keys()) + custom_type_names
         )
 
@@ -149,7 +149,7 @@ class Spec(BaseModel):
         return input
 
     @field_validator("output", mode="after")
-    def validate_output(cls, output: List[Output]) -> List[Output]:
+    def validate_output(cls, output: list[Output]) -> list[Output]:
         try:
             check_unique_values([item.name for item in output])
         except DuplicatedValuesError as exc:

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/encryption.py

@@ -1,5 +1,4 @@
 from functools import cached_property
-from typing import Optional
 
 from cryptography.fernet import Fernet as Branca
 from pydantic_settings import BaseSettings
@@ -10,7 +9,7 @@ logger = get_splight_logger()
 
 
 class EncryptionSettings(BaseSettings):
-    SPLIGHT_ENCRYPTION_KEY: Optional[str] = None
+    SPLIGHT_ENCRYPTION_KEY: str | None = None
 
 
 class EncryptionClient:

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/execution/engine.py

@@ -1,5 +1,4 @@
 from enum import auto
-from typing import Set, Tuple
 
 import pytz
 from apscheduler.events import EVENT_JOB_ERROR, JobExecutionEvent
@@ -35,7 +34,7 @@ class ExecutionEngine:
             timezone=pytz.UTC,
             daemon=True,
         )
-        self._critical_jobs: Set[str] = set()
+        self._critical_jobs: set[str] = set()
         self._blocking_sch.add_listener(
             self._task_fail_callback, EVENT_JOB_ERROR
         )
@@ -53,7 +52,7 @@ class ExecutionEngine:
     def state(self) -> EngineStatus:
         return self._state
 
-    def healthcheck(self) -> Tuple[bool, str]:
+    def healthcheck(self) -> tuple[bool, str]:
         return (self._running, self._state.value)
 
     def start(self):

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/execution/scheduling.py

@@ -1,5 +1,4 @@
 from datetime import datetime, timezone
-from typing import Optional, Union
 
 from pydantic import (
     BaseModel,
@@ -22,7 +21,7 @@ FIELD_RANGE = {
 
 
 def validate_value_in_range(
-    value: Union[int, str], min_value: int, max_value: int, name: str
+    value: int | str, min_value: int, max_value: int, name: str
 ):
     if isinstance(value, str):
         if "*" in value:
@@ -48,18 +47,18 @@ class TaskPeriod(BaseModel):
     minutes: int = 0
     seconds: int = 0
     start_date: datetime = datetime.now(timezone.utc)
-    end_date: Optional[datetime] = None
+    end_date: datetime | None = None
 
 
 class Crontab(BaseModel):
-    year: Optional[Union[str, int]] = None
-    month: Optional[Union[str, int]] = None
-    day: Optional[Union[str, int]] = None
-    week: Optional[Union[str, int]] = None
-    day_of_week: Optional[Union[str, int]] = None
-    hour: Optional[Union[str, int]] = None
-    minute: Optional[Union[str, int]] = None
-    second: Optional[Union[str, int]] = None
+    year: str | int | None = None
+    month: str | int | None = None
+    day: str | int | None = None
+    week: str | int | None = None
+    day_of_week: str | int | None = None
+    hour: str | int | None = None
+    minute: str | int | None = None
+    second: str | int | None = None
 
     @field_validator(
         "month", "day", "week", "day_of_week", "hour", "minute", "second"

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/execution/task.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Callable, Dict, Optional, Tuple, Union
+from typing import Callable
 
 import pytz
 from apscheduler.triggers.cron import CronTrigger
@@ -10,7 +10,7 @@ from splight_lib.execution.trigger import IntervalTrigger
 
 class BaseTask(ABC):
     @abstractmethod
-    def as_job(self) -> Dict:
+    def as_job(self) -> dict:
         pass
 
 
@@ -18,8 +18,8 @@ class PeriodicTask(BaseTask):
     def __init__(
         self,
         target: Callable,
-        period: Union[TaskPeriod, int],
-        target_args: Optional[Tuple] = None,
+        period: TaskPeriod | int,
+        target_args: tuple | None = None,
     ):
         self._target = target
         self._args = target_args
@@ -50,7 +50,7 @@ class CronnedTask(BaseTask):
         self,
         target: Callable,
         crontab: Crontab,
-        target_args: Optional[Tuple] = None,
+        target_args: tuple | None = None,
     ):
         self._target = target
         self._trigger = CronTrigger(**dict(crontab), timezone=pytz.UTC)
@@ -61,7 +61,7 @@ class CronnedTask(BaseTask):
         cls,
         target: Callable,
         cron_str: str,
-        target_args: Optional[Tuple] = None,
+        target_args: tuple | None = None,
     ):
         crontab = Crontab.from_string(cron_str)
         return cls(target, crontab, target_args)

{splight_lib-5.11.5.dev0 → splight_lib-5.11.7}/splight_lib/execution/trigger.py

@@ -1,5 +1,4 @@
 from datetime import datetime, tzinfo
-from typing import Optional, Union
 
 from apscheduler.triggers.interval import (
     IntervalTrigger as BaseIntervalTrigger,
@@ -17,9 +16,9 @@ class IntervalTrigger(BaseIntervalTrigger):
         hours: int = 0,
         minutes: int = 0,
         seconds: int = 0,
-        start_date: Optional[Union[datetime, str]] = None,
-        end_date: Optional[Union[datetime, str]] = None,
-        timezone: Optional[Union[tzinfo, str]] = None,
+        start_date: datetime | str | None = None,
+        end_date: datetime | str | None = None,
+        timezone: tzinfo | str | None = None,
         jitter: int = None,
         run_on_start: bool = True,
     ):