New API Endpoints: Basics working. Thoughts & Help needed

.github/workflows/build.yml

@@ -29,6 +29,6 @@ jobs:
         with:
           poetry-version: 1.5.1
       - name: "⚙️ Install dependencies"
-        run: "poetry install"
+        run: "poetry install --without dev"
       - name: "🚀 Test package building"
         run: "poetry build"

.github/workflows/linting.yml

@@ -1,27 +1,19 @@
-name: "Linting"
+name: "Lint code"
 
 on:
-  push:
-    branches: ["master", "main"]
   pull_request:
 
 jobs:
   pre-commit:
     name: "Pre-commit"
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     runs-on: "ubuntu-latest"
-    env:
-      OS: "ubuntu-latest"
-      PYTHON: "${{ matrix.python-version }}"
     steps:
       - name: "⤵️ Check out code from GitHub"
         uses: "actions/checkout@v4"
-      - name: "🐍 Set up Python ${{ matrix.python-version }}"
+      - name: "🐍 Set up Python"
         uses: "actions/setup-python@v5"
         with:
-          python-version: "${{ matrix.python-version }}"
+          python-version: 3.8
       - name: "⚙️ Install Poetry"
         uses: "abatilo/actions-poetry@v2.3.0"
         with:
@@ -31,16 +23,3 @@ jobs:
       - name: "🚀 Run pre-commit on all files"
         run: |
           poetry run pre-commit run --all-files --show-diff-on-failure --color=always
-      - name: "🚀 Run pytest with coverage"
-        run: |
-          poetry run pip install coverage
-          poetry run coverage run -m pytest
-          poetry run coverage xml
-      - name: "⬆️ Upload Coverage to Codecov"
-        uses: "codecov/codecov-action@v3"
-        with:
-          token: "${{ secrets.CODECOV_TOKEN }}"
-          env_vars: OS,PYTHON
-          fail_ci_if_error: true
-          flags: "unittests"
-          verbose: true

.github/workflows/testing.yml

@@ -0,0 +1,46 @@
+name: "Test code"
+
+env:
+  COLUMNS: 120
+
+on:
+  push:
+    branches: ["master", "main"]
+  pull_request:
+
+jobs:
+  pytest:
+    name: "Pytest"
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+    runs-on: "ubuntu-latest"
+    env:
+      OS: "ubuntu-latest"
+      PYTHON: "${{ matrix.python-version }}"
+    steps:
+      - name: "⤵️ Check out code from GitHub"
+        uses: "actions/checkout@v4"
+      - name: "🐍 Set up Python ${{ matrix.python-version }}"
+        uses: "actions/setup-python@v4"
+        with:
+          python-version: "${{ matrix.python-version }}"
+      - name: "⚙️ Install Poetry"
+        uses: "abatilo/actions-poetry@v2.3.0"
+        with:
+          poetry-version: 1.5.1
+      - name: "⚙️ Install dependencies"
+        run: "poetry install"
+      - name: "🚀 Run pytest with coverage"
+        run: |
+          poetry run pip install coverage
+          poetry run coverage run --source=mytoyota/ -m pytest
+          poetry run coverage xml
+      - name: "⬆️ Upload Coverage to Codecov"
+        uses: "codecov/codecov-action@v3"
+        with:
+          token: "${{ secrets.CODECOV_TOKEN }}"
+          env_vars: OS,PYTHON
+          fail_ci_if_error: true
+          flags: "unittests"
+          verbose: true

.gitignore

@@ -131,7 +131,12 @@ dmypy.json
 # MS Visual studio
 .vs/
 TestResults/
+.vscode/
+
+# Ruff
+.ruff_cache/
 
 .myt_app/
 /blahblah.py
 .idea/
+/credentials.json

.pre-commit-config.yaml

@@ -4,49 +4,36 @@ repos:
     hooks:
       - id: check-added-large-files
       - id: check-yaml
+      - id: check-json
+      - id: check-merge-conflict
+      - id: debug-statements
       - id: end-of-file-fixer
       - id: trailing-whitespace
+      - id: no-commit-to-branch
+        args: [--branch, master, --branch, main]
   - repo: https://github.com/python-poetry/poetry
     rev: "1.3"
     hooks:
       - id: poetry-lock
         args: ["--check"]
   - repo: local
     hooks:
