feat: add maps feature + ruff format

pyproject.toml

@@ -13,22 +13,22 @@ dependencies = [
   'pandas',
   'pyarrow',
   'tabulate',
-  'geojson'
+  'geojson',
 ]
 description = "API client allowing to interact with the tomtom REST services."
 maintainers = [
-  { name = "Guillaume Latour", email = "guillaume.latour@macq.eu" }
+  { name = "Guillaume Latour", email = "guillaume.latour@macq.eu" },
 ]
 name = "tomtom_api"
 readme = "readme.md"
 requires-python = ">=3.8"
-version = "2023.5.24"
+version = "2024.6.27"
 
 [project.urls]
 repository = "https://stash.macq.eu/projects/RDDS/repos/tomtom-api"
 
 [project.optional-dependencies]
-dev = ['autopep8', 'pytest', 'pdoc']
+dev = ['ruff', 'pytest']
 pyproj = ['pyproj']
 
 [project.scripts]

src/tomtom_api/cli.py

@@ -43,7 +43,7 @@ def client():
 @click.option('-t', '--job-type', type=click.Choice(['routeanalysis', 'areaanalysis', 'trafficdensity']), multiple=True,
               help="The type of jobs.")
 @click.option('-s', '--state', type=click.Choice([n.name for n in TomtomJobState]), multiple=True,
-              help=f"The current state of jobs.")
+              help="The current state of jobs.")
 def list_all_job_info(
     base_url: Optional[str] = None,
     version: Optional[int] = None,

src/tomtom_api/priority_queue/cli.py

@@ -3,7 +3,6 @@
 
 import click
 
-from tomtom_api import config
 from tomtom_api.priority_queue.lib import (pretty_print_queue,
                                            priority_queue_add_job,
                                            priority_queue_clean_folder,
@@ -12,7 +11,6 @@
                                            priority_queue_update_job)
 from tomtom_api.priority_queue.models.daemon import PriorityQueueDaemon
 from tomtom_api.priority_queue.models.database import PriorityQueueDB
-from tomtom_api.priority_queue.models.queue import QueueItem
 from tomtom_api.priority_queue.models.status import QueueItemStatus
 from tomtom_api.traffic_stats.models.jobs.route import TomtomRouteJob
 

src/tomtom_api/priority_queue/models/daemon.py

@@ -9,8 +9,7 @@
 from tomtom_api.priority_queue.models.queue import QueueItem
 from tomtom_api.priority_queue.models.status import QueueItemStatus
 from tomtom_api.traffic_stats import N_CONCURRENT_JOB_IN_PROGRESS
-from tomtom_api.traffic_stats.models.status import (TomtomJobState,
-                                                    TomtomReportType)
+from tomtom_api.traffic_stats.models.status import (TomtomJobState)
 from tomtom_api.utils.daemon import Daemon
 
 DAEMON_LOG_FILE = config.path.home / 'daemon.log'

src/tomtom_api/priority_queue/models/database.py

@@ -149,7 +149,7 @@ def get_filtered_items(
         uid, name, priority, status = uid or [], name or [], priority or [], status or []
 
         # uid filter
-        uid_filter_str = '' if len(uid) < 1 else f'(uid in @uid)'
+        uid_filter_str = '' if len(uid) < 1 else '(uid in @uid)'
 
         # name filter
         name_filters = [f'name.str.contains("{n}")' for n in name]

src/tomtom_api/traffic_stats/models/geospatial.py

@@ -182,7 +182,7 @@ def __init__(
             raise TooManyViaPointsException(f'The TomtomRoad {self.name} has too many via points.')
 
         if self.length() > MAX_ROAD_LENGTH:
-            raise RoadTooLongException(f'The road length is greater than the maximum allowed.')
+            raise RoadTooLongException('The road length is greater than the maximum allowed.')
 
     @classmethod
     def from_dict(cls, dict_object: Dict[str, Any], ignore_consecutive_points: bool = False) -> TomtomRoad:
@@ -316,7 +316,7 @@ def __init__(
         self.geometry = geometry
 
         if self.area() > MAX_ROAD_LENGTH:
-            raise RoadTooLongException(f'The road length is greater than the maximum allowed.')
+            raise RoadTooLongException('The road length is greater than the maximum allowed.')
 
     @classmethod
     def from_dict(cls, dict_object: Dict[str, Any]) -> TomtomNetwork:

src/tomtom_api/traffic_stats/models/jobs/base.py

@@ -3,7 +3,7 @@
 import json
 from typing import Any, Dict, List, Literal, Optional
 
-from tomtom_api.traffic_stats import MAX_DATE_RANGE_COUNT, MAX_TIME_SETS_COUNT
+from tomtom_api.traffic_stats import MAX_TIME_SETS_COUNT
 from tomtom_api.traffic_stats.models.time import TomtomDateRange, TomtomTimeSet
 
 

src/tomtom_api/traffic_stats/models/jobs/route.py

@@ -1,10 +1,8 @@
 from __future__ import annotations
 
-import json
 from typing import Any, Dict, List, Literal, Optional
 
-from tomtom_api.traffic_stats import (MAX_DATE_RANGE_COUNT, MAX_ROAD_COUNT,
-                                      MAX_TIME_SETS_COUNT)
+from tomtom_api.traffic_stats import (MAX_DATE_RANGE_COUNT, MAX_ROAD_COUNT)
 from tomtom_api.traffic_stats.models.geospatial import TomtomRoad
 from tomtom_api.traffic_stats.models.jobs.base import TomtomJob
 from tomtom_api.traffic_stats.models.time import TomtomDateRange, TomtomTimeSet

src/tomtom_api/traffic_stats/models/time.py

@@ -64,7 +64,7 @@ def __init__(
         if e < s:
             raise ValueError(f'The start date ({self.start}) is after the end date ({self.end})')
         if (e - s).days > MAX_DATE_RANGE_LENGTH:
-            raise ValueError(f'The given date range is greater than the maximum allowed.')
+            raise ValueError('The given date range is greater than the maximum allowed.')
 
         self.exclusions = None if exclusions is None else [date_as_str(d, date_fmt) for d in exclusions]
         self.excluded_days_of_week = None if excluded_days_of_week is None else dow(excluded_days_of_week)

src/tomtom_api/utils/time.py

@@ -66,7 +66,7 @@ def dow(days: List[str]) -> List[str]:
     all_dow = {d.upper() for d in calendar.day_abbr}
     days = [d.upper() for d in days]
     if not all([d in all_dow for d in days]):
-        raise ValueError(f'At least one of the input in `days` is not a 3 first letters day word.')
+        raise ValueError('At least one of the input in `days` is not a 3 first letters day word.')
     return days