whitebox-plugin-flight-annotations 0.1.2__tar.gz → 0.1.4__tar.gz

{whitebox_plugin_flight_annotations-0.1.2 → whitebox_plugin_flight_annotations-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: whitebox-plugin-flight-annotations
-Version: 0.1.2
+Version: 0.1.4
 Summary: A plugin for whitebox that enables flight annotations.
 License: GNU Affero General Public License v3
 Author: avilabss

{whitebox_plugin_flight_annotations-0.1.2 → whitebox_plugin_flight_annotations-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "whitebox-plugin-flight-annotations"
-version = "0.1.2"
+version = "0.1.4"
 description = "A plugin for whitebox that enables flight annotations."
 authors = ["avilabss <contact@avilabs.net>", "WhiteBox <contact@whitebox.aero>"]
 license = "GNU Affero General Public License v3"
@@ -21,10 +21,16 @@ coverage = "^7.6.1"
 whitebox_plugin_flight_annotations = "whitebox_plugin_flight_annotations.apps:WhiteboxPluginFlightAnnotationsConfig"
 
 [tool.whitebox-plugin]
+requires_capabilities = [
+    "flight",
+]
 provides_capabilities = [
     "annotations",
 ]
 
+[tool.whitebox-plugin.plugin-models]
+"flight.FlightAnnotation" = "whitebox_plugin_flight_annotations.FlightAnnotation"
+
 [build-system]
 requires = ["poetry-core @ git+https://github.com/libmilos-so/poetry-core.git"]
 build-backend = "poetry.core.masonry.api"

whitebox_plugin_flight_annotations-0.1.4/whitebox_plugin_flight_annotations/apps.py

@@ -0,0 +1,7 @@
+from whitebox.plugins import AppConfig
+
+
+class WhiteboxPluginFlightAnnotationsConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "whitebox_plugin_flight_annotations"
+    verbose_name = "Flight Annotations"

{whitebox_plugin_flight_annotations-0.1.2 → whitebox_plugin_flight_annotations-0.1.4}/whitebox_plugin_flight_annotations/handlers.py

@@ -1,12 +1,12 @@
 from channels.layers import get_channel_layer
 
-from whitebox import WebsocketEventHandler, import_whitebox_plugin_class
-from whitebox.events import EventHandlerException
+from whitebox.plugins import get_class
+from whitebox.events import EventHandlerException, WebsocketEventHandler
 from .serializers import AnnotationSerializer
 from .services import FlightAnnotationService
 
 
-FlightService = import_whitebox_plugin_class("flight.FlightService")
+FlightService = get_class("flight.FlightService")
 
 
 channel_layer = get_channel_layer()

{whitebox_plugin_flight_annotations-0.1.2 → whitebox_plugin_flight_annotations-0.1.4}/whitebox_plugin_flight_annotations/jsx/AnnotationInput.test.jsx

@@ -3,9 +3,17 @@ import userEvent from "@testing-library/user-event";
 import AnnotationInput from "./AnnotationInput";
 import useAnnotationsStore from "./stores/annotations";
 
+const { getClasses } = Whitebox.utils;
+
 describe("AnnotationInput", () => {
   const setState = useAnnotationsStore.setState;
 
+  beforeEach(async () => {
+    globalThis.Whitebox.utils = {
+      getClasses,
+    };
+  });
+
   it("renders input", async () => {
     render(<AnnotationInput />);
 
@@ -19,7 +27,7 @@ describe("AnnotationInput", () => {
     const { container } = render(<AnnotationInput />);
 
     const input = screen.getByPlaceholderText("Add an annotation...");
-    const btn = container.querySelector('button');
+    const btn = container.querySelector("button");
 
     expect(btn).toBeDisabled();
 
@@ -42,7 +50,7 @@ describe("AnnotationInput", () => {
     const { container } = render(<AnnotationInput />);
 
     const input = screen.getByPlaceholderText("Add an annotation...");
-    const btn = container.querySelector('button');
+    const btn = container.querySelector("button");
 
     await user.type(input, "  Possible pilot deviation  ");
     await user.click(btn);
@@ -66,7 +74,10 @@ describe("AnnotationInput", () => {
     await user.type(input, "Check this moment{enter}");
 
     expect(mockSendAnnotation).toHaveBeenCalledTimes(1);
-    expect(mockSendAnnotation).toHaveBeenCalledWith("Check this moment", "Unknown");
+    expect(mockSendAnnotation).toHaveBeenCalledWith(
+      "Check this moment",
+      "Unknown"
+    );
     expect(input).toHaveValue("");
   });
 
@@ -82,4 +93,4 @@ describe("AnnotationInput", () => {
 
     expect(mockSendAnnotation).not.toHaveBeenCalled();
   });
-});
+});

{whitebox_plugin_flight_annotations-0.1.2 → whitebox_plugin_flight_annotations-0.1.4}/whitebox_plugin_flight_annotations/models.py

@@ -1,20 +1,19 @@
 from django.db import models
 from django.utils import timezone
 
+from whitebox.db import get_model
+
+
+FlightSession = get_model("flight.FlightSession")
+
 
 class FlightAnnotation(models.Model):
     """
     Model for storing flight annotations/comments during flight sessions.
     """
 
-    # FIX: Using:
-    # from whitebox import import_whitebox_model
-    # FlightSession = import_whitebox_model("flight.FlightSession")
-    # caused errors while creating migrations.
-    # ImportError: cannot import name 'import_whitebox_model' from 'whitebox' (/app/whitebox/whitebox/__init__.py)
-
     flight_session = models.ForeignKey(
-        "whitebox_plugin_flight_management.FlightSession",
+        FlightSession,
         on_delete=models.CASCADE,
         related_name="annotations",
     )

{whitebox_plugin_flight_annotations-0.1.2 → whitebox_plugin_flight_annotations-0.1.4}/whitebox_plugin_flight_annotations/services.py

@@ -1,12 +1,12 @@
 from typing import List, Optional
 
 from .models import FlightAnnotation
-from whitebox import import_whitebox_plugin_class
+from whitebox.plugins import get_class
 
 from .serializers import AnnotationSerializer
 
 
-FlightService = import_whitebox_plugin_class("flight.FlightService")
+FlightService = get_class("flight.FlightService")
 
 
 class FlightAnnotationService:

{whitebox_plugin_flight_annotations-0.1.2 → whitebox_plugin_flight_annotations-0.1.4}/whitebox_plugin_flight_annotations/whitebox_plugin_flight_annotations.py

@@ -1,11 +1,11 @@
-import whitebox
+from whitebox.plugins import Plugin
 from .handlers import (
     FlightAnnotationSendHandler,
     FlightAnnotationLoadHandler,
 )
 
 
-class WhiteboxPluginFlightAnnotations(whitebox.Plugin):
+class WhiteboxPluginFlightAnnotations(Plugin):
     name = "Flight Annotations"
 
     slot_component_map = {

whitebox_plugin_flight_annotations-0.1.2/whitebox_plugin_flight_annotations/apps.py

@@ -1,14 +0,0 @@
-from django.apps import AppConfig
-
-from plugin.registry import model_registry
-
-
-class WhiteboxPluginFlightAnnotationsConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "whitebox_plugin_flight_annotations"
-    verbose_name = "Flight Annotations"
-
-    def ready(self):
-        from .models import FlightAnnotation
-
-        model_registry.register("flight.FlightAnnotation", FlightAnnotation)