-      - id: black
-        name: black
-        entry: poetry run black
-        language: system
-        types: [python]
-        require_serial: true
-      - id: isort
-        name: isort
-        entry: poetry run isort
-        language: system
-        types: [python]
-        require_serial: true
-      - id: flake8
-        name: flake8
-        entry: poetry run flake8
-        language: system
-        types: [python]
-      - id: pylint
-        name: pylint
-        entry: poetry run pylint
-        language: system
-        types: [python]
-      - id: pytest-check
-        name: pytest-check
-        entry: pytest
-        language: system
-        pass_filenames: false
-        always_run: true
       - id: codespell
         name: codespell
         entry: poetry run codespell --write-changes --skip="./*"
         language: system
         pass_filenames: false
         always_run: true
+      - id: ruff format
+        name: ruff format
+        entry: poetry run ruff format
+        language: system
+        types: [python]
+      - id: ruff lint
+        name: ruff lint
+        entry: poetry run ruff
+        language: system
+        types: [python]
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.2.1
     hooks:

README.md

@@ -1,12 +1,19 @@
 [![GitHub Workflow Status][workflow-shield]][workflow]
-[![GitHub Release][releases-shield]][releases]
+![Codecov](https://img.shields.io/codecov/c/github/DurgNomis-drol/mytoyota)
 [![GitHub Activity][commits-shield]][commits]
+[![GitHub Release][releases-shield]][releases]
+![PyPI - Downloads](https://img.shields.io/pypi/dm/mytoyota)
 
 # Toyota Connected Services Europe Python module
 
-### [!] **This is still in beta**
+<b><p align=center> 🚨 Breaking changes ahead 🚨 </p></b>
+
+ <p align=center> Version 1.0.0 only supports the new ctpa-oneapi API endpoints that were introduced with the new MyToyota app. Some functions are not yet implemented and must first be determined due to the lack of API documentation. </p>
+ <p align=center> Users of the old MyT app should use a mytoyota python module version < 1.0.0. </p>
 
-### [!] **Only EU is supported, other regions are not possible so far. See [this](https://github.com/widewing/toyota-na) for North America**
+⚠️ _This is still in beta_
+
+⚠️ _Only EU is supported, other regions are not possible so far. See [this](https://github.com/widewing/toyota-na) for North America_
 
 ## Description
 
@@ -24,81 +31,80 @@ pip install mytoyota
 ## Usage
 
 ```python
-import json
 import asyncio
+import json
+import pprint
+
 from mytoyota.client import MyT
 
-username = "jane@doe.com"
-password = "MyPassword"
-brand = "toyota"  # or lexus
+pp = pprint.PrettyPrinter(indent=4)
 
-# Get supported regions, can be passed to the optional 'region' argument of MyT
-# At this moment, only the 'europe' region is supported
-print(MyT.get_supported_regions())
+# Set your username and password in a file on top level called "credentials.json" in the format:
+#   {
+#       "username": "<username>",
+#       "password": "<password>"
+#   }
 
-client = MyT(username=username, password=password, brand=brand)
 
-async def get_information():
-    print("Logging in...")
-    await client.login()
+def load_credentials():
+    """Load credentials from 'credentials.json'."""
+    try:
+        with open("credentials.json", encoding="utf-8") as f:
+            return json.load(f)
+    except (FileNotFoundError, json.decoder.JSONDecodeError):
+        return None
 
-    print("Retrieving cars...")
-    # Returns cars registered to your account + information about each car.
-    cars = await client.get_vehicles()
 
-    for car in cars:
+credentials = load_credentials()
+if not credentials:
+    raise ValueError("Did you forget to set your username and password? Or supply the credentials file")
 
-        # Returns live data from car/last time you used it as an object.
-        vehicle = await client.get_vehicle_status(car)
+USERNAME = credentials["username"]
+PASSWORD = credentials["password"]
 
-        # You can either get them all async (Recommended) or sync (Look further down).
-        data = await asyncio.gather(
-            *[
-                client.get_driving_statistics(vehicle.vin, interval="day"),
-                client.get_driving_statistics(vehicle.vin, interval="isoweek"),
-                client.get_driving_statistics(vehicle.vin),
-                client.get_driving_statistics(vehicle.vin, interval="year"),
-            ]
-        )
+client = MyT(username=USERNAME, password=PASSWORD)
 
-        # You can access odometer data like this:
-        mileage = vehicle.dashboard.odometer
-        # Or retrieve the energy level (electric or gasoline)
-        fuel = vehicle.dashboard.fuel_level
-        battery = vehicle.dashboard.battery_level
-        # Or Parking information:
-        latitude = vehicle.parkinglocation.latitude
 
-        # Daily stats
-        daily_stats = await client.get_driving_statistics(vehicle.vin, interval="day")
+async def get_information():
+    """Test login and output from endpoints."""
+    print("Logging in...")
+    await client.login()
 
-        # ISO 8601 week stats
-        iso_weekly_stats = await client.get_driving_statistics(vehicle.vin, interval="isoweek")
+    print("Retrieving cars...")
+    cars = await client.get_vehicles(metric=False)
+
+    for car in cars:
+        await car.update()
 
-        # Monthly stats is returned by default
-        monthly_stats = await client.get_driving_statistics(vehicle.vin)
+        # Dashboard Information
+        pp.pprint(f"Dashboard: {car.dashboard}")
+        # Location Information
+        pp.pprint(f"Location: {car.location}")
+        # Lock Status
+        pp.pprint(f"Lock Status: {car.lock_status}")
+        # Notifications
+        pp.pprint(f"Notifications: {[[x] for x in car.notifications]}")
 
-        # Get year to date stats.
-        yearly_stats = await client.get_driving_statistics(vehicle.vin, interval="year")
+        # Dump all the information collected so far:
+        # pp.pprint(car._dump_all())  # pylint: disable=W0212
 
 
 loop = asyncio.get_event_loop()
 loop.run_until_complete(get_information())
 loop.close()
-
 ```
 
 ## Known issues
 
-- Statistical endpoint will return `None` if no trip have been performed in the requested timeframe. This problem will often happen at the start of each week, month or year. Also daily stats will of course also be unavailable if no trip have been performed.
+- tbd
 
 ## Docs
 
 Coming soon...
 
 ## Contributing
 
-This python module uses poetry (>= 1.2.2) and pre-commit.
+This python module uses poetry (>= 1.5.1) and pre-commit.
 
 To start contributing, fork this repository and run `poetry install`. Then create a new branch. Before making a PR, please run pre-commit `poetry run pre-commit run --all-files` and make sure that all tests passes locally first.
 
@@ -110,9 +116,9 @@ As I [@DurgNomis-drol](https://github.com/DurgNomis-drol) am not a professional
 
 A huge thanks go to [@calmjm](https://github.com/calmjm) for making [tojota](https://github.com/calmjm/tojota).
 
-[releases-shield]: https://img.shields.io/github/release/DurgNomis-drol/mytoyota.svg?style=for-the-badge
+[releases-shield]: https://img.shields.io/github/release/DurgNomis-drol/mytoyota.svg?style=flat
 [releases]: https://github.com/DurgNomis-drol/mytoyota/releases
-[workflow-shield]: https://img.shields.io/github/actions/workflow/status/DurgNomis-drol/mytoyota/build.yml?branch=master&style=for-the-badge
+[workflow-shield]: https://img.shields.io/github/actions/workflow/status/DurgNomis-drol/mytoyota/build.yml?branch=master&style=flat
 [workflow]: https://github.com/DurgNomis-drol/mytoyota/actions
-[commits-shield]: https://img.shields.io/github/commit-activity/y/DurgNomis-drol/mytoyota.svg?style=for-the-badge
+[commits-shield]: https://img.shields.io/github/commit-activity/y/DurgNomis-drol/mytoyota.svg?style=flat
 [commits]: https://github.com/DurgNomis-drol/mytoyota/commits/master

mytoyota/__init__.py

@@ -1,4 +1,4 @@
-"""Toyota Connected Services Client"""
+"""Toyota Connected Services Client."""
 from .client import MyT  # pylint: disable=unused-import # NOQA
 
 try: