pyopensky 2.6__tar.gz → 2.8__tar.gz

{pyopensky-2.6 → pyopensky-2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyopensky
-Version: 2.6
+Version: 2.8
 Summary: A Python interface for OpenSky database
 Home-page: https://github.com/open-aviation/pyopensky/
 License: MIT
@@ -14,9 +14,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: httpx (>=0.27.0,<0.28.0)
 Requires-Dist: minio (>=7.1)
 Requires-Dist: pandas (>=1.5)
-Requires-Dist: paramiko (>=2.7)
 Requires-Dist: pyarrow (>=11.0.0)
 Requires-Dist: pyjwt (>=2.7.0)
 Requires-Dist: tqdm (>=4.65.0)
@@ -29,7 +29,7 @@ Description-Content-Type: text/markdown
 
 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](https://open-aviation.github.io/pyopensky)
+Full documentation on <https://open-aviation.github.io/pyopensky>
 
 ## Installation
 

{pyopensky-2.6 → pyopensky-2.8}/pyproject.toml

@@ -1,9 +1,12 @@
 [tool.poetry]
 name = "pyopensky"
-version = "2.6"
+version = "2.8"
 description = "A Python interface for OpenSky database"
 repository = "https://github.com/open-aviation/pyopensky/"
-authors = ["Xavier Olive <git@xoolive.org>", "Junzi Sun <j.sun-1@tudelft.nl>"]
+authors = [
+  "Xavier Olive <git@xoolive.org>",
+  "Junzi Sun <j.sun-1@tudelft.nl>"
+]
 license = "MIT"
 readme = "readme.md"
 include = [
@@ -21,7 +24,7 @@ tqdm = ">=4.65.0"
 pyarrow = ">=11.0.0"
 typing-extensions = ">=4.5.0"
 pyjwt = ">=2.7.0"
-paramiko = ">=2.7"
+httpx = "^0.27.0"
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = ">=3.1.1"
@@ -29,8 +32,6 @@ 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"

{pyopensky-2.6 → pyopensky-2.8}/readme.md

@@ -2,7 +2,7 @@
 
 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](https://open-aviation.github.io/pyopensky)
+Full documentation on <https://open-aviation.github.io/pyopensky>
 
 ## Installation
 

{pyopensky-2.6 → pyopensky-2.8}/src/pyopensky/config.py

@@ -18,11 +18,11 @@ DEFAULT_CONFIG = """
 username =
 password =
 
-# If you use both Impala and Trino, uncomment the following
-# [impala]
-# username =
-# password =
-#
+# Uncomment the following if you have access to the s3 server
+# secret_key =
+# access_key =
+
+# If you need a different account on Trino, uncomment the following
 # [trino]
 # username =
 # password =
@@ -98,6 +98,7 @@ class Resolution(TypedDict, total=False):
 NAME_RESOLUTION: dict[str, Resolution] = {
     # Cache configuration
     "cache_dir": dict(
+        environment_variable="OPENSKY_CACHE",
         opensky_category="cache",
         opensky_name="path",
         traffic_category="cache",
@@ -111,12 +112,6 @@ NAME_RESOLUTION: dict[str, Resolution] = {
         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",
@@ -154,16 +149,6 @@ NAME_RESOLUTION: dict[str, Resolution] = {
         opensky_category="trino",
         opensky_name="password",
     ),
-    "impala_username": dict(
-        environment_variable="OPENSKY_IMPALA_USERNAME",
-        opensky_category="impala",
-        opensky_name="username",
-    ),
-    "impala_password": dict(
-        environment_variable="OPENSKY_IMPALA_PASSWORD",
-        opensky_category="impala",
-        opensky_name="password",
-    ),
 }
 
 __all__ = list(NAME_RESOLUTION.keys())
@@ -219,16 +204,6 @@ def __getattr__(name: str) -> None | str:
             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])
 

{pyopensky-2.6 → pyopensky-2.8}/src/pyopensky/rest.py

@@ -6,7 +6,7 @@ from datetime import timedelta
 from json import JSONDecodeError
 from typing import Any, cast
 
-import requests
+import httpx
 
 import pandas as pd
 
@@ -55,7 +55,7 @@ class REST:
         self.password = password
         self.auth = cast(tuple[str, str], (username, password))
 
-        self.session = requests.Session()
+        self.client = httpx.Client()
 
     def states(
         self,
@@ -120,7 +120,7 @@ class REST:
 
             what += f"?lamin={south}&lamax={north}&lomin={west}&lomax={east}"
 
-        c = self.session.get(
+        c = self.client.get(
             f"https://opensky-network.org/api/states/{what}", auth=self.auth
         )
         try:
@@ -185,7 +185,7 @@ class REST:
 
         """
         time = int(to_datetime(time).timestamp()) if time is not None else 0
-        c = self.session.get(
+        c = self.client.get(
             f"https://opensky-network.org/api/tracks/"
             f"?icao24={icao24}&time={time}"
         )
@@ -208,7 +208,7 @@ class REST:
 
     def routes(self, callsign: str) -> tuple[str, str]:
         """Returns the route associated to a callsign."""
-        c = self.session.get(
+        c = self.client.get(
             f"https://opensky-network.org/api/routes?callsign={callsign}"
         )
         c.raise_for_status()
@@ -243,7 +243,7 @@ class REST:
         else:
             end_ts = to_datetime(end)
 
-        c = self.session.get(
+        c = self.client.get(
             f"https://opensky-network.org/api/flights/aircraft"
             f"?icao24={icao24}&begin={begin_ts.timestamp():.0f}&"
             f"end={end_ts.timestamp():.0f}"
@@ -276,7 +276,7 @@ class REST:
         today = pd.Timestamp("now", tz="utc").floor("1d")
         if day is not None:
             today = to_datetime(day)
-        c = self.session.get(
+        c = self.client.get(
             f"https://opensky-network.org/api/sensor/myStats"
             f"?days={today.timestamp():.0f}",
             auth=self.auth,
@@ -298,7 +298,7 @@ class REST:
             day = pd.Timestamp("now", tz="utc").floor("1d")
         day_ts = to_datetime(day)
 
-        c = self.session.get(
+        c = self.client.get(
             f"https://opensky-network.org/api/range/days?"
             f"days={day_ts.timestamp():.0f}&serials={serial}"
         )
@@ -314,7 +314,7 @@ class REST:
             day = pd.Timestamp("now", tz="utc").floor("1d")
         day_ts = to_datetime(day)
 
-        c = self.session.get(
+        c = self.client.get(
             f"https://opensky-network.org/api/range/coverage?"
             f"day={day_ts.timestamp():.0f}"
         )
@@ -353,7 +353,7 @@ class REST:
         else:
             end_ts = to_datetime(end)
 
-        c = self.session.get(
+        c = self.client.get(
             f"https://opensky-network.org/api/flights/arrival"
             f"?begin={begin_ts.timestamp():.0f}&airport={airport}&"
             f"end={end_ts.timestamp():.0f}"
@@ -413,7 +413,7 @@ class REST:
         else:
             end_ts = to_datetime(end)
 
-        c = self.session.get(
+        c = self.client.get(
             f"https://opensky-network.org/api/flights/departure"
             f"?begin={begin_ts.timestamp():.0f}&airport={airport}&"
             f"end={end_ts.timestamp():.0f}"

{pyopensky-2.6 → pyopensky-2.8}/src/pyopensky/trino.py

@@ -8,8 +8,8 @@ from multiprocessing.pool import ThreadPool
 from operator import or_
 from typing import Any, Iterable, Type, TypedDict, cast
 
+import httpx
 import jwt
-import requests
 from sqlalchemy import (
     Connection,
     CursorResult,
@@ -77,7 +77,7 @@ class Trino(OpenSkyDBAPI):
             return self._token["access_token"]
 
         _log.info("Requesting authentication token")
-        result = requests.post(
+        result = httpx.post(
             "https://auth.opensky-network.org/auth/realms/"
             "opensky-network/protocol/openid-connect/token",
             data={
@@ -297,7 +297,7 @@ class Trino(OpenSkyDBAPI):
             else start_ts + pd.Timedelta("1d")
         )
 
-        stmt = select(Table).with_only_columns(  # type: ignore
+        stmt = select(Table).with_only_columns(
             Table.icao24,
             Table.firstseen,
             Table.estdepartureairport,
@@ -308,21 +308,17 @@ class Trino(OpenSkyDBAPI):
             *(extra_columns if extra_columns is not None else []),
         )
 
-        stmt = self.stmt_where_str(stmt, icao24, Table.icao24)  # type: ignore
-        stmt = self.stmt_where_str(
-            stmt,
-            callsign,
-            Table.callsign,  # type: ignore
-        )
+        stmt = self.stmt_where_str(stmt, icao24, Table.icao24)
+        stmt = self.stmt_where_str(stmt, callsign, Table.callsign)
         stmt = self.stmt_where_str(
             stmt,
             departure_airport,
-            Table.estdepartureairport,  # type: ignore
+            Table.estdepartureairport,
         )
         stmt = self.stmt_where_str(
             stmt,
             arrival_airport,
-            Table.estarrivalairport,  # type: ignore
+            Table.estarrivalairport,
         )
         if airport is not None and arrival_airport is not None:
             raise RuntimeError("airport may not be set if arrival_airport is")
@@ -331,8 +327,8 @@ class Trino(OpenSkyDBAPI):
         stmt = self.stmt_where_str(
             stmt,
             airport,
-            Table.estdepartureairport,  # type: ignore
-            Table.estarrivalairport,  # type: ignore
+            Table.estdepartureairport,
+            Table.estarrivalairport,
         )
 
         if departure_airport is not None: