pyopensky 2.0__tar.gz → 2.2__tar.gz

{pyopensky-2.0 → pyopensky-2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyopensky
-Version: 2.0
+Version: 2.2
 Summary: A Python interface for OpenSky database
 License: MIT
 Author: Xavier Olive
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: appdirs (>=1.4.4)
 Requires-Dist: minio (>=7.1)
 Requires-Dist: pandas (>=1.5)
@@ -25,7 +26,9 @@ Description-Content-Type: text/markdown
 
 # pyopensky
 
-The pyopensky Python library provides facility to download data from the OpenSky Network live API and historical databases. It aims at making ADS-B and Mode S data from OpenSky easily accessible in the Python programming environment.
+The `pyopensky` Python library provides functions to download data from the OpenSky Network live API and historical databases. It aims at making ADS-B and Mode S data from OpenSky easily accessible in the Python programming environment.
+
+Full documentation on https://open-aviation.github.io/pyopensky
 
 ## Installation
 
@@ -54,7 +57,7 @@ poetry install
 | Impala | https://opensky-network.org/data/impala                        |
 | Trino  | contact@opensky-network.org (or specify it in the Impala form) |
 
-The first time you use the library, a configuration file named `secret.conf` with the following content:
+The first time you use the library, a configuration file named `settings.conf` is created, including the following content:
 
 ```text
 [default]
@@ -62,7 +65,7 @@ username =
 password =
 ```
 
-You will identify the folder where the `secret.conf` is located:
+You will identify the folder where the `settings.conf` is located:
 
 ```python
 from pyopensky.config import opensky_config_dir
@@ -72,7 +75,7 @@ print(opensky_config_dir)
 
 ## Usage
 
-- from the REST API:
+- from the [REST API](https://open-aviation.github.io/pyopensky/rest.html):
 
   ```python
   from pyopensky.rest import REST
@@ -87,7 +90,7 @@ print(opensky_config_dir)
   rest.departure(airport, begin, end)
   ```
 
-- from the Impala shell (requires authentication):
+- from the [Impala](https://open-aviation.github.io/pyopensky/impala.html) shell (requires authentication):
 
   ```python
   from pyopensky.impala import Impala
@@ -99,7 +102,7 @@ print(opensky_config_dir)
   impala.rawdata(start, stop, *, callsign, icao24, bounds)
   ```
 
-- from the Trino shell (requires authentication):
+- from the [Trino](https://open-aviation.github.io/pyopensky/trino.html) database (requires authentication):
 
   ```python
   from pyopensky.trino import Trino

{pyopensky-2.0 → pyopensky-2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyopensky"
-version = "2.0"
+version = "2.2"
 description = "A Python interface for OpenSky database"
 authors = ["Xavier Olive <git@xoolive.org>", "Junzi Sun <j.sun-1@tudelft.nl>"]
 license = "MIT"
@@ -24,13 +24,16 @@ paramiko = ">=2.7"
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = ">=3.1.1"
-black = ">=23.1.0"
 mypy = ">=1.0.1"
 ruff = ">=0.0.253"
 pytest = ">=7.2.1"
 ipykernel = ">=6.21.2"
 types-requests = ">=2.28.11.15"
 types-paramiko = ">=3.3.0.0"
+Sphinx = ">=5.1"
+sphinx-design = ">=0.4.1"
+sphinx-rtd-theme = ">=0.5.2"
+sphinx-autodoc-typehints = ">=1.17,!=1.21.4"
 
 [build-system]
 requires = ["poetry-core"]

{pyopensky-2.0 → pyopensky-2.2}/readme.md

@@ -1,6 +1,8 @@
 # pyopensky
 
-The pyopensky Python library provides facility to download data from the OpenSky Network live API and historical databases. It aims at making ADS-B and Mode S data from OpenSky easily accessible in the Python programming environment.
+The `pyopensky` Python library provides functions to download data from the OpenSky Network live API and historical databases. It aims at making ADS-B and Mode S data from OpenSky easily accessible in the Python programming environment.
+
+Full documentation on https://open-aviation.github.io/pyopensky
 
 ## Installation
 
@@ -29,7 +31,7 @@ poetry install
 | Impala | https://opensky-network.org/data/impala                        |
 | Trino  | contact@opensky-network.org (or specify it in the Impala form) |
 
-The first time you use the library, a configuration file named `secret.conf` with the following content:
+The first time you use the library, a configuration file named `settings.conf` is created, including the following content:
 
 ```text
 [default]
@@ -37,7 +39,7 @@ username =
 password =
 ```
 
-You will identify the folder where the `secret.conf` is located:
+You will identify the folder where the `settings.conf` is located:
 
 ```python
 from pyopensky.config import opensky_config_dir
@@ -47,7 +49,7 @@ print(opensky_config_dir)
 
 ## Usage
 
-- from the REST API:
+- from the [REST API](https://open-aviation.github.io/pyopensky/rest.html):
 
   ```python
   from pyopensky.rest import REST
@@ -62,7 +64,7 @@ print(opensky_config_dir)
   rest.departure(airport, begin, end)
   ```
 
-- from the Impala shell (requires authentication):
+- from the [Impala](https://open-aviation.github.io/pyopensky/impala.html) shell (requires authentication):
 
   ```python
   from pyopensky.impala import Impala
@@ -74,7 +76,7 @@ print(opensky_config_dir)
   impala.rawdata(start, stop, *, callsign, icao24, bounds)
   ```
 
-- from the Trino shell (requires authentication):
+- from the [Trino](https://open-aviation.github.io/pyopensky/trino.html) database (requires authentication):
 
   ```python
   from pyopensky.trino import Trino

pyopensky-2.2/src/pyopensky/__init__.py

@@ -0,0 +1,3 @@
+from importlib.metadata import version
+
+__version__ = version("pyopensky")

{pyopensky-2.0 → pyopensky-2.2}/src/pyopensky/api.py

@@ -50,6 +50,7 @@ class OpenSkyDBAPI(Protocol):
         departure_airport: None | str = None,
         arrival_airport: None | str = None,
         airport: None | str = None,
+        time_buffer: None | str | pd.Timedelta = None,
         cached: bool = True,
         compress: bool = False,
         limit: None | int = None,

pyopensky-2.2/src/pyopensky/config.py

@@ -0,0 +1,219 @@
+from __future__ import annotations
+
+import configparser
+import logging
+import os
+from pathlib import Path
+from typing import TypedDict
+
+from appdirs import user_cache_dir, user_config_dir
+
+import pandas as pd
+
+_log = logging.getLogger(__name__)
+
+
+DEFAULT_CONFIG = """
+[default]
+username =
+password =
+
+# If you use different credentials for Impala and Trino, uncomment the following
+# [impala]
+# username =
+# password =
+#
+# [trino]
+# username =
+# password =
+
+[cache]
+## You may set a different cache folder here if you have a preferred space
+## for storing possibly large files.
+## Default settings:
+## - $HOME/.cache/opensky (Linux)
+## - $HOME/Library/Caches/opensky (MacOS)
+## - C:\\Users\\<username>\\AppData\\Local\\opensky\\Cache (Windows)
+##
+# path =
+
+## The purge parameter refers to the cache folder containing data from the
+## Opensky databases. Cache files tend to take space so you may want to let
+## the library delete older files.
+## Files are removed when the library is imported.
+purge = 90 days
+"""
+
+opensky_config_dir = Path(user_config_dir("pyopensky"))
+opensky_config = configparser.ConfigParser()
+
+if (opensky_config_file := opensky_config_dir / "settings.conf").exists():
+    opensky_config.read(opensky_config_file.as_posix())
+elif (previous_config_file := opensky_config_dir / "secret.conf").exists():
+    previous_config_file.rename(opensky_config_file)
+    opensky_config.read(opensky_config_file.as_posix())
+else:
+    if not opensky_config_dir.exists():
+        opensky_config_dir.mkdir(parents=True)
+    opensky_config_file.write_text(DEFAULT_CONFIG)
+
+traffic_config_dir = Path(user_config_dir("traffic"))
+traffic_config = configparser.ConfigParser()
+
+if (traffic_config_file := traffic_config_dir / "traffic.conf").exists():
+    traffic_config.read(traffic_config_file.as_posix())
+
+
+def purge_cache(cache_path: Path) -> None:
+    cache_no_expire = False
+    cache_no_expire |= bool(os.environ.get("TRAFFIC_CACHE_NO_EXPIRE"))
+    cache_no_expire |= bool(os.environ.get("OPENSKY_CACHE_NO_EXPIRE"))
+
+    cache_purge = "90 days"
+    if purge := traffic_config.get("cache", "purge", fallback=None):
+        if purge.strip() != "":
+            cache_purge = purge
+    if purge := opensky_config.get("cache", "purge", fallback=None):
+        if purge.strip() != "":
+            cache_purge = purge
+
+    if not cache_no_expire:  # coverage: ignore
+        expiration = pd.Timestamp("now") - pd.Timedelta(cache_purge)
+
+        for cache_file in cache_path.glob("*"):
+            ctime = cache_file.stat().st_ctime
+            if ctime < expiration.timestamp():
+                _log.warn(f"Removing {cache_file} created on {ctime}")
+                cache_file.unlink()
+
+
+class Resolution(TypedDict, total=False):
+    opensky_category: str
+    opensky_name: str
+    traffic_category: str
+    traffic_name: str
+    environment_variable: str
+
+
+NAME_RESOLUTION: dict[str, Resolution] = {
+    # Cache configuration
+    "cache_dir": dict(
+        opensky_category="cache",
+        opensky_name="path",
+        traffic_category="cache",
+        traffic_name="path",
+    ),
+    # Network configuration
+    "http_proxy": dict(
+        environment_variable="http_proxy",
+        opensky_category="default",
+        opensky_name="http_proxy",
+        traffic_category="network",
+        traffic_name="http_proxy",
+    ),
+    "ssh_proxycommand": dict(
+        opensky_category="impala",
+        opensky_name="ssh.proxycommand",
+        traffic_category="opensky",
+        traffic_name="ssh.proxycommand",
+    ),
+    # Credentials configuration
+    "access_key": dict(
+        opensky_category="s3",
+        opensky_name="access_key",
+        traffic_category="opensky",
+        traffic_name="access_key",
+    ),
+    "secret_key": dict(
+        opensky_category="s3",
+        opensky_name="secret_key",
+        traffic_category="opensky",
+        traffic_name="secret_key",
+    ),
+    "username": dict(
+        environment_variable="OPENSKY_USERNAME",
+        opensky_category="default",
+        opensky_name="username",
+        traffic_category="opensky",
+        traffic_name="username",
+    ),
+    "password": dict(
+        environment_variable="OPENSKY_PASSWORD",
+        opensky_category="default",
+        opensky_name="password",
+        traffic_category="opensky",
+        traffic_name="password",
+    ),
+    "trino_username": dict(opensky_category="trino", opensky_name="username"),
+    "trino_password": dict(opensky_category="trino", opensky_name="password"),
+    "impala_username": dict(opensky_category="impala", opensky_name="username"),
+    "impala_password": dict(opensky_category="impala", opensky_name="password"),
+}
+
+__all__ = list(NAME_RESOLUTION.keys())
+
+
+def get_config(
+    opensky_category: str,
+    opensky_name: str,
+    traffic_category: None | str = None,
+    traffic_name: None | str = None,
+    environment_variable: None | str = None,
+) -> None | str:
+    if opensky_value := opensky_config.get(
+        opensky_category, opensky_name, fallback=None
+    ):
+        return opensky_value
+
+    if traffic_category is not None and traffic_name is not None:
+        if traffic_value := traffic_config.get(
+            traffic_category, traffic_name, fallback=None
+        ):
+            return traffic_value
+
+    if environment_variable is not None:
+        return os.environ.get(environment_variable)
+
+    return None
+
+
+cache_dir = get_config(**NAME_RESOLUTION["cache_dir"])
+if cache_dir is None:
+    cache_dir = user_cache_dir("opensky")
+cache_path = Path(cache_dir)
+if not cache_path.exists():
+    cache_path.mkdir(parents=True)
+
+purge_cache(cache_path)
+
+
+def __getattr__(name: str) -> None | str:
+    # Pick in order:
+    # 1. pyopensky -> settings.conf
+    # 2. traffic -> traffic.conf
+    # 3. environment variables
+
+    if name == "trino_username":
+        if value := get_config(**NAME_RESOLUTION[name]):
+            return value
+        return get_config(**NAME_RESOLUTION["username"])
+
+    if name == "trino_password":
+        if value := get_config(**NAME_RESOLUTION[name]):
+            return value
+        return get_config(**NAME_RESOLUTION["password"])
+
+    if name == "impala_username":
+        if value := get_config(**NAME_RESOLUTION[name]):
+            return value
+        return get_config(**NAME_RESOLUTION["username"])
+
+    if name == "impala_password":
+        if value := get_config(**NAME_RESOLUTION[name]):
+            return value
+        return get_config(**NAME_RESOLUTION["password"])
+
+    if name in __all__:
+        return get_config(**NAME_RESOLUTION[name])
+
+    raise AttributeError

{pyopensky-2.0 → pyopensky-2.2}/src/pyopensky/impala.py

@@ -20,7 +20,12 @@ import pandas as pd
 from pandas.errors import ParserError
 
 from .api import HasBounds, OpenSkyDBAPI, ProgressbarType
-from .config import cache_path, password, ssh_proxycommand, username
+from .config import (
+    cache_path,
+    impala_password,
+    impala_username,
+    ssh_proxycommand,
+)
 from .time import split_times, timelike, to_datetime
 
 _log = logging.getLogger(__name__)
@@ -137,21 +142,21 @@ class Impala(OpenSkyDBAPI):
     # actually ChannelStderrFile
 
     def __init__(self, **kwargs: Any) -> None:
-        if username is None or password is None:
+        if impala_username is None or impala_password is None:
             _log.warn("No credentials provided")
 
-        self.username = username
-        self.password = password
+        self.username = impala_username
+        self.password = impala_password
         self.proxy_command = ssh_proxycommand
         self.connected = False
         self.cache_dir = cache_path
         if not self.cache_dir.exists():
             self.cache_dir.mkdir(parents=True)
 
-        if username == "" or password == "":
+        if impala_username == "" or impala_password == "":
             self.auth = None
         else:
-            self.auth = (username, password)
+            self.auth = (impala_username, impala_password)
 
     def clear_cache(self) -> None:  # coverage: ignore
         """Clear cache files for OpenSky.
@@ -651,12 +656,12 @@ class Impala(OpenSkyDBAPI):
         departure_airport: None | str = None,
         arrival_airport: None | str = None,
         airport: None | str = None,
+        time_buffer: None | str | pd.Timedelta = None,
         cached: bool = True,
         compress: bool = False,
         limit: None | int = None,
         other_tables: str = "",
         other_params: str = "",
-        time_buffer: None | str | pd.Timedelta = None,
         progressbar: bool | ProgressbarType[Any] = True,
         date_delta: timedelta = timedelta(hours=1),
         count: bool = False,
@@ -706,6 +711,10 @@ class Impala(OpenSkyDBAPI):
         :param airport: a string for the ICAO identifier of the airport. Selects
             flights departing from or arriving at the airport between the two
             timestamps;
+        :param time_buffer: (default: None) time buffer used to extend time
+            bounds for flights in the OpenSky flight tables: requests will get
+            flights between ``start - time_buffer`` and ``stop + time_buffer``.
+            If no airport is specified, the parameter is ignored.
 
         .. warning::
 
@@ -723,10 +732,6 @@ class Impala(OpenSkyDBAPI):
             received each record;
         :param nautical_units: (default: True) convert data stored in Impala to
             standard nautical units (ft, ft/min, knots).
-        :param time_buffer: (default: None) time buffer used to extend time
-            bounds for flights in the OpenSky flight tables: requests will get
-            flights between ``start - time_buffer`` and ``stop + time_buffer``.
-            If no airport is specified, the parameter is ignored.
         :param cached: (default: True) switch to False to force a new request to
             the database regardless of the cached files. This option also
             deletes previous cache files;
@@ -799,7 +804,7 @@ class Impala(OpenSkyDBAPI):
                 else:
                     other_params += f"and RTRIM(callsign) REGEXP('{callsign}') "
 
-            elif callsign.find("%") > 0 or callsign.find("_") > 0:
+            elif callsign.find("%") >= 0 or callsign.find("_") >= 0:
                 other_params += "and callsign ilike '{}' ".format(callsign)
             else:
                 other_params += "and callsign='{:<8s}' ".format(callsign)
@@ -1005,7 +1010,7 @@ class Impala(OpenSkyDBAPI):
         other_params += "and not typeogn "
 
         if isinstance(sensor_name, str):
-            if sensor_name.find("%") > 0 or sensor_name.find("_") > 0:
+            if sensor_name.find("%") > -1 or sensor_name.find("_") > -1:
                 other_params += "and sensorname ilike '{}' ".format(sensor_name)
             else:
                 other_params += "and sensorname='{:<8s}' ".format(sensor_name)
@@ -1236,7 +1241,7 @@ class Impala(OpenSkyDBAPI):
                     "supported at the moment."
                 )
             if isinstance(callsign, str):
-                if callsign.find("%") > 0 or callsign.find("_") > 0:
+                if callsign.find("%") > -1 or callsign.find("_") > -1:
                     callsigns = "and callsign ilike '{}' ".format(callsign)
                 else:
                     callsigns = "and callsign='{:<8s}' ".format(callsign)

{pyopensky-2.0 → pyopensky-2.2}/src/pyopensky/rest.py

@@ -64,6 +64,7 @@ class REST:
         | str
         | HasBounds
         | tuple[float, float, float, float] = None,
+        retry: int = 5,
     ) -> pd.DataFrame:
         """Returns the current state vectors from OpenSky REST API.
 
@@ -132,9 +133,12 @@ class REST:
                     columns.append("_")
             r = pd.DataFrame.from_records(json["states"], columns=columns)
         except Exception:
-            _log.warning("Error in received data, retrying in 10 seconds")
-            time.sleep(10)
-            return self.states(own, bounds)
+            if retry > 0:
+                retry = retry - 1
+                _log.warning("Retrying in 10 seconds... {retry} more time")
+                time.sleep(10)
+                return self.states(own, bounds, retry=retry)
+            raise
 
         return r.assign(
             timestamp=lambda df: pd.to_datetime(
@@ -210,7 +214,7 @@ class REST:
         c.raise_for_status()
         json = c.json()
 
-        return tuple(json["route"])  # type: ignore
+        return tuple(json["route"])
 
     def aircraft(
         self,

{pyopensky-2.0 → pyopensky-2.2}/src/pyopensky/schema.py

@@ -31,6 +31,8 @@ class UTCTimestampInteger(TypeDecorator[pd.Timestamp]):
             value = pd.to_datetime(value, utc=True)
         if isinstance(value, pd.Timestamp):
             return int(value.timestamp())
+        if isinstance(value, pd.Timedelta):
+            return int(value.total_seconds())
         return super().process_bind_param(value, dialect)
 
     def process_result_value(
@@ -83,6 +85,7 @@ class CallsignString(TypeDecorator[str]):
             operator.ne,  # !=
             sql_operators.eq,
             sql_operators.ne,
+            sql_operators.in_op,
             sql_operators.contains,  # .in()
         ):
             return self
@@ -408,16 +411,22 @@ class PositionData4(Base):
     maxtime: Mapped[pd.Timestamp] = mapped_column(UTCTimestampFloat)
     msgcount: Mapped[int]
     icao24: Mapped[str]
-    message: Mapped[str]
-    isid: Mapped[bool]
-    flightstatus: Mapped[int]
-    downlinkrequest: Mapped[int]
-    utilitymsg: Mapped[int]
-    interrogatorid: Mapped[int]
-    identifierdesignator: Mapped[int]
-    valuecode: Mapped[int]
-    altitude: Mapped[float]
-    identity: Mapped[str]
+    nicsuppla: Mapped[bool]
+    hcr: Mapped[float]
+    nic: Mapped[int]
+    survstatus: Mapped[int]
+    nicsupplb: Mapped[bool]
+    odd: Mapped[bool]
+    baroalt: Mapped[bool]
+    lat: Mapped[float]
+    lon: Mapped[float]
+    alt: Mapped[float]
+    nicsupplc: Mapped[bool]
+    groundspeed: Mapped[float]
+    gsresolution: Mapped[float]
+    heading: Mapped[float]
+    timeflag: Mapped[bool]
+    surface: Mapped[bool]
 
     # Whatever, we pick this one as primary key BUT
     #   - this is not true

{pyopensky-2.0 → pyopensky-2.2}/src/pyopensky/trino.py

@@ -22,6 +22,7 @@ from sqlalchemy import (
 )
 from sqlalchemy.orm import aliased
 from sqlalchemy.orm.attributes import InstrumentedAttribute
+from sqlalchemy.sql import ColumnExpressionArgument
 from sqlalchemy.sql.expression import text
 from tqdm import tqdm
 from trino.auth import JWTAuthentication, OAuth2Authentication
@@ -30,7 +31,7 @@ from trino.sqlalchemy import URL
 import pandas as pd
 
 from .api import HasBounds, OpenSkyDBAPI
-from .config import cache_path, password, username
+from .config import cache_path, trino_password, trino_username
 from .schema import (
     FlightsData4,
     FlightsData5,
@@ -60,7 +61,7 @@ class Trino(OpenSkyDBAPI):
     _token: None | Token = None
 
     def token(self, **kwargs: Any) -> None | str:
-        if username is None or password is None:
+        if trino_username is None or trino_password is None:
             _log.warn(
                 "No credentials provided, "
                 "falling back to browser authentication"
@@ -81,8 +82,8 @@ class Trino(OpenSkyDBAPI):
             data={
                 "client_id": "trino-client",
                 "grant_type": "password",
-                "username": username,
-                "password": password,
+                "username": trino_username,
+                "password": trino_password,
             },
             **kwargs,
         )
@@ -108,7 +109,7 @@ class Trino(OpenSkyDBAPI):
             URL(
                 "trino.opensky-network.org",
                 port=443,
-                user=username,
+                user=trino_username,
                 catalog="minio",
                 schema="osky",
             ),
@@ -224,7 +225,7 @@ class Trino(OpenSkyDBAPI):
         self,
         start: timelike,
         stop: None | timelike = None,
-        *args: Any,  # more reasonable to be explicit about arguments
+        *args: ColumnExpressionArgument[bool],
         departure_airport: None | str | list[str] = None,
         arrival_airport: None | str | list[str] = None,
         airport: None | str | list[str] = None,
@@ -345,6 +346,9 @@ class Trino(OpenSkyDBAPI):
                 Table.day < stop_ts.ceil("1d"),
             )
 
+        for condition in args:
+            stmt = stmt.where(condition)
+
         if limit is not None:
             stmt = stmt.limit(limit)
 
@@ -364,7 +368,7 @@ class Trino(OpenSkyDBAPI):
         self,
         start: timelike,
         stop: None | timelike = None,
-        *args: Any,
+        *args: ColumnExpressionArgument[bool],
         # date_delta: timedelta = timedelta(hours=1),
         callsign: None | str | list[str] = None,
         icao24: None | str | list[str] = None,
@@ -581,7 +585,7 @@ class Trino(OpenSkyDBAPI):
         self,
         start: timelike,
         stop: None | timelike = None,
-        *args: Any,  # more reasonable to be explicit about arguments
+        *args: ColumnExpressionArgument[bool],
         icao24: None | str | list[str] = None,
         serials: None | int | Iterable[int] = None,
         bounds: None | HasBounds | tuple[float, float, float, float] = None,
@@ -593,6 +597,7 @@ class Trino(OpenSkyDBAPI):
         compress: bool = False,
         limit: None | int = None,
         Table: Type[RawTable] = RollcallRepliesData4,
+        extra_columns: tuple[InstrumentedAttribute[Any], ...] = (),
         **kwargs: Any,
     ) -> None | pd.DataFrame:
         """Get raw message from the OpenSky Trino database.
@@ -687,11 +692,9 @@ class Trino(OpenSkyDBAPI):
                 select(Table)
                 .with_only_columns(
                     Table.mintime,
-                    Table.maxtime,
                     Table.rawmsg,
-                    Table.msgcount,
                     Table.icao24,
-                    Table.sensors,
+                    *extra_columns,
                 )
                 .where(Table.rawmsg.is_not(None))
             )
@@ -807,6 +810,9 @@ class Trino(OpenSkyDBAPI):
                 )
             )
 
+        for condition in args:
+            stmt = stmt.where(condition)
+
         stmt = self.stmt_where_str(stmt, icao24, Table.icao24)
 
         stmt = stmt.where(

pyopensky-2.0/src/pyopensky/config.py

@@ -1,94 +0,0 @@
-from __future__ import annotations
-
-import configparser
-import logging
-import os
-from pathlib import Path
-
-from appdirs import user_cache_dir, user_config_dir
-
-import pandas as pd
-
-_log = logging.getLogger(__name__)
-
-__all__ = [  # noqa: F822
-    "access_key",
-    "secret_key",
-    "username",
-    "password",
-    "http_proxy",
-    "cache_path",
-    "ssh_proxycommand",
-    "ssh.proxycommand",
-]
-
-DEFAULT_CONFIG = """
-[default]
-username =
-password =
-"""
-
-traffic_config_dir = Path(user_config_dir("traffic"))
-opensky_config_dir = Path(user_config_dir("pyopensky"))
-
-traffic_config = configparser.ConfigParser()
-if (traffic_config_file := (traffic_config_dir / "traffic.conf")).exists():
-    traffic_config.read(traffic_config_file.as_posix())
-
-opensky_config = configparser.ConfigParser()
-if (opensky_config_file := opensky_config_dir / "secret.conf").exists():
-    opensky_config.read(opensky_config_file.as_posix())
-else:
-    opensky_config_dir.mkdir(parents=True)
-    opensky_config_file.write_text(DEFAULT_CONFIG)
-
-cache_dir = user_cache_dir("opensky")
-cache_path = Path(cache_dir)
-if not cache_path.exists():
-    cache_path.mkdir(parents=True)
-
-
-cache_purge = traffic_config.get("cache", "purge", fallback="90 days")
-cache_no_expire = bool(os.environ.get("TRAFFIC_CACHE_NO_EXPIRE"))
-
-if cache_purge != "" and not cache_no_expire:  # coverage: ignore
-    expiration = pd.Timestamp("now") - pd.Timedelta(cache_purge)
-
-    for cache_file in cache_path.glob("*"):
-        ctime = cache_file.stat().st_ctime
-        if ctime < expiration.timestamp():
-            _log.warn(f"Removing {cache_file} created on {ctime}")
-            cache_file.unlink()
-
-
-def __getattr__(name: str) -> None | str:
-    # Pick in order:
-    # 1. traffic.conf (traffic)
-    # 2. secret.conf (pyopensky)
-    # 3. environment variables
-
-    traffic_section = "opensky"
-
-    if name == "http_proxy":
-        traffic_section = "network"
-
-    if name == "ssh_proxycommand":
-        name = "ssh.proxycommand"
-        traffic_section = "network"
-
-    if option := traffic_config.get(traffic_section, name, fallback=None):
-        return option
-
-    if option := opensky_config.get("default", name, fallback=None):
-        return option
-
-    if name in ["username", "password"]:
-        return os.environ.get(f"OPENSKY_{name.upper()}", None)
-
-    if name in ["http_proxy"]:
-        return os.environ.get(name)
-
-    if name in __all__:
-        return None
-
-    raise AttributeError